gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /kde-apps
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
923 files changed, 11004 insertions, 10036 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 2897ca062691..eed15bb0d803 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 9cf0dfd9ea18..92cd313197a6 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-calendar-19.04.3.tar.xz 332632 BLAKE2B 928fc1ce338f90fa16378eddab3861aa49938f35d434259675362ca1a4461cfc7c4181f2c14f5b037be8f4e512ba917b3adb58440415c34c4a1c91259bab2c3c SHA512 b72b79c51d007669f637299a60dc246a363a9484f332983c348984e62e8e1dfd3f7808e6de9014efc09786f78a12bb705cf11193c32071aef7b916c7a4abc3e2
 DIST akonadi-calendar-19.08.3.tar.xz 331796 BLAKE2B 0e43007a230c315919daf5203f5df71caead01b6c63e5a5ba01b1ac45726adcafcaed7e4a87a2900677baf81539630f4238792d62224d41a6fd86dd17f25bfb8 SHA512 e4c22cb43b7ec87f947ceb2746e159d75f6c370f16a9448c7d6ab46b30ce00f25624fc94f68e5a866651e49689248aa36de6f2d72cd3e15d5ef05eb82d6885ae
-EBUILD akonadi-calendar-19.04.3.ebuild 1158 BLAKE2B 5810b19759b28d1ccb55642dbb9b27d757176006ec15173515971f0c710bedd3f18b8d46d0400ba984bfffcf0d98b4013ffd4d382f1dc724a6348a82ef971330 SHA512 8accd7ad834b011f61f7ee16f87cb6baca1888c1016766adabac903fb62234450998b4bc850c398ca1de7ba9c7d7c8e57ef4869f4b4bfd4707e1b09152e60c31
-EBUILD akonadi-calendar-19.08.3.ebuild 1288 BLAKE2B b82bc49817feabe9a351243a630f40550f996c2ff97d21d7eae4c395f311dd2bc019dce0559c35adfea395033b53fc4c9ff926c24625fd5765701a7418e8fc5b SHA512 0795fa6eb76deae138c559023de19f7478ffae80f02748527e3ca03ce0b951472041ae1b46fd7edac15f2be32140ca115ff4d6bc515cbb8144470d0e16dbeb05
+DIST akonadi-calendar-19.12.0.tar.xz 331480 BLAKE2B 9084970c2314cb77268b724394ed6d3286d6aace2d557b042afdc9ce5d045fd0b23608a3f0d98f46b169f5af542fb0701c762e4d119924c8fe2b252e936f2766 SHA512 414720ee822103c940fbab39f8272f2ab52f32e32c60bb1630e0eb4805ee778d9ca772c4f5a40859f2ceae2eac569202a98a485d31f3b41799d4d2100e4c578a
+EBUILD akonadi-calendar-19.08.3.ebuild 1285 BLAKE2B e7891c8ec2730be2e9cc5574a35443c36e9bed92a994e7d73e7c553cfe4a1e9d9976f6ddb464ee2022924fd09af017ad9d9ce1380935dd823b593f70f27bfb29 SHA512 724f482a8673b5908f4862e3080cab926aced7080037624bbc8f62094d388982af98bcfc929ad69686b810907d9c4d1097a0043ef2a2a875cee393c9f53ec68b
+EBUILD akonadi-calendar-19.12.0.ebuild 1289 BLAKE2B 751500ba702763f1b86dcc73a2aa205f510bcf0e5c05062e8db70ae8b16e7d5270aadab27a681b4ae3089455c61cf3f31084db4664ac0474473d949ff986c2be SHA512 e093bb459c6c4d8bade0edf1057ef37c05b674f0f539142a60121a186c4c6bc3f661fd3ccf48a5ad65b1a934db297007274227c4f7ea4838f4f3fa64bdf3cc1f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.04.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.04.3.ebuild
deleted file mode 100644
index 7af44096708c..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.04.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild
index 488e99343f4c..868b59f79eb8 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for akonadi calendar integration"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.12.0.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.12.0.ebuild
new file mode 100644
index 000000000000..34ff7539893b
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.12.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 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.63.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="
+	>=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/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/kjobwidgets-${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-mime-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index c638fee934d2..ee56293f9246 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-contacts-19.04.3.tar.xz 392564 BLAKE2B 27cdedd9e7317292593af31cdd1bf010d855de78f89505de43da29a824a5d4b15afc8a761d730ec511ecaf5a92df987dbaeac6672be92961bb79c91071bf2def SHA512 c183dc31db60ec89dc36e24c0e3f04ee0969dd893f4eb37d5fe37b4153474e5ceed4d7a7aa1e1c63343db420eca4e1e117fd6db74b97f75e86d32cdc7a738081
 DIST akonadi-contacts-19.08.3.tar.xz 385320 BLAKE2B b533a1195a5e586b8aac42c44a2320c790db96680d9af8cc75f90a8f531b4ff7f53df03f294c4562edc38ccd6a67012c3205750a06c7a6bbb9e784f37cbb7cae SHA512 e22cb4406e06d4c39bca3ceb9cd507a70091e4ae1919b7ec137ce51c2c8151246eca071ec640ddfc1127cf7496deb945c8c617f3f64434a9739ff5736358d47f
-EBUILD akonadi-contacts-19.04.3.ebuild 1064 BLAKE2B 0560e4de4d72329a881da92b999d8c720416a626e9f84f39fcf77cc420de3582c04f090aa28088e3a84c011a056030c6f2b37567f17ef0808e15e945f71f58ad SHA512 42a0cba8d8ddf2e7f74332d89c2b34f6090e9d4fac10366662b1268cef8463633e2e480c845d81dd2b595f2f0d6ace73cf92df1cb03310d5d384a775c98a6cee
-EBUILD akonadi-contacts-19.08.3.ebuild 1247 BLAKE2B a32b662224a8adb52f3c652d231f28e81275bb5cb4c9767d5eb17d2649a5a4500782c0b3139d470df476fe3773944940b4b791f971996712f8011395663e6e1c SHA512 0fad58bcc02206609d1ccb5c8c7e164111f9f22850436807110de0730e263427c31bfd303c3f3f84457cdbd3e5fe019aae0793e45a285adae706013a6513a6a2
+DIST akonadi-contacts-19.12.0.tar.xz 393264 BLAKE2B 2f5cd44fd14e0dbe88be60697e27ec882ecd5d5bc16c3ddfe302c3415a3d5532fbc6cf58c37e8c496cc2afa4e8ca9c5ee016bc2e069a74b5668862524061c1eb SHA512 ebf93cb3e40da1115be36455fd89ab3204648e98c917bb817bbe36ece4fd9c983e2552a8dbb8005ef6adef645898b012d8f34806ebabd5d3e03c2ef7d59cddcf
+EBUILD akonadi-contacts-19.08.3.ebuild 1244 BLAKE2B 48f081a536f1c5904c48c6338156401ce1cca7b0181ffc068dece68e2726c03dc840dda1b050d419220b3b278f18dd3c1f3214d3a30e2e9c048895f33692cd9f SHA512 5f0a72b9fa23866f0ed49e76757cf0f19aecfc1b2140ba85ad229403b0e714197806a50e64bf89f8aa687907784dd0383183ab0ae59cd729150ef3a20789d9e3
+EBUILD akonadi-contacts-19.12.0.ebuild 1248 BLAKE2B 6e994aad63ce0ee8ae500059917dc00a08bb1964450f519745ebce0f2539228954a353dc1a9fc5e055c2ac70536e338e6195758084db9550beb52a4b8d48b725 SHA512 82f5d65f3466d021d2b6ec4b3665f1ee63b7248363ba293aae595736a9da7f707222a3070a8e180f7eb04e8e5b2c43f2cf71132748a6635f55c1f32f68de0b39
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.04.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.04.3.ebuild
deleted file mode 100644
index 363d10d52f67..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-19.04.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for akonadi contact integration"
-KEYWORDS="amd64 arm64 x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.ebuild
index 4f6d6855f53d..6ea0b7c059ef 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for akonadi contact integration"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.12.0.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.0.ebuild
new file mode 100644
index 000000000000..5bf2fe36e8a4
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for akonadi contact integration"
+
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+LICENSE="GPL-2+"
+IUSE=""
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+DEPEND="
+	>=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/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
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+"
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index c12837cce6b9..a05c203c89c5 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,6 +1,5 @@
-AUX akonadi-import-wizard-19.04.3-missing-header.patch 683 BLAKE2B 35cbaaf10fa7ed95935ae06f655cbce0ad8b8c5a092fe652498017fc202e01d8c117173f023624bfb7514cad3d7c849f63d27533a3655b72fce6c18b3e999913 SHA512 9966d80e83b4d42c20037cc0fcf1262a2818c35686e9aeb89b386e1fae7e2649f872a4542c320bc30ea08882605b0d9b98f5a50ccef74bb628b854312b5c25c5
-DIST akonadi-import-wizard-19.04.3.tar.xz 438784 BLAKE2B 12ef065b14195b81f5aba705e5ef6f59f1def0e257c1758a29625184919effc1b3c09bd4e8843f907b8d4c859e4eb10df3af90e64df5f4ca788bf75cd360ebb5 SHA512 20093df36a3d6a2bf2a1549664c12e687dfe22e0decc57b6151ab91a3dc5a3c2f1ef0c1d11c5f30ff1e700f2e8670f1e26ce945667ff3134a536e15b76407e48
 DIST akonadi-import-wizard-19.08.3.tar.xz 438896 BLAKE2B e49aac5ce6f282933e5c31637ef9230a62f176f1f321118986e1b8c39d37ce9b84fb420524fd7d8a9797cf8e17dd1d9305348a1526405257f397706a6b68fbe6 SHA512 8564a9a7d3aa87583bc486de9eb09d31fcc7e7351bdbed282a0dc17e4aa7caf41b8153341bc1e01c58154563f1b6d1e8b85bd46225219a3ea6e59daeec8b4c61
-EBUILD akonadi-import-wizard-19.04.3.ebuild 1148 BLAKE2B 92601b02a881967cb6a97a1b367ed7fbe0d247e415096ea26d3d8e34622248bfda454e1b652fb7d9f042685942196fff6c32b76bfd744ed44f1308f25f097ddf SHA512 d160eca6372cb4d590e077f299ef5e131ba79b714777e894875c28d43ca6373c814040437a9d85596c043f106cfe30c1832230ca6f7ab845e78e09f80afb7c45
-EBUILD akonadi-import-wizard-19.08.3.ebuild 1266 BLAKE2B 38b139a777146a7bfe4d1a7d368d5842e75c9b8efe7d7581806e94c40549870bd921910c8c37899b006765fd7b7194a826780d604f212b2bd727485866c0206d SHA512 67195c4be6472484e331eda52ac759dbb6a624cb4406854e5c5c36450ea3190750460ef78195d16b735bdeb25fcaad6a2e27f2d3d50a783a91de8a6ffe68371f
+DIST akonadi-import-wizard-19.12.0.tar.xz 439116 BLAKE2B 6d02e3d279b9d09b48ea15c74884ab85dfcc947e870358fc62f27f2f099d917a5ca4624fe111b920425e1fb76f3b3a22424847cc9c673a26404cb8a7a9324be1 SHA512 d6e2f75f23f139bbdd0d520756976af83193430de75e193d281b40754fb891ada62359a575233f5ef7210cdeba71bcc3be3a133a58e12a173894043d8c189736
+EBUILD akonadi-import-wizard-19.08.3.ebuild 1263 BLAKE2B 5837545329f4bd0333fce2b4da61b84a78e35b48c82811e543fa5b776c60c6a7da24981bd5ec75e3767533e7bf84f8cd03d6a88f3deca46f1a6822d1a87a53ba SHA512 ef87e02385d2573679e52289da81450d813bdbae65583b83b8b2539f25a7f007dc67c3be42234cd320163ebd92016b4bff6afc74a3883e11cc56d31657e10fd9
+EBUILD akonadi-import-wizard-19.12.0.ebuild 1267 BLAKE2B 795266f566e985d6f36e57849cd09b469d0dfdc76c1290bbf04f49c6696a49a6259548213c2050817e7fde7c86dde688f93f80742cde9299c0931b204a9b97e3 SHA512 5b9e65f5aaa9bf9d693c46d5a608aa17a8081aba82f4d5e6b9d1b31f5ba9df40c982ef407acd8fb92ce8a4fe676218d34bbf5f9f07e02a0756d18abb1b142508
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.04.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.04.3.ebuild
deleted file mode 100644
index 105ce90171bf..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.04.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-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+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.3.ebuild
index 878ef07ac770..93a6ddcf1c74 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.3.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.3.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.0.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.0.ebuild
new file mode 100644
index 000000000000..49bd357f72c7
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/akonadi-import-wizard/files/akonadi-import-wizard-19.04.3-missing-header.patch b/kde-apps/akonadi-import-wizard/files/akonadi-import-wizard-19.04.3-missing-header.patch
deleted file mode 100644
index 262d364326d2..000000000000
--- a/kde-apps/akonadi-import-wizard/files/akonadi-import-wizard-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2b520d8417323d4af6595b510978153063d50b98 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Fri, 12 Jul 2019 13:17:39 +0200
-Subject: Add missing QVector include
-
-Fixes build against Qt 5.12.4
----
- src/importmailpluginmanager.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/importmailpluginmanager.h b/src/importmailpluginmanager.h
-index a7c1049..7f3a100 100644
---- a/src/importmailpluginmanager.h
-+++ b/src/importmailpluginmanager.h
-@@ -20,7 +20,9 @@
- #define IMPORTMAILPLUGINMANAGER_H
- 
- #include <QObject>
-+#include <QVector>
- #include <KPluginMetaData>
-+
- namespace LibImportWizard {
- class AbstractImporter;
- }
--- 
-cgit v1.1
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index 692f245c6245..e30b0b4ec115 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-mime-19.04.3.tar.xz 136596 BLAKE2B 53203e06de035140e9ee3bf90ec49ab844a36c80ba8d6a8229a9df000e547445be350f7879670c83f49a9a7e45523cb7c9522bc148544be5d765591cf0a29e61 SHA512 e0f1eb074b81948537d87e0dc177319e41bed5435eca2efd8f96e55735caae54d8506aeddb0fa5e952e529078e6c630f6a5cf9f9413be77c1729c5be9294bba1
 DIST akonadi-mime-19.08.3.tar.xz 132756 BLAKE2B 4083a820e8ff6c1134f34fc14c179064abbfbb8747a52c1d7ee82a065ae9c96b8e17ac6857e308674ee41f24ed8993a342adf4ff8348751d275e07165aa02a1c SHA512 a8f501f36107818f5e0553aef7a4b958ad58fdea9c335e5ab53fd4dbb7729f49be2c459c6e3ad3d42ff4807817ef38059acbb1d1a11d1f9f88290758299c84c6
-EBUILD akonadi-mime-19.04.3.ebuild 866 BLAKE2B bd11d3ca8964d723abb24c9d19a811d50dd945730bbf3d4896b17c9ce1c922f3c5eeb7149edc6a4bb4d8ef9778c976e89dec42fb3338900089aca1ad60f643ce SHA512 60382394409bd2e300b208922f9158e93e730ff118b900bce802f3d1e64f7f2a517d3ace0952e76b8a21bda1e8b6f01f2364cf7a60b9079c2470a71579be85d0
-EBUILD akonadi-mime-19.08.3.ebuild 1004 BLAKE2B 30b15da6f53e5b59403d4f10ddc39bfdeb5c814de8c50f1f006ac0d68ad57ad02ab50c9a23219664844a6498b493cd44b313abd19e30ba619079e51e969697b0 SHA512 436fa4706084cbc21069669b0c3fc8904a161f1eb6071656a19d71adc8a3f192c7afac2e8792cd4fa4f33f737b39b194b54a7a1874b256557be54ed48a4e0bed
+DIST akonadi-mime-19.12.0.tar.xz 132972 BLAKE2B ad752651c5173e6db60d415f6ea3039748ec461bd8e4b81d9ea2b14481c289e6518010d9d54527adabb1aa894d06d52420d4fc450b796a5a10d7b21642cd2fbf SHA512 27c66e8c6069fbca2d82fccd1c2dbf77c3dfcda97e5f16353db5efd4928b361a719da964397fb04322f32b2a147d25b3310f7101886ec94c959c71ebe62c6a23
+EBUILD akonadi-mime-19.08.3.ebuild 1001 BLAKE2B 14865322f2adb3724e5fb9a25580a4ddcee2dd96b7d7a63821f17b3ce1699bc82a31586cc552cf18d594cbd3bee54dd67fa25b07368dcf54271eba79b65efe12 SHA512 f5c09e46e63e03592bb74eee1396411ce7ba4b8ce02eecc52df76308e5624dfc451f33af381d70d972593b70838971b1c57cfc6bbf796c7057d4a2181ab46eb0
+EBUILD akonadi-mime-19.12.0.ebuild 1005 BLAKE2B 2eb2d4b283a9a254171eb6ebd16fa847afc76a4c28c9bc48bed549cb01a910f347eb0e8857c8aac200b70c7c18e4c0a0e5cff7fdaa50f410451453c5e8494f99 SHA512 0ec1fb9d8efa9319ee00500ef75bd7fb89f78473ef7f9f751756315a3b9819187f86bd95a9f4553c78c2886046155021ab3c09c579a7f321e60d7a69ea683f33
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.04.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.04.3.ebuild
deleted file mode 100644
index 5406eb43e1be..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-19.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi mime types"
-KEYWORDS="amd64 arm64 x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-	!kde-apps/kdepimlibs:4
-"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild
index b597bca87af3..6ffd471e42f6 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for akonadi mime types"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.12.0.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.12.0.ebuild
new file mode 100644
index 000000000000..2aeef523c323
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-19.12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 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.63.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="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${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
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/libxslt
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.03.80
+	!kde-apps/kdepimlibs:4
+"
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 7574d392d4a8..b0f8f76ca6f8 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-notes-19.04.3.tar.xz 24460 BLAKE2B 2dd7128c01d4cbbb36026697e712f2068d654095880e6975f2b5ebe4a426c77ff81c905dde4af29838c3b1356552265a42d5991812e20ead1f626e2306b0e8b5 SHA512 1aadd86e6f525592ebe3bd73b8eccaa8ff11249e5d9e8bff257c208cf6ba48d8f991fc3cd59a7bcfb0d94f155e404d14bc0b51c406b34b008501860b4fb0b7ec
 DIST akonadi-notes-19.08.3.tar.xz 24416 BLAKE2B da9f89dcfd54c6a0346865bfa445a294beb0708f2fcd5f12710565779604285730507989f5da09c122ebaef8f950c92f1969e7c0a51860ab24895b930878f1d0 SHA512 de3bd78e98e85020c6eb5922e4033f45d323bbd90843932d223f22592b538d9460e027bd89fbf167e9bdad2c4b55d4142e857f89a8d93ab4530ff6f575e92806
-EBUILD akonadi-notes-19.04.3.ebuild 400 BLAKE2B 9a571a28009a4c4843226eca8be01da9224e07c9739d2df9cb626f7478bad3c9e6a181efa7b875d82ea665b107fec085ed45415d61ad9da1401be25fb51a4e66 SHA512 cfe1f4d34da58e5f210f3e68a8c204c38db55d40a5bbcf3a5c16d0ae94d291a7624cefd80f6682b1c1b8626b683a8777ab8077d7b838af6c5d94f72bc708f0f3
-EBUILD akonadi-notes-19.08.3.ebuild 487 BLAKE2B f89db3f1e90fd5c7d28c084109b33a5825c8404ac173b06db0378b70ee35a0a878fad4932057300546bf715dc5e8b7c48524e97553ba7248cad09ba19c4d2503 SHA512 4fa38dfcb43727bcf7a5c3a0584c4905b1f9ae74310cbf7eae8b3d16f399241d40742afa7baa5176f60e7126f3f811adecbdeb060995277d65db5904b33f55f2
+DIST akonadi-notes-19.12.0.tar.xz 24424 BLAKE2B c31d435c5fca1cae70ce8fd9aef5b51f745cbc7633d2697365a8ec3dca038ffa9a5bbdf2ac406dd66e11d478f9aa03b145f6a4b754be58d995b8a163c9bc0948 SHA512 353a468233d30dc1aa75a1e16e0a879dfb8b493c99305b4c30befeaf6e9c080571105c672af8043d3352a4b120d70e44a9c5369b5bb6d6940783383932324b2b
+EBUILD akonadi-notes-19.08.3.ebuild 484 BLAKE2B b0cd82f452b3463e9fb77d22941d5c3492a4012f70087528240555ad3837f1a1831f4a093a010d987fb4b46a4c415d9e03edbcaba87900db9685d53b11db996c SHA512 281303e4414240e85712cb26dcae33601af39a639cfb7eedea475a5e41f51b6f2b9dd7e495fbf4e635dbf6d65cd67a3fbe7917af719e6df9800a9591b5f4889a
+EBUILD akonadi-notes-19.12.0.ebuild 488 BLAKE2B cf0af1aef307fdcf98ca87cc3eaf02e87aba256a6409df0ed04b3865e3aff5811fb60de8d612c5deef0ea2008eea10a4e4bb72c6f92ac99f637b730f6170a211 SHA512 b5d228e2a37ac417c708e1b08ea10a85d85a8c4dcf56cc71a50e5512e9b89d5a21ac529801545d872d38d25890f1b2692f5c3f780490d820b6204c4510d18bf5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-19.08.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-19.08.3.ebuild
index 9c3f45fa6033..44250855e0a7 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-19.08.3.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Library for akonadi notes integration"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 LICENSE="GPL-2+"
 IUSE=""
 
diff --git a/kde-apps/akonadi-notes/akonadi-notes-19.04.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-19.12.0.ebuild
index 1d3313bfcc07..e2b253b24b1a 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-19.04.3.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-19.12.0.ebuild
@@ -3,19 +3,24 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for akonadi notes integration"
-KEYWORDS="amd64 arm64 x86"
+
 LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index 5e4690422c60..9e055c50ac57 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-search-19.04.3.tar.xz 82496 BLAKE2B 1c3db64d6703bb22fb0c61c5adec8fa56ed5705115dc5d903dcbdd80f63b794159e05deffc6c02bd83659b4eb4cca1d93ed46428f78d995a400d80e604c0e723 SHA512 896f7b38de04bf7d2cfbdcba2e3cfa9da84060d9eac037edcc28dffa261c6d3f35d92f4152da992585d210262d630b2c2ada8c9674e600f2bd4c29bc6009e62a
 DIST akonadi-search-19.08.3.tar.xz 82480 BLAKE2B eeba0750d0c77d0942efffd01043ddfb02836a0b1174b9c3848c3f696744d6fcb7c7b0f38701da791db0f5f0a209e41ceac3ff1bf9331562b32944186d85065d SHA512 48e9b6247acab7c8dd874693c7302566b43f7758089a51b2c2e4d4c1eeb6ad6d217529c418254f8d930370d69c977264ddd1919f26a7f692ba0cff2426d0b3ec
-EBUILD akonadi-search-19.04.3.ebuild 1131 BLAKE2B e131b048b4e34552c13674e3be728afd78c6c8a747741eea3248d46fb8e66d78766648558cbfa50894b8cb1107d2d0e3196130a35149b8fcb3757bcd7c9c98b0 SHA512 215dc4b854cc2e3ad1f39958f6b83b2500dfe8b5cae8c8570d68af12294b8054409837df8fb589bfb484c626b70708dc0e9e5644e7ada5e0d97594de33d48f5d
-EBUILD akonadi-search-19.08.3.ebuild 1305 BLAKE2B e2b149400a0f53a0d951d219e8c5e311dbc6f97c79bcd4481f7ce96c2ed23cc94f791df861b6d00485428b366c99bbeec9d840ba4f51a8e7d97f4d30d26c67d9 SHA512 739493c5a4ad58ecc96c63ccb54e37b8e98dbfcc4503163c6bf3c3b8d09bfe5aa8bae956a457426018c22521425f6730d1e1acb83352058aac86a7277a351d8f
+DIST akonadi-search-19.12.0.tar.xz 83116 BLAKE2B d36d1c080703f13d7ba54c2aa8af9dd8d7d4e563159a569bd0921a3e5f8e1198aa253b9044f70349abe9193ceefca81f229fc86d0afa08ddfec060f782cdbf98 SHA512 a0d2964e582d7c5bf536a4d617be7e322b00306aaef1149973dfedd897a2ad524752966ef733c80f6e1df66a27f919219716e1f5300f5e308f543e5937d47e9b
+EBUILD akonadi-search-19.08.3.ebuild 1302 BLAKE2B 4449fa1eb07b8ae74e8f2eb003c35ca1e7a0dd92ba06c6e9622d57150c9d9c456c7c8f07ea7a01c9f79158a2a20c6c31e8d9b8e387531496414d37de6fd46df9 SHA512 2619de5aeaf8142f4596e190ec438a7da006bef8554ee5cb568e04a1b4a23ee45b2f09860fa620d8376d7e30a2c4ace60aa73b2f204558e04929c016d524a425
+EBUILD akonadi-search-19.12.0.ebuild 1306 BLAKE2B d42b72fdd87250039f3bebb5764c64e49f4542d52ff4c6ab47b067fb2ce35dc677c6f254d04d0c3b9c5003abd49718ce5b64ebea668427554f562b5bd9c9f81b SHA512 71168aeca8b5ee2e17b0a2a2edcc63093a8799a4cbec38e4d2b351e98c0e464606fd5658f71a9da2d09b2b41840b704a922ec0a13d7fdf1049cf01319a51aeac
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-19.04.3.ebuild b/kde-apps/akonadi-search/akonadi-search-19.04.3.ebuild
deleted file mode 100644
index b4d2aa564265..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-19.04.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	test? ( $(add_kdeapps_dep akonadi 'tools') )
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/xapian-1.3:=[chert(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	test? ( $(add_kdeapps_dep akonadi 'mysql,postgres,sqlite') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild
index 367c64b8dc8c..b8da159402d9 100644
--- a/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
 HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/akonadi-search/akonadi-search-19.12.0.ebuild b/kde-apps/akonadi-search/akonadi-search-19.12.0.ebuild
new file mode 100644
index 000000000000..461498223878
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-19.12.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 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.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
+HOMEPAGE="https://cgit.kde.org/akonadi-search.git"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+COMMON_DEPEND="
+	>=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
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-libs/xapian-1.3:=[chert(+)]
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[mysql,postgres,sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index dfe86bcc2862..f9f0c1060433 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,7 +1,6 @@
 AUX akonadi-18.12.2-mysql56-crash.patch 2196 BLAKE2B d12643c870da557f540f199f78462f97fc569ffe160415f56f166d89b7e94e0f6682fa68ed84c9629e66639ddac61b5c54376c309a8921d84a1d52ba351a9aab SHA512 093a0b4243668344db59b0419809500e411f7399137ba3d9c439b4d5300a2f867fb231f7d5a8bc5d95ad2d1ccb6921804caff8200ddddba74a62ddcdfa9ac623
-AUX akonadi-19.04.3-qmysql-fix.patch 1642 BLAKE2B 5ca247ec787d6f4182fdb13e8990909548473adfc2ef95a1bdfa29f85c76a6747f1c9135f5220e290c64397cc0d2c3c6b7c060f76d89147394b2d7d71b7cba13 SHA512 6678df405c290989667a2d58317517378c365862650f851a1ae3d919e3370dbe216f42db52c0cb5f7b7faaad252ae08aa55f6c8aa0570927546af73892056e1d
-DIST akonadi-19.04.3.tar.xz 1574868 BLAKE2B f520f5e8f8fc6480b6e44d6f91c561317b2d3460072c5473baccdf149c0e9eca5587cfeefaeacee0e504349624418a0ba5de7042866c0f5806de0b677f8f38a1 SHA512 62d7367ef87cd6fd7e26ae87dcc15df427f3b647618334a5ae67e722ca16dc2c7882152bd6172ab6a0982979f45271f6d65cc15b18f86e8a0ebf144b1bbe576a
 DIST akonadi-19.08.3.tar.xz 1579468 BLAKE2B c7df5162768a00d395d598a098a25aa789c2e9694958cef47a014a744b4e7322471b3855963fb1ec63708608a59c29f5cdbf7049848d8a44ad7e88366316c18f SHA512 612cf8860476c32462dfa565c392a94f7fdb60953dc3afe7ea87ffdd9e78ec5f01e44aaf2ba0c6b018fa0f4cc75d1c56da1211daa13eb9589f270c2761da1e6e
-EBUILD akonadi-19.04.3-r1.ebuild 3526 BLAKE2B 7f30ab98cee979d02dff8b402084894d4b2da241466e41639488a872acbdf8232ca958ce7dcd4d675ecb634b0567813f9554448d6f7ad9cb3c6a9ffaf53095bd SHA512 3f55230c10f5513130a6044108b41819cdfa820a652dd7f675d6ce5ccb21ef7211514c09a51ed95e59fbfc0a3a86f04b8a7b44a6249dec458815d41b2f65cf95
-EBUILD akonadi-19.08.3.ebuild 3646 BLAKE2B 0dfe9f6d15fbda8515f7950e83f6094658de32bc498eea187c4b78f2f72e1603f6ab8d7dd0a1f62ca2df6fe2271cb9dd3b4d7db5ad5843a22b87f7821bd4c820 SHA512 837e21b1def7e896ba032e0e737c0e5e3cc49590d8a29dbc578fe52226f2b3d71195422637ddca41922251ef3df8e0182782fc575ccb52543c41fc51a9dff7ee
-MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
+DIST akonadi-19.12.0.tar.xz 1582164 BLAKE2B b08e5442b4c6a5a67a23fe197ea322655c2f686384ed708dc443de76484a28fc7e6ef35fba8b0c3056c060e51a0a52a5664a3d2239163dc245b76ac5decb493a SHA512 1c3d770dfccae7b596dd45af65aa05652a96f2c81fbd6094a089d7fa610b55b30339eb2b2cecb798ed8a40f389f896fcbd381ea8a8bb6f05951a7f8b7dc5fed3
+EBUILD akonadi-19.08.3.ebuild 3643 BLAKE2B 9571095fa215e6730e2fb07c23b452a90fef3094e25ddb52a6564e41695e8d45fb6f87299ab9242bcb48b0e8cc4d4f0f0d96d1fe6eeef6982d1b279ff1d8ec43 SHA512 b4700fd72867ad805d6d2defa15679a0aaafa0bc1617f64220426727453475499b81b32b9c4e4c1ec5bf433d9f63ed2bd1e68370eb1348dd86209f0443961b48
+EBUILD akonadi-19.12.0.ebuild 3856 BLAKE2B 891108562474aff1218605e0d26baccf6b26831295d30821d5e033dad882a31c11cf00c708b5b58c81657e51cc55aed4852ae1e46b8b97948d4e521da2fa324e SHA512 f47a742412df517123de8b15603a9f9719f2ecf276338a4f8e4b1e8730d63cdee98ce40c81d116fb27b11c791a1445e3e43fc244d4fd9c1bc2b80f435d2da5ad
+MISC metadata.xml 491 BLAKE2B f4d942600308e7fbc604467130f087b7dc9c22f92a21aa89224cdabe9b822b1b8f0986e14efa5e1d5206718f3dc837b00c926b559ee32b21b71cff09fe0ee0d0 SHA512 fbb184c959335ec38a98faa983f67eed457c7eaa7c401261c5b7c0401d813d7a9a4521001376c6d70d76b98286446346ae1592dfbf3771b8112591bc3fe2472e
diff --git a/kde-apps/akonadi/akonadi-19.08.3.ebuild b/kde-apps/akonadi/akonadi-19.08.3.ebuild
index 29ed0f40384d..0c1c41e1a9b5 100644
--- a/kde-apps/akonadi/akonadi-19.08.3.ebuild
+++ b/kde-apps/akonadi/akonadi-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
 
diff --git a/kde-apps/akonadi/akonadi-19.04.3-r1.ebuild b/kde-apps/akonadi/akonadi-19.12.0.ebuild
index e0b34bf8f256..c8ddf505aaef 100644
--- a/kde-apps/akonadi/akonadi-19.04.3-r1.ebuild
+++ b/kde-apps/akonadi/akonadi-19.12.0.ebuild
@@ -3,44 +3,52 @@
 
 EAPI=7
 
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
-KEYWORDS="amd64 ~arm arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="LGPL-2.1+"
-IUSE="+mysql postgres sqlite tools xml"
+IUSE="+kaccounts +mysql postgres sqlite tools xml"
 
 REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'mysql?,postgres?')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=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/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/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? (
-		$(add_qt_dep qtsql 'sqlite' '' '5=')
+		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
 		dev-db/sqlite:3
 	)
 	xml? ( dev-libs/libxml2 )
@@ -61,10 +69,7 @@ RDEPEND="${COMMON_DEPEND}
 # 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"
-	"${FILESDIR}/${P}-qmysql-fix.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
 
 pkg_setup() {
 	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
@@ -91,17 +96,19 @@ pkg_setup() {
 		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
 	fi
 
-	kde5_pkg_setup
+	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-utils_use_find_package xml LibXml2)
+		$(cmake_use_find_package xml LibXml2)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
@@ -113,11 +120,11 @@ EOF
 	insinto /usr/share/config/akonadi
 	doins "${T}"/akonadiserverrc
 
-	kde5_src_install
+	ecm_src_install
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
 	elog "Available drivers are:"
 	use mysql && elog "  QMYSQL"
diff --git a/kde-apps/akonadi/files/akonadi-19.04.3-qmysql-fix.patch b/kde-apps/akonadi/files/akonadi-19.04.3-qmysql-fix.patch
deleted file mode 100644
index c26d3d993b2b..000000000000
--- a/kde-apps/akonadi/files/akonadi-19.04.3-qmysql-fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8b8db29d10b2ef92deb2d87ff613f3d7f39af34e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Fri, 26 Jul 2019 13:31:58 +0200
-Subject: Fix compatibility with QMYSQL driver after 74aed95
-
-Summary:
-QPSQL requires the table name passed to QSqlDatabase::record() to be lowercase
-since Qt 5.13, but doing that breaks QMYSQL, so only adjust the name when
-using QPSQL.
-
-CCBUG: 409234
-
-Reviewers: #kde_pim, vkrause
-
-Reviewed By: #kde_pim, vkrause
-
-Subscribers: kde-pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D22677
----
- src/server/storage/dbintrospector.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/server/storage/dbintrospector.cpp b/src/server/storage/dbintrospector.cpp
-index 70d952a..932444c 100644
---- a/src/server/storage/dbintrospector.cpp
-+++ b/src/server/storage/dbintrospector.cpp
-@@ -76,7 +76,10 @@ bool DbIntrospector::hasColumn(const QString &tableName, const QString &columnNa
-     QStringList columns = m_columnCache.value(tableName);
- 
-     if (columns.isEmpty()) {
--        const QSqlRecord table = m_database.record(tableName.toLower());
-+        // QPSQL requires the name to be lower case, but it breaks compatibility with existing
-+        // tables with other drivers (see BKO#409234). Yay for abstraction...
-+        const auto name = (DbType::type(m_database) == DbType::PostgreSQL) ? tableName.toLower() : tableName;
-+        const QSqlRecord table = m_database.record(name);
-         const int numTables = table.count();
-         columns.reserve(numTables);
-         for (int i = 0; i < numTables; ++i) {
--- 
-cgit v1.1
-
diff --git a/kde-apps/akonadi/metadata.xml b/kde-apps/akonadi/metadata.xml
index 58d880b38b44..8acbee94c7a6 100644
--- a/kde-apps/akonadi/metadata.xml
+++ b/kde-apps/akonadi/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="kaccounts">Enable support for system-wide defined KAccounts</flag>
 		<flag name="tools">Install tools for developers and testing</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 05925861ce1a..c3c2c19006d0 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,5 +1,5 @@
-DIST akonadiconsole-19.04.3.tar.xz 193896 BLAKE2B ec993faba9ac0e1330d93fa1122b61796719f7cac8414f7d5de1b5c4ddd95702d15bfe0a19d58db5400b4fd0e1c0f0e5587ecfaa0a748203d3759b611c5c7d10 SHA512 bf6676038cce5c02830be76659264233ac892dcd37731db0e5146983c95e699ce6d9569b96f47de30fd254e016ac1ecf16312e1b29851a56deff133759133b2c
 DIST akonadiconsole-19.08.3.tar.xz 193848 BLAKE2B 0450da29afb328cf63cd027028f65c6e6c498f7269755631b0a5aa654ed1258f76b6b35fb592dd11c3031ee00cd8a02c27592571c748a3f8ff03b6a0a0596e01 SHA512 dec8b73d970e16906fc21bc10cc6b102f79b3891c2e5fbcf543473393803809414a5bf17045fe504d0bce8cf6bd5456b046d0a47b667b2b5902bb61b31fa2071
-EBUILD akonadiconsole-19.04.3.ebuild 1223 BLAKE2B 2a5208ba751e41905a99aaffe24d75a51a4b98ddc230ea692e2a73e89646517f9446065e5555ddb5b9b450d60e9d8a56b3ef5bac451c59f1b347b4495007c27a SHA512 29010d6f961612b4a3e805864658d9e4873e0429268f72b78aef8c8983aa3616f6aeaea4b30cd0db1a60b6d5ac359b08979e2d88bca9bc43cc9a396ff86504ea
-EBUILD akonadiconsole-19.08.3.ebuild 1435 BLAKE2B 8ff0b4c6deb5fca1cf88d8fda94705f2b15cfbeb71236acdf95e50fd50a336fc04c388c4bdcf68d25a6f9f3d8861e52adb1a12492b8c44d6afba8498c9993cf7 SHA512 00476efddaf7bcb241e0807f09faa3d5e33377269660b1cffee35fe30749d4f60900e4a565081f6d1c8ffa1dcbe69d003dcab6584ef4ec4a50478888c39f5e5f
+DIST akonadiconsole-19.12.0.tar.xz 193624 BLAKE2B 589edc07d781016128248d939b7481e228de2f1ff39a1765fd6de3f5c71ed0b364c0c20eb83d5b3f3d59156dc5f59ff228e48131e7728b72f4a7f174d1c74a28 SHA512 429699e2b6ae54e2b62fbeebfd5250d310dbd049251a1521f3610b6aeaee057d8257a4d2c881349e179ebf4e7442885d7a231e68b1601eec7390595a8f9a1b7c
+EBUILD akonadiconsole-19.08.3.ebuild 1432 BLAKE2B e9181162ddce68b232c939b86656b9737aff6a0870cd218f03b1261b945811661f24321cb55396ef79a007581297040fc9678d10dbefbd9bb6500d32d533041c SHA512 a156364f18fa648fa8ebcf404f18fc5e632f7492e4d96e04fe308dc68d211a33f840f917a3f95f407cc8a20fffbc246d65b58f80f8fd62033430e99e0d080a71
+EBUILD akonadiconsole-19.12.0.ebuild 1477 BLAKE2B 89898a4ec4e431b194c1c4e232cdd60f817ac14d6b8a98696ad14a7de22dd4290cd8df4863a1d2a8e6671f152fcc65f90ea90b3f47a7b2786185c8ec8d059731 SHA512 c290d36ceeac1a297c3c50d2e7a861e2cda3c6b346b24e60a50b8bc6062ebe66c92d243975e6b45fe04e37af1ffdaf4529dd9ed3fa47e8c71cd879d76cdff435
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-19.04.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-19.04.3.ebuild
deleted file mode 100644
index 6ee296d6588f..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-19.04.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-HOMEPAGE="https://kde.org/"
-KEYWORDS="amd64 arm64 x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-19.08.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-19.08.3.ebuild
index f94b5dc9e9c9..a64681759094 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-19.08.3.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Application for debugging Akonadi Resources"
 LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
 HOMEPAGE="https://kde.org/"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/akonadiconsole/akonadiconsole-19.12.0.ebuild b/kde-apps/akonadiconsole/akonadiconsole-19.12.0.ebuild
new file mode 100644
index 000000000000..eddde1ab13f4
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-19.12.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 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.63.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 1b260b7dba64..9f07f58ddf8e 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,5 +1,5 @@
-DIST akregator-19.04.3.tar.xz 2190396 BLAKE2B 2677020c80e234e8fe035b24d4bbe01a56771e457bf0766d9c875dbf1d42404520a7ae687290c01dec0ee15f81e941360acd34bda603e5551030cf6c12dddbba SHA512 c6a53fc8ad14c448bc07619fd49c5d34af29c4b8d598fcf25383209bd9e99422d1f9c011c5689b29ffcafde57c2dea9a7f454472e9c1fdb6d88af368581af74c
 DIST akregator-19.08.3.tar.xz 2193472 BLAKE2B eaea7e2136736cf0f2ca568782bed6fa9532d2d3f20bf489e5e3934b99f6ac1d63be43099de7b36a4bcf8c2677ec2ae76ee40a313e8545268bf4de7d196328eb SHA512 96b24da53a1491a51949e5fdf4417b1dc2698cd8914a20b202bd03e598c69d9d7605964ec6c4703efaaa4150c3f5ecd84a92714cd89010f84b27c950aedc2475
-EBUILD akregator-19.04.3.ebuild 1440 BLAKE2B f3b9064c21ad63c254b8bc1e2e4935c11c87d7d175b9054b6df857299b605afd0ffe478bf5b41b0a0dabde6e4f9387c4e38baf2cebb64a32e28daef9be7b4f19 SHA512 6ea03d547418c8a9bce3fd3ae1b1e8846f38283fd84b13abee9f236bb4a094ead4504ce9b5c9964d5affb10ce8de3189be3c9f84647431f1e52c0070ebaf90fb
-EBUILD akregator-19.08.3.ebuild 1674 BLAKE2B 05aa3f218bc5e17bf7d417bfd6fea3f5d0126fb170275fc5284ec7ac360f11ecff6704b37bd23c41cc9e1006dbd1d901d7be0f3540378754deb5732f26e349a2 SHA512 3f7c5afef06cea166828b174f9963c876f90af56fe8df1f03bad3496272d12980c6b193bfe08b388150a5198865297a376b8dff1f50d86ffc3ad6ef62ed34389
+DIST akregator-19.12.0.tar.xz 2193148 BLAKE2B be396d2aae7e807f5b8c3b84345954124d8fab80a6cd5a84522c65cfe0f35b54ce3738f4628411a35c8a04f86c3fad1140d0998a9d6b7f5bbcd2ac0d179db74e SHA512 95608dfb3857400e4c07a553250df5616e695b486f74d105c6ec422728d593c1d836b5b8b782608bf4c97062002522d81f4bfa815b106e5fe4193e690284ba50
+EBUILD akregator-19.08.3.ebuild 1671 BLAKE2B e0840fffc893b183591a4caca49d4c40af45835c9f718a16d8eafcf888bfe16f1ff6b44381e9dc537e40911fa9fe8353e853eb302e1410fe7c600fe86f95b060 SHA512 245d35df58c352a1bbbf54ac24addba112f928f51b33d78eac9bad74420047f36c01e5ad4265fe079a0e53e42b9f5859b02536cd0856558a38ec02e7054e043a
+EBUILD akregator-19.12.0.ebuild 1682 BLAKE2B 8b281574a00175278765b332aab46c6c73633453597d63cc360d4e6b266831ae32f87dc3444c5408c3ba6df53a4954ecf163509c4f75940f1874c2177c0f9d68 SHA512 8262aaabb72c1d1b1fe134355d110044a0db09c09f7a91d91e02fe2c3ce4e0348e0f9706f2a6c29b214d25b30eae7c5b752c28ee0ff444a3c4f30b815bde00a5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-19.04.3.ebuild b/kde-apps/akregator/akregator-19.04.3.ebuild
deleted file mode 100644
index cd4e389c07de..000000000000
--- a/kde-apps/akregator/akregator-19.04.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://kde.org/applications/internet/akregator"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syndication)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/grantlee:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/akregator/akregator-19.08.3.ebuild b/kde-apps/akregator/akregator-19.08.3.ebuild
index c1719482816d..9e7082443caf 100644
--- a/kde-apps/akregator/akregator-19.08.3.ebuild
+++ b/kde-apps/akregator/akregator-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="News feed aggregator"
 HOMEPAGE="https://kde.org/applications/internet/akregator"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/akregator/akregator-19.12.0.ebuild b/kde-apps/akregator/akregator-19.12.0.ebuild
new file mode 100644
index 000000000000..2501013f4e6f
--- /dev/null
+++ b/kde-apps/akregator/akregator-19.12.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 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.63.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=""
+
+COMMON_DEPEND="
+	>=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/kiconthemes-${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
+	>=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
+	>=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
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/grantlee:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/analitza/Manifest b/kde-apps/analitza/Manifest
index 704c6d15d3a4..f5649bb4ab37 100644
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@@ -1,5 +1,5 @@
-DIST analitza-19.04.3.tar.xz 330112 BLAKE2B ebd746241ad0f626ae6bc3e9f17730c203e75fdf573f1c87175747ebaec4c29bae5b1f5a74966f2ecbee6c476454dbe4897051f78a284b4f6c974bdc6e723af4 SHA512 28518afdc0050494247c874c401160dc6e1246c7bab4cf3f36e4db5d1759292721db0dd0d5dca7a949d27d34f61aeefecca63c1fae195aa3ff6b9f3cfbaf1c5a
 DIST analitza-19.08.3.tar.xz 332648 BLAKE2B 33b14050ee7a62f4615c131295e935d73fb59c6643bc208f7a6daf1c34fa1d63d7d404e828cc27904588d9ced23186326a322e9657d4d17c28acfa508f23387f SHA512 962e854383b44b8acaa12188d69dc60122455836275dae3f5f79cce7607a1ce998cfdf18f48d4557b2708d91ebc15964c4842b24aad7f9974b9d7299418912bb
-EBUILD analitza-19.04.3.ebuild 825 BLAKE2B 98fa138d691b8ed1b889c0bf83d1063b92be3cf6dce3a7c0a51d90e9ff02050a69c45567399232853a0c55e121b015507b6a9269db9ab3783e3c2b7d0578655d SHA512 9909d6c5b011c880c63b443b258431f763bd1aec3c99fc627e801d9947682c622ffa9737a96ecfa553c9c20c9c48a89ee58eab7e272a98f597520e6b4b86bcb3
-EBUILD analitza-19.08.3.ebuild 926 BLAKE2B aa9a39971bdae6cfeaa7e353ef3926b69bb0af3e3991b98012bae6f37afaefd4a937f56df712aee43238f7c776391c8bda8ac2e1840c3e8e163dc0e2d25db119 SHA512 8f19206682d1a78475e5ffd2b89d106644e3c9d8a00c707a31070d45d251b652664aada7633e9a34867bf67862a684f646d7a6ed36b9d520805c08f3fa81cf7a
+DIST analitza-19.12.0.tar.xz 333132 BLAKE2B 63834818ffdcba8d79d937c3a82a982a7628a30195e268d6ff5d19f8d8d4c0f5d680b507c34d17ebb088f7d5d0243bf1f7aea6c4095d314d30700fe190de3e2b SHA512 6a885e18d6242f560df6ae3bdd3f8450effef4cd49461f3ea4971f4de42d2d0b90874c74a7ed5bf68caf2f4e34e837f788b741b906dc9b320ec75181240520da
+EBUILD analitza-19.08.3.ebuild 923 BLAKE2B a2fb3da3fac3a3bd0ef9afe48eff6d31322393e7759c5c389980d657a1afe30f8cf9f9f066a5bb579773cc36e25bd272a472e78e54364cb3add24155ef5a8cc4 SHA512 697c9cbb0b50da9b67242544949cc83cfd2938508c119f7d8e18f0c33c04a2cd67afdd94cfcff89ff98a32423f74fa32273693ece6f3c0cc0615c96beedb3444
+EBUILD analitza-19.12.0.ebuild 921 BLAKE2B ae10c34f6df609e62d71ef4c8dd45e8ca1e2d7fa1a1cfe859eb529ec83e7d8f82c73df7c762e6659e449909487e4b27268a26ffa2e9bf07aa067869a5368c2e3 SHA512 e1448ac9e3e0f5e9f06752bb49afc895d29c2f1456837b4a9b6ad384b803438f61db2ed16e89ace9a06e1ff78ca5d8a1ad5213937ac42e659077341c7e7af02b
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-19.08.3.ebuild b/kde-apps/analitza/analitza-19.08.3.ebuild
index c8e62e6caf2b..0030c9a8bf75 100644
--- a/kde-apps/analitza/analitza-19.08.3.ebuild
+++ b/kde-apps/analitza/analitza-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE library for mathematical features"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="eigen nls"
 
 BDEPEND="
diff --git a/kde-apps/analitza/analitza-19.04.3.ebuild b/kde-apps/analitza/analitza-19.12.0.ebuild
index bcd40c52b32d..8839f1d0f832 100644
--- a/kde-apps/analitza/analitza-19.04.3.ebuild
+++ b/kde-apps/analitza/analitza-19.12.0.ebuild
@@ -3,30 +3,34 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional-recursive"
+ECM_TEST="forceoptional-recursive"
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="KDE library for mathematical features"
-KEYWORDS="amd64 arm64 x86"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="eigen nls"
 
 BDEPEND="
-	nls? ( $(add_qt_dep linguist-tools) )
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 DEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[-gles2]
+	>=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() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if ! use test; then
 		sed -i \
@@ -37,8 +41,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package eigen Eigen3)
+		$(cmake_use_find_package eigen Eigen3)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 42f47e3962eb..1b4070d7c8b7 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,6 +1,5 @@
-AUX ark-19.04.3-missing-header.patch 1692 BLAKE2B 5295e673fb206614d446f02e76904ad82494c3ceef14b373151272c87fef2b3db0ccb30cad1136784de3d00e63371b8a65230bb29763e22b215fd42e61e76a2d SHA512 a3a14f7868ce53aae81d6383c8f66430d58b33a0e80857c6b7f8b5566def77ce4dfdd69406e72a7a1caa7f10c38b6f5cc80f9d8fcde571ea29c215827a0174e6
-DIST ark-19.04.3.tar.xz 2579920 BLAKE2B a8637d4f564fe20aa28035e5c1a09ca8c6803bf6acb9fc82074a8219368f1ff9b45dd88dc1439823e73eb627d2f13269b4cd776480d991c1499e8de1510de14c SHA512 dc41f8daea7c63f93725cd1dada978fde68c7e7c659840014fe3ccc32a8e9e7013f495590cd5344d68001cbba81f527ec368829b4ff1577f71d5de268cd0b459
 DIST ark-19.08.3.tar.xz 2585196 BLAKE2B 2f3ad8052ad5ead34d30d5fff41c076e387740ac77c80791a8f600d9158c254592916a92e8e181b98adee916baee2f58c3d668bfdd1d9d1be7a36f7b8d61c07c SHA512 2bbbce37e5f892840517688eb4ce78770514eb5c780d34ae3c33c4b4e60cd153ebc190e4613411d5e01f01a78b6a74bad86c79b9efe8a156250c18033a3271cf
-EBUILD ark-19.04.3.ebuild 2106 BLAKE2B 1f92d8915daee4085e8ff75538cc46190f42956caa41e65a074ad9787640eff4e51dd9b090eb068f95918f452afb9e7e349ad68087b263231de2282bd526c351 SHA512 7e4d239835e923c5daf90585d4cee2b107367faa16eea50de1894de66bd956efcbe72f0932eefd77dbba43eb579fd40ff57cc1cea18cc8065e7d2d18b18058a6
-EBUILD ark-19.08.3.ebuild 2252 BLAKE2B 768e7e5d365dd72f0b823ce2e5af066205d816f8e1de26579dc42de88397693ed982ec0772a00ce84e5cf69be41ed1926d37670c1173234ac07db9c2ccc07581 SHA512 2ece7258b5e9b4f7758866c5d184174a6d0ea3758b7c10b66dc9a3319e8d0e3bc2c389f8b09cf3330e87966297848c52089310e563c9dfde22ccf6db84b9e924
+DIST ark-19.12.0.tar.xz 2588820 BLAKE2B 6b01d392eec688ecce957d6407bdde335d16d62e2ec456ef5c3f4e8e00887bf8811de98d637b77ef06796539f13cf34319c225f65824cbd867bc757335260860 SHA512 ac4f0379cc7927bada4416a5569c96ace173ec1b85e46e95682f46e254da094d9cfc6049ba8f49c6dcd6bc0d3ee6e08a00150f9f6088ff2325bd1a1179d7184f
+EBUILD ark-19.08.3.ebuild 2249 BLAKE2B 450fe0836890c9b05b67992ba79785811edcb5d05a2180468dd7f71b5d1fd1284d7912df31d1bd18f5aa804675e6bee60ee596b51c19895ba3f5a4b698f89167 SHA512 f14246ca859eb5c52b3e1ffb427270cfbdc6caa72a8e59ede7e54bfc42cd83057497c5e6d7d6b2cbb221930a10cd34d46bce024253657cd65d34f8dc15028096
+EBUILD ark-19.12.0.ebuild 2243 BLAKE2B b4ba7f8f5770de6e4025d9a79300ab0fcb61ff8937deffb8d2c56046de50f2b6329bc6b78fe25359a7c7433475ee57373f80e9b9d36dd73509f3bc9b0e3b7d5b SHA512 bce3d7b60eb6546f64003a75533a91cf614b0a382e0d036fdabac9d3aab1a1dba4bd1bebf3d8c1bd0d64498c389affe02493f165e8deec43def52e12e1bf19f3
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-19.04.3.ebuild b/kde-apps/ark/ark-19.04.3.ebuild
deleted file mode 100644
index 1369e67045f6..000000000000
--- a/kde-apps/ark/ark-19.04.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Archiving tool"
-HOMEPAGE="https://kde.org/applications/utilities/ark
-https://utils.kde.org/projects/ark/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="bzip2 lzma zip"
-
-BDEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	app-arch/libarchive:=[bzip2?,lzma?,zlib]
-	sys-libs/zlib
-	zip? ( >=dev-libs/libzip-1.2.0:= )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
-# bug #560548, last checked with 16.04.1
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-		$(cmake-utils_use_find_package zip LibZip)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_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/ark/ark-19.08.3.ebuild b/kde-apps/ark/ark-19.08.3.ebuild
index 5de4f8e9843e..fa158209aa3e 100644
--- a/kde-apps/ark/ark-19.08.3.ebuild
+++ b/kde-apps/ark/ark-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/utilities/ark
 https://utils.kde.org/projects/ark/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="bzip2 lzma zip"
 
 BDEPEND="
diff --git a/kde-apps/ark/ark-19.12.0.ebuild b/kde-apps/ark/ark-19.12.0.ebuild
new file mode 100644
index 000000000000..1c677a7ea9e3
--- /dev/null
+++ b/kde-apps/ark/ark-19.12.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.63.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 ~x86"
+IUSE="bzip2 lzma zip"
+
+BDEPEND="
+	sys-devel/gettext
+"
+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/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/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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	app-arch/libarchive:=[bzip2?,lzma?,zlib]
+	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/ark/files/ark-19.04.3-missing-header.patch b/kde-apps/ark/files/ark-19.04.3-missing-header.patch
deleted file mode 100644
index a0b16e93a4f2..000000000000
--- a/kde-apps/ark/files/ark-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From dfad7a3f389c3b852f45563854df123ac6facdec Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Mon, 15 Jul 2019 00:09:18 +0200
-Subject: Add missing QVector include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Summary:
-My build was failing with
-```
-In file included from /home/nico/kde/src/ark/kerfuffle/pluginmanager.cpp:28:
-/home/nico/kde/src/ark/kerfuffle/pluginmanager.h:138:22: error: field ‘m_plugins’ has incomplete type ‘QVector<Kerfuffle::Plugin*>’
-     QVector<Plugin*> m_plugins;
-                      ^~~~~~~~~
-In file included from /usr/include/qt/QtCore/qglobal.h:1204,
-                 from /usr/include/qt/QtCore/qnamespace.h:43,
-                 from /usr/include/qt/QtCore/qobjectdefs.h:48,
-                 from /usr/include/qt/QtCore/qobject.h:46,
-                 from /usr/include/qt/QtCore/QObject:1,
-                 from /home/nico/kde/src/ark/kerfuffle/plugin.h:33,
-                 from /home/nico/kde/src/ark/kerfuffle/pluginmanager.h:31,
-                 from /home/nico/kde/src/ark/kerfuffle/pluginmanager.cpp:28
-```
-
-Test Plan: Builds. Can open a file
-
-Reviewers: #ark, elvisangelaccio
-
-Reviewed By: #ark, elvisangelaccio
-
-Subscribers: kde-utils-devel, #ark
-
-Tags: #ark
-
-Differential Revision: https://phabricator.kde.org/D22461
----
- kerfuffle/pluginmanager.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kerfuffle/pluginmanager.h b/kerfuffle/pluginmanager.h
-index 75a971b..8b9ad69 100644
---- a/kerfuffle/pluginmanager.h
-+++ b/kerfuffle/pluginmanager.h
-@@ -31,6 +31,7 @@
- #include "plugin.h"
- 
- #include <QMimeType>
-+#include <QVector>
- 
- namespace Kerfuffle
- {
--- 
-cgit v1.1
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 8afe546fd6d5..e5f4821169cb 100644
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@@ -1,5 +1,5 @@
-DIST artikulate-19.04.3.tar.xz 3986260 BLAKE2B a0ffe7a8193718d4a51f0a7c51292cdd9312d2ff4779d5436fd906dfabd3a54159918f7e27a4d084f3ff6843e7e102409a3f152e9569240be918374ef560c5eb SHA512 b61cb3514839c9d6af09f8be950528ff08cab827c27e338cf92972aee7f8811032113f0fc8fe1b5cabe11b4ba689c7d10870a90fdb830c32fc565c879adfc939
 DIST artikulate-19.08.3.tar.xz 3998692 BLAKE2B 77849480349e3edbd6b6a98884cc25b28ab6246dd36991f728659d9535f751ff68a13065fca4c510d96b87bfc12982f8c911cb59de2ef13ef33886d8ae157334 SHA512 2c27d37462fde6fe4b1b68efb96f71e4ee4b88c2685274872cad44a264a46a98bddc143d2074b3ccb0fe214a73abd54de204a52aeeb0ddae150a55c0c08ffb8c
-EBUILD artikulate-19.04.3.ebuild 1124 BLAKE2B 42ecf7dd97280d34a589e9ae74d04a0e9b147e884b4ca615dbd4180a9ec854ebbd0f0663264472ddbcd734269cd74838ee91f129f1b27c18ea6bdebc00505a4c SHA512 695aaccdd37cae1d0d68d18fcb2c359dbf71fd3302d87c8d6678ba1b3f606b3ba5b016a70f9baa1f5a4b37f688e1944371b48bd39a2a6c47f86fe0882df44d27
-EBUILD artikulate-19.08.3.ebuild 1294 BLAKE2B 7b732dd7a0d018cf81493b5e9d7b79057e9a3e1589730f9cf471fa954afb53aa691a645be99b0a3b2045f143872f4c41ff0fb83493eb1c0877cae4664aa93689 SHA512 f2a9dabf101132cbd27267dce43585d0da83e6bb9786ba25403a290d81f4301e43916a9ea80bbef8ac6e4c035471f4098a7a9406d2901351538c74917940f43a
+DIST artikulate-19.12.0.tar.xz 4008004 BLAKE2B f449aea6293dc101b99f2236a812ea69569a8ee2439e54c1d4f40e0d2cccdf2a48ad3bb89fc39f4e336941a022834fa732e202927045d6a19ea76606a0deb31d SHA512 3c06b2764812cf4f816a75b47f30e45a81b65df82a554a9b52c1116dd3e6e8713e16dd03cc3ac843d1419c55300c8f21c985ce05b27d76a6d2dd49d06080e802
+EBUILD artikulate-19.08.3.ebuild 1291 BLAKE2B ec41db6f49861a90732a61b1106333ecf8dd80b8cf6cbeba7044ea46e46c7ea562dc8267a0046099498dbd9ef9af4e7b44e8bb43bed27b89912bd01ce8f5d15d SHA512 6728ea8ea58fa5efd63d235a1f4641f21c7bc4fb2e0aa33efb86e73f0df5ec7ed70681616c98c509fb1e97cfe7816626c50cf6cb386c76bd84c3d0875432b28d
+EBUILD artikulate-19.12.0.ebuild 1263 BLAKE2B e17523d759ccab90c3062e6660a2d922be1fa2daf4bed79a5b377c5c8e6d27c34a821c7b3be8b0050a8fe83cd3fcbfd9f04585e01a763eebe3178d83befa3d31 SHA512 69d1b0562a3a3d37a67e2edb1bad7446d1b23bf48b3992a83a0b998ac37c7aabdbbb6c9416961467101a20fbcfa0b6489e1a7f7273ea898a7f2bd6249e1f223a
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-19.04.3.ebuild b/kde-apps/artikulate/artikulate-19.04.3.ebuild
deleted file mode 100644
index 72be6e1f3808..000000000000
--- a/kde-apps/artikulate/artikulate-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Language learning application that helps improving pronunciation skills"
-HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+gstreamer qtmedia"
-
-REQUIRED_USE="|| ( gstreamer qtmedia )"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	gstreamer? ( >=media-libs/qt-gstreamer-1.2.0[qt5(+)] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
-		-DBUILD_QTMULTIMEDIA_PLUGIN=$(usex qtmedia)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/artikulate/artikulate-19.08.3.ebuild b/kde-apps/artikulate/artikulate-19.08.3.ebuild
index 3eda6c9272af..283725ca9839 100644
--- a/kde-apps/artikulate/artikulate-19.08.3.ebuild
+++ b/kde-apps/artikulate/artikulate-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Language learning application that helps improving pronunciation sk
 HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+gstreamer qtmedia"
 
 REQUIRED_USE="|| ( gstreamer qtmedia )"
diff --git a/kde-apps/artikulate/artikulate-19.12.0.ebuild b/kde-apps/artikulate/artikulate-19.12.0.ebuild
new file mode 100644
index 000000000000..60bb8abecd29
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-19.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+KFMIN=5.63.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 3eb375e16f3f..0a82a7986674 100644
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@@ -1,6 +1,6 @@
 AUX audiocd-kio-19.04.0-handbook.patch 717 BLAKE2B 997c82779a9598d0ffbb0605ca7b9f71ed62298ea3f3acb2ec88ee99417dac84fd8e6ffa0036d036346bf28612c6bb4323ce2e4f62316c4d321201d00462e665 SHA512 7601c79145be90cc9a49eec28b8ff63e275212d76d4faba779a1cda53c45ad863cd638de64d522c099a2c8858275c92058928a6f4396951aaf370277189e72ba
-DIST audiocd-kio-19.04.3.tar.xz 354536 BLAKE2B d0cbfcbb729099a0676394c3a44ec2d0ef6e4522813a0b6f24c87fa6177722be120b6f5867d341b2718db073408e1b509ad9b91209230b3a78ebf6aad6d9c7d8 SHA512 d3ccfa3fac445f4b89a3cda6ef996247d841b96612bf3b32342ff77148047503c99ae44cb54bbad18e09b7dc2347c643aa819cd480684ceb5caa3406513bfb98
 DIST audiocd-kio-19.08.3.tar.xz 355684 BLAKE2B c2cdd23f8138982be9eee050a3ed803898f76abf7b1e1aa8dd5a2fc1509dd89c1b26540728ab11461ede2fccdc8799f8ec3731882cf94f4eb89f9f27068bcc64 SHA512 602d125e05e3d86256860efd8bc822373b8d4c464f12ff05c811e16a5adc0d48fcd0523b09b521f5c759021e3f0c2fe47d57928f4be3132a757e61748d447b9e
-EBUILD audiocd-kio-19.04.3.ebuild 970 BLAKE2B c8d14c2d7199bc9ebffa2335628bbc04fbc47a668df4b3f32bab1f1f338f0253e0e1a50440bb8fe787c8da455a8fbb42989e5f8841126520221e90c77b8a307e SHA512 ca55f51b0e83f3179619b2d67e8be5e93051b49b7e1ddaba506a4a2a0e42e28613ede7edf6cabc912604f71a0c7346588e590b3d3aa08d215e4f48e21d72dac9
-EBUILD audiocd-kio-19.08.3.ebuild 1089 BLAKE2B 66fb5d54c6c6af1fc6848677330534fd4ed85ef9a4523c1a5c39a7f8a8f3fe977b4213136abc05bcf9084be13bed75ca21aab8ca8a758d17dd68352ee0cfc4f4 SHA512 56555473bb19743ae299635883eb4c4f6ed26666a36bc059b2fe67ff8e15f11baadc92933f7dd187201b84e8b1350189eaea41766d55e83999a878e76d411ff8
+DIST audiocd-kio-19.12.0.tar.xz 357096 BLAKE2B a44975d341ba736688c0f7e3959a20a7c94f1998c702be7512bdd86119acaeb2228727c2d99bc46b270addcb1213bf3e6a46c143a195df37897e573c6508d81b SHA512 dfab78c873f1abec022499a2db6c509f8ba86a643c343297d23c654210c7bf89fca8475538cb9c4f862b144a8f908c40294d4da00e53a31d9b8076bb85b35718
+EBUILD audiocd-kio-19.08.3.ebuild 1086 BLAKE2B 92afee8aa6ff56eb89aa06c054b07f4ae244b47f898cf00364274ee77c69be8aab80553a2343a53fdb151b4b28f0026d3a7cbcfcdcb82089e2a6ac120b107a53 SHA512 a1f22155e3d59a6d7e89d9f5631560e7b64934bd3557da0fe8b8d60a750aae034251561b72365ff8d11a42b130ee17ce79470f739f570f10680a3d3dc9fb4940
+EBUILD audiocd-kio-19.12.0.ebuild 1078 BLAKE2B a9f1944716832767d0b64018cb4fd3c694042365884c2158ffa926defd377e1c97501ea307621af3f997bc2df151b2407e8ce1f91356c90f13c2fca3e0f43287 SHA512 ce3deebbb38acd8af2c255a9c05fc012bc0f1e1905a07e6d4887ff63b014a17c49f82c026c6db7bf2e31a2d70ffaa159da5125286dbc3050a30a74c759289c99
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.04.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.04.3.ebuild
deleted file mode 100644
index 411f30c4421a..000000000000
--- a/kde-apps/audiocd-kio/audiocd-kio-19.04.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="kioslave for accessing audio CDs"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="flac vorbis"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep libkcddb)
-	$(add_kdeapps_dep libkcompactdisc)
-	$(add_qt_dep qtwidgets)
-	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-utils_use_find_package flac FLAC)
-		$(cmake-utils_use_find_package vorbis OggVorbis)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
index f4626e3b19e1..319f0bacb4c6 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="kioslave for accessing audio CDs"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.12.0.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.12.0.ebuild
new file mode 100644
index 000000000000..ed2d17284d45
--- /dev/null
+++ b/kde-apps/audiocd-kio/audiocd-kio-19.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 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.63.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 eb5f2f57820b..d28769da416d 100644
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@@ -1,5 +1,5 @@
-DIST baloo-widgets-19.04.3.tar.xz 249112 BLAKE2B 31035dd371799eade41cbe5d4d600e1b40e6aa25b4c529cfcdfe1ff424f57faa77e7e3b960f3df0eb82bca4cfd6a963d6c3e8fd23d3a2db6cac78afaf15ed031 SHA512 46fffc6722928752c70723d586ad1c8071767a9562f042c1f8b8c9d1faa7962fc659a6c6d5129c20f9c3c86a962ce643f34832d03e01dceb2c2fb9a624b2dbf3
 DIST baloo-widgets-19.08.3.tar.xz 261744 BLAKE2B 43580ec151165c1c5c59363a986e049e3366d1da4ae2ee79de9430ed9a09e9dd60be13ee5f9aaba92032be901be6a0ab497ae45a0735f0d0f64c8ee387d8b732 SHA512 f63525822a3e90e1f0c13e6b8d893f1e796efbd6061cdb6b976d9869e929b1c05ad5af1a955be0c7664372ba82f87978337a4ff3b4141d30cad80ad4606fded5
-EBUILD baloo-widgets-19.04.3.ebuild 600 BLAKE2B a62787b6419982f28c86bd46e119dea57f1e6318b55e09dc03a4879ae74f076ca82eb072aeffe8d00cf9adc74763c71e48e72a294d210dfc46d6d27283d9bd7a SHA512 3f26cacd623294ad786300793e43bd565c2cf253190c8235d4fd7e4393eecfda39ccfd848d319094fd1bf4445a3ae42a8af3a201f790e244c338395d29d5522c
-EBUILD baloo-widgets-19.08.3.ebuild 699 BLAKE2B ee8743d63b93675c176104fb4080a633a33b85bd2e283677e7caed7c9a4593b7b1032aec06532228aecbc26d505cf66d1c72d274f7363ffdd0f343884c6ccb4b SHA512 c17a644326a5c67ab0ca62cd026c5f44c4c85f0857a6c8e56ae69a76c1a5d66e5b2feede9589a43c4cf439f9ceedd77a02b95c887d6741acc4414e135f0c7a38
+DIST baloo-widgets-19.12.0.tar.xz 262956 BLAKE2B 58dac0a3a0e552546a3e318af53952d193553530f37918e81c51934d53a7b6294b2a45d12b1ca397a37d304308551e95faec0f20210d3a01b8af2b727c3b7281 SHA512 25c3cbf25b32f61a9b27f63d8a6ae83c43980778da626232697ec043d01e2c755119ccf51395e8e429c1040e9a0932aa816441052505be7b6cc58444c3fb53f2
+EBUILD baloo-widgets-19.08.3.ebuild 696 BLAKE2B e48b1fffae9384769f1f5470abe88d5a5b979860e2272322fa130f6f08514e2056e0e34570a1f28ede2a05beb00da78753ff5af5d3b72ea8c2c93032d32ba878 SHA512 72e615e2a6b68dfd3b6b0fbbdf129c667ce74c39feffd7028929d2527a7da685478416f1cec27e658e1b8707ab1ddf6c9ec49ce8fed50da3756ea8bffe08d935
+EBUILD baloo-widgets-19.12.0.ebuild 700 BLAKE2B 4cc4949c0d0c7fd3cc09489e5889009cc27cbdc5f97048951f8d6a1eca5292e0ec08a505f2dac2c34fccc299f4c75733530b4d88724e1230a4e504ce9cf80ff2 SHA512 0368751cd23495c820846c7389c388bd3d7bfb5707b7eb0a3f72534a51c99623ea76051fa9d806b8a63b202d5738114949dd82e5b7d9df1e7c1f090e6679d392
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-19.04.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-19.04.3.ebuild
deleted file mode 100644
index 9f0999cc994d..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-19.04.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Widget library for baloo"
-LICENSE="LGPL-2+ LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep baloo)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/baloo-widgets/baloo-widgets-19.08.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-19.08.3.ebuild
index 2efe12582630..0546e955ae94 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-19.08.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-19.08.3.ebuild
@@ -11,7 +11,7 @@ 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 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/baloo-widgets/baloo-widgets-19.12.0.ebuild b/kde-apps/baloo-widgets/baloo-widgets-19.12.0.ebuild
new file mode 100644
index 000000000000..8f5b6b138582
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-19.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.63.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 ~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 356e7e53a835..48b3d005716f 100644
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@@ -1,5 +1,5 @@
-DIST blinken-19.04.3.tar.xz 2820320 BLAKE2B b0fa0f5485cb106d4bb7088fc18eaa500f441b5100dbc29c3a5aa4fea8c984024f65adea291fdad5501e7cc7b6a77f45b85ea767b3f1da2feff3f147e67ef699 SHA512 bb66c895eb8adbc74a7ba2904e036a4cac0332129600837097e9bce5eeb967e17a61a4d3fdc6fa5bd1849387ed13f2aa6f4a814fdbdd7a623b96380bd8844e6c
 DIST blinken-19.08.3.tar.xz 2820600 BLAKE2B cd367cec7664004be89ee242ffc829d4b0e02c76b3c94267af5b3a584012362644917e9dfa051ff9497dc56fc57380a33e0f7a96a09a70fd7cd1784a7cac6037 SHA512 0dd9d9afbaab7365878c4137e520e31cd1809a243598e7d1eb0e51b638306edc7860c9c057326f55f1ba3720f0529b4859cbcfaeef094811af19c07466d65c61
-EBUILD blinken-19.04.3.ebuild 780 BLAKE2B 3fb497db1dfbe237e20030ba05382ffbc87f468e2ee2bb6f219fd5ca7d2a82230c20966ed7ff9e8b4c5964865feb24d1222f0d3a318c5aa1e9a5f9d831e50b73 SHA512 0b4cbde06d7cb9de53191ceed57f1db139fe0288b01d7632d01b107e0bb6edd7e4502fce7b1b88e2d78a5edc2c9971fd92f0d6ac1c815bfdcf7396bf9c038d98
-EBUILD blinken-19.08.3.ebuild 914 BLAKE2B 0220c2daa7689fa0a5b8bfbcaebc2b50a7167394f94e9257b01042290a6551da85fad7cb55675ca5e712232fd2f360e54e774b2485efc045ce0ff65c3d2c52a7 SHA512 42b4966da816ab3da65c24f0d0accae26aa42c20a74bae7c0c9c49c407e1e255ca3ec3c3920357067e8ee6535ed2525541e47fa18dc6649c9ab6ae8f991c5259
+DIST blinken-19.12.0.tar.xz 2820412 BLAKE2B b5e38b99de4451b02a74af78b71af5e6044c84c1418611edd0d70d407809cfc8fcf403619249dd5b19161461f76a4b77e3c3cf3473a1cdb9695b36739591e95f SHA512 61e74c8e96105d1f25897d93fba70b2b7f8e56c75021f33f4096452e273e27c0cc4e84765686f5e887babf675fde81f7f84484b84b2b2c747938853fde52e03f
+EBUILD blinken-19.08.3.ebuild 911 BLAKE2B ee8f08d87279e273d6b88bc73aced86e56f990d585a7045f5b527858a5666b1cc69792e9d3ea28a08ad3adf168d1a75aa25396da3c3ae91ee31967f47b3cb48e SHA512 3fb4195244031f0555f0ed4d6c282a1fdaa84139807794a4112f35c59cccf80e2a64fa2c718ed8767042f4095673e60cbcf0b51ff951e770380ff378a30dd439
+EBUILD blinken-19.12.0.ebuild 923 BLAKE2B ddefa94b1915cf83d71728f84404c3ef35a067d4ec9c167d19b95626e0632fbbd2f55d6f8301925ead896cac6449e505b15e6ba7d93dbc355f8702a8a209abbd SHA512 67c79f4f1be5d8e234c413bfb2862ca34263dfb6540386e8b5c1465465c84f010cbd9dd73b241958c15506c8e39d8f918a5119a6ad51aa70ad8acc7ec9472d81
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-19.04.3.ebuild b/kde-apps/blinken/blinken-19.04.3.ebuild
deleted file mode 100644
index f884dff435fa..000000000000
--- a/kde-apps/blinken/blinken-19.04.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Memory enhancement game based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/education/blinken
-https://edu.kde.org/blinken/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde5_src_install
-	rm "${ED}"/usr/share/${PN}/README.packagers || die
-}
diff --git a/kde-apps/blinken/blinken-19.08.3.ebuild b/kde-apps/blinken/blinken-19.08.3.ebuild
index ee87dc1f6629..f21838bda290 100644
--- a/kde-apps/blinken/blinken-19.08.3.ebuild
+++ b/kde-apps/blinken/blinken-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/education/blinken
 https://edu.kde.org/blinken/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/blinken/blinken-19.12.0.ebuild b/kde-apps/blinken/blinken-19.12.0.ebuild
new file mode 100644
index 000000000000..3154856d6d15
--- /dev/null
+++ b/kde-apps/blinken/blinken-19.12.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 4552797bb976..92f546688297 100644
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@@ -1,5 +1,5 @@
-DIST bomber-19.04.3.tar.xz 819392 BLAKE2B 6a0662780685d9c45d5d0c54d3a87c96de8605ca43a123158c2adcf45efad7bba79f6ac67d3819735054d13a333ddb4b966a3278e96968a094915140fc848806 SHA512 6be4a23149d91f63b0d124bcf467be3d034e7d8ac5dcf3fce1b93fa17d389b2f902729d628f434bceea0fa09bb068677b051b0406415ce080bfd7764ae02402f
 DIST bomber-19.08.3.tar.xz 821164 BLAKE2B f9bd278b6aadd58421b36155de6e4a6a9e94f492314dfa99b6dc13bdbe562cbab01061ef79b8c1029fd037c6f74e5d2e0ca5ddce8ae998d1d0214a6077812c38 SHA512 991e6601fa5c89dafd8e25fb308ad2ebe4253bf0019e1dfc298128e2003ba9d01ceb21160ff44aa8fce46ce39fdb7152185cd89fa7b1a30e65dc9c04d32c4f50
-EBUILD bomber-19.04.3.ebuild 694 BLAKE2B 1695f0faf4b2f5fd67a6beed8af75929337a9ef0909535d438e0e1fac430cbc544af88c51940eee147a6e694c36472ae7fa5c386a0188fd0f241cd7561cc1248 SHA512 1a7cb37b75d4a166fc913d720492bc2b4fa8e551baebdb320cb7357eb364e0f1612e692e9e2fd38de31fc43531e0287d64ca84a5d0cd4fa232fe20073cb7e169
-EBUILD bomber-19.08.3.ebuild 853 BLAKE2B e9e4c2bab41bab38cca30eed92497f056295f587580f07ee5e929b052cc570075f53434d79b8e25664aebd98da970ac7725b758caceff3e56c93fa6a32aeb789 SHA512 c7df4e4ed829149847286f79226caf9043550e10413db5d0e7420bec10c482f89cf4bf178737f9ab143402ef576b62ee28a92613f60deb7ee8b079409d0fe48b
+DIST bomber-19.12.0.tar.xz 820508 BLAKE2B 563531d6bc25de0b3bddc99ca1a240600d697c834e2c6814781a6a0226e95fd1112b1265e9471d2e0c35429c92bf261d096ed69705d8a13f8e578f065fdb7f21 SHA512 608d35d106ba5e6cb81d7cc2f4bc3cb458550fef14acdb9a502267c6ed721af39abe81f9c57e17449cff5abd2c017ec068d3de2dff1585b69993a8198826b1bf
+EBUILD bomber-19.08.3.ebuild 850 BLAKE2B 3c357e6b604729d193e6c1013feb511213e9cfbebafc64b76207ae61224c27f6a1d4470881deb70a20916e757224d50d7cc51da3d11cc400616acd973443de9f SHA512 5f9c1b9b386c12a3de8404dc6597c67def9cfcead77d52ef8edb26e1d4b706a76d6d428404e225b3c64dd73d3db416c5bc4104b98fdfbebc3da22f2b21e3d48f
+EBUILD bomber-19.12.0.ebuild 861 BLAKE2B ac190826fc79c7fcdab70756c5bcfbf63a4095b10207d5e90a1737a53d6dff11a1ce1656d2a8a4910c7aa132bdc3b1cf7b2cbdfc64dbaa1ca3a89d09ce195e52 SHA512 0659a43086468e8a3275edec2b094442773744fa20af582670c9b061f633c451b14a0e51fa8d5f3a8992d90cdb98f1a31e1050e64ba9fcff0aa9a8f9c582a188
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-19.04.3.ebuild b/kde-apps/bomber/bomber-19.04.3.ebuild
deleted file mode 100644
index f0840d2c9984..000000000000
--- a/kde-apps/bomber/bomber-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Single player arcade bombing game"
-HOMEPAGE="https://kde.org/applications/games/bomber/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!games-action/xbomber
-"
diff --git a/kde-apps/bomber/bomber-19.08.3.ebuild b/kde-apps/bomber/bomber-19.08.3.ebuild
index e9a04ed652c6..c2e39119d9f8 100644
--- a/kde-apps/bomber/bomber-19.08.3.ebuild
+++ b/kde-apps/bomber/bomber-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Single player arcade bombing game"
 HOMEPAGE="https://kde.org/applications/games/bomber/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/bomber-19.12.0.ebuild b/kde-apps/bomber/bomber-19.12.0.ebuild
new file mode 100644
index 000000000000..462f099164e5
--- /dev/null
+++ b/kde-apps/bomber/bomber-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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.63.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 59a77fc68fad..4f8ca5237a36 100644
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@@ -1,5 +1,5 @@
-DIST bovo-19.04.3.tar.xz 199884 BLAKE2B 5c6d0cc99d049fdae2efae9346b5f519e7e512ea9b672792196dea769ec958808689867a676f864b179845e8908888a9699b94fdc9b9650e8e9312580f3d5383 SHA512 d51178341443b1ed6e70d91c2bef38ed7befe925250e8ea17841f1af5687acd29133103c433ed3ddb8a1a280daced6518823847ae66bf6474a22e3b13b1aa9f0
 DIST bovo-19.08.3.tar.xz 200164 BLAKE2B 706ce9e463bdb72c8a6f2f29825e2e0d7c17df8ca7713de0d0705a0bda3455a589441aaa29fd50751bab8403c3a95d5f283f2bcae8600a37c904f671dceabea1 SHA512 f92150ad31b2230810c573c1ee1f5e5d906587823c747bb347ae62a39385f45b62c28a6452ada80c6c3e7b71c1ce87892d62d4bab41f80bf3fe5da09c3c8a349
-EBUILD bovo-19.04.3.ebuild 701 BLAKE2B f0267f92b7a2819f66b9ec15ffdad927a9bcd34a2043a56cbacb857602e983a99a4b409e3b39141447c6d5f631285b8fc2fe2e41391b6fe00458dae3b27f8aca SHA512 ddd1170faecd2e2555acd06722325ae171ff776554a361d89792615c96639375fd7074f8f897b56feee388a7ee03ef0b151014f70fd91463afa631c1af51069e
-EBUILD bovo-19.08.3.ebuild 866 BLAKE2B 1eedf05325681fb09bd4f76bda83e981b201a30ed63aecacb2999e2c7ff50c11d386225c483098808b9ba724fb7eb7216440bb4fe71d8eb1ce1bb5b7bf38bdd5 SHA512 9275aac587384c7380d65947f51898024adc066b74b2972f82da23105e0d6f1ae763168527cc9c0e668f2b01cb65415417d95add4cef4ff59085a704b2a856b0
+DIST bovo-19.12.0.tar.xz 200168 BLAKE2B 7cb24bb25de6d3e033897d4c0bb685f9ff905df46deaf4eabec944c836666ab43d66807b522bf9ac8bdc302c45e730dab80ae1761472cf0eeef52fe3237eb5ae SHA512 01b44e84847f9de98f8ac881220b719112923422666ef9f724e5ad338244ef4e482d192e8dd9eb5456e2010ca7d26bfbcad7672608a53ae3f3adf5c26948b82e
+EBUILD bovo-19.08.3.ebuild 863 BLAKE2B c913b02f3631a41990e2c83ebbe30a50357010b7afda089de04a855b2efbf30236b49c35395ffb785aae5d234abbaa5cbbf84a537c668c956edf36a363c380e1 SHA512 2982c2c591cb2cdab9ad4f83ead1c35a0302b5aecc17d94a22f73a727133d19fa88793cb3f13fc43e9ac1b997ab20e6da7bb13fc047aee10ee933ded19466842
+EBUILD bovo-19.12.0.ebuild 874 BLAKE2B de73b236f111abf6996b22b78756e1cb80cb12cff4d4f7b6266fa7cd6b767275b52de21ea2a5455567d6cb501d6a6e5ad912f1304f5d9d0d9d0c1a2fdf9fc3d7 SHA512 2846d7a517ca0f06dd493c12f13f3f5c03645fd33638a669df66550a797956a397ebe9c2e7501e30e6e99bb111768c92fc8e5a6c04501fe1d833ee713a6e5be4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-19.04.3.ebuild b/kde-apps/bovo/bovo-19.04.3.ebuild
deleted file mode 100644
index 2c24aca3cbd7..000000000000
--- a/kde-apps/bovo/bovo-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Five-in-a-row Board Game"
-HOMEPAGE="https://kde.org/applications/games/bovo/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS HISTORY TODO )
diff --git a/kde-apps/bovo/bovo-19.08.3.ebuild b/kde-apps/bovo/bovo-19.08.3.ebuild
index a2c6bfdc4ac6..5d981385e433 100644
--- a/kde-apps/bovo/bovo-19.08.3.ebuild
+++ b/kde-apps/bovo/bovo-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Five-in-a-row Board Game"
 HOMEPAGE="https://kde.org/applications/games/bovo/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/bovo-19.12.0.ebuild b/kde-apps/bovo/bovo-19.12.0.ebuild
new file mode 100644
index 000000000000..fdcb05cfaea9
--- /dev/null
+++ b/kde-apps/bovo/bovo-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 43debb6b8498..8304daa7d0ef 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-calendar-tools-19.04.3.tar.xz 223328 BLAKE2B 47f16a483f49f27d203db3b0627532b7b928f18bead7e22176b340698e7c2e52322139ca92cae9a776b239d9d741656ec3c943eb997c1dd5064da4d818610474 SHA512 d4c61f04861b26fb01b0cd76056fa5107e0257e7b2c118596ed40d87a3cffa8526889bc82b45f9d3cc61d1d4d25518bbeca56edaa028d02f779b7880df2522e5
 DIST akonadi-calendar-tools-19.08.3.tar.xz 223564 BLAKE2B e0d9f01659a471307db2c7d8c0906297ec4a880cb0019414520b29a14eee68bf39b02d02dd4e5b3b03c3684022f675f30cdb6efb214adaca64dc27f5eec03c25 SHA512 4cc146da96f6a006749e4c3e0962155fc8bcd788d2ed39adbbe73f1d82bc4264349ce06a9b524ff4fb1a1675e0d66345e5bbad8044360b6fe28d9565672f3922
-EBUILD calendarjanitor-19.04.3.ebuild 993 BLAKE2B bccab9d221cf58e5771a0e5f26ddeefd84fa9eb330badaab0886dfba9add5eb137839d9aa596c3ae0552ea1615560017b351126c2c86a3791c2fa52a10acc876 SHA512 039f660706274f490d1ebdf4c761ada31fe03fb215da07c1c757c6d5cb71ad3de5396bdda1d6b6377ceaac1b09a8f45d6dd58b3c190089b6740ce8f262375f0a
-EBUILD calendarjanitor-19.08.3.ebuild 1105 BLAKE2B 496b4046d8c00af53290009d2f5c4b64af43c789e2d60b4675e03319237aa4931f7abaa6bf9b85518400c0cedc9553c9f45ccf822cc8cbbcc21fb454ebb6f25b SHA512 29e0afbfd74dc6194ae9859fd647930517c130ac357ebca8a3f56ebc1c1cdee3c469173b8c032a249e3f1fdd9cc3870404fd2bdcbf2c6f36d2de37d3997d1c88
+DIST akonadi-calendar-tools-19.12.0.tar.xz 223424 BLAKE2B 042182b9884f5b81f91eec2a92e37db9244ce30b4360358f958dbaf317e2bd6d1b5a8c40e8336d0560b4cfac9f3428511459435d40f723f9f9832b190efff601 SHA512 90df1342f3685df0c0496d83dc1b483d0c126bbc7ad03d6abd51c421c5edeae18b3b677b790e3646f55bfd37d27d9aaa0f484ac8983755de20b187efed34cd76
+EBUILD calendarjanitor-19.08.3.ebuild 1102 BLAKE2B 6e63e0c53b76a31eaeb7b19716b851e1e93bd24661c5f1c6ca7d25c15e1442ac3c578fc70359d66e946f924c7845e6cc5994d200213822d706f9b1f3a8a28735 SHA512 b47bd05fbd95ee39b937b01ddc500940250eabe0c887e079a63812989eac19d0d14280c46fa1e31f078c960a711aa5a0433c11828dea40d18424d753c5117d00
+EBUILD calendarjanitor-19.12.0.ebuild 1105 BLAKE2B d12562475111979e494d404d70898497a3db8980b065a2b56ea8f9cd6c2165b90fd0eba8b9b2d9782166673ac9f6ceb88a8d886116d372e477534a31463ebfdf SHA512 e2943fca10917f4a036cc8aba9abc112b82a8bb517233d7a6952395a068e54604061b52d733c3d98fa72b9f8469a8d725a449e11dbda7f54a635c5ef21245567
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.08.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.08.3.ebuild
index dd2eef2f4368..c79906f5590e 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-19.08.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-19.08.3.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.04.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.12.0.ebuild
index 4bfec8f24667..c0fcc353cb67 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-19.04.3.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-19.12.0.ebuild
@@ -3,32 +3,36 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="false"
-KMNAME="akonadi-calendar-tools"
-inherit kde5
+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.63.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+ )"
-KEYWORDS="amd64 arm64 x86"
 
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	cmake_comment_add_subdirectory doc konsolekalendar
 	sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index abe0d5717d18..fe6062f9699d 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,5 +1,5 @@
-DIST calendarsupport-19.04.3.tar.xz 646352 BLAKE2B 4a638e5db0a74523131412828aea93b71c5363e33439e22748b719e77a8686f2777df8c4879af7fc3de1137576939c051c10d05eba9bb003a7baf51beb105507 SHA512 6997b204af48873ede65b6307f4a5074c7ef88815d18c363484cbf95f03085d2388d9da3851858db62343c0fda30f8e1fe99815981c6d0beaef05291dde7536e
 DIST calendarsupport-19.08.3.tar.xz 646440 BLAKE2B f43f743cf6cbe39601cab39d38565f129f6470099770d60ca9805ab4edc7d9ee8427675d76e5f9b948ee3ee47e119661263519f4121547f5ef6778b7f9d1d7c2 SHA512 a93243c625aab807cf04c57fe60ccdac9d4bb341da4639ceff5aa0c65d569107ebae8a07dc0053f2b83028e9729368a08969dacbebdba8e645fa108b4e1ac567
-EBUILD calendarsupport-19.04.3.ebuild 1102 BLAKE2B a1eaf126557638f7efdbf387f23b485adfdb5403f1f2b26877e8d9ce8330ffa09646832c155e97248835731d3ed98391aabd6ea1f78e4867bf25417e384ddce1 SHA512 71ab4333510326b26eed63d204a940df3a178e4e39108b71e4b29ee3e7b3d0bbbf9f74105d215f4471e0b5f93a49f62e09e098af0c5ed610445a71d10369955a
-EBUILD calendarsupport-19.08.3.ebuild 1299 BLAKE2B 6eba664023132e4a373cc5e6054d7691b96cbf982897658567a071f3bca6bb045f8a27a69ffc4b4b4e10be9c8ad86a09352405fd8238e299a3537e99ff7ac983 SHA512 71d0123cafe0e86f51f7d56ea77c9fe85b1a88d9a84dc3a2259d9f3c784649815b3d3d55be435e79ed8140beb25a7f86837eeb8a7992280910dfb041e7b48452
+DIST calendarsupport-19.12.0.tar.xz 646124 BLAKE2B e183320e28cd54308412dfc01b16e8d8c439ac7fbbb677059c5698f0024a2a1384db8e190f2403d9e1d78cf558a040e53c941ec3c96e4f2e688fccfd49375ba4 SHA512 79e22651a606feb9a3bc2e308d332107c6d783689c6cbe7c88a352f6452105eb526dcdeeb4f9c5a6bb8bf0f7a12a6eb9b94db3f5d5b087e71b8d2426eccb0f84
+EBUILD calendarsupport-19.08.3.ebuild 1296 BLAKE2B cab3f26af8669a71416f63646bca05574cdd9cd79e67af4feb680d4419c42fc9da477fe253e47f9cd2986417431501281c8fa884083813845da71cc03192c39a SHA512 1f59436062c95dc63781378cec3cd342cb201aa0db95ae95fbbe86c1d2debc0dfe7c7199103083194b820c88f39ef10069c7f96b72be9451bb19b035b6fb12a1
+EBUILD calendarsupport-19.12.0.ebuild 1259 BLAKE2B e0303d8fd48b49e4bba860b7b41d47baa375ea9af1f3cf3b304312acc26ecd7a7f06da5445a6fcd42ee27e3b8b4aac0d6f1ebc312a1fefabeed93a8193177836 SHA512 7de6463caef52cbfd646f43c8ca0b027526e15964c540d4248a28e6fcddaefd39e0c096d065899f07ac4e4045277fbf7cc25b35fee9a5ac288570f8d67b6049b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-19.04.3.ebuild b/kde-apps/calendarsupport/calendarsupport-19.04.3.ebuild
deleted file mode 100644
index 3e4aae1f2600..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Calendar support library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/calendarsupport/calendarsupport-19.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-19.08.3.ebuild
index 2d9ee1ae9882..383dadb223a6 100644
--- a/kde-apps/calendarsupport/calendarsupport-19.08.3.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Calendar support library"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/calendarsupport/calendarsupport-19.12.0.ebuild b/kde-apps/calendarsupport/calendarsupport-19.12.0.ebuild
new file mode 100644
index 000000000000..196bab5c7374
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-19.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index bbdffa2a4a5f..a800e5ddaed4 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,6 +1,5 @@
-AUX cantor-19.04.3-missing-header.patch 566 BLAKE2B a95a8b12bde8d3281f4732f789f38d7c21ce12a441b6ae8f78bcd23cf37bd3402121410df83c87b0ffb2e332bb6736fe45036a2afe89ea46dfa127a07f5400d2 SHA512 f8bdcb555b0f3e7d2400d7eb23a3b08ab6e5dbf3cfaa0756928135ca372a9c41afdeeae20a5b4a12ab75f1a0f334e87a3ac6cf168e09b3ab449040412825e789
-DIST cantor-19.04.3.tar.xz 2523496 BLAKE2B 59b7267eb8ac13aefc25e706bfb29e7430a59ecd7e92c69ff76032cbdf199cc9eee017f71bd2f0736e05dde09963de1926849d77678d15af6d1599795ff7402b SHA512 bfbb598e7fb4c61bddad0ef91802107a268121493146e7105d0c41450e3803b26b40363cc8fa69990f309aadb3bfefacb3fbb7dda75a3f274d70506c53d79ad4
 DIST cantor-19.08.3.tar.xz 2538816 BLAKE2B e2445835eb6ffb368b50fab2089642a28ee3548bf572d3265b152696a4d45e1deb984793bae2819361132097f5dd19ea98ddcd7643c3675a8fd7c3f2fe3518a0 SHA512 1dc545c2c122d0303d418c757d7f4079250354e4326f2ec0d4796de343d00beb580ab47945ecc6ea491f4cd893bbfe6fced7eeb0ab8e3122000b4c75912ca807
-EBUILD cantor-19.04.3.ebuild 3150 BLAKE2B ffafb3942ad7ba176937c38c223f0f3ffb092697b7427bbc6915270f9ce0a24ecfff1d14c01b63c1c0864209843f05386bc8ab79c3ae2a13b1574cac0be38ce5 SHA512 b5e25ad41aa9cb2ddd0fa922df2ed999050701c6acb9a43db28a6ef1f54d92b33ca40b635469b9d2650cdbedebf9ea70b03406ff5d1e61c95cbb1b80c46916ba
-EBUILD cantor-19.08.3.ebuild 3335 BLAKE2B dfb86f4287ae1be7ddde92961e903c14d8e14ecee98e8f9e50210005909fa493526ad0a5e9cb74ce13b9f6ef224ae03b4bd141486d9be92c532c1281f70f6a0f SHA512 35cb996029b9ea6caef2cdc1cd64eb3b925bd77645ae0344069a163ab8cd4ebb9a91fa73dd76f304eb749471bf63095df9e22bd0bf8aea4071429a758e111a1e
+DIST cantor-19.12.0.tar.xz 9015328 BLAKE2B 2ba2f387945765b2b214d3f702b3c36f0a677bcad061ebf9aff2dc63fe6bb5d75aaca0acaf17ba3acb184694ecfc824225d0b68ab2f8881e128693006bcc686b SHA512 d8373c25ad4582938362d393498c96a2e82a15c0c492c6f403d096991950f608e71f2398217824783ee028665e042d755254aed4ed40135edd4f8464b918317d
+EBUILD cantor-19.08.3.ebuild 3332 BLAKE2B f99bace88703a265ddeb8301c81ac293f2ce0be27c2bc2eadddf575f81156f0a3ce78a0f047eca6cee5e203c4dfe47eca739a5d552550a6b0e2baeeb88c0eb0f SHA512 20b76760a6c62ca2710e4a2e237bef045b997d6be9fe2814601c1f2777a4f5d9049a6952ad138370eda52b2d5c458d51053558a59976068f8067758b8ccf6927
+EBUILD cantor-19.12.0.ebuild 3235 BLAKE2B d1892917817ae00554a2d20526d16bd7fa90cec970ebf5b03d82037b830ecccce4195848ab60b982dcdba648708fe30222b28f608adb9dc96be88d04fb7b1fd2 SHA512 629e2fa389f9c65ff3556ddca285b808aefc3f6ff9e0c2128600dd3be5f9d6aaf37ded0f0dbf97a0f7e3a8b9d2975f922dfb387f7caa6ff39e85e942e331a755
 MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
diff --git a/kde-apps/cantor/cantor-19.04.3.ebuild b/kde-apps/cantor/cantor-19.04.3.ebuild
deleted file mode 100644
index 306541dd15aa..000000000000
--- a/kde-apps/cantor/cantor-19.04.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://kde.org/applications/education/cantor https://edu.kde.org/cantor/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+analitza julia lua markdown postscript python qalculate R"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	analitza? ( $(add_kdeapps_dep analitza) )
-	julia? ( dev-lang/julia )
-	lua? ( dev-lang/luajit:2 )
-	markdown? ( >=app-text/discount-2.2.2 )
-	qalculate? (
-		sci-libs/cln
-		sci-libs/libqalculate:=
-	)
-	postscript? ( app-text/libspectre )
-	python? (
-		${PYTHON_DEPS}
-		$(add_qt_dep qtdbus)
-	)
-	R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
-RESTRICT+=" test"
-
-pkg_pretend() {
-	kde5_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
-	kde5_pkg_setup
-}
-
-src_configure() {
-	use julia && addpredict /proc/self/mem # bug 602894
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
-		$(cmake-utils_use_find_package analitza Analitza5)
-		$(cmake-utils_use_find_package julia Julia)
-		$(cmake-utils_use_find_package lua LuaJIT)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package python PythonLibs3)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package R R)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/cantor/cantor-19.08.3.ebuild b/kde-apps/cantor/cantor-19.08.3.ebuild
index 777069dfce34..e246fa0117a6 100644
--- a/kde-apps/cantor/cantor-19.08.3.ebuild
+++ b/kde-apps/cantor/cantor-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Interface for doing mathematics and scientific computing"
 HOMEPAGE="https://kde.org/applications/education/cantor https://edu.kde.org/cantor/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+analitza julia lua markdown postscript python qalculate R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cantor/cantor-19.12.0.ebuild b/kde-apps/cantor/cantor-19.12.0.ebuild
new file mode 100644
index 000000000000..a1a2fbf6a5b4
--- /dev/null
+++ b/kde-apps/cantor/cantor-19.12.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 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.63.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=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
+		$(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/cantor/files/cantor-19.04.3-missing-header.patch b/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch
deleted file mode 100644
index 3844b6bcc54d..000000000000
--- a/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6a49ffa048f619752d32ff9b85a03c8cbcb448b7 Mon Sep 17 00:00:00 2001
-From: Nikita Sirgienko <warquark@gmail.com>
-Date: Sun, 21 Jul 2019 02:00:46 +0300
-Subject: Try to fix build error in stable-kf5-qt5 #7
-
----
- src/cantor.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-(limited to 'src/cantor.h')
-
-diff --git a/src/cantor.h b/src/cantor.h
-index 0352753..bbf8f6e 100644
---- a/src/cantor.h
-+++ b/src/cantor.h
-@@ -25,6 +25,8 @@
- #include <KParts/MainWindow>
- 
- #include <QList>
-+#include <QStringList>
-+#include <QMap>
- 
- class QTabWidget;
- class KTextEdit;
--- 
-cgit v1.1
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 5e33f05489d5..05ee455dea07 100644
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@@ -1,5 +1,5 @@
-DIST cervisia-19.04.3.tar.xz 1895668 BLAKE2B b1e411e3f87105e50200153e93e36f82463bfe7e6b5a372bf9a5bc5c299bcea5f7c3d7f12354e082accdcbb4ad3223eed8411c356949cd634c93e99d4a02aaa5 SHA512 e09b6df9524652dd744e21aeeaa7e951c813c4cb89d8c16b31733dd70d04dd6f9115b73c53a35b18babb5fb77959c722443484c4829d56e34e11845a19ef695e
 DIST cervisia-19.08.3.tar.xz 1894440 BLAKE2B d5aa3e9404960fca3f241e7c96ce01b5f3f45840d17585d3d3710287e11375d65deabfe21642a26170e9d088743c8acd2bb941ea5ce9484ec1d451202ac74271 SHA512 82253694b67dfdc87f2887d5a2b1866929440439a66b0145b546207786e2509477a5b3766be378e760f3f6f2a224f8c084e8f4280f980e3738ddcdd571dfb0f3
-EBUILD cervisia-19.04.3.ebuild 898 BLAKE2B 20320110f61a5cd16a9f9ba54eb9b9239640e2f962ea009733027940dca171eaa04e87c7f9959017c3b35fe053acad48553e4d7608ec1a224d3ccc7b0603ae21 SHA512 199f9406b4482e87db49e445046659d991e0a3c874881bbd3bee23548600b1c0532bbe922ec6484d3a8067631e4d94763771a371e5e402dc23676cd9fe9c9e1a
-EBUILD cervisia-19.08.3.ebuild 1081 BLAKE2B f9622cae9ae1ac5b336f5a607661c53bd3a2deaf669e2dd6a8d7c7235216472fd96286f704136bc76b14c8b3cf8c95b5ae68fef17dd24b13f64b7dd016f8a619 SHA512 84d24f6099f87180d133c7536f04cd2576661a18a06dac114fadd1438c2a6efb028977df1344ca63cec0d82a5982778d503757a19413d23c19752a0de800939a
+DIST cervisia-19.12.0.tar.xz 1896844 BLAKE2B 4cbecc69f8a85964ac3b832913416762d03a8d05eea31cf10af579c6c588359ce0314054b647835935e8a076066efdee36884eaa919c60581b523a11f998753c SHA512 1c342d1ffb1ffedf51279648287202ea7111d3ae7c12e9a7a0e1702d2e2f53921bcd3c70e79ee7364c4fd10424e8a49f86693259794e278a29dde4a40033a163
+EBUILD cervisia-19.08.3.ebuild 1078 BLAKE2B 84682ccfe6c5bd0ddd35158b010f4bfd7b0df3c61d2f8f611e93c58af30678c31c1f762adc4d226b648f0394a97fd18c4cfbc249341389f238684ac236ef9ca3 SHA512 cd481dfeccc5850557fe4c9d030b3198acf0e9c20a705bbbf975e6df9afda13df060980917bc7526843862e17cd763458c55f490dd74b1c49eb3c041af5833f5
+EBUILD cervisia-19.12.0.ebuild 1090 BLAKE2B eab394e014df27a0e71475b737bf96cb96958944849d1fa6baa56a5a5d4694b0ae9ec0fa432305c78d1e118628095b47cd9fd6de9b0a1c3245024f5f5fe9e653 SHA512 0b6e16e3153a83136471e74f8bb405bf42c3aa8540e73380057a1f002ac75f60623b7cfbd0f9b2a855e80e52f603e7a1d2c28e3fd3bd7adbc17b7b34a5c0b4ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-19.04.3.ebuild b/kde-apps/cervisia/cervisia-19.04.3.ebuild
deleted file mode 100644
index 8c936082dbd6..000000000000
--- a/kde-apps/cervisia/cervisia-19.04.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="CVS frontend by KDE"
-HOMEPAGE="https://kde.org/applications/development/cervisia"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	dev-vcs/cvs
-"
diff --git a/kde-apps/cervisia/cervisia-19.08.3.ebuild b/kde-apps/cervisia/cervisia-19.08.3.ebuild
index 16c993674ce2..806074cb1e72 100644
--- a/kde-apps/cervisia/cervisia-19.08.3.ebuild
+++ b/kde-apps/cervisia/cervisia-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="CVS frontend by KDE"
 HOMEPAGE="https://kde.org/applications/development/cervisia"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/cervisia/cervisia-19.12.0.ebuild b/kde-apps/cervisia/cervisia-19.12.0.ebuild
new file mode 100644
index 000000000000..8acdf3494898
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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-bazaar/Manifest b/kde-apps/dolphin-plugins-bazaar/Manifest
index 77b762007a7c..4a044fc0203c 100644
--- a/kde-apps/dolphin-plugins-bazaar/Manifest
+++ b/kde-apps/dolphin-plugins-bazaar/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-19.04.3.tar.xz 191524 BLAKE2B 8869c9e5c4de20b64ad426db82ce2249821f2bf6ceec958f55b385b16c3c85af7b4e908a37f422e79454ee1ba4f604e1ed9a4ef7ba7ff431dffb32d7443c55e3 SHA512 5a89daee3a4366905bd5c884460b62b9faf75989f8bb9b108f019c4359c5ea6406efcaf896a3504870819467130cd76e31a92cf9d697a5306293b5efd701e4c3
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-EBUILD dolphin-plugins-bazaar-19.04.3.ebuild 1039 BLAKE2B ca8509b337e3cf358712c0445f3044c8de205f755e4f3afceb20fecf12ef363fd50eaa10907fa5f9d3f6379796b09f2ffaefdb5a127e6b2847b76fb005c6b6f6 SHA512 c39571c198d637081d4558000270247f02a2086592beb8ce3b5a4134315480c7945aa9275e1832ccb0274be6589621e64ea80a433ef7a2a83ad39a7c0742e1c1
-EBUILD dolphin-plugins-bazaar-19.08.3.ebuild 1186 BLAKE2B d1bbaf57c4422ff5f4363fed19e572f9007806509d613af775de5ee8c49b9d58ee20769f7b210abaf7751c5305bae779ecb73a9182cec5aa44a7b8acc32f7944 SHA512 6790d6a2b26571e087eaa4c1afc30e64ceada303e01c1f8dd547db8bb3ff31bd35c739a7464fe1e9c1210d2b97aa0c5647031b4fe260ffe034e0281b6dbe5bb6
+DIST dolphin-plugins-19.12.0.tar.xz 195968 BLAKE2B 10a294ea3950b14b5593f656d067cf8fbfbf680df7dc96e542f6afcd6c29c50d853fc2ab648a0ca151d342a42c3abc5dcc20dd328e2db1dd2aaf97550ae2226a SHA512 2f02cfd4f5b6596e350a77547f76cb484966393947c2c60940e6570c90121085588b2485ae1e46317b86e6d24189356f123f5243f221217942ede587a2d6400f
+EBUILD dolphin-plugins-bazaar-19.08.3.ebuild 1183 BLAKE2B 3f59cf2440c540fbe7cd0ba515b2d458cb274d8646de5d92eeb21174d2fd71813e5506680cca8fbbdd1125fdbcf95ff61f3714768a81c8e73ed70a7676d8ef29 SHA512 588652513f6e2591b322f1f1152917e8a64eaa154637a1a2cf1db17da5f33e9c3f9a2f2207f451c5fe439da11cf7641fc5270f09e81913be0e6b3cb7f4f33ac7
+EBUILD dolphin-plugins-bazaar-19.12.0-r1.ebuild 1368 BLAKE2B 5a8b0bfbae3cb1eeac2e68728908f41331d8c815e477b075530996fb13e1c7997025e4af29195e14725e1e8c8787fbe0d9c2e6b880e17b2123607675f12d39bd SHA512 f07b85665dadc292fa194586e637e9b51d957109b237769ae16ac45949323656cb02a822c8832587749f6a0b7cea931d4d0bf9a8c858fa4c3507e57c9fec10da
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.04.3.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.04.3.ebuild
deleted file mode 100644
index ba9be805e415..000000000000
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.04.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="bazaar"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Bazaar integration"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	dev-vcs/bzr
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	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_dropbox=OFF
-		-DBUILD_git=OFF
-		-DBUILD_hg=OFF
-		-DBUILD_svn=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.3.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.3.ebuild
index 12274e094623..3ee3fc62e9ec 100644
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Dolphin plugin for Bazaar integration"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.0-r1.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.0-r1.ebuild
new file mode 100644
index 000000000000..594aafcd89ca
--- /dev/null
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.12.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 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="bazaar"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Dolphin plugin for Bazaar 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
+	dev-vcs/bzr
+"
+
+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_dropbox=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-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index 1ca7e96dcca3..d9101ef7080b 100644
--- a/kde-apps/dolphin-plugins-dropbox/Manifest
+++ b/kde-apps/dolphin-plugins-dropbox/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-19.04.3.tar.xz 191524 BLAKE2B 8869c9e5c4de20b64ad426db82ce2249821f2bf6ceec958f55b385b16c3c85af7b4e908a37f422e79454ee1ba4f604e1ed9a4ef7ba7ff431dffb32d7443c55e3 SHA512 5a89daee3a4366905bd5c884460b62b9faf75989f8bb9b108f019c4359c5ea6406efcaf896a3504870819467130cd76e31a92cf9d697a5306293b5efd701e4c3
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-EBUILD dolphin-plugins-dropbox-19.04.3.ebuild 1005 BLAKE2B 26e20c73fbcd3971afedac764d49ec81e564ddf4b5b7678cbd23276c644d8b992734f3224c1483cde21ed01c91147e24be30243d5e7c42176fa38f29c6460bc8 SHA512 de3fef9b6eeecdf2dd92cd599dc156a2d863e4beb3f5d2f6fb49a23c18eb48be944c9ab43370c2c990a5838a3a2562b8ae3f1f1b57534a7b397e649f7d3125b0
-EBUILD dolphin-plugins-dropbox-19.08.3.ebuild 1155 BLAKE2B b2949642081852198a0497b6cfcbab02efcc32037e067a1f3eeb4371a4ce17865db3df25b285f0b6810b6f01b5a91bed18ab19450b27f2855144f18e906fa488 SHA512 9f7a298136435161df4587a962d30268d10b22073a1560b9dfc9ddcdf3cb3f93e91482429e4a7e7a8dd26eb61fd8feb907ab2f67891e54184fc75c6ea39540b7
+DIST dolphin-plugins-19.12.0.tar.xz 195968 BLAKE2B 10a294ea3950b14b5593f656d067cf8fbfbf680df7dc96e542f6afcd6c29c50d853fc2ab648a0ca151d342a42c3abc5dcc20dd328e2db1dd2aaf97550ae2226a SHA512 2f02cfd4f5b6596e350a77547f76cb484966393947c2c60940e6570c90121085588b2485ae1e46317b86e6d24189356f123f5243f221217942ede587a2d6400f
+EBUILD dolphin-plugins-dropbox-19.08.3.ebuild 1153 BLAKE2B a00f04503ab8664b7ccf9d503a49ed2d25b5997661ea8db0815232122ec692322adbbc468d83ad74ff879263e3bedcb141f9c21dac7f90d340f376846a25b3ac SHA512 e1b5afb04a802e9f3e9af4840e5b700941b6c1bacecc62df710ba879913b25644a97f0623dc1bd79b7919fbecf13e24c3c85f66104bb8bf163ba969305704feb
+EBUILD dolphin-plugins-dropbox-19.12.0-r1.ebuild 1337 BLAKE2B 5d2b0ad57d0a8d696f0b26fa7a987b47469ae8f0cdecdb114861d941cfd2efc50d98284a626e7211a3505cce31da9ce56c508ebe2b31aa539259462598729fd5 SHA512 9842e1c04ea0f6a5fbbe982fc30cd977d7244d4fcf599a88e3e0544708fd7d694898a6c47b456c25da0383394cc62211a2b57662bbed194443cee8df1ec5c127
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.04.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.04.3.ebuild
deleted file mode 100644
index 64ed8d390529..000000000000
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.04.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="dropbox"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Dropbox service integration"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	net-misc/dropbox-cli
-"
-
-src_prepare() {
-	kde5_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
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
index 91c272ea7d84..d5e4234d75ae 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Dolphin plugin for Dropbox service integration"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0-r1.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0-r1.ebuild
new file mode 100644
index 000000000000..419a6c9fb354
--- /dev/null
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.12.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 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.63.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 fad8d6d22508..4c411d14e7df 100644
--- a/kde-apps/dolphin-plugins-git/Manifest
+++ b/kde-apps/dolphin-plugins-git/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-19.04.3.tar.xz 191524 BLAKE2B 8869c9e5c4de20b64ad426db82ce2249821f2bf6ceec958f55b385b16c3c85af7b4e908a37f422e79454ee1ba4f604e1ed9a4ef7ba7ff431dffb32d7443c55e3 SHA512 5a89daee3a4366905bd5c884460b62b9faf75989f8bb9b108f019c4359c5ea6406efcaf896a3504870819467130cd76e31a92cf9d697a5306293b5efd701e4c3
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-EBUILD dolphin-plugins-git-19.04.3.ebuild 1102 BLAKE2B 9a8cff732d041ffb70a6a0c2ec126c04e523f001393319b550125a5a845086cc7a133ba3c11ddc7156183e0819735cafa63001c25d8d4ad5a0499a72a668d7c6 SHA512 394af0335d93282c7321a84a3ff676f8e123305c00319a71c515d3c3efcf0ada3c604a816d3aa9a7556a9513762e2d233fd08c1197b701577ca78d6901f7bbc0
-EBUILD dolphin-plugins-git-19.08.3.ebuild 1261 BLAKE2B be59a518ef2842c62661685305277bab40ebe4890fad3ee8d9229b024cb4dbb8a18f2978f364e5bcbd0b688367000d109d8cfb44dec0b3099c076c2cb8c223bb SHA512 67737ff04018c829a053f57933db7dd541732637ada235f8d348ecfc523cea059328273bb477bb55395a0ead60225bec405704ceece2c71222f94b5f80804974
+DIST dolphin-plugins-19.12.0.tar.xz 195968 BLAKE2B 10a294ea3950b14b5593f656d067cf8fbfbf680df7dc96e542f6afcd6c29c50d853fc2ab648a0ca151d342a42c3abc5dcc20dd328e2db1dd2aaf97550ae2226a SHA512 2f02cfd4f5b6596e350a77547f76cb484966393947c2c60940e6570c90121085588b2485ae1e46317b86e6d24189356f123f5243f221217942ede587a2d6400f
+EBUILD dolphin-plugins-git-19.08.3.ebuild 1258 BLAKE2B 21b30a3895dc8c30e1e60e90982364dacd37748bc1528fdb99a6d66bdb3e39d3e46eff607c98efeabf2ecec34dacccbcd41cac1c9f2550c5a8e70538af378819 SHA512 458ffc88ca57fcd94d571dba363611dc247efccf5d93160a278573e7533aa1fc33adadbe867c27a78bc5c671fd9ffdbcbff0a32b99311fe23f89eceb9c0e0366
+EBUILD dolphin-plugins-git-19.12.0-r1.ebuild 1443 BLAKE2B 12148e0cc43052b0c4eb252904f7f36d2540adf44fdbd2ad0edcb4868225189774f825c1300c01d86303c683dc3f99d31c2ad8188c4b8465ed006e89868b1f8d SHA512 e8ff5d4a33b3628868708bcb152870c83743b10ca4ef3e2e687c8102df8c871c510a86bc42d40065e38c967e32a792c347c0f705d07b58622fbe734d8a5a677c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.04.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.04.3.ebuild
deleted file mode 100644
index 65c2f2de81a5..000000000000
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.04.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="git"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Git integration"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	dev-vcs/git
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	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
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.3.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.3.ebuild
index c93351db8f09..b93a5e4ac2c0 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Dolphin plugin for Git integration"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.0-r1.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.0-r1.ebuild
new file mode 100644
index 000000000000..faf12875607c
--- /dev/null
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.12.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 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.63.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 ~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 35054dde958b..dd433a9bfa98 100644
--- a/kde-apps/dolphin-plugins-mercurial/Manifest
+++ b/kde-apps/dolphin-plugins-mercurial/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-19.04.3.tar.xz 191524 BLAKE2B 8869c9e5c4de20b64ad426db82ce2249821f2bf6ceec958f55b385b16c3c85af7b4e908a37f422e79454ee1ba4f604e1ed9a4ef7ba7ff431dffb32d7443c55e3 SHA512 5a89daee3a4366905bd5c884460b62b9faf75989f8bb9b108f019c4359c5ea6406efcaf896a3504870819467130cd76e31a92cf9d697a5306293b5efd701e4c3
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-EBUILD dolphin-plugins-mercurial-19.04.3.ebuild 1219 BLAKE2B 5fcda1c51b6ff51da071a8f5b6383101a64d4ac2b60927429e9bb1556459134ecceb21d9041f20dc55496fd4727787d35fee0f7f2fc87417ff4e6b0ed2a8a4e6 SHA512 c5ac9a331c8e49fcae878df39401c48586e7359ebfc4b2a132c9a87d8ec0d7bee290dd0f6377f598bc67a09e8e6dca993f122682a528995af8ba801fab29be12
-EBUILD dolphin-plugins-mercurial-19.08.3.ebuild 1396 BLAKE2B 2f54f84a66b094568682289a4c6f3f72ac6b10ae6c5e7d45f20a751e58c1f6b05e7cd22a37cdea7259730f636aaa4d6b4cf4f6061d7ceabb042f647c381e532f SHA512 58c772607240f040aedca8c77d39f114921674264fd4f2c1f160c26d9a4930261a2f4170615b149e34a1fe22bc18fa2cc0d99cdfea315ac2e5341ae292faae4e
+DIST dolphin-plugins-19.12.0.tar.xz 195968 BLAKE2B 10a294ea3950b14b5593f656d067cf8fbfbf680df7dc96e542f6afcd6c29c50d853fc2ab648a0ca151d342a42c3abc5dcc20dd328e2db1dd2aaf97550ae2226a SHA512 2f02cfd4f5b6596e350a77547f76cb484966393947c2c60940e6570c90121085588b2485ae1e46317b86e6d24189356f123f5243f221217942ede587a2d6400f
+EBUILD dolphin-plugins-mercurial-19.08.3.ebuild 1393 BLAKE2B 14ac93d50d135b612ea35e522574b0ee3b0c1e7e922e4110d999e384e41034a73c18b21b8327a7725066aab5e404d885a4c8f064a8418f026533e919945949b0 SHA512 291a93de65c2c6a6acc4c8c9369cde3b71df92fadcd4e2954cc499b89c0232f2f42b8faff458dba0e6344c18cf9a39a732b211d0ed0e2741c31e57a27889bb97
+EBUILD dolphin-plugins-mercurial-19.12.0-r1.ebuild 1578 BLAKE2B a88f166d8064860c61f909dd34bae0759fc7ae495159b3f7df36950aaf45d6e6726c7328c4de0085cc850eb7dfbbe3d120f63ad39013fb7d28c15498ff2ef81e SHA512 a31b2bf6d08dcb6decf7d63a19d67ed9e04080acfb303628d8d9c643128d30b5d0d269f2b69e45a6797eec6090a70c9e65bee7e2bb4504224d489e3e7de16e59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.04.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.04.3.ebuild
deleted file mode 100644
index a675b36183a5..000000000000
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.04.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="hg"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Mercurial integration"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	dev-vcs/mercurial
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	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
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild
index 7b2e926413e4..aa9f14c9e97c 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Dolphin plugin for Mercurial integration"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0-r1.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0-r1.ebuild
new file mode 100644
index 000000000000..377f98447cf7
--- /dev/null
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.12.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 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.63.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 59b3a0a0e78f..fcfed51f60b0 100644
--- a/kde-apps/dolphin-plugins-subversion/Manifest
+++ b/kde-apps/dolphin-plugins-subversion/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-plugins-19.04.3.tar.xz 191524 BLAKE2B 8869c9e5c4de20b64ad426db82ce2249821f2bf6ceec958f55b385b16c3c85af7b4e908a37f422e79454ee1ba4f604e1ed9a4ef7ba7ff431dffb32d7443c55e3 SHA512 5a89daee3a4366905bd5c884460b62b9faf75989f8bb9b108f019c4359c5ea6406efcaf896a3504870819467130cd76e31a92cf9d697a5306293b5efd701e4c3
 DIST dolphin-plugins-19.08.3.tar.xz 192608 BLAKE2B 36ad06761a2e016d23af7fcfd206b7d5bd0e07a26f7268dfa40f8f111555c8f41545751c5255d94cab4c8855f3c5e47dacfe762ec4558abc7620f4c6dea1668c SHA512 a9155d8811eebfdaf0e76636746eca20e065d994a7c9e69672e8ebb9cdede118ce518e012e165d3ea82786ee53d46d044e63f208564d2de91b0c8d8c9daf509e
-EBUILD dolphin-plugins-subversion-19.04.3.ebuild 1078 BLAKE2B bdaf82368c9abe7bf4162ff3a10f2001b1fea8a229a66e6f2030172a58600c93200024a104f72877d6f4b04f0391f91374d6c7eaf926e3278c7bb14a72acab16 SHA512 bceb092fa15686ad3bb2b542e5968ada986b7a8cde257da5187e39474cea0c7ef4f12c3b18ec9637a599e4341a359ff8bb406e0702a0d553b878b2a6a7936d33
-EBUILD dolphin-plugins-subversion-19.08.3.ebuild 1228 BLAKE2B 4c2b2db5f915a5c94e215e48b58f60eafaee30a4e35e121b692afb11bb69d71e20d9ddb5894fef9d652e0d4f2b724d9ba485093509accea53f7d80360e018fde SHA512 2d3940ca9ab44daf3b9f48eca6dd6225b1a13d7aea9c2f752c859445071a5303e1b06a891b04889e95de47e435fe6a1483c4ef5cdc2ebb34d92dc6eef0cf6910
+DIST dolphin-plugins-19.12.0.tar.xz 195968 BLAKE2B 10a294ea3950b14b5593f656d067cf8fbfbf680df7dc96e542f6afcd6c29c50d853fc2ab648a0ca151d342a42c3abc5dcc20dd328e2db1dd2aaf97550ae2226a SHA512 2f02cfd4f5b6596e350a77547f76cb484966393947c2c60940e6570c90121085588b2485ae1e46317b86e6d24189356f123f5243f221217942ede587a2d6400f
+EBUILD dolphin-plugins-subversion-19.08.3.ebuild 1225 BLAKE2B 9f2e186f9c1ed186d2209e1e3455285a126181deb30bd3e823dcc93728c2c68a00977b97efd72be51ca216c71b10b1b0bc2bccda66d8484eb738eaac4cc8a37e SHA512 82ef1b2f1c8dfb9ee324b214b7098e7006780c5a5fadb68c8244a3c65583f8502f8a242994aa3ad9e0363a83b53307868193e7b40b2dd5cd9becb1bc64f12d77
+EBUILD dolphin-plugins-subversion-19.12.0-r1.ebuild 1410 BLAKE2B 193d572dbfe7e601d795e12ae29fd86851a4164ed8446e3d43877c2aa73a5e6237c766905363aca9aa5679b5b2b1bb062ec2764700486d73dad9b54c62374ded SHA512 1db1307687bfe40a13772a790990aa747c2fa177a271951e5993571d895752afc77e7f1f6ccf3946b626ef9e37cde3b594f247317de2e47a6fc4edc80039374c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.04.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.04.3.ebuild
deleted file mode 100644
index aeb4eeeadff3..000000000000
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.04.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
-MY_PLUGIN_NAME="svn"
-inherit kde5
-
-DESCRIPTION="Dolphin plugin for Subversion integration"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/dolphin-plugins:5
-	$(add_kdeapps_dep kompare)
-	dev-vcs/subversion
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	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
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.3.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.3.ebuild
index c3c8e455fbfd..64720d0bfdf2 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.3.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Dolphin plugin for Subversion integration"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.0-r1.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.0-r1.ebuild
new file mode 100644
index 000000000000..45e0ff88cec7
--- /dev/null
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.12.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 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.63.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 af5999419392..9de19d366be5 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,5 @@
-DIST dolphin-19.04.3.tar.xz 5128016 BLAKE2B 9cf2b075cdbe87002589aa99c31036ad9648a6f70cd248698ff38b0a983a2b59100b52cd6645396d613294dac70a33bca1a52ea225630c15339e0f8f471ac0c1 SHA512 b0838f2ec1e1a22912a1178a262d7cc680dba5f11828bb0dac6bf59bf4c1a2affab912994d4f43adfe299bacd337848d11333996cfdfa54940f8604667e97e3a
 DIST dolphin-19.08.3.tar.xz 5276344 BLAKE2B f894ab567be12bd3c6194c84897c13201a286064f9b1e10690b88433ae712d4d14870783d729d1d61fde89700709ae75262111684ef592e66c1c3c66bb606e9d SHA512 4390f97398b437b24f0139982e068e32a042a0740790b7dbf19747cd77b41c70dd04f0c6ba3120775f8ce48f43bdd3d2cff4590ba5556773950dd73dd9f7aad0
-EBUILD dolphin-19.04.3.ebuild 2313 BLAKE2B 6f46bcdf2bcce4fa160b6d077fff1ef03c1130e6b09bfaa32cd7b431637964eadbc0a8cdaf4adb37ce117cc79dfec63b921e8685a534a36b8a5e627c83c7d4e2 SHA512 8093bffe06d620e7044eeefe216b7ee2ffb96a189e20f7759d37d5cc8bea09e40f225b5a8bfa660b84bdaee5ef4ebf0567e0c94a00cbb3e997549bc660314af2
-EBUILD dolphin-19.08.3.ebuild 2922 BLAKE2B c4cb251f906c55ff85695019047f3e8fd329e165ed8911ed2a49073644cc9ba561a08abff57fa7428f26b0aa147051f2e12ee47d3bcf556e32cf6d8082984f7e SHA512 3ce832ed6edb3aefe25ec0622d24ef1b813be023bf84417e8828b10c865bcf5b8abc7091adc5120aaaf6038e5d66043cc26b10423d98354fa96684a8b8641d44
-MISC metadata.xml 422 BLAKE2B bacaf060f870e305255375a8902e9d64332b4b19d7ee428f28a09b3d0d47ebe9131968c8aa2c9e940a632f2b742a4fc349154c6070604bc27dc8ac7b184a6bef SHA512 99e4db3ad705d867fad873bb8f58c02bc3716a0903fe59d4781e127994b00f40e2f9b205ad561f531da049ce7ba566c2300e9fc630220cbfbb9721ea045fd24b
+DIST dolphin-19.12.0.tar.xz 4779296 BLAKE2B 9ca84a44fbcc10c4d9d3cad297f06ea4aa17942e795292a746873beec4ff69fdbd8ba0a0e3908929b60ef7f0f8e2013ca320e328222aee04052ef293c8522ad4 SHA512 e9f47d8ed9e5b3def97182d9d1600730aa41e69d32aaf49b705fe2542eeda93ec719624e735e5f7d36a1dbf64c58e2a7f177e3ac4daf303ad5a2ba519d03923e
+EBUILD dolphin-19.08.3.ebuild 2919 BLAKE2B a601a0e06b2276389202ae47447e911a4b0e9a1567428c54fc138c1e5b039390483551c71a94e615c0d34dca78a13bf9859f8c9dfdf8a6a0cb2a06eabe75bfcf SHA512 d48ac47df2000937284badf12a4d8a2d3aad68961fe3fd0734a7e65165bf385a911d00f1ad13b5db66323d86c1360cb884a494eae484ad16589c78b17164c590
+EBUILD dolphin-19.12.0.ebuild 2907 BLAKE2B f8702063f38bd3a560fb10df3e7abaf9df1b7e018b1f2bc56f11083d3bd2afb19b17b6018f748c102d7d83bad58e0ecf7a6bb157c13f23d3107232a804c58bc1 SHA512 495009c1f5514aaedbb458b29c4cc9b2d4365e168fa20640b1915e8a9b53300ef046e5ed20986296ca10f2a47ddb0b9c668edfe4518b830eab7072305335240a
+MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-19.04.3.ebuild b/kde-apps/dolphin/dolphin-19.04.3.ebuild
deleted file mode 100644
index 9445a28a121a..000000000000
--- a/kde-apps/dolphin/dolphin-19.04.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
-KEYWORDS="amd64 arm64 x86"
-IUSE="semantic-desktop +thumbnail"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-		$(add_kdeapps_dep baloo-widgets)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kio-extras)
-	thumbnail? (
-		$(add_kdeapps_dep ffmpegthumbs)
-		$(add_kdeapps_dep thumbnailers)
-	)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_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-frameworks/purpose:${SLOT}" || \
-			elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}"
-	fi
-}
diff --git a/kde-apps/dolphin/dolphin-19.08.3.ebuild b/kde-apps/dolphin/dolphin-19.08.3.ebuild
index 8ad734c376f7..f73a18c7931b 100644
--- a/kde-apps/dolphin/dolphin-19.08.3.ebuild
+++ b/kde-apps/dolphin/dolphin-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plasma filemanager focusing on usability"
 HOMEPAGE="https://kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="activities semantic-desktop"
 
 DEPEND="
diff --git a/kde-apps/dolphin/dolphin-19.12.0.ebuild b/kde-apps/dolphin/dolphin-19.12.0.ebuild
new file mode 100644
index 000000000000..fcaf127a47df
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-19.12.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 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.63.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 ~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/dolphin/metadata.xml b/kde-apps/dolphin/metadata.xml
index 32739ea6f617..976727be8357 100644
--- a/kde-apps/dolphin/metadata.xml
+++ b/kde-apps/dolphin/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<use>
 		<flag name="activities">Track which folders are frequently accessed on a Plasma desktop</flag>
-		<flag name="thumbnail">Enables thumbnail generation</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 5e5222210cc6..e921e81852f6 100644
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@@ -1,5 +1,5 @@
-DIST dragon-19.04.3.tar.xz 1350276 BLAKE2B 7e766c79416bcf8d2dd17dbd6efb17b1fa5146d6d3d159a2fe18a9b81b7492305812035fff8a62ec8f4674453db62dd23d4b5cb5ca8722cbb8f958a7ec4c74b4 SHA512 610edb284bc73908ff9d143d6b58d0c75d88bb8cb0fb8d82df2a9419690d1c782f815fae73c0907e1c5260180e09710a6bbfbe5371e317c03ab6a9832f62673a
 DIST dragon-19.08.3.tar.xz 1350768 BLAKE2B 1650976805f47cf9a405bc24428eb229c9b664d8d98eca17cab9ff4eef1cde68f8972dd675159cd3d256cded58d5b7efa0335a92acd808c2edc766ae9357bb90 SHA512 932a56f236e0fa7b133b667746fa65ea64e4b3f87045ea87712b3bf19f8f32efa3b73090dd72784363918c5d929dc410e20ffd0870bca24f4d7efd0c6fd489f2
-EBUILD dragon-19.04.3.ebuild 1003 BLAKE2B cc8bb850d3d48948ceb7226dac44526ef3538713dbc3c28d96e11afc1d556cdd7456cd029a8d1a80b92cb61ffb64dfe05cbac1a0f486329a93c31664e26a62b9 SHA512 2aa09aa4214bd5ce2b966312f6467d4c7385752108e1c8abee1109878219aeb8287f4cd4c5c80e89c474f2cc5f639038f4681b4168180f4d438f65ee823b29af
-EBUILD dragon-19.08.3.ebuild 1156 BLAKE2B dd0cc6f64f931148ed8c1843cdc39e7d79305a1f602e476c040f7eb812563ca79883786ab69c24341fdff7090117d0a8ec7d6bb88e24ccb6fd03268f2b0f9b45 SHA512 bc80a2ad5e261cba09cd3eee1d28932e6da7bade8558c658345ff36164cad2c4d5679b2fdb1909d7ca6d091c4b9009141fea8d61cd4d0480d806b6884aa839de
+DIST dragon-19.12.0.tar.xz 1352108 BLAKE2B ecc02e8c0cff4dcc99b4f4851fe4a7e6a67db413a8e86a90371978f3dc73a99859ede182cbf60b18044f55b732a4a3e5c8301c808e8ccdbbdd22c753284be9b9 SHA512 a8516a87a7efbf53f8e73478ed053bed34b529c098e47dfb1fc4dc1535a0beb66bb5afe9862c53fadb8928972452fa7bad09bcbe31177c72d14fc03658bd2bf6
+EBUILD dragon-19.08.3.ebuild 1153 BLAKE2B 771328954c8f12657b8c4ab66e8ec807a8e93a2396a9f4c255014aac68ed5c69eeee995035382508234dc2f515d853831223f084f7bcfeca6193dc75f107128f SHA512 244afeccbb0b0f89687cc02a56634b27eadba64537b72859bc5b96d81200f1626569f42ee6c20b90d645dd6c8d702a90a9e5337d1591cbc15f0809f49a31b9da
+EBUILD dragon-19.12.0.ebuild 1162 BLAKE2B 60707beadabfc708ed2a9788452cffea65c7c47e5e89d0bdf4054f7a6ac53a0f78f7a4f34d67184fc0e5a70f2e0c5a710d601debb524e39cd546c96c6247674f SHA512 f1f5bdfafa841cf592a43ea10636f7d62ee1d934c83f6b9c4aed2b7987849eebc5700e7cb3df5bf3398bc0bcf4861faa899eecac21a1d14e519ed336e8370f3c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-19.04.3.ebuild b/kde-apps/dragon/dragon-19.04.3.ebuild
deleted file mode 100644
index 69fd4f81db40..000000000000
--- a/kde-apps/dragon/dragon-19.04.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A simple video player"
-HOMEPAGE="https://kde.org/applications/multimedia/dragonplayer"
-
-LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/dragon/dragon-19.08.3.ebuild b/kde-apps/dragon/dragon-19.08.3.ebuild
index aaf3863e5769..1c30075c5deb 100644
--- a/kde-apps/dragon/dragon-19.08.3.ebuild
+++ b/kde-apps/dragon/dragon-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/multimedia/dragonplayer"
 
 LICENSE="GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/dragon/dragon-19.12.0.ebuild b/kde-apps/dragon/dragon-19.12.0.ebuild
new file mode 100644
index 000000000000..13217171acf2
--- /dev/null
+++ b/kde-apps/dragon/dragon-19.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 b231feae9113..0518430d7a40 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,5 +1,5 @@
-DIST eventviews-19.04.3.tar.xz 442584 BLAKE2B 6fdcea927295757fdf82c77d4f7c55681b777af374c6435f8904a3445dc38ab469920d721673f61e944f46becfa4d2701d11e650a45584c88130676ce1435ed5 SHA512 b6c20f6a06b2309aa76dccd3a06d843aacb69a4789aa60f4e31800f68a437b034fc2fac8c4fa6d892d3b6f8780c086acae147fc14425c2d3a6f9850080a89532
 DIST eventviews-19.08.3.tar.xz 443148 BLAKE2B 2a59da83d3882fb2b3a59ceefbc723ded681f88c318c0c3e18f82d2963d461429c38fc491165648c7ed0821739323f51695d4e7dd65854704ed3c87a48cb001b SHA512 58636b0614f2df5e8f13b63769685c4f13d1beb2d00f6690cfd99999a428687a1004c8ede0854c3bcfd117cabd1b91ea8a5f739945d6d1d4e79d9bba39046d42
-EBUILD eventviews-19.04.3.ebuild 1031 BLAKE2B f25dd5b25aaf7db8a83f71433bf02349ca05e43b346507cddf2825c8534e3ca0bc1f88d0e12755a07c87324d0d65d9e233329c21508d5c4f0cd3aceb052ed016 SHA512 c516058cf76d7bc2358501f13f0393f0dee17ec0c88dfd2c2a6435e9430fc6f870e58a3274c64d73b74c494d9b61ed6cb0d56f0e247bf470ed29b5fa19309d68
-EBUILD eventviews-19.08.3.ebuild 1279 BLAKE2B 4055958049cdd89102e3562709c07f71d8d910d08bf078f2638ceab7f4e2122f005ab4dfb1d7dfd0ab1db9aba92ec7adeb79c1419c2b3c5b651a56abf0e2b24a SHA512 f4fa28c55ecffdc082cfbaf52aafe7c60dfbc9fde39082ce3a920f97d5ebebc70da0afb487af9e17bdf918868addf0e52e4a65dd3001e0d3c49d85c20f393c34
+DIST eventviews-19.12.0.tar.xz 442640 BLAKE2B 36e9db12ea9c166a139f3a343cf394497b59efaa30c51dd7bb6420664cb77ff68123bead6338b805c482045444e15134a3fd3d17a2f9bbda35cf084ec71c9fa4 SHA512 fc00833529079ce10c916cc98809af4b04a9d8d88fef3088b51ba041da33dc5cb24f4875b124147a94a3b4bd3a80b7c2f9f4bc8077bbf407647e404d765509a6
+EBUILD eventviews-19.08.3.ebuild 1276 BLAKE2B b960bd6f1b5012796708b19954ab92929b6d86ec8d8ef0ae8a58e18ea3723a282b3963f8f851e1d9d11031dca82f7f436cfa0b7057f20e9938d60bf477b8b766 SHA512 24451b365b87e6a6770b77767d5379bce7869ac689ad58885dd5e7777ae26a2765bff1354d796f4ad2c505ac54c9a4a4798135d05ad5f77be3eb65df08a57414
+EBUILD eventviews-19.12.0.ebuild 1280 BLAKE2B 485ed3f5016393a7b719f1388561cf4054bb395a14a0611bbf2f68cce38454aebc0c10bca6cce573d3f0da69ded52ea6af8d3415c664d699fcc9e8ffd0104ae6 SHA512 d4af623b86fcae07a0f545b5e409ad5db5292a257dc43fb07e1819469b513ac8c99a3e82fbcf93a84c9b85056847cbb76024eadb46e8fc3d3d2b3b98806888ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-19.04.3.ebuild b/kde-apps/eventviews/eventviews-19.04.3.ebuild
deleted file mode 100644
index 1c8a36f1c30e..000000000000
--- a/kde-apps/eventviews/eventviews-19.04.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/kdiagram:5
-	dev-libs/libical
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/eventviews/eventviews-19.08.3.ebuild b/kde-apps/eventviews/eventviews-19.08.3.ebuild
index 4ef87d252720..55ed079e2acd 100644
--- a/kde-apps/eventviews/eventviews-19.08.3.ebuild
+++ b/kde-apps/eventviews/eventviews-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Calendar viewer for KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
diff --git a/kde-apps/eventviews/eventviews-19.12.0.ebuild b/kde-apps/eventviews/eventviews-19.12.0.ebuild
new file mode 100644
index 000000000000..464f7e5e7609
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-19.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/kdiagram:5
+	dev-libs/libical
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 6d5ae3f9d5e7..6695342ea576 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
-DIST ffmpegthumbs-19.04.3.tar.xz 24820 BLAKE2B 6084af2c6ee82e378dbe68e7f3f0a6a2f1f5436cedb844616c2fdc995d70a196681d4441449a98d7828d537d4b45bbc486effdd9af60e74ef3fc1f59d781772d SHA512 472c064b2af7b5dc58929db6ecdd396bb739bb6e90be0b51d1bc5caa824608f8ec39ee135b9950849c7f6c8f56aeb4211a5e1594d9332d454d76ae6bbfe2d325
 DIST ffmpegthumbs-19.08.3.tar.xz 25112 BLAKE2B 43ba05e3bf9d731ed599a05b1a1299ae15edc80f01ed5d8be8fa4b1f820632ba9a0b060afb4e04fc672837ce9e46a11d24b21e4c5ede68dff64f6b8dc2540594 SHA512 84e6da40658d4a7963928a509acb982a5cfbe88c3e164096ca946df9e336ab1bbeca8fbd45be1d8f55ee1377645af914561c74ea1da74736cc573a182f385fca
-EBUILD ffmpegthumbs-19.04.3.ebuild 510 BLAKE2B 283fc6906fe52a20508786a0fced6fc63ed8cad83d3cb373d9da1b24d5f0b435b2de72e3ec74db14404aebad115fd522aa2e4b3f134e11b4aa274d5631b83e49 SHA512 fc84d5553d1b3003efe907c832800f7c41c059d638555ab304894ffeec1c0af960abc019f723cdf6cfc2ab1888a819e616de8fc8f1b0bbb8d8007aa998c69280
-EBUILD ffmpegthumbs-19.08.3.ebuild 585 BLAKE2B d8e35aa1974190e3945a3c7d8e77b9d55606e7d1c4d4302ae13a90177be78fbc9f5b709e8148d4898770b57f8ead6b0131a43a2e64e56c5d08d866ea53dc8f79 SHA512 92fb9e65841df38f1f25030a9a0a91b84e44aeae09a952c860fcbdbf0bab210c2b568e88feee1c66b5ba4a6def38896851eabe3bbe6687c21296bdbd9c6862cf
+DIST ffmpegthumbs-19.12.0.tar.xz 27008 BLAKE2B 6f50efe3364f37e7fd3efd2105ec02e607fb7ae4591b1848c91d379f016d3df2647e65006d43543e14be84c96f3c14823487256b777d304d6fe874d887f9241c SHA512 69db3a49d5596d5df30e6dd5a95e9f8bc3d18c2bd5aeac6bd89468338ef4b983af8e67b4c56875dd1cb7b9206c6803732e5151a74c116e6154486221247e9762
+EBUILD ffmpegthumbs-19.08.3.ebuild 582 BLAKE2B 86e476120949151ad8daa589fff5b141fa08ec3c158d8da914b61847a573b75ca5fb3de5aa3b81b081e9cec5d568af69ab28ef11a105387b1cb980c3c63a408b SHA512 07c4647e190f8d3db5790e0b9b35662f6961f5253053ea57b9b59a004c18abda271f5ef110be202dcef7047a6b0667fb96b3a00fee359e43c7dbbcf4c56bafe6
+EBUILD ffmpegthumbs-19.12.0.ebuild 586 BLAKE2B a08887a90ef5123c29ae38891159640cafd6cdcb174dc91e726edf6e4f5e10154b932378ddcd751cfb894b4d2898159eca175160683cdce35da91788770728d3 SHA512 d4805d91cb050f1a5ad82eb9c5c9c827694c9ff7d738638aea596d1f012e04b0449dc55c140173c801dcfa62f38b2e693b2f6f46f5137195228512c8190e0ccc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.3.ebuild
index 8e0e9a920b9c..5441343aaa9b 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="FFmpeg based thumbnail generator for video files"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="libav"
 
 BDEPEND="
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.04.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.0.ebuild
index 7f2b6b386ee8..85aab0c2a50b 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.04.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.12.0.ebuild
@@ -3,22 +3,26 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="FFmpeg based thumbnail generator for video files"
+
 LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="libav"
 
 BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	libav? ( media-video/libav:= )
 	!libav? ( media-video/ffmpeg:0= )
 "
diff --git a/kde-apps/filelight/Manifest b/kde-apps/filelight/Manifest
index 97ad8c68ced2..f0c2393df035 100644
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@@ -1,5 +1,5 @@
-DIST filelight-19.04.3.tar.xz 660700 BLAKE2B 813f56ef52ebe22c5ce38c60a1188fa063772ab3f6fba6e357df690fa9ae710ccddb2913af3a5a1da6195b4fe873e61f6fe794219ab4424e1163ed75e1f20455 SHA512 4e6062de0a31cc7ea981b73ec1fcda6164c7ba2abca6d4e820bbe8a20c23aed3c1f1f61c90955938c5ea9cdc88cbd70c94b507bdb1ec60c16a07b30be82c4b29
 DIST filelight-19.08.3.tar.xz 660804 BLAKE2B 94186097da1b1ba7e9148d387e4a2d3164a38f406f318e37e36456c3d137625d520e99b0f5c0b0c305ad834c0305c45d4487636a759f8794cc760691a4e9565d SHA512 547affcf9b78ec06ee981d68e847174d8811907b5220249a616298c43af19c1a35d4d3932306903cbae2873afe92a9b6655c754c6bcd55a8447ea0fd311745b4
-EBUILD filelight-19.04.3.ebuild 700 BLAKE2B 3e78dab1148c1d8fdc5bc28c4190dcbda498e6071a757af4b7e55394056cd6e0d7626f63fbc8f8bcf0ffe35d931c43ec41eeb1b399b493b4c2d9a060fa0f70be SHA512 d166a04d4c7ffc2faffd8add273f2cac16d0d9f45f321d305039b54ef67b270192ba99f1eed208c08b61df887aded1be357abc26ac68e0bd476249c19ad9de7d
-EBUILD filelight-19.08.3.ebuild 841 BLAKE2B 2fde540ff2e6d30b8ea75a59158c5e39c05ae421e36652c3df5b27211c26af43d7a071bc6672d3546f48e3f50b88584382966dc63e83b6e8e7734b1b70563863 SHA512 d792a8cca3915b471fa12d541133106fc1c53743b99e92530e45f84a5c93e4cb70d2123ef2c12d554cdf65e94a593d0039ac76a5026b9e0a43f754e6be2d1c82
+DIST filelight-19.12.0.tar.xz 661692 BLAKE2B 5008797ac6e09023320a46da655ffe8e579a42d4483d194b4258c2deccdc6292e4b0b34b56c666baee941e3a274b3e6ea08cfc113f4ab9b4c9c79719fe115c51 SHA512 781fbdd34c0ba612ce18218751118df6ed6b09dea237d313b6f70974992463dfba2fc4d4365fe266d909adcff4ee91824b28d4c399b5bc8a8971df38cddb1ea7
+EBUILD filelight-19.08.3.ebuild 838 BLAKE2B 8da84bf97ea69cbe0eaf4e4f032db65c181e073a8359e8d3d710ac937eefcb364199fab8da145a6b4d7489d36e169505655b31100581debc83ef07ff79bad573 SHA512 82982ed7592aa4ee2f4703bb4d6519a233ef6c0fe5f2de4abe6b4fdd2e940a0a2238f478f66bdb250afa3b6968582795aeb3c2f1212a2c4af5dc6742abbc67ab
+EBUILD filelight-19.12.0.ebuild 899 BLAKE2B e2630f06ca3fc577154b1a3cb4cdd4437d0b7cefc3be08617dbe05754882bb66165becdaf9241e57370eca38918b5336990febe507b17126cdee10915476966d SHA512 610ec585ca360b29b6b4919982483acd5078b4e18e20847a4af975d897631956049bf4b4bdffd430427bbaa12a8fe4dfa589e1d39127552f9559175d3d65b45d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-19.04.3.ebuild b/kde-apps/filelight/filelight-19.04.3.ebuild
deleted file mode 100644
index 1c29d2676692..000000000000
--- a/kde-apps/filelight/filelight-19.04.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
-HOMEPAGE="https://utils.kde.org/projects/filelight/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/filelight/filelight-19.08.3.ebuild b/kde-apps/filelight/filelight-19.08.3.ebuild
index 403614f46308..c238a914166b 100644
--- a/kde-apps/filelight/filelight-19.08.3.ebuild
+++ b/kde-apps/filelight/filelight-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented
 HOMEPAGE="https://utils.kde.org/projects/filelight/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/filelight/filelight-19.12.0.ebuild b/kde-apps/filelight/filelight-19.12.0.ebuild
new file mode 100644
index 000000000000..6b61d7fbfc22
--- /dev/null
+++ b/kde-apps/filelight/filelight-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+KFMIN=5.63.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 ~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 dc539ac52001..68035b18f19f 100644
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@@ -1,5 +1,5 @@
-DIST granatier-19.04.3.tar.xz 1941860 BLAKE2B 988fbff5bd511869234f392b1f6a0efb4d0f8a86c0df7ab4e8700622c7616b202e11ac776cb96ef0f3ff3b8564b30054687c8ed696f14be737cb587fda1497c1 SHA512 cb1646c4492695c81210e53efe415391733a0626c9a60d499faf38ed165da345569905af1ae28f35447e328b9b732a362f005a35f46ab46532f869f6df12ad7d
 DIST granatier-19.08.3.tar.xz 1945196 BLAKE2B e9617eba2df293a944d1251aaa863762b1a160599800ac91678ea2121c8307d0db8dd17a5ba00d10b5e457de6023505207a1ccaff16266c8915ae0ceccb57e60 SHA512 8407d4e3a7c0f3858301227ac51e9c2d38e54e20b7cc2210ba6e3444e3da8420aa43256218bbc4311277909d32c7faf3a313dffe564bac0bd01dacb8f5c6a0e9
-EBUILD granatier-19.04.3.ebuild 733 BLAKE2B ea7dd365497ba904969a25a555290aee995f1425f089c4b6ba528ea4cc52bf5e889017c03f7d86534e7a79f3632ec09436336f3a1cb1aa1522c3564e49bea7ae SHA512 c0bb2547655109ff146c99ed2f40c984bf08e537511da6bf516cf800bbd20ccedf754936800be0ae64d178bf2df7d1b9e729c858a380710ba7d6a9944715c229
-EBUILD granatier-19.08.3.ebuild 910 BLAKE2B a347833eaa494d401a7bb572d2e48b2f12a929f509a51f6dacf4d1bf0363decd7881390c67b381022f5f787a3ee1cb24959b0810e2b75381d2e6c565539dd882 SHA512 2131f3526fd88d8646cd0e9f7d20af1735ec2e1ecdcec57484400616d1cde4331e898f311ac23fe75b034ec106b95841e110382cfc1d142b6c90d7aa994c8109
+DIST granatier-19.12.0.tar.xz 1943484 BLAKE2B 73e918856163feb72c200ea68b4051ba22910e1229973eeea0d7f392980f2711453c501400ce09f05c1a24de13f0f240c07d13f88fd43470a0051354d243a6df SHA512 2527c7145e4b753c01dd6327d8bb0ce4b174e37666f675fad9204c084d522535ab8a748d26e25e8617e4b4906f9acab1c08b9b8517dd3242efcef1ccf511a8ed
+EBUILD granatier-19.08.3.ebuild 907 BLAKE2B 83608a2752f5cdc6753ed0f6bcf50dfc01bc20a172095cfb5570dcb746aaa90183c22d0b0166ace05413770219e83b74f0b265fe85938570ddf20e83b465fbf6 SHA512 fa4d0d491be81413c08c30fb01af1bb23378e3b65b03199effd00d98077b5ce1706682659934a810b585667335486fadff60cb6d4012562035cb9da949c5b77f
+EBUILD granatier-19.12.0.ebuild 918 BLAKE2B 72f78e9aedc8dcbb846cc5d8d61e67ff6e11520e99177799ea211f844383d981441878a3ee822007538e6007b9f7fa4a3b419a2981b23d854d86bad62f767391 SHA512 7d0a18e0370d5b4691ab25c81122c38a292bfdd44353f8a631746c4647fd0d8ee420f8af431a3d5be7a449f54faa4a745914d079b00ac330f7861f45a5b7b5af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-19.04.3.ebuild b/kde-apps/granatier/granatier-19.04.3.ebuild
deleted file mode 100644
index 2b932c041951..000000000000
--- a/kde-apps/granatier/granatier-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Bomberman game"
-HOMEPAGE="https://kde.org/applications/games/granatier/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/granatier/granatier-19.08.3.ebuild b/kde-apps/granatier/granatier-19.08.3.ebuild
index 1a40aa3e99ff..23e712580386 100644
--- a/kde-apps/granatier/granatier-19.08.3.ebuild
+++ b/kde-apps/granatier/granatier-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Bomberman game"
 HOMEPAGE="https://kde.org/applications/games/granatier/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/granatier/granatier-19.12.0.ebuild b/kde-apps/granatier/granatier-19.12.0.ebuild
new file mode 100644
index 000000000000..d004ba837082
--- /dev/null
+++ b/kde-apps/granatier/granatier-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 254fc3c51a02..9c690794e012 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,5 +1,5 @@
-DIST grantlee-editor-19.04.3.tar.xz 110936 BLAKE2B 3109ee01668c86aa38eef7e487e204e7b3d418f8c48866ce2e624fa577a42f21c58d41a1384d7aaaf2ec89f81b8d5cae492d9b49dbbbed833b9ebc2808b1137d SHA512 bf17160ab384c1b316f6f4da51c789235d1a4490bce7a38aeb6840fe67afef83381b6d099e4222cbe55a7d365c612ef6be0c6ec6c24d2e6a5d1ea04d15a4e5ba
 DIST grantlee-editor-19.08.3.tar.xz 111720 BLAKE2B c12d25138bddd4f80e8a2865854650c6ee856c3f9afd1627bdf3e68e426684985c4f08c5db0a73b1435b4205f4b93e3362c4069f607b698ee21c9c344175d005 SHA512 1be20ad47b04e702eb93aea60c0871d410ecca404c2649fde17f0b0cad423a2845afbd665f065c03ed93136f039cd22bb0327a96a71c7b434b84b050270a7acf
-EBUILD grantlee-editor-19.04.3.ebuild 1169 BLAKE2B 48235b8331652c4bac96887fe673d86d844218f451424af90b1aae363778b74c289cafbee12f09b86ef1c540be0e4e9f8997a9b667a156e6a9bb3f9495895693 SHA512 79b99607e5ce892d61aa39b4adf364205724485f2357f7378afa6f459770b75fac447372d5ad0810050da52ef3b9937c09a5aba822fedfe122b0444bef627749
-EBUILD grantlee-editor-19.08.3.ebuild 1360 BLAKE2B 8a45a979ba6b5a3e3cfff8dc17121c24124db2788fb212269a60b076009e8f5df8868af0dccf28644d9360f7aa818135d613000bd9dfda246f44a5970f6cfbff SHA512 a9dfe540ba180580288de0915557185da991a49c85b9b173c780fa1846b25b7e0e36aaf086dc265256a7f48b0700d5fcff53366e11cc3d2c998493ebf61eced8
+DIST grantlee-editor-19.12.0.tar.xz 111380 BLAKE2B 5f4e4b1f7b38d897add9f7ad281e400ad22558b39f7885324e581096e6c6b5c7898c4775f0389e0f9aa39e01bae5b4ccd5cb3ec6125a6ec2ed0e4a2445e98970 SHA512 f08cda5c6237c547ea17bc152713e93ec30654642819eb57d04baa35065ef223ad08c0bb7d1aefeeab20ef21a6dbb7f06e7403ba86dd3d9487fd9bf950e5aba4
+EBUILD grantlee-editor-19.08.3.ebuild 1357 BLAKE2B f070f9dce2f1c785293b9ce2bad4573684e001a7818050be8cca28b6e426c82a09fda7df13c60fbcc2eb1a9e4fdf7cc622967ddf05058b77a0d3f9b9f33c2002 SHA512 caa8e2b7d842e6df08d4593d72404a4e71f9316b638f52df74a7b97c3a9a215d4e9315f4e20ffaff7bd751f810aa0d6b5433aba1bef1227053b27bfd41a049f2
+EBUILD grantlee-editor-19.12.0.ebuild 1361 BLAKE2B f63f688b8d10ab2ffeb1416d471d4868d70683c354555bd9d681bb654fcb0e454c3923f7c35a7599649ce45265d0422518892f353a6e996a0f5f4140ea72ee28 SHA512 bc748f38254d8082a8aa95355ffd6febd77e10447732f36f6b1b0daa36b493246b538ec34c41e5ac2ba581947f62d3c4efbb8df7f79a043959be59d022b42a5a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.04.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.04.3.ebuild
deleted file mode 100644
index a4b5d30076c9..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild
index c8cf5c0a806c..5c172ee49933 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-19.08.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.12.0.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.12.0.ebuild
new file mode 100644
index 000000000000..fd4c5ec0966b
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-19.12.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 3b0ec9550f4e..89a2d3ff1c3d 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,5 +1,5 @@
-DIST grantleetheme-19.04.3.tar.xz 51656 BLAKE2B 009b0e8cde1e61e8aaf171dadaffe5f184a83bdd6412b24240088d6cc63d96e5d869d97f55734a46c3a95c0218433960348706f34710c28fbbfc6b86736e1670 SHA512 41b1dc8ca6b05f11facbcec479f12c43dd9db6c6e5e74594b41866f6628ec159685988cc42bed1fd0e2dee6082c0e962f5482e78f627671f44302f8ca9dd5c89
 DIST grantleetheme-19.08.3.tar.xz 52260 BLAKE2B 7da5238e4ee23ff663c283625bfb3628789cf5b3cd01ff6a15a2811f5bdecdc739c23c58dcad792235dfeeb6ad526efe0c301f077d576560919ba03142813671 SHA512 1e84df335d938963fe1a9c62a0a8909613e63d6fe3279cc7bf149afdcac552078af8c4e0125768556cc216eeb6876f6f1a1c9f8e862aac5da1ec1c55bc3040cf
-EBUILD grantleetheme-19.04.3.ebuild 738 BLAKE2B bee83a6ac7bd048ba2c074b88191484e1dd7ddb4b236aa707ff5b4ec6f456cf2f074aa5fa0ca626dc0dbb7b9989a2cd62de11b956ebff5ca6476a67429ce85dd SHA512 5e45485b2e0477becfb0d508bbf078a7f4ac11f9dc981b43e0ca38fa0ef1e7ba9ecb2e45e5d29d6d4aec36e39b8500d76cf73a3bd129f9d38ac95d1849100485
-EBUILD grantleetheme-19.08.3.ebuild 843 BLAKE2B 387bbf2482aa5a427fac316928f9bfbf2a2aa1c94d702437fa0c142291fb7bb3887e57c5002bf32de4eb56d6b659b6f6ec09138ae71e04be3a94c833f24c12fa SHA512 823e9c06dca431da9ace3f62fc8a69b4111e4f704150158bf513588122d9845083e9d70acb2693fdaca851af7ace7ef19ee1b2ff80b1de0f68a8892fe8153501
+DIST grantleetheme-19.12.0.tar.xz 55136 BLAKE2B 1a0df4588986b706d551bc8fe2af4bb94bc034b3f9ca44c722028c3d9795e2f5b6397c5ef76217dee040c4048ca663b44c4579eddc9a96c5024345cda6283483 SHA512 903296cc937a847ba3c798a327e7714c392d8641737fb9e726d47ad669e0362a3cd12ef125e3639030ff04577f49bc1594dd07e774f2cdc27730e7cabd755099
+EBUILD grantleetheme-19.08.3.ebuild 840 BLAKE2B 3e1cea4dad7e71e82cc248427df7c6e5ceed5c3baeefd78fcdf1fd747167421f42214847a0339dbf1d6e4642fff69a963114b458e96ddd842599bba33e286400 SHA512 1b180ce90b3abea1b154084df9b6fc5510cd33022527835fca1fd6c651e7dec9d0d92effac4ec29bd452411c234d5feb5a32d095b85da4f76887db78e3d4f029
+EBUILD grantleetheme-19.12.0.ebuild 884 BLAKE2B 73e417a12bdf3353f44eb910c46500d3402c745cb2774fd0bd7bcbb22a2e028040f5ff8388230ad1d50a4529f9e4d44b18bbc2f521c768decb60afd29a585be5 SHA512 0588135215c6507aa0ee0a30e192dc569074c7971028049a5a839ea65329e6b3b26f4d5bc85faef9a3830191c5a258c16cafc361efb278228e8f0ad676952a4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-19.04.3.ebuild b/kde-apps/grantleetheme/grantleetheme-19.04.3.ebuild
deleted file mode 100644
index 116b4e707da9..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Library for Grantlee plugins"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtnetwork)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild b/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild
index 47f33a7cc5ba..06d1d962bcb8 100644
--- a/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for Grantlee plugins"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/grantleetheme/grantleetheme-19.12.0.ebuild b/kde-apps/grantleetheme/grantleetheme-19.12.0.ebuild
new file mode 100644
index 000000000000..ac92bc6872e2
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-19.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.63.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=""
+
+COMMON_DEPEND="
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtnetwork-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+# fails if package not already installed
+RESTRICT+=" test"
diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index d5b13a16b5e1..37ecb72169d0 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,5 @@
-DIST gwenview-19.04.3.tar.xz 5713352 BLAKE2B b56cf65e76e7c2e580f615c995d636476e50478d7b53ca9814bd103a887eb94a12f26a78bd1fed6058dd596ad0a213a648cebba99cac5eabf6bcef16bf70e497 SHA512 03368de984dba8125d7cb1c49fb643bc313684621bf3e06ffc34258591673fdb180769657a5318412acc68c33b219df04148a8b4271640adca621a844f3b8103
 DIST gwenview-19.08.3.tar.xz 5723104 BLAKE2B fe369a5be382eb431dde1289bed53cb53dc06a273b99f313b4bb8cfd57f95d85ade5be4799267fc3b6164bef93bb3e5bb8fcde3fccc570eb78ca396d76b944fa SHA512 5db117a5975ee09b8b40fa420cc129fc6cb786a19d67dd391f12a560049134328977f3ed1dbf3f6ba379d46d0d8c00fb2290dda84fb44e90055037818cce84bf
-EBUILD gwenview-19.04.3.ebuild 2650 BLAKE2B 48bdc918dc36909120525b6c28e74df867d7fdac161e5195da77e2dfc4b4d9b0a47da22c51584f458ee729971b24724a12b3693c41538ae18123d5f507ac4630 SHA512 d261ccab4612aa8e5fbdfc2d536776bebd08d36bb0df34b99d30e24635955071ff3442986b67c01986e37c297d6e1e3d732e15e0a0bfe37ab8b8058110b9727a
-EBUILD gwenview-19.08.3.ebuild 3005 BLAKE2B 096d3f84eea25b34ec40ab46acd1d422952dbbc4b5aad36775e7588e483ad9d90e26795407f1cf0301dea3f48b01176da7d535211cf8b63251eb250246f80cca SHA512 bff6b038b2bbd02c09109cfc25969f58d0434add155af091bf41039134dfec774ebbe40e563931bbac77e1b75cb5691418fb1a3726ad6ee901d10715f96a6013
+DIST gwenview-19.12.0.tar.xz 5735360 BLAKE2B e9bf4c8060a8fa1dfbfc4b1498d5e33a2c667925172ef134fe49396d491051cd4437f14f8eb9902e0b1ff919c2df6356334e270d92195c047b08281b3be40c38 SHA512 4018fe46ccb0b9a7c9cd4ad03c7804816bb6ace1d0f57499204ace818226b115ae88177e00df7704b0214555f1a346433e48d763f1666a24dbf919c210ec55dd
+EBUILD gwenview-19.08.3.ebuild 3002 BLAKE2B baabe178815d80dd6e1c94b06cd2c6adfc5282a9ce6931f2b526e0a8db0f6ac2d653343598fcd90d8dd6a216daf933aea11b1e86b3fa3686c71efb6d0a319963 SHA512 0d23d23d7c7961ed404f41b540dbf31b4f3eb6dd3814959f224bafa5a1c17596169c415fd7ff4266a644f6eb8e33949ad477fc7428b36b3d0c90979079583d69
+EBUILD gwenview-19.12.0.ebuild 2972 BLAKE2B 121d19b9f8848cf34b70f2cdb463aca95fd7d467ee3f4741bd1dbfba146ea1d43929d68326e2c5cc7d7db441cb4057a5a0b17db99c45ebffb3f70e41182f4043 SHA512 97f0d11fe8d3943ae33f0b28368c57725a57de0d10e7fc1df6e121b34e2fdd95c6229ac340aa42c4e56ba1fffc0ded46907b742baccc2da8063e88307b88d0c5
 MISC metadata.xml 708 BLAKE2B cde335a32954748c28475a1620aac2e6733490fd8e6126f8963c6b5b0b6e8e87065dbab17e1723945e8f5646815acdf9fdfbf89c4dc57639663567fdcab0b5c9 SHA512 b8fffc87db328df9c5dafb6d72b954ce052678810375278adb390c832bec11f419000fcdd08bd73b9dbcc3e475b7e7b927663c9886b6eb92b7caca7e311015e6
diff --git a/kde-apps/gwenview/gwenview-19.04.3.ebuild b/kde-apps/gwenview/gwenview-19.04.3.ebuild
deleted file mode 100644
index 029d4b2f353f..000000000000
--- a/kde-apps/gwenview/gwenview-19.04.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="
-	https://kde.org/applications/graphics/gwenview/
-	https://userbase.kde.org/Gwenview
-"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-gfx/exiv2:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
-	virtual/jpeg:0
-	activities? ( $(add_frameworks_dep kactivities) )
-	fits? ( sci-libs/cfitsio )
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	mpris? ( $(add_qt_dep qtdbus) )
-	raw? ( $(add_kdeapps_dep libkdcraw) )
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-	)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kimageformats)
-	$(add_qt_dep qtimageformats)
-	kipi? ( kde-apps/kipi-plugins:5 )
-"
-
-src_prepare() {
-	kde5_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-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package fits CFitsio)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
-	else
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
-	fi
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_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/gwenview/gwenview-19.08.3.ebuild b/kde-apps/gwenview/gwenview-19.08.3.ebuild
index 4398c866bcbd..bf3290636902 100644
--- a/kde-apps/gwenview/gwenview-19.08.3.ebuild
+++ b/kde-apps/gwenview/gwenview-19.08.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
diff --git a/kde-apps/gwenview/gwenview-19.12.0.ebuild b/kde-apps/gwenview/gwenview-19.12.0.ebuild
new file mode 100644
index 000000000000..3a7238a59ec4
--- /dev/null
+++ b/kde-apps/gwenview/gwenview-19.12.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 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.63.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 ~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 fe4e54d16f4f..47603744d5aa 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,5 +1,5 @@
-DIST incidenceeditor-19.04.3.tar.xz 549696 BLAKE2B 75c82801dd8175eb54f616d84ddf972a61bccff7dc02df92e76d016adc37ab6a07f357f1ca7e1fd9de16483a5398472d9a49ac75bfbb606d7d1a3d8fc039c08a SHA512 452690936da28744123ffef195e3bbe31da90690e13fc872940465150c9822d2eafa2335433b225603b3becac4d4f3176999cc10b5243f0a6d3230ab2772036c
 DIST incidenceeditor-19.08.3.tar.xz 550144 BLAKE2B 8b0fd36d81d117e640ab272460bb29c1ca3e86916927220ec9aa12469f7111a8c1a9b08613fbc7fee5b3e99e66ee8e96088fbde5a0d79916c7f5bbaa29009053 SHA512 4d2ac2416810cad38e37d15dfbc7f19af7557164d9d2317aca0f6b9d3c072750281942068fb70a42a0aecf307c69a6f876ce5f73f39fe39529320c09f841aa4a
-EBUILD incidenceeditor-19.04.3.ebuild 1396 BLAKE2B 7fbc2ec78ef41022a22664789566c55d32d125a4db0e400bf7b0072c331b5e3a9e7b6d6d9121af458649c4edb3b4780e32909004b3cae04450e33ca70601c17c SHA512 bb030a2d1c5ff34545d5114aeb761b7b2927acb44f272182605e15d575505b6319f87e5d7ab37f7ed0b1e648f94c79e6025cf0fc2e12d9d0cb644df1b0a26cfa
-EBUILD incidenceeditor-19.08.3.ebuild 1626 BLAKE2B 913db423aed23c1705be9744835def625fba0e9a5640d01f471d820eb9ddf893f8331792b479060891cbbc38099dd46cd2da4ac287919170ff6919a66373fee9 SHA512 2e9081e7abefde80e1821baac1674df23228028e5a1f8b14b66c6f097672cd6a759535b5a1af9d71d9a0b0aa29caaa70aae3bdff672822292953f572091eb834
+DIST incidenceeditor-19.12.0.tar.xz 550320 BLAKE2B 221ea24340bc6032e0014aea986c2c824c0fdce41d72cce54416be4eec8be38f2dc8733c0791bc86e3ce676423f37ef6409574c8c541332243097b0769aafad9 SHA512 2c55c01cf27d4e7328854bb94f1346323e47672272756ddf199556bd7fdbaa42976feb9a6f150c3cb6945d5b4102f97649c40bc045f2cd56af46b482aa776d5e
+EBUILD incidenceeditor-19.08.3.ebuild 1623 BLAKE2B f8bdb6beb0fd1976827bf4cd24cb6b7e0da3807a2c8b23be0a8c1fed6370710ecca89334f8cdbae8cc042908aa41d12392430065c230dc1c6ce7bad55d29f33f SHA512 20bf76f12a7f60b62d33cb768820b04c9ecc92a50e02347e2f7409594da2b05ad696696541ede68bf788f26a9b6f0b087dfdf4d7f04901374a81d5d8da20b3f5
+EBUILD incidenceeditor-19.12.0.ebuild 1627 BLAKE2B 197619454ca7557a000668837ece37fdca06652b7af43ef6edd4e393fdc295b48fc3fd9934d55d6f35fb46acf265ae907e4d01836ddabab0b602621f0c6cd5bc SHA512 6e77d9d12d3adfabbea8ec70eab0c39f721277d7d78ade6057ab5980ec61ef5167d6a1a9ff42c82352bb892f3ab47e1d3588382adb75b5c728f5420fdc40b2ee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.04.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.04.3.ebuild
deleted file mode 100644
index 04586d37807c..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-19.04.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Incidence editor for korganizer"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/kdiagram:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.08.3.ebuild
index 2a238686537c..3bd2d07ebcf2 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-19.08.3.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Incidence editor for korganizer"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.12.0.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.12.0.ebuild
new file mode 100644
index 000000000000..e87d1fabc292
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-19.12.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/kdiagram:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/juk/Manifest b/kde-apps/juk/Manifest
index d59e8a14c69f..602cb31b0512 100644
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@@ -1,5 +1,5 @@
-DIST juk-19.04.3.tar.xz 1868172 BLAKE2B 78b183b65161682140cbbae633340271c3d02bf09abb39b490a775b7b5a6707a01679cce1c6296348fbab24995d647ed8f10beb24331675dcf906c65188e1c13 SHA512 f89a872d2bd7efe8bc900e9bb1dfe00f0d857c8557e79ead6a842fa5258c748c3205ecb211b74fe3135c7f14f9f924796c975e674d09b34b3e896b07837b189f
 DIST juk-19.08.3.tar.xz 1867552 BLAKE2B c5cccf09fe27a49ed8235289f7f1df253f0621d38a77995161913bcb1f20c7f3a0193f378782f0eeae50ed9d8fc8517d2c98826e76ef988a043259e109e3c2e9 SHA512 a523b85c1049f3f76bba1f3ba4e9d1086e4c02783a0c5d6262f3843e96f336d52f649fdcca000e1b6432324eb6bc2a6681034d2ab43065b9a93542095c3b4931
-EBUILD juk-19.04.3.ebuild 1081 BLAKE2B 9dbb3af5d6a337e36c6ecdcc14e56e1cbf000ca9b01564226669700068321c155b75b59c5bd52ee242675fb7cf14d65a295cf713f748003efa034bade69d22a0 SHA512 9492cd46ed857cb04cccc4e6d303a296a9e333baba06c09b91515ec19f2c478497c6983535335c508ff1e892ed0844096c29c4e69a41797a548239b092007c4d
-EBUILD juk-19.08.3.ebuild 1288 BLAKE2B 9ff3e04258ade44c0a1686ae37338104b811f424c1c0dbc8ed4d7c26585a3735b7955e3a233c6d5964a15094c228702892e5face8fb82d08a31af47f1e5a85a9 SHA512 a88ae90dc2a189eedb5b78cd7a27df003afbee005b403d072bf8b49ec31e8bffa20359d76c665480b7b7caf7a71581d93a15c85f531ce34fb27f18a0ae24873c
+DIST juk-19.12.0.tar.xz 1865796 BLAKE2B a6399c67e281f6d748de0448b9f5c96cf85b896201d6f681016c0ef7bc28851fb37f501ee48761e89935e125ac388dad03c4b065463c6861594d9c9b57c6fde9 SHA512 0ca5d4114fcbc70f16ee2eda5ffbd384d75d6a055eeb30b33b42d743fbb19d325d8abce4bf257d769bf2f34b805edc03f0e504a12fd3aa19aafa93f62fe62bf4
+EBUILD juk-19.08.3.ebuild 1285 BLAKE2B 6e7ecb5cfc21f9351b2b436e9e1b452fdf84c2ee21e3614673766f15655a600f308bd72ac83d1432e2ea70182adb9d75ec7543900b431ddb41590dc71a9772c0 SHA512 6666ed0c22e2f478ed37ec3b509fc6570abe00f5782dc860feb7af1149f587ba10d862db342cdf28e7a3d1654bac5d4f3e9577da191f76625c7bec87f9e85a92
+EBUILD juk-19.12.0.ebuild 1295 BLAKE2B 4ec5185a2c09357d936c378da121a47212c0184fce6e2f47b6b722c5c3c4f5cfd3763a5c0187397d1623150df129d908b899b2a8eecde72836758f18e3cf6ba2 SHA512 04723e02dd93657abe26a2db6ff0163b1cf6ec94a65ef5b24ffc3f797900f8be1ee0560bf2d234215194632afdd3781d274b5a50c40541dfcc091cef86554527
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-19.04.3.ebuild b/kde-apps/juk/juk-19.04.3.ebuild
deleted file mode 100644
index 3ab8c7d2071b..000000000000
--- a/kde-apps/juk/juk-19.04.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Jukebox and music manager by KDE"
-HOMEPAGE="https://kde.org/applications/multimedia/juk/"
-
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	>=media-libs/taglib-1.6
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/juk/juk-19.08.3.ebuild b/kde-apps/juk/juk-19.08.3.ebuild
index 72e67b79e250..af5d56fdebad 100644
--- a/kde-apps/juk/juk-19.08.3.ebuild
+++ b/kde-apps/juk/juk-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/multimedia/juk/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/juk/juk-19.12.0.ebuild b/kde-apps/juk/juk-19.12.0.ebuild
new file mode 100644
index 000000000000..dcb7291612ae
--- /dev/null
+++ b/kde-apps/juk/juk-19.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.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 a075c3f24c36..689f9dfedd13 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
-DIST k3b-19.04.3.tar.xz 10496576 BLAKE2B 15d9b42b52b43f687f917ea077315404cae9225fe2d9759331336afd9135c2fadf35e0be9580933fd68661e054d981a19c74110b01e022be96d5afcbfac6a451 SHA512 1098ba685d683ad3687c5a0bf0fe27db69358d6142a76830227e497577ab0cfb2fcbccb59912fab2265f54568b8f6236486d2cd407dce709f6d2d725b40afe96
 DIST k3b-19.08.3.tar.xz 10500940 BLAKE2B 8184e6790a312e66f76d3112084e7ec8cf16b67ee3deb2d1fe88df76680d573b26310544c9c747168708494fca0e0c88db9b3ee8f05d66470622a0c42a491e87 SHA512 6a98100a43ba7b18e7333e4782fc070b6faae480c03a788d80d0051b2a72e8e89eb501ef7ffc1f1fa46b18141a6f53407079778b6c51709282cc43530863cf84
-EBUILD k3b-19.04.3.ebuild 3354 BLAKE2B bff7ca6bc0e315ca4f5c37ddabab8e55038386a844bf113a25f64e0dc822add8d9fd6a87074fdfc8e9558dd8b1cce1c24fc97d4a27eac4d0fb6006bafd483736 SHA512 2af4c22cb1f8131154bef1792cd3a108459ed8ac26a8c6bb6d67eba99e1a11182b18b9e33daa6266b2b43e19dac1f4f3eb9ad926b921711db0351dbfc69687eb
-EBUILD k3b-19.08.3.ebuild 3566 BLAKE2B 8c103ecd616c635fc55776a117df5555566cd271cd900ab699a5a49683b3211c471285e5bf011c60098ac06f81977744e642cc37f9601d0c5434ab2042c22eeb SHA512 f95426bde10182b32886768eda6bfdd66186b4f33531b4859c20879104068cc5f33830dd689b0a33972f192a832058a7226d4ace1e7dff5fb318de3283fe5b6c
+DIST k3b-19.12.0.tar.xz 10505540 BLAKE2B ad542279da542abfa68d627da65dd0c6592941bf875926f047ee25339fb06b34e4b0005f8184f5de945b1a21ddcc5062935f06c37c77aab3ca6dff736107b2cd SHA512 8d2638e88dd580268de5391d6ac5732bfe62483ace94a041f84447e74444844e54abf4a08913a252115594c75b5f3e78a196c1f3b6baa9ba22321622d545f531
+EBUILD k3b-19.08.3.ebuild 3563 BLAKE2B 796f76b12a3a98f5a428a0172001848beb42dbf1e9620e1df5029f989f7ccd649725b156495431f758e8d2a1e866e86abafaff2af450d9a7351bbb455e42a541 SHA512 0714a6f1b1cd765ed32f2b6b8655f125dc6a7922915871f58d6dc68f997de2be1b0198f25a13da37458abc1cad462892ea56055ed91401b041f53b0710668b6b
+EBUILD k3b-19.12.0.ebuild 3612 BLAKE2B a87ed07cec67ff489033f2683f7f0712e5ae9b3ee0402eb0c4db196f1460905e262bc525a4def42b90d7213ac84583a7d2e43b698eb0ea9cf5f741b41c0a11b2 SHA512 e886d4fa638bb9463ceb23dc6af33dfe41b90d2bf952ccef084d57e994ef9077f975b78ed22c9867dcfbac72b7b34c89817d67b9c95a70a132bf08cf983bf547
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-19.08.3.ebuild b/kde-apps/k3b/k3b-19.08.3.ebuild
index 3f2f8b8ba15c..584b48bf6dc8 100644
--- a/kde-apps/k3b/k3b-19.08.3.ebuild
+++ b/kde-apps/k3b/k3b-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
 REQUIRED_USE="
diff --git a/kde-apps/k3b/k3b-19.04.3.ebuild b/kde-apps/k3b/k3b-19.12.0.ebuild
index 9f04aaa53709..7c186a8a0d61 100644
--- a/kde-apps/k3b/k3b-19.04.3.ebuild
+++ b/kde-apps/k3b/k3b-19.12.0.ebuild
@@ -3,15 +3,20 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/K3b"
+HOMEPAGE="https://kde.org/applications/multimedia/org.kde.k3b
+https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
 REQUIRED_USE="
@@ -21,33 +26,33 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata 'taglib?')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=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
+	>=kde-apps/libkcddb-${PVCUT}:5
+	>=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
 	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread )
+	dvd? ( media-libs/libdvdread:= )
 	ffmpeg? (
 		libav? ( media-video/libav:= )
 		!libav? ( media-video/ffmpeg:0= )
@@ -99,14 +104,14 @@ src_configure() {
 		-DK3B_ENABLE_TAGLIB=$(usex taglib)
 		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
 		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake_use_find_package webkit Qt5WebKitWidgets)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	echo
 	elog "If you get warnings on start-up, uncheck the \"Check system"
diff --git a/kde-apps/kaccounts-integration/Manifest b/kde-apps/kaccounts-integration/Manifest
index 78d25b8edfe2..4f2317e7a390 100644
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@@ -1,5 +1,5 @@
-DIST kaccounts-integration-19.04.3.tar.xz 71276 BLAKE2B f31ad7c6d0f5edf7ec2fda72c5e16d064e02dd6b1b08c0ade58bd04d6c597e0b41b48cee777a074abd5007eed28025ae3b0622469b32ee2db13f92334a5cc8d2 SHA512 19e25869fdbb086d0619e49ed3c2f893ac462e9ced6b5faa50f9935b448461fd3cc6a9a3f646f4563a798e573f7b441f1030d4ab38e336dd7f36198deb3ffc99
 DIST kaccounts-integration-19.08.3.tar.xz 71924 BLAKE2B b4c6fa383c053843c0b6529d33e8bff7f4fcbbef20287c6f102f696b1ea833e35d889342668d0617fdafc63663ba3bd47ee6178dafe1b76d8e486f8e8c3e92e9 SHA512 f1e7a1c3959b6739aeba3ab8a2bce51116b1b7263951cb55931564f2628f0fbe7eaa876dff9a4b7a4c6846853360293e5949297d4faf5d6a739579bf29245fd6
-EBUILD kaccounts-integration-19.04.3.ebuild 974 BLAKE2B ebee9faac992e21062c774937a3587acafca2bb066b84054ed417c4308c3fcb94ad359a209d0abbea20faf90c12453676976ef12b8b8c6e3952ed7026ddf09a4 SHA512 bd78326f8aeb718e6a8aac2a57823954b1d481296fdb591c2a00d080d93c074928121968c099baf20f605ab8e2183e3d5d54126ee6b2a19e372b41ecaedf81d6
-EBUILD kaccounts-integration-19.08.3.ebuild 1122 BLAKE2B d01aa612e88e70ab36666bc6b416583706d65f920c40c3a9a228817d3a7ad2cf3f92e97336aa4d3250bde9f52cbb514cbace5e33f61a4e936c91f219d8ea3485 SHA512 50f3a5428ec80f091bafd43d773b67325e2e6629c1d08eff11d1ba75cc1b40d504c6531c5a614ab5eca50679a911d79d917075ca87645ce90c4d4d246b28a772
+DIST kaccounts-integration-19.12.0.tar.xz 66496 BLAKE2B 3752f9ebcc4f92f6373f323a8d43c0cd7b513fed154549bef75fe638554d6d2ea8f0ee38833e34a2c84804a4b2ced4a6eb6f89e94d40c7cb7a2e37a6191da6cc SHA512 c40775509f9c336974bef0effade36adf36e19398a0445e5d155a8e4e3062219da191fab912640c610799dc7d6bc114f7daa423fea97304714332b9f00db94b9
+EBUILD kaccounts-integration-19.08.3.ebuild 1119 BLAKE2B ae323d64dff359664f76d5a73423d2e9bec23c25942c7ea68e674c6422cf093e6a912539a8395fff9baa105eb28d2ca172a9f5ad67ae99cff75eb075e8c25bc8 SHA512 95b78b84e136bc3f3654a36d4ad4aaf2b45c6dc081db17b0a0638d921cca8ac90ebe00e9d338a3ed63ba64644c8569c2affd887a8b69d79bded343eaf635e167
+EBUILD kaccounts-integration-19.12.0.ebuild 1122 BLAKE2B 5e6acaa443d0e5acfda16d33146ddf69130b0e7e7a8d44c10e3311a0d69d24994923429deec71928b731d3b43b0f560649d891c4152cc2a1a4dac3074d85078b SHA512 81a42f8f855ff53fe6104d4dfbec53fb0e2d0f916acc70844f8145282ea198448a024cf1385abba5db234e21c4328cd06baa4a16539a99764fcb90e5395817ce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.04.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.04.3.ebuild
deleted file mode 100644
index 5d256445c110..000000000000
--- a/kde-apps/kaccounts-integration/kaccounts-integration-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Administer web accounts for the sites and services across the Plasma desktop"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	>=net-libs/libaccounts-glib-1.21:=
-	net-libs/signond
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_plasma_dep kde-cli-tools)
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-"
-
-# bug #549444
-RESTRICT+=" test"
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
index 37b62f17e3b3..a9b6e2a67330 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.12.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.12.0.ebuild
new file mode 100644
index 000000000000..aadd91a625db
--- /dev/null
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-19.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.63.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 ~arm ~arm64 ~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 324d13ede7f9..2b25978a9d11 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,6 +1,5 @@
-AUX kaccounts-providers-19.04.3-missing-header.patch 684 BLAKE2B c68fbf10b772c4e9a2ea84f5f571349a35db4f8417fcc8ed708d51ad7ac084175ccb2067bb36204e65b0cf8464653a8d0222a11e2da8365d6731d0725237f640 SHA512 a659ed6c206cdec0dad5c039ede2dbbee171888e1b949842a3a9c52083145b0d5ad5a520e014bc795a4461eedc2f6dd211db2de71fb8e0e4e297587b8e6a5d24
-DIST kaccounts-providers-19.04.3.tar.xz 31984 BLAKE2B 78d9cb9975a10cbff5b33a148e86685a812950e92a4d4d59bd11d85d5758aca3bc6632bbab0cbfbf42c9976ef9e664ec571a9770d54b1f5f7ef05c024e34c241 SHA512 e22e0747cd9d14bbfb8607e1de127343e7ad9d84a9420a168b0b9e37a3dc53770ba0fb1ebbab01d08f0b4e0754aa7f7744da5de3e3d6615eacdae27d5d649480
 DIST kaccounts-providers-19.08.3.tar.xz 32104 BLAKE2B c8d23fa7a7ae32caef2ac8ace2efeaf20e41a70b424009d2ab6c4604c817f4910d2400b21c3030cf66f17fb27527a3b81de3c801e38e4aa6bc4fc8526a8401fa SHA512 bb8e6a409688ca7a31ac802ab75e796eb161b9f4495d1ba1b9c3c5aa2d836b917f4549e81ce327ea157f5f19d15fcb0c50c079be49e114dff897066ae3fa1e06
-EBUILD kaccounts-providers-19.04.3.ebuild 693 BLAKE2B 1cb5a56dbfeb63a7774c6d18541ced207ff6567b31f098d05381dc937ef484ea265c1cedc14e53aac539e4d3686fb62d3d9044ddf03cfe0affde63de164e0c93 SHA512 9003d7e0c8383a6e47f10b03396bb185e22a07816625e11501482e7e60e59a1eafc4d5afc6ae60db4ae0524a8fc7c96ce5759a5296fc9437818d4077ffcbbfbf
-EBUILD kaccounts-providers-19.08.3.ebuild 757 BLAKE2B 9012afb9c856f7dfbe002689089bc2b251103aef2a3257adc08099c052be5aeae45ba8f757ed3311f3eda564b7e609580814ac8e623ca695c4fb0036a6cb9d70 SHA512 d7c0f679ea51fd9537807b485b61f2c06dac2be308ed68d3ced524f37e5f79e18ed474081aa8860e28819582dd5b5ec2dfae1024d4854a8bbd37196875db4697
+DIST kaccounts-providers-19.12.0.tar.xz 32180 BLAKE2B 1591368416dfbb9b60b3f368b6f230266f00908365084e7b7e9870ce5dd361f312ae39053e497c168723a99443b990c62ceb20b35e6a6c3ae70e862d8ec7f7fc SHA512 0bc9be70592f7e9a4e8eecf771f86bc89201a97627e177afe071e8581b1ce5c04a304dd3a0f0667e120b7a32b8d6f34558fa42d03460080c71ebfb84800a4278
+EBUILD kaccounts-providers-19.08.3.ebuild 754 BLAKE2B 3293c84ef37627c0a00b7173b7307cedf09721c16ab0f4b09085fa47740357fa9532ce168b10e71adf7984d23e82b70d43dc0c915df3b5262e4df7276691bf03 SHA512 af3437c0b702eccd11487a125cb3d103800cbc48ba4c63e8861198cd29264812cace6f9d8956a9bbaed1d22480f53f0bdd82597f450cca23e57e0778f50717f7
+EBUILD kaccounts-providers-19.12.0.ebuild 757 BLAKE2B f06e79269e311a862b2a80bcaf7eeac231bc058ca986b1b2205123dde89f58b35d0c04fb5128f138740f79d597f900277cb4d57980abda79c9aa532e314a59da SHA512 2c179e113f2c90bd3d35de5288b65cb54a861287dd3f60e04384dc74f30056051677868a7811a7b89a070fd320e19a6240f80b62f23dc316633686e3897c80cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/files/kaccounts-providers-19.04.3-missing-header.patch b/kde-apps/kaccounts-providers/files/kaccounts-providers-19.04.3-missing-header.patch
deleted file mode 100644
index 162fd681454a..000000000000
--- a/kde-apps/kaccounts-providers/files/kaccounts-providers-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fd6b3ebfa73782de44f952f95394a6cbccd74ca4 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Fri, 9 Aug 2019 15:28:13 +0200
-Subject: Fix build with Qt 5.13
-
-QWindow include is no longer included transitively.
----
- plugins/owncloud-ui/owncloud.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/owncloud-ui/owncloud.cpp b/plugins/owncloud-ui/owncloud.cpp
-index 4330871..423faad 100644
---- a/plugins/owncloud-ui/owncloud.cpp
-+++ b/plugins/owncloud-ui/owncloud.cpp
-@@ -25,6 +25,7 @@
- 
- #include <QQmlEngine>
- #include <QQmlContext>
-+#include <QWindow>
- 
- OwnCloudWizard::OwnCloudWizard(QObject *parent)
-     : KAccountsUiPlugin(parent)
--- 
-cgit v1.1
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.04.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.04.3.ebuild
deleted file mode 100644
index 8bd58fca12d2..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE accounts providers"
-HOMEPAGE="https://community.kde.org/KTp"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-util/intltool
-"
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	net-libs/signon-ui
-	net-libs/signon-oauth2
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild
index c1a57e6b012c..89d256e2f5fd 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.12.0.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.12.0.ebuild
new file mode 100644
index 000000000000..3d78ba1c09d4
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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="
+	>=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
+	>=kde-apps/kaccounts-integration-${PVCUT}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	net-libs/signon-ui
+	net-libs/signon-oauth2
+"
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index 820c6fddb64a..94983f0e5011 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,5 +1,5 @@
-DIST kaddressbook-19.04.3.tar.xz 473480 BLAKE2B 263d4b20967e428fbeae77ea96cedcdce0cdb95c065871abc18318fdadd6f06754f4c0385f522bf5f9ded61e507609e49558f91770064e1b33ca8109eb44caea SHA512 8428ac9ca70a855c49a029073a36855d6b4604b9d1dbd386b22e096e6d76a815033767209c0f0afd9d728fa0f3117adb09cac021a3506afa2375973fa441d005
 DIST kaddressbook-19.08.3.tar.xz 473792 BLAKE2B 3e91dc694f1161efbee03545646cfcf50da42d659fdb15104bc3a348aa37f3390baedca5b74433477b2b1333eabc46434bfc57d299919cf9db8d4fcefda8908f SHA512 82d0f41bf722a24df8db9d040256d69e8818fa5cd52bf42a310e503772b27ee0745476c2ece607bb5acc81dd4f44f85e2a6b5d26e9b4b061772c361520053022
-EBUILD kaddressbook-19.04.3.ebuild 1601 BLAKE2B a67022c100d95c276afef5f2a4c200c6a1a38b3dc597945ca29b406c2f605a8d8c06ab2e71099dab28706d3776d823215d57b8f0423652ae022fc7291ce695d4 SHA512 6adad14bb54b7f8a91a55ffe160aeba74ac7edf9ef9403fea1208afd79fee447e1c7c0a0340f2533e04889e243e94bd35ffa1c119447357d81d1d69ff7df5dc8
-EBUILD kaddressbook-19.08.3.ebuild 2046 BLAKE2B e8e350386a36884f1c59573f9cabe37b36ee2571f44af50db07876888c5f078539e2034d09ef1c44b12c0bcdea5e55fd98bf365b3d93005d4a0bc7d863a29644 SHA512 b35b127f6d7dd8a23d51977e2744130ac33b58ae8d0df9295755e76c33e960a7be1c20429b22c49847de99acc01276ae2c9393246f4297c8baa68bb0be9835db
+DIST kaddressbook-19.12.0.tar.xz 2379408 BLAKE2B 4c1fdd7f99cea3d1848eca653eeb22dd2aa814e9f9a90a506a791a38a123aff288301c8ac0d41271fc67ca711958f9ac34fb5e99d6aae987d87e7865bea03fc6 SHA512 fb326204d7a9b939655652d3c1316ee3d0f96413f6b75b80f4fc7810cf1d96b09cf60f1f4ed9fc871effc03644a49d1bff938fc2b123d9ee4f82ac20930675e0
+EBUILD kaddressbook-19.08.3.ebuild 2043 BLAKE2B 6b0e2719ab23872ca0198c7a69a9c08508678530583916335cb04cb74dd0e7dc4d0d7cc80b356298347622b9b28517622d725b8eec2436c32cbd020fa431bea2 SHA512 fe8dcf2b941126f90435655eaa168ee7cfbf3321f2d04998ae4734e7b47cb058783b7ec11869a13b7413e23d53f8e72a54e1bdbc63608979209b605b4540ebfc
+EBUILD kaddressbook-19.12.0.ebuild 1973 BLAKE2B e91dab8a6cbc223eaeb7390f967455955db360f93cb6d28b8f798b7c8c22e446e7d25984a815316cd712abdefbba06e0e9b11583210ffa975c5d378055d6dfcd SHA512 8ebdd2989f46c88ed51b0fa7b246df6572f95ba1214bd8220180505ce77c5223566ff53454279cb6b6b0f9ab3b5e7105e3293c1cb0ae248cf6c46a6e52742f7b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-19.04.3.ebuild b/kde-apps/kaddressbook/kaddressbook-19.04.3.ebuild
deleted file mode 100644
index 192ce9d6cfc9..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-19.04.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/office/kaddressbook/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
diff --git a/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
index 0a9d58ea406c..032d872aeb4e 100644
--- a/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/office/kaddressbook/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kaddressbook/kaddressbook-19.12.0.ebuild b/kde-apps/kaddressbook/kaddressbook-19.12.0.ebuild
new file mode 100644
index 000000000000..9ae86355aafc
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-19.12.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 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.63.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=""
+
+DEPEND="
+	>=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
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	dev-libs/grantlee:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	>=kde-apps/kdepim-runtime-${PVCUT}:5
+"
+
+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 1e6bcf2b99fc..d8ad82fe29a3 100644
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@@ -1,5 +1,5 @@
-DIST kajongg-19.04.3.tar.xz 4466048 BLAKE2B 4a11030bcb95abeb336b7e1dfbd0e878a8d36e148245b4cf3b10bdfc0812a445e18cdd5f4729118bf663c860efae2d5079bab76c3a1fb3f412b6f8ef1b8f4d22 SHA512 6e2091c46cbfb5916eb3e2a219b391d97a7b3eab6f3b2942032ba663f1589da663a0d5470ca9b285a83f52ae540ee960dfb4276dff3b534835bf52c9203b7bc4
 DIST kajongg-19.08.3.tar.xz 4463292 BLAKE2B 9dab5915414155806d13695cd91dfa27289da3d236a954becc4c9657d05db8968f1801738106a2c2ee31ed493817c0924947abf69b3ce0e31700a1541a8161db SHA512 49c5877216e9c73ff66e11fa8d14e3a82e08149f92c5cfb54ac7057096b0b53a46bf4a8eb4ca2f3b7bde066249b4a65b81ee42cf8969d06d221cf8c89a2fe97e
-EBUILD kajongg-19.04.3.ebuild 1248 BLAKE2B dc69812b49028b1ba38d034508da5abe96024f06b3a7c55e435b1037f5a1282ec803b3d3ac467228274e7653e25195be7d138089b24fe86c743c1166395583d5 SHA512 47ada136dbc64f70e33a30355f48647c12f2296944b161fc9fe7ee40fa28a66cc5a3a2a66d3898c6def90392f83b6e5e30ab785f9eb630e4cf89388ccd004890
-EBUILD kajongg-19.08.3.ebuild 1268 BLAKE2B 8ef06e579f51a76426bcf978ce575c516684f2b76e816d7c7cd802120688db77d21bd872bf968a677589b584539ad8059cc3fe07dd88d50bfc8c3941fec1f3d7 SHA512 5cf84881aa336aca396cb22cf6a6c043e36aa2c14aa61f33cc6ae370a85cc33cf9a2b17ae8fbd6bfc293713c09e43b64356297818e0001566388a8433050fbb8
+DIST kajongg-19.12.0.tar.xz 4466968 BLAKE2B 79f0a5f1435c1cf7d5eb61b8f7212293a83245019c40d136e2424cac33dfe41415cd1a0efeff20c3106dcbda43ee76e0447c7cff995b428bba6d979c45241557 SHA512 e1ef9581038039741d687cf90fe9bb93ee5e6a9e6a7b5a1e350ca5c74532b7f342970a89fba0cacf43b4b45cff175c8f7dde3e73709c73b6a366ed94cc2fb2dc
+EBUILD kajongg-19.08.3.ebuild 1265 BLAKE2B 3f3d46fce4a547467823d76adc8044662bd459d3d8584cc038820e79f8924ec83ba0c8c9dad0bd2965544c280c230d0e39d309de55a557020178ebbb0a3fd2bf SHA512 aa49a61955852a32073233793c0af0e2f964895b06caed6f69ee6ca52e467896cd63fc311c582c884b25dde9818c5ddc4b435208da5a8fe2477486d12109c3d5
+EBUILD kajongg-19.12.0.ebuild 1276 BLAKE2B 794e5622dc8d04db8ac14e03635ac4eede7bc6e8a7504b40d3839b48f29724ae82049271e7de36c1aa427a7570c056d68759d985d8c849c181a696409c4477c9 SHA512 12ada32e5da54999dc7ebc018758dd6eda9bfeb11596adb47d6b8a8959a5afaccceb163ea6a28e5a5f7d09eb53da3dd1b3dc29698078f53d9e52cb413b7f7aa3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-19.08.3.ebuild b/kde-apps/kajongg/kajongg-19.08.3.ebuild
index 4486345c5207..2265010c57f6 100644
--- a/kde-apps/kajongg/kajongg-19.08.3.ebuild
+++ b/kde-apps/kajongg/kajongg-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Classical Mah Jongg for four players"
 HOMEPAGE="https://kde.org/applications/games/kajongg/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kajongg/kajongg-19.04.3.ebuild b/kde-apps/kajongg/kajongg-19.12.0.ebuild
index d742187e18f6..c54dccf4fff2 100644
--- a/kde-apps/kajongg/kajongg-19.04.3.ebuild
+++ b/kde-apps/kajongg/kajongg-19.12.0.ebuild
@@ -3,49 +3,51 @@
 
 EAPI=7
 
-KDE_AUTODEPS="false"
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit python-single-r1 kde5
+ECM_HANDBOOK="forceoptional"
+PYTHON_COMPAT=( python3_{6,7} )
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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/kajongg/"
-KEYWORDS="amd64 arm64 x86"
+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}
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
+	>=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
 	dev-python/PyQt5[gui,svg,widgets,${PYTHON_USEDEP}]
 	>=dev-python/twisted-16.6.0[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}
-	$(add_kdeapps_dep libkmahjongg)
-	!kde-apps/kajongg:4
+	>=kde-apps/libkmahjongg-${PVCUT}:5
 "
 
 pkg_setup() {
 	python-single-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_prepare() {
 	python_fix_shebang src
-	kde5_src_prepare
+	ecm_src_prepare
 	sed -i -e "/KDE_ADD_PYTHON_EXECUTABLE/s/^/#DONT/" CMakeLists.txt || die
 }
 
 src_install() {
-	kde5_src_install
+	ecm_src_install
 	dosym ../share/kajongg/kajongg.py /usr/bin/kajongg
 	dosym ../share/kajongg/kajonggserver.py /usr/bin/kajonggserver
 	fperms a+x /usr/share/kajongg/kajongg{,server}.py
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 8075b1e59f15..301392bc7534 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,5 +1,5 @@
-DIST kalarm-19.04.3.tar.xz 1819888 BLAKE2B 349ba5b984837f1eb3dda32de22cf0c68bbed9dcd5ef869e25b64440c24cebe98a33d9b14d129beb76d2317f91b242af922969cd373d755a3d47965f24f24b9d SHA512 46967c6067a5d7248341edcc82a3b1e35b5c24e7ad02e33f07c8f923f99b938cafcdff9297c74ddf800b239a9f4f98f9b916e8435c772fe21d18cb135f05920c
 DIST kalarm-19.08.3.tar.xz 1823656 BLAKE2B eecb00302fbac54da91a6a4de91da65d503fd64222fd522d330c5ebf115002e1d4eb1baa74054ead486beee701e881291593475dfcc29b2ea094ac9748e817bb SHA512 b1ff5137c4ec1d0067767a7e14a2ce7e2c3c1a621845975140ac538af6aa6dd6bb44f567c2569a8812552379c79f70bfb828ab1b6afa103cabdf07ca492d5dfa
-EBUILD kalarm-19.04.3.ebuild 2143 BLAKE2B f35a5062894b02ba445c5eb38010d918ceda114e5e26b300289d74c44ba9f90932cba48e79851d838d803117411b8efb56e7ae4db31b69395ed80e3080c50f8b SHA512 78b293d764f80987813443e2956b7e3a16ddb67ca032321767feb10098680f7b163705aef1bef7a8b103a8f96f5fb3ea8389e785f26a38a585b891e475474564
-EBUILD kalarm-19.08.3.ebuild 2450 BLAKE2B 35863edb671cda046f37cecac5ef73d7850367d00e7a926656b9141a0930a61516cef0900d9e129af6b26542eeadcacbd562e24aad60ef0ad7c592bdf71b227d SHA512 53463e0a1cc86848f942002bb3baa084543c5d3622438a1212b707e9126ba068ae79c57e68a48876734a6c3affc2144d89f1f953b5e8003b7d6e313fb2ec0c36
+DIST kalarm-19.12.0.tar.xz 1838864 BLAKE2B 797d53df010dc438309f0f44a9b66eab1af6a3376fb0984758e264a2d586e6789d76fdb0a9de2a826be94815e4e6e85ccd71390b660d47d980f2f93d26e1fd53 SHA512 8f0f360fbab1a78a141a02de3b7624074afe4b0a9bfd1336f86571225dd3e4af27148f0f9e684f68b4bcd477fc4516b5bee1deac124f9a6e64f1700bf4cf833a
+EBUILD kalarm-19.08.3.ebuild 2447 BLAKE2B c65ea67516d7dd76faa94bb0e0ac69b2ad026ef2061d3274fb7ab36bc4eaa274e750729f925e2f38b1ee29e6484ed3861af58d6d312512ea4bf5d25b97a85548 SHA512 cfefa633f291a8adf00572e2c5d07f709970073469cba0313d20f0ef439eb51fde85a4278aeb95cf9e089fed4c3a30dfa32c3362cba0f785f01715284acea209
+EBUILD kalarm-19.12.0.ebuild 2446 BLAKE2B bebff197104ba60bb4526c4f3b1b6e200b58ff312657b549b336d9984320843d58afae888f8ba5097adf8594c07e8c664409d69166969be1cd07c2faee2523ea SHA512 823764eee390492d55948a597d4d1d2394d3ea825c922b4c4fb74a498936c43409d7f4c928612817f5861bad80b57ae7eafe33130add4633aca4435b3a143558
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-19.04.3.ebuild b/kde-apps/kalarm/kalarm-19.04.3.ebuild
deleted file mode 100644
index 3d548b77e42d..000000000000
--- a/kde-apps/kalarm/kalarm-19.04.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalarm/kalarm-19.08.3.ebuild b/kde-apps/kalarm/kalarm-19.08.3.ebuild
index 917871df0446..b7c746cc5a51 100644
--- a/kde-apps/kalarm/kalarm-19.08.3.ebuild
+++ b/kde-apps/kalarm/kalarm-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Application to manage alarms and other timer based alerts for the d
 HOMEPAGE+=" https://userbase.kde.org/KAlarm"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 BDEPEND="
diff --git a/kde-apps/kalarm/kalarm-19.12.0.ebuild b/kde-apps/kalarm/kalarm-19.12.0.ebuild
new file mode 100644
index 000000000000..628eddb564ce
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-19.12.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	>=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 860c65073e7f..bbab07e7fcf1 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,5 +1,5 @@
-DIST kalarmcal-19.04.3.tar.xz 571716 BLAKE2B 5b8ed989740e55169421f2cbe955cacd569e52bf17b7df62f0f899eb996bd4b0f365810897baf31e6e3292e22fbe1085a0c79118cf8f1b95fc044f764377757d SHA512 a676f5fbb2a045dffe2e34d1cc1e9a33719b01c88ee18b3ac35d1b588f61e70d163decd00b3e68ce9a949b07e78baff74503deebcb1ea3fe5967d471234a2bb9
 DIST kalarmcal-19.08.3.tar.xz 573036 BLAKE2B aca3d5bf38744d603661487aa8a705fbd4e664107ca4ef05fa49e1195bb17a9b0997b078a9e01bf1af5e6c40d7fd3f6137152081cff5dd47af89167452b7a5e3 SHA512 18eea0a1629e9491e65d4041cfb14f878521f4a8455129357ee3b831b8de1a54fe5d1909fd30afdead508216d310f7042ccae8f929bbf0fd456833e6e638ceb0
-EBUILD kalarmcal-19.04.3.ebuild 739 BLAKE2B b2833cca72bf21c8a748f8c27c51746f8feec12eae3d0b9dcb56df9a04c3ab4ebde8d9de7195c6f046b509f0a48380fac6765416dcabbc47f3984df14ff1dac0 SHA512 512f098bec96259f165b778826d58964c0d0f5cb85038f29eced29d52de77e1d1392ccbdcab063d6c8360722930b5eb2af62002850cf7ddcc1a711a8251c6932
-EBUILD kalarmcal-19.08.3.ebuild 857 BLAKE2B 21eb56720b8f6f53cab1c5126fc62c1dec3ccadd48b9673a8f24c1b561e982668ce21b32c0e19b04ec5d3db0c0a38ad9b5c3d31945a9f46f4be078179d5e505c SHA512 275293f6edcc437e3aa5ba55352a163389c76855db5f2f6aadd60055e55267860434e3ef4e9e2b60f213e5008ff22035f931030dd46060bb75285ef365a55059
+DIST kalarmcal-19.12.0.tar.xz 574076 BLAKE2B 95d5670171ac026b84cb051989939c409bb59717a6c370fa7e96e3475acbc48ba44884224e783317836ac9bbf99be3a3cac81f414e1780f91e18dabbf3d34915 SHA512 eb7832464fe64414e31508f75c8a8cb91b5b196a0927f96c0266cb220842c77dafd098dc6985477ce27c9bf1b142697bd3d2b48108792e5b51b9351b9c36fdc4
+EBUILD kalarmcal-19.08.3.ebuild 854 BLAKE2B d84a4f56f005ff01580118935a9d42a4a2dd54d9a320103fa57612915ecc09c68b2edae60e486b74c9deb8daa32b9b8ace447326324b893df2ac0689e6da2dca SHA512 c33c35e0a224c15e37d5c5350f9ce6cdac2c0ed65cd994a7b4f28cd29bb03c92ac8535e38a1d8fa83068b11e9f511445d755bf6f89e35db150af792f6925d003
+EBUILD kalarmcal-19.12.0.ebuild 858 BLAKE2B 10868f7ddb82a5a76e6f2fb2b55b3db35378458de9aacae2bf299ed25452d61a2922e62332c5ee700926d3adf4a103d2167faba98375e59e58c03e3033dc518c SHA512 de21e3cf4ba5380733ecced7a6bd16b66724c81e6da30c52092b25988fe0a72d8ce7152fa25a507ca0587ed875c524022530c6f5175fe8e8459631ff12be2971
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-19.04.3.ebuild b/kde-apps/kalarmcal/kalarmcal-19.04.3.ebuild
deleted file mode 100644
index 069ce249363c..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_qt_dep qtdbus) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.03.80
-"
-
-src_test() {
-	LANG="C" kde5_src_test #bug 665626
-}
diff --git a/kde-apps/kalarmcal/kalarmcal-19.08.3.ebuild b/kde-apps/kalarmcal/kalarmcal-19.08.3.ebuild
index d9bd2cad8814..868679a28930 100644
--- a/kde-apps/kalarmcal/kalarmcal-19.08.3.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-19.08.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kalarmcal/kalarmcal-19.12.0.ebuild b/kde-apps/kalarmcal/kalarmcal-19.12.0.ebuild
new file mode 100644
index 000000000000..42ebd8739d0b
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-19.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 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.63.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="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!<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 e8a736c7c9f7..635cccfefc82 100644
--- a/kde-apps/kalgebra/Manifest
+++ b/kde-apps/kalgebra/Manifest
@@ -1,5 +1,5 @@
-DIST kalgebra-19.04.3.tar.xz 1153428 BLAKE2B c2e38d56140eea6b64b23fcc6f03cd749e9ef41821baad6b970dbb5099a6f0bf73a38557aebc47ba740b0bd09dd5a39e038d5bc68bdbcf6837a9c03d3139d20b SHA512 ac9e1be9a63b81495d62f4c3d705b661377ef1a118d900543cb7415a90985aa5dfee2a81421184892bece0da81f9a139afcf73f552550e1867a30cf81d553b98
 DIST kalgebra-19.08.3.tar.xz 1157236 BLAKE2B d1d5309ed6d56578045270ba184582f94e0f14944f5bc4fab2c741958849507dda62b36af20eb25452b372301077a914331a1b777480c9a800aa3cd94b533601 SHA512 a623e4675b1e188411da358f965648b6f9ea60a65d3155c377dc5e60b288a2c757627f1c76cf98629ed23784374f60b2c748cc80ff22a93e3469ad2e3dff310b
-EBUILD kalgebra-19.04.3.ebuild 994 BLAKE2B c659a979ed2f1d67d0da032c59d5dcebcdae3aa19c9359e960c5dfbc77726089f9f3ea517742b33e7590b8d2f9f4b0c2c9f52ef3a0a5e82fa05f85a5045ca27b SHA512 99a17c92e1c3b12bf515e75d8c1caf76e6e537ca1ca814f3a36fc9024b3fdd00fbc80d9730a1d9e7a47fa987fc12669230a742a73bf278da9c9aaae0c48486ea
-EBUILD kalgebra-19.08.3.ebuild 1175 BLAKE2B ad3fb064702ec684f8db0e63a076907b33fb920c4c78daaea74aa464135f534cc079a0d4dbd309393831dfd6f7736914f9074e0b050e6e9f65a5e35ac90e04db SHA512 b9ecf2efa0a31f85562bfadb8e3487e366a8449b656b0ed3d20e706637657940f9227fb962cca4efa5f23110f2d6259982b0f69b484c0d6e2f160e4fdb3b909a
+DIST kalgebra-19.12.0.tar.xz 1158468 BLAKE2B fe058b1fcf299d1d95975211302088e5665b5eadb7bacb74706e82366f7339e95da71006402306923fab3cbd36ad5099a6ca7d16a998c950f60f4e335ac5cd16 SHA512 19f4193671269d1e7d73f74eedffc1bdbe2d4c5a6d548bda1e53064147465c9cac7fc45f7df4ca2f80431429d8d7159fa8fab53e495627ef6e34570c1180332d
+EBUILD kalgebra-19.08.3.ebuild 1172 BLAKE2B d60493349f3b4a230696e128d564a0f63f072d07a8d933f2423e32a7a079d87f0c5d82f3deae2693ea79e068946e3cd8a81446a1c0f31f243c0c590019246c9d SHA512 2f69c41999c55dcd126dcea05fb91fd5861465d6931837c9b8263fb5a30623679a2a72b6c84ce181c18cf12deea204eb542f9abc4b5c1ccbd106a7eee2c54b6c
+EBUILD kalgebra-19.12.0.ebuild 1178 BLAKE2B 6e08c7d671fe78a8a859011946e98d80eead06572b2363452d1540e7764d3486e0e6b72e2f6986b92753be2f06c07aba9150f6edb302eb02d029041b7d2b15c6 SHA512 d6002f97ca8f28415976b9b8c3df057b3ed27c6bee26fcbab18d8c39f323317a389baa98bec48433766c2b6ed0f0ad9017bbb67e77fe2969daff304334732476
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-19.04.3.ebuild b/kde-apps/kalgebra/kalgebra-19.04.3.ebuild
deleted file mode 100644
index 3ef629585d4a..000000000000
--- a/kde-apps/kalgebra/kalgebra-19.04.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
-HOMEPAGE="https://kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="readline"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep analitza)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	readline? ( sys-libs/readline:0= )
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package readline Readline)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalgebra/kalgebra-19.08.3.ebuild b/kde-apps/kalgebra/kalgebra-19.08.3.ebuild
index 9b74d28d7969..3ee55b2ddf7e 100644
--- a/kde-apps/kalgebra/kalgebra-19.08.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="MathML-based 2D and 3D graph calculator by KDE"
 HOMEPAGE="https://kde.org/applications/education/kalgebra https://edu.kde.org/kalgebra/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="readline"
 
 DEPEND="
diff --git a/kde-apps/kalgebra/kalgebra-19.12.0.ebuild b/kde-apps/kalgebra/kalgebra-19.12.0.ebuild
new file mode 100644
index 000000000000..1fc078c7a8fc
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-19.12.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 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.63.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 e425ab4823c1..f61443ef1ed2 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,5 @@
-DIST kalzium-19.04.3.tar.xz 26404792 BLAKE2B 524077674be45b62a042bd33de3dc6f3fb5bb2a02ac4e636b9989847ef4f1903686cdf6bc89b2c92a0b873616237897a5f70df8f566e7c4689a8e80a98e6d5f7 SHA512 405f5102b7e8326aca4934167f34fcdc0770132ed93bda1d5069b42503bdd4cf8c9b1b080632a776a38625deca0ee1d9cbf20858b64ae1083d6ab160f94d1146
 DIST kalzium-19.08.3.tar.xz 26415448 BLAKE2B 8fc50e38201514385dadf7e7f788e90304bde6a82a3c124a55f848d2609d2734a7ea50853c6d9e60103ebc4868cac1ac28d0fea4491828e43d05a28b6372d5db SHA512 a500255222f2e3a7ebfcf580f7afcdb119de0afa2e2a2d06f273c23e518fa9901b528fe9ce6d3343940c93d0eb4a39ebb9a38c6301c347907ab3a54658ed7b53
-EBUILD kalzium-19.04.3.ebuild 1553 BLAKE2B a976004a732eac69818757732cda84dc81d7cddc3cc43868a456d50511476bb24176481bd49dee56b9b5c6f7b8565e53d1bd44d71257e1004c911c805bd5ac27 SHA512 732388ce7a2300b2330661635df11d874a72c559bc190d5a7b2eb5cc55de35b409a8896610d53a0188fc61bbca9f1984815d9198465795d63ca81c398915a917
-EBUILD kalzium-19.08.3.ebuild 1747 BLAKE2B 69e53f3464a602d4a5bbbbfd4060bcb4e4cba691b96b9a58f9f8768cccb624e84929c80cf58ab8cf3449c6d14838807e1b517f785a1b1b09120db3a0f6b10e67 SHA512 79d086a2da9f0d565b943767666d65e791f8fdbe262b53e920e4fa99228aee09f4163bddf7d021c196dbb3de1e5d098dadda8d325c54fb8fb70a2f5c29786042
+DIST kalzium-19.12.0.tar.xz 24587464 BLAKE2B 185059ff3a18bfa17a25d6c17a3d3fe58bf5d6416269e0f3e2ffc94c8a06f2cfb6ecab7fcf75fe6a5b90967091a69e2492ac3b0d56b7377e5faf4fb71b856393 SHA512 e4217778fe8ea20b0355725b4f5acabb91c812f05107d7dbae589e34b7e26b7087822c2e893046421575be7ae1e44d88cd0aa66b40b3dbd2f251b57ff69ece6a
+EBUILD kalzium-19.08.3.ebuild 1744 BLAKE2B df1b437cd6c9ee7f3fb2dd792f723c486d338bf019d223b82b6498793ad66d2384af405af7f4d6f06f036ae4996afb529ea580247a76a75fcd926c201c4bfd60 SHA512 7ed1e2237abc338ed6dbc4d570a0ec718256037db29db54862d4c807d4b4a00bdeab1c0c2b2e6ab8764113d8b91007e2860c75b57898b168f4cae336e82dfb74
+EBUILD kalzium-19.12.0.ebuild 1691 BLAKE2B c0d3b01b08729fa894eb2066b46a221d2f48e646f06213686e974feeea51d48fd26f25f3a01bd411311091db809e4ec3edc387ae7918f0a297976b1692bd415a SHA512 a6e730d62d1c84af8686fdbc401295ff12c27d8ac4f2543a06e737a4d2c4e80ba24fe1f6d6b670e2f6fed4f133205052936e8f2794fcc87f92cc6c872c78f996
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-19.04.3.ebuild b/kde-apps/kalzium/kalzium-19.04.3.ebuild
deleted file mode 100644
index 4e406fa2ef2b..000000000000
--- a/kde-apps/kalzium/kalzium-19.04.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5 flag-o-matic
-
-DESCRIPTION="Periodic table of the elements"
-HOMEPAGE="https://kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="editor solver"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	editor? (
-		$(add_frameworks_dep knewstuff)
-		$(add_qt_dep qtopengl)
-		dev-cpp/eigen:3
-		sci-chemistry/openbabel
-		sci-libs/avogadrolibs[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-utils_use_find_package editor Eigen3)
-		$(cmake-utils_use_find_package editor AvogadroLibs)
-		$(cmake-utils_use_find_package editor OpenBabel2)
-		$(cmake-utils_use_find_package solver OCaml)
-		$(cmake-utils_use_find_package solver Libfacile)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kalzium/kalzium-19.08.3.ebuild b/kde-apps/kalzium/kalzium-19.08.3.ebuild
index 465797cbdba2..61202b251f36 100644
--- a/kde-apps/kalzium/kalzium-19.08.3.ebuild
+++ b/kde-apps/kalzium/kalzium-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Periodic table of the elements"
 HOMEPAGE="https://kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="editor solver"
 
 DEPEND="
diff --git a/kde-apps/kalzium/kalzium-19.12.0.ebuild b/kde-apps/kalzium/kalzium-19.12.0.ebuild
new file mode 100644
index 000000000000..c081e0d6a771
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-19.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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="
+	>=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/kplotting-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=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
+	editor? (
+		>=kde-frameworks/knewstuff-${KFMIN}:5
+		>=dev-qt/qtopengl-${QTMIN}:5
+		dev-cpp/eigen:3
+		sci-chemistry/openbabel
+		sci-libs/avogadrolibs[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 fc6b81f078e8..4f8ffe7d3e10 100644
--- a/kde-apps/kamera/Manifest
+++ b/kde-apps/kamera/Manifest
@@ -1,5 +1,5 @@
-DIST kamera-19.04.3.tar.xz 98716 BLAKE2B e037119b32ed76d39c994e7b991a6d75d9f817ffb9964341e021f02c69e19f61c0e4985ac0ced55b486f8e98e7fe1be48329bb02da21949a04e4514330571c29 SHA512 53fd0e70930c06bfdf8301319eed94da15aef654896f3c7c228600319dcaca2cf255641391c64530226f6bd93bdf1b9b768d76b75f8ff2b0cc951c86ab6f9982
 DIST kamera-19.08.3.tar.xz 100144 BLAKE2B 23e0a242e9c04b9cf93850b7d1df68e6f26a4ede8747d030a07eeeea8b675071317ecff35b3e0a3ad9d0a24d10788ab5482b36885bad55493be55e2f1ef11811 SHA512 a1388abd72f3905a918fc69341e8cd64c37d205530d05e554444c1fdb8d773496d9783e7a26a8b324a8904ad9ef2b1347c77a23f430c0663014e5a66ec63b913
-EBUILD kamera-19.04.3.ebuild 646 BLAKE2B 5380960ffd5b83bd061cc6dbd6c6c936d474609b6508e82747c7c5c28783c1369188e65687238b95b8deb9cbf1aa1afd431a090fb51292e494129dd06d0a8fac SHA512 2a3881c144660a3e9385041bf6a0bcb83c7c01d002d79e04a0dddb9c5c284df0787ab57963668f1df819b199538878d1194acccc2698df4efe81bb3fbb27b6c5
-EBUILD kamera-19.08.3.ebuild 745 BLAKE2B 913a96e31a2ca03f5f9593eed1b137b90f077685f0096040faa29d998f669d168d7d690cf8a42263cb8957d155a61c7dd57f14533988692337d339c7ffb80513 SHA512 836dd9060411cafa9f0ff29a91a4844455ea7eacc3d7ac7e0805d9f79b2e83e50b8bbb7d0c1364bc4a09809cbf5b8de2d75309fb54c38966cf033e8fb6b7b4dc
+DIST kamera-19.12.0.tar.xz 103492 BLAKE2B d9f99cc6034d3ab677845cf8c4ca86ac5352d24ccb0705fdd8fc2c6df55ca2c5112ca9983c8ea1dcab8eed09ca26496d651ee68b8e210756d27c6e02fa095d34 SHA512 79b9ab797ed0b191411dd09a26a8b48acdcac49d1439727a1c580f37bb391882758e4fb473270bf2d4af03200cdd2b8a4da4d96f08a7ea9cc3ea2a35f07a8f4e
+EBUILD kamera-19.08.3.ebuild 742 BLAKE2B bee4355e20fd0aa65e711298507b8f49bc24f54825f8e4879b74b56bbd4591fd148386d4c152a88926db8be8c73bc0750f5d6f0701af6b3e6138f639e1747f6c SHA512 5b22cd59cb9813cf15866d6f3a389299b5c3e870fe6cc0bf87e0cc4eefd00ab84684616e3ead70101990e14c279406f43198c04f60cc3a336d35bea96399d5ef
+EBUILD kamera-19.12.0.ebuild 811 BLAKE2B 491a36a7c7a342aa8c96a2a758af631cf8efbe5712a7ae298dbe61bbd273e1258d9638aa5d689a11e53b0f9ab5ff7036920f0e8f7de765f7df6e0c27e52ae446 SHA512 5e6de143d3da591e2f8e1168948edc5f90ea30ac11607ce8a74698d4958c3405d4c3010c6fdd55a35bbda5df9fab0101805ebc5f7782e2560b9c2a03c0dcedfa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-19.04.3.ebuild b/kde-apps/kamera/kamera-19.04.3.ebuild
deleted file mode 100644
index 090688c59e87..000000000000
--- a/kde-apps/kamera/kamera-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Plasma integration for gphoto2 cameras"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libgphoto2:=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kamera/kamera-19.08.3.ebuild b/kde-apps/kamera/kamera-19.08.3.ebuild
index 5c9aafcbbb81..cecf9b628a3d 100644
--- a/kde-apps/kamera/kamera-19.08.3.ebuild
+++ b/kde-apps/kamera/kamera-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Plasma integration for gphoto2 cameras"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kamera/kamera-19.12.0.ebuild b/kde-apps/kamera/kamera-19.12.0.ebuild
new file mode 100644
index 000000000000..7a971f2920e1
--- /dev/null
+++ b/kde-apps/kamera/kamera-19.12.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 27548e142b4f..905a86243635 100644
--- a/kde-apps/kamoso/Manifest
+++ b/kde-apps/kamoso/Manifest
@@ -1,5 +1,5 @@
-DIST kamoso-19.04.3.tar.xz 200692 BLAKE2B bae5e566cbd49a5c2659f2487833db88529fa92512de52a96de3dc0d1b2509da2abea2392f57ef158a17c4807329f3af052077c180a2bf3cbebdc084e0fbd2eb SHA512 34a4d6efe8a4e8c009ce412fdc0c98edb43fcabc6d0f1b08e709ce2a0584a5b5a1405dbc92dac0f81e12b67ac9cad930e9afc5d068f3c42272bc59bfd9f6f2af
 DIST kamoso-19.08.3.tar.xz 201848 BLAKE2B 3a136931e95faa459bd9f469f33c410932268073fa3e5cbffb2e9e6ec10a3919c7b634cda13487c84117ade141feed7494f51d100e4b43d5249cb74bf0d8af6f SHA512 d6c1212a469a684cfdedf8868c60d97bbb499b73dc8ffd44f17619718d3baf4988007f9cbdcd614194ef4cf19a09f99b4d830dbe4ca7a170c65f2186e2144f5d
-EBUILD kamoso-19.04.3.ebuild 946 BLAKE2B 224757e81be364755f7aa7fdc59d06f871233039d267a98b13280f6edec0b219f42d8e6663f51568c6d7952fb5f7917c79737c65df456ce8b648b18f9180a54a SHA512 0090164ab3c9ef6e9103f251d26a35ded1dc88e51c9c0b58f7e8c7c4c1606356fd3da3311eba9242f621adf751120e891e7f151d50e3e144e0c7af6ba996d965
-EBUILD kamoso-19.08.3.ebuild 1057 BLAKE2B da6ed1cd415a5087665b6b8c4f8af2225971a6371d0e0eb5dd7250225954c178970e4b9f3e17ccf44bd6af058fa784b1caf3b7c919fe41cb5cf6678dbfaa7d51 SHA512 36a2fde285070ab092fe8775ac7992a50f8fbf19033c30fda7f15a8c0a6c75db056e27f732b2c091359ead5e9ea039f520f8795331042a31600e24360d986447
+DIST kamoso-19.12.0.tar.xz 203128 BLAKE2B caec5504c308843a768a54faa27b16d57ad5592b0aeeb479d0d5492905eabcd909a368057f7ff91d0425319b241a6f65bc7129e912d54eaeba72511428c9bee3 SHA512 a88a0289c1340948f27b25e4769917277d321a6731d11543935166dc7714f182ea1f7d76e4239990117436546bb356e442f97737392a9359c57e3e05aa5cc86e
+EBUILD kamoso-19.08.3.ebuild 1054 BLAKE2B 4d9387bb18f68487180b4ba1ae7087209a787821e99ee0af0c835e471c5dd540044b5f6ee60dce0ce1dc17c6104b0c88c3c88db0e60ce5f28f0c97979a41faa0 SHA512 f850cb6acb3f4ef6d18edbfa2e44981f52ab12b382d927465a301046458840d2fcb76bc9f957220f6107a9243ed7432c710cf62fc8aeda6b6d694e69d127f010
+EBUILD kamoso-19.12.0.ebuild 1112 BLAKE2B 70ef80d23392c7cf131169c05aff8d35645abdbd01afa99b578812a954b2255288b419a9cfa738396a20ed4fc0c28dcae97d7cfdf56840506982d359f33f94db SHA512 fb6a3c2e4b40f7df7788634bd2c4e38a2442d9c506e9d2b901f390ef816d92b4e12f995d610e72d0773ff028523b8f5f05dcad18d8d9fc18ef5e305993346bad
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-19.04.3.ebuild b/kde-apps/kamoso/kamoso-19.04.3.ebuild
deleted file mode 100644
index f78f422e509a..000000000000
--- a/kde-apps/kamoso/kamoso-19.04.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
-HOMEPAGE="https://userbase.kde.org/Kamoso"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep purpose)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	media-libs/gst-plugins-base:1.0
-	virtual/opengl
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols2)
-	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/kamoso/kamoso-19.08.3.ebuild b/kde-apps/kamoso/kamoso-19.08.3.ebuild
index 03aeafc74f39..1bf1b0eb5441 100644
--- a/kde-apps/kamoso/kamoso-19.08.3.ebuild
+++ b/kde-apps/kamoso/kamoso-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Kamoso"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kamoso/kamoso-19.12.0.ebuild b/kde-apps/kamoso/kamoso-19.12.0.ebuild
new file mode 100644
index 000000000000..52f4af4ac006
--- /dev/null
+++ b/kde-apps/kamoso/kamoso-19.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 23a2b09f2473..f9ecc2a9a951 100644
--- a/kde-apps/kanagram/Manifest
+++ b/kde-apps/kanagram/Manifest
@@ -1,5 +1,5 @@
-DIST kanagram-19.04.3.tar.xz 8034020 BLAKE2B 2e925e09fd37126947c6781373c57bc0d0663a836a4fb46705cbc512dc02aff5aa6f6ed4f6a96c149b862964fdaf35cc9560460b6751951ec652aecdc1f0abf5 SHA512 dbdccbcb01f76dd5143d9844e80b9bc992a2334e55e5d7a70009cb6bb3ff83be3dae77e3d091eb2f2d1c44a45f73ef40eebea9bda836eb117e86760de4747246
 DIST kanagram-19.08.3.tar.xz 8031760 BLAKE2B c6af0c58ead32a0e781f843dfe2e23288e5538a5fa9ed05ba6b81143f1c6981a49d5b987c294302fad016c61e1b80b92c1c12a7071055ded08879e01af3b5341 SHA512 72120d98ff5555ed84fab22716c0871d8bb11bd32529bae62d632aa979668d2ff8166c94b46bff91f77aa88b7a355f1afa13ad769771780a9dd52cb0452f7870
-EBUILD kanagram-19.04.3.ebuild 1093 BLAKE2B 0464a99e0bb0d249f6d49f7f7326db1a035a7c7f71fd23d2e79bdec932b3b051950093a20b18f76ead2f497f6205ed516fdd6b8987bcf4ccc0cbd28c0b098ec9 SHA512 be8a2180cbd7cb9752ed3388e5298b44aba639442cbef1c4dfba4276c17c41f8a0c47885d58b2cd8b64998c14727c0cf256fe5866ae79db3f9c942bbea7ba635
-EBUILD kanagram-19.08.3.ebuild 1289 BLAKE2B 2bb79f35fb9f138536b5868b80fdf32c16cb95b280b6baa06408ecb2cc7bc32929145bb1c0296afa5dc1edcb494a76dfd4db57ea043e95eb811d4fa1b10e3693 SHA512 cc05819e83bdb25af2410d9fc69cd93a2919cc32facc5cde82a0cfe09a11c3077d2c3b879cbd7aef8c8f4fca4e248153a6176ace4499437c3a0f2a50323cc8c6
+DIST kanagram-19.12.0.tar.xz 8028824 BLAKE2B 1129557abd5ee35ed8f98c9a275604a233bfaac5d88c3ccbcbba3fe37b42ac59eed637b4242c583c0cb95657244cca2d56ff021407436885c2c37bcb0d83fa88 SHA512 4ffaf3723a745af61c55d71d991c0892e27066264ebf887422d9e6772e4e817aa465cf120efd188cecc095fe67eb7250ef6d390a6a07f01df3ded613a8cf61d3
+EBUILD kanagram-19.08.3.ebuild 1286 BLAKE2B d4fab88f3599832d4b5ef0899b397c49350cdfc454e8497c2bf1daa6a6d2b788701cd31b5ed2aad2feeb7b2474eb3322c854b71bdd4007725ac69f6df85467f0 SHA512 fb660ce6e266784b12f8acce3e0b4a7426c78689f33d839579b690049ccc6d646f53f84a8fc2b74b5d51e8ef7dcccb3a667ec73c56facbe8a0ef96de6c53ba3b
+EBUILD kanagram-19.12.0.ebuild 1292 BLAKE2B d2ce1145882295f7904444a6903a26c1b506aa3f7a2853ea39a2ac9271e49ed57d7fde230b67018aa28d9a214566964783839fa04387c033867353a853789ead SHA512 56e7f5d920e1e8d5ab879fa591f4ef254a03edcfdc9d3722ffad0f0bb31a3ba08872f797fa09f61786ec85fb93f60b42b53c3dd477b23633a606b8cbbe7088ba
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-19.04.3.ebuild b/kde-apps/kanagram/kanagram-19.04.3.ebuild
deleted file mode 100644
index cd2c418a3c1c..000000000000
--- a/kde-apps/kanagram/kanagram-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Game based on anagrams of words"
-HOMEPAGE="https://kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtmultimedia 'qml')
-	$(add_qt_dep qtquickcontrols)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kanagram/kanagram-19.08.3.ebuild b/kde-apps/kanagram/kanagram-19.08.3.ebuild
index 39bf95d6fb53..44774001c87f 100644
--- a/kde-apps/kanagram/kanagram-19.08.3.ebuild
+++ b/kde-apps/kanagram/kanagram-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Game based on anagrams of words"
 HOMEPAGE="https://kde.org/applications/education/kanagram https://edu.kde.org/kanagram/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/kanagram/kanagram-19.12.0.ebuild b/kde-apps/kanagram/kanagram-19.12.0.ebuild
new file mode 100644
index 000000000000..a1a4f5088dd2
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-19.12.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 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.63.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 30826bcb4572..9b247a23b84e 100644
--- a/kde-apps/kapman/Manifest
+++ b/kde-apps/kapman/Manifest
@@ -1,5 +1,5 @@
-DIST kapman-19.04.3.tar.xz 2524828 BLAKE2B 4266e1291b9172c245eb7a8a73bf4dbd40422bdbb771f191918721f20d73a137b82784d1206f77a56c9942c4294c92ee81898567a603c61d5de397fab7892ed7 SHA512 048b4de4c7168c21a6f43d98c3e6cf286c2625909f2ab23c8ab8e993c1bc106c5426a749e9620e76267642238ea23a4d910c860ca10fcc706d5276b5773b6aa9
 DIST kapman-19.08.3.tar.xz 2525336 BLAKE2B 7d9b4f846686f212ec11b8b98a66f0a66f5c7c4a72bb2cd8de4a30241e78b51fdfac8e6712585d6ebb55bc28aa67002ad4bfbd132d0ff6b17969fb0e464ea1bc SHA512 8f9054e264017af87d37f11750d803225c498de5e7507bc17be1304e171128bd514e07019ebd8c43bc7604e963bd1596a39ac991ebde0441fa98d22629c1ffce
-EBUILD kapman-19.04.3.ebuild 699 BLAKE2B 2719ce195edd47940ad4e805062daec3d1bd86bce86250f15e820d707c9abbc16d7463f5bfa720dfa5eb6422c06e803ff56d63f080508dfa5acdc1bb26247717 SHA512 c02a396c07b7f0be942a887b0d7af062c6a63ea8e269c54acbef56ccf5c5cd8448ee9295298a5c76f8c94338945b4b29eafd6c8e8bd875bf28cb7f1fefad1ce5
-EBUILD kapman-19.08.3.ebuild 870 BLAKE2B 7f77a2a2843da0a753e2a4381bddb9c6c920f2558ec25fed75d129df1b9fb27d3070ff14b4bea4615dcbf5e24c053245ff7199324e2dbe101a6a97b2a477b2b4 SHA512 2e0683e4db0c1c036de36723fe2bccf257e9230b8b6b76101f2e1966cca5fd17beab38d6d125954d3fbfa43aa275498d3f703fda51e83646292c98c80329f42e
+DIST kapman-19.12.0.tar.xz 2526380 BLAKE2B 27b050fae403288994d75d720ada78fa001ca1d078815820a55da907e6c370e53c6f61e59d7b64eba3512f8575e5b01d578ec4e8c82c430d3cdf635659243cfe SHA512 b1e8f4ab2466f44b8abb2d74a78e5bdafb6ab6371c7ea731acc839d6ee134c6ed175cc4090f77fdcb384f48c578fec7c290061872189aa856dbe7c833486bef2
+EBUILD kapman-19.08.3.ebuild 867 BLAKE2B 9748df6515e6f3e1b9cc726e416e3559b1ba1089f48a96e720b1310eb1b7ae83bf955d0832cdf2411926fbcc4cc992833aba530e91aab26f156835c4937bb29e SHA512 3895fc66818c75a786f906e382a89317a6da69e882a628b162a36d5afc32b53bbf05d801a5b273de97856619f93398bfe586989863ade48750b26ccf9265e0e2
+EBUILD kapman-19.12.0.ebuild 878 BLAKE2B 1ecb0a2996e1f7a02828930a0a457340a49c179754867f23c87fba93d1e7a08376ad41eeb743f133e1770a6484168bfe7d289113824256d624e76a0e7aabd187 SHA512 8b3cdce34b26d9e4692ad95a64d867c6be83c3bfffad89818383c5c08b004d5e9c4af8798cde77ade85e79da1b54ab69e6d215e6626a92ca18913e0cf0eea501
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-19.04.3.ebuild b/kde-apps/kapman/kapman-19.04.3.ebuild
deleted file mode 100644
index ed6d7a81e6a0..000000000000
--- a/kde-apps/kapman/kapman-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Pac-Man clone by KDE"
-HOMEPAGE="https://kde.org/applications/games/kapman/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapman/kapman-19.08.3.ebuild b/kde-apps/kapman/kapman-19.08.3.ebuild
index 77e4778e56dd..984ff8e5a215 100644
--- a/kde-apps/kapman/kapman-19.08.3.ebuild
+++ b/kde-apps/kapman/kapman-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Pac-Man clone by KDE"
 HOMEPAGE="https://kde.org/applications/games/kapman/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapman/kapman-19.12.0.ebuild b/kde-apps/kapman/kapman-19.12.0.ebuild
new file mode 100644
index 000000000000..4808d9126421
--- /dev/null
+++ b/kde-apps/kapman/kapman-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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.63.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 19a819db9a4c..b75d5518a481 100644
--- a/kde-apps/kapptemplate/Manifest
+++ b/kde-apps/kapptemplate/Manifest
@@ -1,5 +1,5 @@
-DIST kapptemplate-19.04.3.tar.xz 317360 BLAKE2B 2503e8c93c23de4876aa836af05840447cea73d501c9d00391841b1f04ea6944083ee5c610777911e054579142557c3ce1f9e22a60bcc034b86971f1b544447c SHA512 d19f6c406ab68cbf1c98dd451e96f21b5d5167908c06613b8adea977127d916fc00da0de5644f0f5342f589d9caf847ee00d7c13d3865c3a4f1b516adf87aac2
 DIST kapptemplate-19.08.3.tar.xz 316724 BLAKE2B eaa289f012bc81e4553adf0b424900122287dec681e188da7c97583a8854741f854341ee94b5ac742a360643adc74c627f28a7d51f9e237d656a3f27f9f301d9 SHA512 215b0144c4a6d2743b9f4cb387f9f7eb75de420949a3e835da992cd7e6d241bea54b225932371741bd4cfcc288b9a2bc89dceee66b47fac84cbc7290e5459baf
-EBUILD kapptemplate-19.04.3.ebuild 713 BLAKE2B 45bb3273769b87b842b99a5ebbdedcd17bd2a4038772a47df74e4824ca464555933f98588d65e628224b3f2ba0966cc387c9b0c0ae99ceb16e514dcbbcfdc429 SHA512 4a67bd7292c46290dcf14cb01571461554fcdc1ff4463765331e009b1118bf6447228a7c3f155dac5365ee6cc73ea71ece464a2369cffbdb5ef1c9eb4b984c90
-EBUILD kapptemplate-19.08.3.ebuild 848 BLAKE2B 716c24c5fd4e114a23389f7cef46f9030b8e066dc9a6c3f5606e7ab6ee980cb501c12628510c00d044992c2b897d633ff4771075ba5785c80818961589ed73d4 SHA512 38cdbd8a74b6f65bbb9305e63036418446ce7ee8a9c7ebaf489cedec77064753d40468b8066e87ebecc95c589fd465a8633e1773c823576240b0ca2f58177baa
+DIST kapptemplate-19.12.0.tar.xz 316660 BLAKE2B 53d1dffbd56934c1d1a86c83f509c4cdd028e88715edd32100e1c99d6b6a5f0e6ad03e521416d035280f40b129e520a974b6a68940e93584a0452a1947196ad7 SHA512 f6427797f12db97b4ccd16268b71d11ab0f7a3e93a1faf5ae3e74e21208e25daa579de0d41f066766b6fc2c0e88b1925923a69bbf3349385c6148b4a55e35dd9
+EBUILD kapptemplate-19.08.3.ebuild 845 BLAKE2B 62bc84ee5e536937a94d7a802489e8af702d376635beade33287017a9cf88ecf122f31359842a128b72590b2862f1c65e3be04f37ceb5ffa90393783e1295e25 SHA512 0028da2b8ec0a3d3ff2f28beaae837ffb415111f4ae03c56fee13854e6167c98bec05e4d940a2d392d54a2656a2891688565d504efad600efdc7d39ba9073d9f
+EBUILD kapptemplate-19.12.0.ebuild 857 BLAKE2B bf4e9dbfa2f477ed717142c607673980bdc8fddcb29fc7b748fc8a7349b8e259a6a0d830daf010a7450af6f3d8af01c394e7fa22d1ef36fbbb9ae2caba07cf6c SHA512 2bfafad4fcce0c4f6e82835d6fba5e2287ee2570a855e42e7538b35e8545e1458e4bc4f650a0d67f5c0fe2dfb1601718af327aa1b4e8391cd5197338688887ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-19.04.3.ebuild b/kde-apps/kapptemplate/kapptemplate-19.04.3.ebuild
deleted file mode 100644
index 028896d364e7..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-19.04.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Shell script to create the necessary framework to develop KDE applications"
-HOMEPAGE="https://kde.org/applications/development/kapptemplate"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kapptemplate/kapptemplate-19.08.3.ebuild b/kde-apps/kapptemplate/kapptemplate-19.08.3.ebuild
index b0edd2a0e615..87ec3e087599 100644
--- a/kde-apps/kapptemplate/kapptemplate-19.08.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Shell script to create the necessary framework to develop KDE appli
 HOMEPAGE="https://kde.org/applications/development/kapptemplate"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-19.12.0.ebuild b/kde-apps/kapptemplate/kapptemplate-19.12.0.ebuild
new file mode 100644
index 000000000000..ef0eb65cc219
--- /dev/null
+++ b/kde-apps/kapptemplate/kapptemplate-19.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.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 18174f309af6..b507edf745ef 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,5 @@
-AUX kate-19.04.3-qt-5.12.4-missing-header.patch 516 BLAKE2B c28523203705b0e1536a992506bffbbfe2ed9381410a986a578676a6e9185c2655708c1e3621bb356f5946c903424b8ce913df5e4b73c653fdd632e5f98eaecd SHA512 b2d248a973fb1470ec63b7b2da8da82998d374c817e67a5bcb70ff00b7d4eb1567a4c126dfa4709d1d116bc911fc29d714b6dff6b6d46e69a73040203e39b17f
-DIST kate-19.04.3.tar.xz 5790932 BLAKE2B a6eb6b73a671cff1c5ba7b4f46e790fbfbabbc7d97322983fa524ddbd8b0d12f528275b9d90210c66332081edea3c10968933f151894a3048d9a815d28c3f82b SHA512 57ea4a527307dd45818b7e3f1b59ac346f5e82090b01fb010d4e3e31d00eda9c1b8e554ab203c3320fa073fbd65e775e27375f254f05f2dee512a32ef09bc218
 DIST kate-19.08.3.tar.xz 5844532 BLAKE2B 34aaceab92783a869de616be9290887f75eba5ef6198e93d90a71d62b441a907a7893916c72ac85c46d6156330322d5297c60c8c9b43cbcd615c05b51cdd0000 SHA512 0a0b33858bd4856bdf29d354603d33541b2c0aab134025db3014aa31cf3231fa2bcc244252872c0b51c28b7cd715556966d9049ce85a8ad614e1f552479c1bc8
-EBUILD kate-19.04.3.ebuild 2207 BLAKE2B 85e88a4f1bf8dbbe5ee8f8d7022c11717adf606ca1823cf6484727cec6a6849336aeeb2959652837301f27daef00a00baef2fce8f4c0063cb893379b40c4ad73 SHA512 d77b0801ae672d44d563efe4be19338ceb924214049875361a92e336e43eedf79a2aec64d272e7eab0fe493c565c5d76fe71b0901761b3db84a9ab5ca0cd6f36
-EBUILD kate-19.08.3.ebuild 2572 BLAKE2B 96654bd2480fd4a44227561b71fff162bf351a62848aa8a6c058caf7227e8ea18ae5844caadf825ef0cdfccc972ac4653ed33595304b6b50b6a400f7559108c6 SHA512 746844e5753f530bd27556a2125d9b2738000723086724b207b567456142eade759e0ad48f79802d2a00a79ddac39600d5a2c91df82969da5deb07fda4a9e15b
-MISC metadata.xml 438 BLAKE2B 73e26b12116384010c313f77322143b111d10f1f90b8c4762edbf4e12de9d864b626de3c60781f00c098053ce4a71243c034352cd3178c5c77be78a0c5e2bf88 SHA512 a6e3518490973483bbf1a04394601c0d0b68a0869f3026f2aa96e31e74356effeeb53f0eb1d29ea914a614a52807ad04cdf6ba28ce4bc35553af4b6dee4f30c2
+DIST kate-19.12.0.tar.xz 5695096 BLAKE2B 8b783c86879ccf49d8d028b02eb5ff89e85ff061605e1fd46e0d5952611455a1832a20fba2158eff61617617f95207a158a6e36975602fb4ff0dcd7147928f8a SHA512 37106b3db09c302d69922cb81a425b2a74bc7bac8cc7d767d6efa59d60b5e80b4f1d2e20dc1e87a2cc57b534fdaefd58b40ce463894f58b56d8ec9a229487db8
+EBUILD kate-19.08.3.ebuild 2569 BLAKE2B 6c7ac0169c419424009524ccea13b952fc07519c76b7b61771f079e9fcc2d71bf977d00c96c1f4c181f84cb548d2d5b13ea732f8e689f0c2ab47c137f0777a9c SHA512 50b7abc71b9a693df6c9a9c9455070779a66bf974aa2df794f67ccc9c1de9a48d18ade9eb647f9c11392dd94894c7c9f347cf1ab5c6afc864c3c19f43b183ad4
+EBUILD kate-19.12.0.ebuild 2903 BLAKE2B fb06f0e5344721b12f8b789921e2322862af70756c1596f047b16dc06329531fa184080d7380c89559545789a1ed48c685083c590eaf9f573f012c430b190576 SHA512 cda9f88c4f77bf52cef3d1a654fe85b91a90c62a5d58aa9b7c53293ed5beb2f790710087ccc7c3cd8e42a8e4057e8d9442f48bbc3f51e0a9bde35a2671fc6518
+MISC metadata.xml 928 BLAKE2B 82f8586f3a4473f33f28880a33c6e5949b38f72186838923066dc9c109d6c58101912e4ef9b374e9b6ddec962635e421e0385ac8a6c07e4dc2785006073849f6 SHA512 69c8bcd624acd1cf9260abf1408351450caaff184275126a0a988848e565fbd81602f6b61b858a0f36fe6bba4e96d7af1911600bfe4d9c0cbf32263aab530df8
diff --git a/kde-apps/kate/files/kate-19.04.3-qt-5.12.4-missing-header.patch b/kde-apps/kate/files/kate-19.04.3-qt-5.12.4-missing-header.patch
deleted file mode 100644
index 3fd4147bd0f6..000000000000
--- a/kde-apps/kate/files/kate-19.04.3-qt-5.12.4-missing-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From fce700be7740704929c8bd64549ddf80774e4bda Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Thu, 18 Jul 2019 22:10:05 +0200
-Subject: add missing header
-
----
- kate/katemdi.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kate/katemdi.cpp b/kate/katemdi.cpp
-index 495d1a5..8173ebe 100644
---- a/kate/katemdi.cpp
-+++ b/kate/katemdi.cpp
-@@ -43,6 +43,7 @@
- #include <QSizePolicy>
- #include <QStyle>
- #include <QDomDocument>
-+#include <QVBoxLayout>
- 
- namespace KateMDI
- {
--- 
-cgit v1.1
diff --git a/kde-apps/kate/kate-19.04.3.ebuild b/kde-apps/kate/kate-19.04.3.ebuild
deleted file mode 100644
index b47fc1d5b383..000000000000
--- a/kde-apps/kate/kate-19.04.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Kate is an advanced text editor"
-HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+addons"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	addons? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kwallet)
-		$(add_frameworks_dep plasma)
-		$(add_frameworks_dep threadweaver)
-		$(add_qt_dep qtsql)
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/ktexteditorpreviewplugin
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.12.4-missing-header.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-	# test hangs
-	sed -e "/session_manager_test/d" -i kate/autotests/CMakeLists.txt || die
-	# 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=(
-		-DBUILD_addons=$(usex addons)
-		-DBUILD_kwrite=FALSE
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && use addons; 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/kate/kate-19.08.3.ebuild b/kde-apps/kate/kate-19.08.3.ebuild
index 35b405cb6c81..50f033411a0a 100644
--- a/kde-apps/kate/kate-19.08.3.ebuild
+++ b/kde-apps/kate/kate-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Multi-document editor with network transparency, Plasma integration
 HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="activities +addons"
 
 DEPEND="
diff --git a/kde-apps/kate/kate-19.12.0.ebuild b/kde-apps/kate/kate-19.12.0.ebuild
new file mode 100644
index 000000000000..568126824f0e
--- /dev/null
+++ b/kde-apps/kate/kate-19.12.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.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 ~x86"
+IUSE="activities +filebrowser lspclient +projects plasma +snippets sql"
+
+DEPEND="
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}: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? (
+		>=kde-frameworks/kwallet-${KFMIN}:5
+		>=dev-qt/qtsql-${QTMIN}: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
+	)
+
+	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/kate/metadata.xml b/kde-apps/kate/metadata.xml
index cc30415dbac5..0a6b46015bed 100644
--- a/kde-apps/kate/metadata.xml
+++ b/kde-apps/kate/metadata.xml
@@ -8,5 +8,11 @@
 	<use>
 		<flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag>
 		<flag name="addons">Build and install additional plugins</flag>
+		<flag name="filebrowser">Enable File System browser tool view</flag>
+		<flag name="lspclient">Enable LSP (Language Server Protocol) client plugin</flag>
+		<flag name="plasma">Enable Session Applet addon for KDE Plasma</flag>
+		<flag name="projects">Enable Project plugin for executing queries on SQL DBs</flag>
+		<flag name="snippets">Enable Snippets Tool View plugin to manage or download code snippets</flag>
+		<flag name="sql">Enable SQL plugin for executing queries on SQL DBs</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/katomic/Manifest b/kde-apps/katomic/Manifest
index 6bbbbc965fae..d686f63a75a7 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,7 +1,7 @@
 AUX katomic-19.08.3-qt-5.14-1.patch 1864 BLAKE2B 5ba599090cb8e63a3831f9529ebf556504413b3b9c7a095667c03cdc3d1e105cc87fa42d0a1a4ad69da58c7f315de18d20577c709b65ab633e6dce94fa874130 SHA512 518bb34a1707faf57f5919d05e738e26eecec1f8e74a633c2f966f2320c250b158ad0bd7c270677cd59abe3b5c43fd60e60eea6b9811cb66d3c12fff28b01306
 AUX katomic-19.08.3-qt-5.14-2.patch 983 BLAKE2B ee718aa69afab72ce2f70aa9155edbce5f77224f8d995daa5ea47ac26d24c7ac81fc68ee6e921998a7fb3a1fce793b79247fb5512d4d0e8abb7a285c1eba3a0a SHA512 288ef44bb2d8da8f412239f9ef996de2b00e35e12afa93830be7796249d2e8efe85802c25eed610f044ff8f409734bcc5b4c9d40b1b35429c03a5645ee5975bb
-DIST katomic-19.04.3.tar.xz 1422248 BLAKE2B afdda00fcb810e4c45ee855e5b1c7731f0f506fc2c9f81563799e21cd7f26678508655f3afc6075f0a3a39137399902bf79133bac6e7cd829754e3128b642ade SHA512 7a65cca9f49004d594b58aa911d46dd8e749da30e1f014804e89d62e95f669584c21064cb902cc1a6e7511c70467216b51f5142fc7f4dcafadb935d2c663e48d
 DIST katomic-19.08.3.tar.xz 1423744 BLAKE2B 89c4a6c7a53a086d9da899d65ee552a12c86c663261f27239fe8efe64117342bc5667db6564a573954d86c26b7c6106c6a8b426083d6fcc74250d9fa63eda6dc SHA512 cbf777134dd7e6a8fe1684643943ac665c5a87e2e57d6633e61e6fee0528da2eb9b874506e6b4d8f4d83024f0d62c187296bae9a496f4f9bc3b1ad293baf8671
-EBUILD katomic-19.04.3.ebuild 737 BLAKE2B c5291f36dd283f966aca18347576117a335b1c93ea603b0a88a9b25483ae3972b92b270670f9bb58973b9988119dfdf2a70150b17d264fc72425cbd6b65672e1 SHA512 815bf9103ab2b6d34cdc2e7c96d15f49877466d239155b31b00e4c798e019e1a1f10f9b30be2b5c343c350f52223d7f48f7dbdc985b70412421c7813d0e3cc66
-EBUILD katomic-19.08.3.ebuild 948 BLAKE2B a560ff56ca273715db613e0c16ee500157187704f3c9d08dff7fc407b4f5b537c58ce503510cb1df0cfd61e5fefc0c109215659d25d58c35ab523e851c67e8ed SHA512 6a2a8045c050ca10f2bbc00924da2f63f5326f77467ab055e89da472390dc0813e4d9bc2ed06f398b45edfb221f867f587d69348d09c972ecda87362a0daa6f6
+DIST katomic-19.12.0.tar.xz 1423304 BLAKE2B f4b1b8fdf64d466f102460fe1cff737e27a9b4c685487090da6da809a72404b75fb54ecafb097c56e986ceeaebbdc612e36c3c3fea19caf3c199a7348073766d SHA512 acc172a0d90fb35b1b062e72fb93b0a5eb3141aed01a5fe0f37e033cd999a30c44409fd8a6790a177dfd07a40b619fcc4fcae66394c7fc8c84b68343cdbb78f4
+EBUILD katomic-19.08.3.ebuild 945 BLAKE2B 5372dec4f1c5a114db20af2c57199b5df0a0b2bd146138cd368afa7bb98c758c02bb72acff2df441894c26c2d9aec00e938e49caca130e3f6cea29f870d396c8 SHA512 cac8c1197629fbe115232efdbaea696eca3344cc2fe0b18a06e6ab87e63a284104fc03f0da5097122115d6ef3cab2b7944d8e16d7270af61cf78cf20d87c168b
+EBUILD katomic-19.12.0.ebuild 900 BLAKE2B 9217871f5de398b0bbb13a2d58c165001d6b63fbfb42af78869660c7a7ef098cf983fefccdb3e9277a5b9c0ddade74c2976c0076ab565f4c3e3a892bf2b9e678 SHA512 8e3c95a3cb0379e4868e333d265f20f08b3fe5dbf83d5137f3c60867b152518b91f440ff51fb66acc2bd3cab6d8ea8040808a3ee8815e703c719521378fd230a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/katomic-19.04.3.ebuild b/kde-apps/katomic/katomic-19.04.3.ebuild
deleted file mode 100644
index 10e9f24e4cec..000000000000
--- a/kde-apps/katomic/katomic-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Atomic Entertainment Game"
-HOMEPAGE="
-	https://kde.org/applications/games/katomic/
-	https://games.kde.org/game.php?game=katomic
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/katomic/katomic-19.08.3.ebuild b/kde-apps/katomic/katomic-19.08.3.ebuild
index 1038eacef7a2..e00914a2bb0a 100644
--- a/kde-apps/katomic/katomic-19.08.3.ebuild
+++ b/kde-apps/katomic/katomic-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/katomic/katomic-19.12.0.ebuild b/kde-apps/katomic/katomic-19.12.0.ebuild
new file mode 100644
index 000000000000..e52bf04fbff9
--- /dev/null
+++ b/kde-apps/katomic/katomic-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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.63.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 68272f03e0e3..16fc95b70e52 100644
--- a/kde-apps/kbackup/Manifest
+++ b/kde-apps/kbackup/Manifest
@@ -1,5 +1,5 @@
-DIST kbackup-19.04.3.tar.xz 357424 BLAKE2B bcd0c082d90d08dcde7c27b95458001d1701b9657227cc4feb03b4beceb6baa3f59d9f872cd5f4ffe822dc67af33b072b40fd690efe2a0f721261ec21d21fc05 SHA512 46134dc3028fb0c81f906ed111155e2e141793c63fe4215cca9f04dc0edc740d4a05ed28d99f26c973ca9a2caf8cae19b99244368f8728416a9eb65240c607d4
 DIST kbackup-19.08.3.tar.xz 358156 BLAKE2B eb3a50f201c4b2e92e33b395af80d1368444761a725352fe6535416de53b254532519b97287ebed76fc4ee6075100a1a17df593714d94a56e5fee222099f3230 SHA512 5bef8202d9f0205c39b14f5ffaf99b7e6694afe0188dec3716ac4eb8c50c7f1acad2912b29d113603915ea6e74695c4fffa20ce7b05e81ff8ec5757c6d0435bd
-EBUILD kbackup-19.04.3.ebuild 755 BLAKE2B 269fdab822bef3de65719e440d93c7a0350a10142f15e7c18e8e48563bdefcd3dde3455b4bf1bcd4325967b86eaf74f6a71fa99f2a2535f017c26a62ef952551 SHA512 eddb8fbc36c9d5db21467e04d772d060735409ebc4bdae27348a2f2fd153277e6f436412af5a85d8492030d9f3b7afe4d64f6094ae69f25cfa37f3d857e5b510
-EBUILD kbackup-19.08.3.ebuild 884 BLAKE2B f812198ec9fcc8addd9f12549d3de2ac3236363da3a9c896299aadefd8b41251f9b437a5355b638dc526ec2709701aa2260d49f62006d3f0cdd52f77d66983b7 SHA512 1ff61021c68e06b3928823678a2f33cf6812bff77d9aa001c7dc4ff278d32ec4c2b86cc9a33d933282f3c41d9a163655580d5ee87b5cb2ecfe7bc92c4135d708
+DIST kbackup-19.12.0.tar.xz 358300 BLAKE2B 3f37b8abd09069fb55315612b9f996bf72a7ee0178e0a345138dbbed90b9ca16e62a117b5d88041ff3c70b32290c09309035d7bb4aeefe649fd69d0927569654 SHA512 76ad11fd2d3d85e4a71fd8abb6cc24a00fc912da5f9f4b2156ae9bdeceb2428a30551b29b6233cf818591e438c6e30dc9d8bdc7f41b60d95ff377ad32d005fdd
+EBUILD kbackup-19.08.3.ebuild 881 BLAKE2B d6e6dfa293ab90fa9b2c7337624a203b306448a5193d65558b5ce48919d95d6e6d42a9612bacca46cdb9a2f0b636832289478037aecefcae279d359a07cbdfba SHA512 a7a300c2cc7502c2eef4f64fa295f457495e9ceb6d0cc4a65d61fb5511c13a4477d3492b44e0901e0ab7fdbc8ec900000c97a259ef2e280269bda1d4943831ff
+EBUILD kbackup-19.12.0.ebuild 951 BLAKE2B 27d538be2f26b45ee536c3f5c0020638d18df359019ed9a0564456dd0f4a56f0b70be593d042965b283ad034e27abd62e9929ec4f922c4d5e202a529ae12b44c SHA512 c31ee3f8bbcf3b4cce6384ac4ebe79c5ec7a311ce60ad3595c505b6d3579feb3e3655c83f231be6b1ad7a98fa2d760cae8c6104a5725af5d84393c6bdd761f50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-19.04.3.ebuild b/kde-apps/kbackup/kbackup-19.04.3.ebuild
deleted file mode 100644
index 7156a0bd5508..000000000000
--- a/kde-apps/kbackup/kbackup-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Program that lets you back up any directories or files"
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbackup/kbackup-19.08.3.ebuild b/kde-apps/kbackup/kbackup-19.08.3.ebuild
index 0f63cef5852e..543e72d1f6bd 100644
--- a/kde-apps/kbackup/kbackup-19.08.3.ebuild
+++ b/kde-apps/kbackup/kbackup-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Program that lets you back up any directories or files"
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbackup/kbackup-19.12.0.ebuild b/kde-apps/kbackup/kbackup-19.12.0.ebuild
new file mode 100644
index 000000000000..c6365e304a56
--- /dev/null
+++ b/kde-apps/kbackup/kbackup-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 105dfea91ba5..333127ed0d47 100644
--- a/kde-apps/kblackbox/Manifest
+++ b/kde-apps/kblackbox/Manifest
@@ -1,5 +1,5 @@
-DIST kblackbox-19.04.3.tar.xz 443180 BLAKE2B b0b57cbcedd8a8f734ac017a0ac45753c993f8ea6101266fe75e2dc1900c0c69c5564b28b58b3a1b061de8b3685c239c3df56330635ea289f00c093f0a8c271f SHA512 dd9d30ef96bba4e586dada72351f306cd601ccafc9f94ad75dcc334733fc8059a8b78abac3b022fb23b6910d859ccbf38b81fb1e8a9d1f23b68f25021efeecda
 DIST kblackbox-19.08.3.tar.xz 446396 BLAKE2B 3715f7d5eb98058f2aa220637d0ebde9ef8a493133f689de76a88bb3acbe0905c0d86fbcde2239681096816c5c9ed24825eb8e7d8ccea5131213c3c3f854b757 SHA512 c584fb8a51bf63d6611616f7a3e9b839859a6bb825af77fe5243baa335d78d544581404a03802cb894c6eaa297fcf4492f5c49a7accf971aff63af55aa206851
-EBUILD kblackbox-19.04.3.ebuild 767 BLAKE2B fbc00f0cf99c17885995e01816e414e221d4ee3bece121f76db77e6b0bfbb9d9ba997bc557cdf67cab6da4e68ae641282317b7ebbe6d8b1be3ce449948e2305e SHA512 6e5eb36b7412e7a673d2416af5a1958bcae58bfa34d5476393c052308f19bbfa01580ae419371fe07892b4b3a1f054cda44594f1df5449ddaca0895908eaf943
-EBUILD kblackbox-19.08.3.ebuild 950 BLAKE2B 4a748b4cf04b59251f4299931e3aaa7a46c021a1114beb6bf0932efddbc7c27411e3a66cceae40d1dc51b7bc7f1d3c08f36deead666a6e584b517005142fad72 SHA512 edd3009710f3c35d3c397ff0517218c38b9139f8f856614ea0c3a8d517d7b3686942433f265fc694a1988e3b432a063bee4b5349facef5a8d862bffff7f73afc
+DIST kblackbox-19.12.0.tar.xz 447576 BLAKE2B 748190e6cc50c8642163f67e429600a85a36f497dc88be1a1ede2b7558310953dfc1a071a66144c477b01f6a7aece650010e2743cc0aff0f31d565dcb9456a5a SHA512 9025609e0f491a86a46676d7f7a2b6ff182de186851a4d49c641c069e9832e3da1bc37c2ba38873732f41b553e41216e447760eb679730d8caf28a37bfb83781
+EBUILD kblackbox-19.08.3.ebuild 947 BLAKE2B 6d7e340bb119d444ffc019dbaebe0c0f80373d4be0df5341ab642b86b167127ea4ca04b7581eb2b7bf70011c5663a272632ad43a86d888607c67c4c68dce507d SHA512 7f1ce2eafaac197dbca7f632b31eb05a3ba35bb7d0e858d4801b829b0b33cbb14a7690dcfa37d999e1b052db1f52b1425b2e319b13bbed7a0f862741b237171b
+EBUILD kblackbox-19.12.0.ebuild 1015 BLAKE2B 4a5c8a6e8a326cc872d6a0c72064d11e3061cc5a3b4e018a8c1591cff35df3244bb8e9e79551ae23e8f7afe35df2239c359332eb86a255b6a73ceb8ad1d8aada SHA512 6930176cd97175e33fee49d74adeba229812b84c3f1a528ee7f1b4edbb192f9835c25c8b23f4d70550629762fca2ff86ec4f20b363b5ffa7ccaed9e71f96fc61
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-19.04.3.ebuild b/kde-apps/kblackbox/kblackbox-19.04.3.ebuild
deleted file mode 100644
index f72862f0d0ac..000000000000
--- a/kde-apps/kblackbox/kblackbox-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Game of hide and seek played on a grid of boxes"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblackbox/kblackbox-19.08.3.ebuild b/kde-apps/kblackbox/kblackbox-19.08.3.ebuild
index 169c47b04762..ec67acedb423 100644
--- a/kde-apps/kblackbox/kblackbox-19.08.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Game of hide and seek played on a grid of boxes"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblackbox/kblackbox-19.12.0.ebuild b/kde-apps/kblackbox/kblackbox-19.12.0.ebuild
new file mode 100644
index 000000000000..f6f3477c72b1
--- /dev/null
+++ b/kde-apps/kblackbox/kblackbox-19.12.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 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.63.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 3f18924d9d52..0125ba7655c7 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,6 +1,6 @@
 AUX kblocks-19.08.3-qt-5.14.patch 843 BLAKE2B 896d0f7007d2bcfa8879ab7cabe359ad84c19a9b4f8d7e2e8409d7f4b21f8dffbdaa88585e88278d54ba3922d6dfc291686f81e350468bed5301c08b11316c25 SHA512 16486f935b3a9118194885c3ad8e78582078c8f19adedb1838625b8cfc20d21fbaa86a64b4ed94c873a8f56b8ffafd7588cd5cda470b58016943561f87c13015
-DIST kblocks-19.04.3.tar.xz 1920560 BLAKE2B edf6f563d8a2057d713d420375ec0bb981f13dae196e04f7d03ec2fffa740833d904eef234a3be667da06bbd959532e007902cc3e41dbd21ba611d4a86387275 SHA512 6b8e904cb9ad0b4ef30e3272f8c9d75f34e6377130a31adfd384f43b7a651994a375a4fd7db9d7159025edd45fbc705c181056cebff287d68877269840a6b180
 DIST kblocks-19.08.3.tar.xz 1906952 BLAKE2B 2a6a5c2e774aa371a8c69202fc14bec96da8cf1fb4fd03cf2d295656eb0f05c9d8958e467b1063a91714d6c60a3e9133b94286171c5b177ed09a1c2116c41997 SHA512 e7ea3a5bf2f9b2220db2c6df0df7bf9736cd7a3be10dfbe6cb8189f14f3c21ebe8652568d342611e1d6f2754acc1e6ef3593a33acb7655d9836bfc7240a63a53
-EBUILD kblocks-19.04.3.ebuild 683 BLAKE2B c4f9270dd638dc39f2fbe6692fb0a84e18864cbd6693b438c34933ddb2aa17a3699dbe584ea353de1b1026fa68edc3756fc06784e77948ba46304cf39ccfdbd6 SHA512 fb8c730be0c2849d0978606fe5bb20e266841ade6be6c5e662d9257b0fb6b61b05194e5648ff7d85f289c688118423a248352653b8ab34ac4d901821ca5d9586
-EBUILD kblocks-19.08.3.ebuild 894 BLAKE2B cca3d4871ab128402383fc4204cfa104c54952deba06bc9af661ae00470467f784fdbaf87dad3a5dc2e1cc281aba0ff0db9a1ab7687d14837d85a2e2bfa674a8 SHA512 ef5fc232fc4a562c50b63e0e1a62aa3731db2f373eda43038e218c7de4453ef66d254708267e9662a190e9dd46324dfbf5bc2d759364655899b584765e31d9fd
+DIST kblocks-19.12.0.tar.xz 1907700 BLAKE2B bad0560a0182e8f2af87e8cdabe527a9996a9332bf449d2f49b3f1e6cb404e8aefdb59c648e9812a8c8f17eea42ced21960822129c53e86ca471824c9fa3f902 SHA512 e766be37e08751946b962a493a027eac1c30c8287095e253f1d687586176eeab17b5bc15dbf104c92ba46ceeb19244c109480ebc5bcbf7fa88d5b233586451d2
+EBUILD kblocks-19.08.3.ebuild 891 BLAKE2B 9ffa895d8a1c0390ec25153dc28e8f39dc38b64afc771146dfb729c219f05597aa3fe741fcf7dd9769e5dbb0bc25cd0e5fd36e443ba6178df460d4b4b9009369 SHA512 2e52cc568c8f71c1f7399eb1fa20960cb4a1346c8e7ed4ba861bdfa6ce2f58f02d61cadf0f980786ff66468775485169581cdcc7688a6d4382ab965c41599a1c
+EBUILD kblocks-19.12.0.ebuild 856 BLAKE2B e855f624ca40ab1a91f4857721dd1cdc011d021aa06aad776079244fdbf1539b9752cebd4422417f04d51a9696568a31df2a3c1e2190102c8c3ea845a42fed19 SHA512 da47200124cb8bb1f2cbf9a4e327a5fc45b45de522e7f5b8a04b334686fe081a6d792080f1ab8351023dc54d728832b31b4765b99fed476c13e1e2f8971d3f5c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/kblocks-19.04.3.ebuild b/kde-apps/kblocks/kblocks-19.04.3.ebuild
deleted file mode 100644
index 803ff7502a3a..000000000000
--- a/kde-apps/kblocks/kblocks-19.04.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Single-player Tetris-like KDE game"
-HOMEPAGE="https://kde.org/applications/games/kblocks/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kblocks/kblocks-19.08.3.ebuild b/kde-apps/kblocks/kblocks-19.08.3.ebuild
index 495a2a812802..9c2b106d0b3c 100644
--- a/kde-apps/kblocks/kblocks-19.08.3.ebuild
+++ b/kde-apps/kblocks/kblocks-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Single-player Tetris-like KDE game"
 HOMEPAGE="https://kde.org/applications/games/kblocks/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/kblocks-19.12.0.ebuild b/kde-apps/kblocks/kblocks-19.12.0.ebuild
new file mode 100644
index 000000000000..1144b7461715
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-19.12.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 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.63.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 40c679c045a8..4b961c7a5655 100644
--- a/kde-apps/kblog/Manifest
+++ b/kde-apps/kblog/Manifest
@@ -1,5 +1,5 @@
-DIST kblog-19.04.3.tar.xz 72608 BLAKE2B a9260597a282fd710529419ab7f17077ef7350735128b2ed54f8a3b13d1a08750d310109956277d531207c81f0096de462bf1536ae428fe321c42e94538d5ae4 SHA512 073896dfaadb15a3819980651009ae998e080a9123859b2859c06f387ac0f3e61a336610269630a79932bff6dd8e7d110917bd344c95a2feb97ff19c26eeb9a1
 DIST kblog-19.08.3.tar.xz 72776 BLAKE2B 36231e32c23633d934159dd27e37dc3b9a58da57acdda0fed1f37a63926d91bdf6241a9f52770bbc9fccb4c628d98129e8dc428bab1cacfcb559ab6f4eb3e8a3 SHA512 48d9ae8d891ee7fd0a9ea225e403bd791fb30d483937d72e219a1fb390350266a3b11704dd13f0e8e23ba7c6d808ae8eef9efe831bca55cd3f75223884e01782
-EBUILD kblog-19.04.3.ebuild 536 BLAKE2B a80e4b5d14f052f87777d0e0d8a302b578e04e00d1dcb86a37448276c8896416e051047e4bda027fd70914bc76937db741a0a748fc0ef625530965bc13f302a7 SHA512 e4508c39ad09e209f2447d7269bc6a018754eeb4552e67bd29673bedb0f5c32312d296cf800993018ef080fcb008a7b4645856a99caa0b1a551315d43d1f4f33
-EBUILD kblog-19.08.3.ebuild 612 BLAKE2B 465b610a8cb759b1e6a49ed3690acf4e932bba3117e724cbc37aaccf8ff23a374ed18fc4a1fa81db3b3ac48254b21abfa067809aca8cf74975d8594a92d472dc SHA512 18b60be1ba6edbb828c4d3b9cb82d0338401874a68debd0dbd369990faca9958f683ecb738acdf6c2b81c7898a902a0f59977ba09982caca57cb17b2a05e5ae0
+DIST kblog-19.12.0.tar.xz 73120 BLAKE2B c236b0c89d2294914e6d97b6f4a1095ae1cf878430d387f3f0590df5c53110722f598d3bab4a79c13699ff2df22058bc273ff879405c0ddca8f08d1c7a1934b7 SHA512 4d1998c10f11a9adbf323c08ce4fa641b27a4e63ed8a12004723c6ffc319ed841376d018b6bd4487ddbb0579b54cbf2111d26a2c0c15a85fecdaa72a05f9a560
+EBUILD kblog-19.08.3.ebuild 609 BLAKE2B c9f1dc6ed726f22a9896cef77a87e16796080609b6b181eb5e7f2d274a756ba44f7e04acd73156a884f99863e3f9aaa53a436f778323f8adf9a0bdf229efc226 SHA512 2d118e38142124f60330c490ce0257674b788df1d8ff99dce509eb322c62df7e3b6fd88d11f8c4a760dabbe92b2150768238ce82edd7cec8e576692061daa6b7
+EBUILD kblog-19.12.0.ebuild 673 BLAKE2B 37a4fde0b17cd8e6beb12d61b180766aca0bf0e32d58b495162577fa05a73481a6d03760179a89fe22076751762699073f00711658d1f1d7e635913b796ff99b SHA512 343f15bff806c286eb0aa00415ad53a38c5a952c4de7cea0fe1b326bc7710127759a04d6fd54504d0f29c2aaa37da0f8a28f11ff9d2349b2f16f21dbf4ae0843
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-19.04.3.ebuild b/kde-apps/kblog/kblog-19.04.3.ebuild
deleted file mode 100644
index bde5d5d25b8f..000000000000
--- a/kde-apps/kblog/kblog-19.04.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep syndication)
-	$(add_kdeapps_dep kcalcore)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kblog/kblog-19.08.3.ebuild b/kde-apps/kblog/kblog-19.08.3.ebuild
index 1dc1d62c10cd..093e5eaa761e 100644
--- a/kde-apps/kblog/kblog-19.08.3.ebuild
+++ b/kde-apps/kblog/kblog-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Library providing client-side support for web application remote blogging APIs"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblog/kblog-19.12.0.ebuild b/kde-apps/kblog/kblog-19.12.0.ebuild
new file mode 100644
index 000000000000..0bb08c0f080a
--- /dev/null
+++ b/kde-apps/kblog/kblog-19.12.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.63.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}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kbounce/Manifest b/kde-apps/kbounce/Manifest
index a79d3d0cd553..09ca56572f72 100644
--- a/kde-apps/kbounce/Manifest
+++ b/kde-apps/kbounce/Manifest
@@ -1,5 +1,5 @@
-DIST kbounce-19.04.3.tar.xz 3465392 BLAKE2B 4edd7cd3c6ae12636bcdf671a2d30940aec8046add09ef37b92f83520d14ab96cc0216ee6dd90774c44dbe502f5666479f76404a18abaa8b04e575b0c008a3b7 SHA512 e92ac3614d0b1802cf6d66d18c92af15874937093b1de58b64e7eca2af935b4d0e19369a2eadb8345a7e5eaa546b6c1557745b89eefe9a7a64619dd0cd6d0d10
 DIST kbounce-19.08.3.tar.xz 3470400 BLAKE2B aaf42d01e6c5b875c05870a963f0f101729bfd371c55a11b97a255b8a9c210be61eef72cfcbf8c4074a3fb790a938f048eaf94f74114eb0e5e66e95b1a1a404d SHA512 ebd077815b35dcdab594acb23190bd4e913c79a9fa1a206008cf4c329f10b347b689fd6250779329e0c17dacfd8d30c81538b0b98515c688733bf2813fbead9f
-EBUILD kbounce-19.04.3.ebuild 816 BLAKE2B 501f03df6ac7b53406937162d456521cdd00086c1598e2f6c44d10e50d02afe00b4ceeb730ad0fffd415c11d58b46d04bfa39f34b0b69e189eb2acf2aafdd476 SHA512 a7f309d574eafe6c884dd1c30eee7c93b09c1247bd68218668bf4bf92b2753faf01750642b6a346394ecdd745e3feb6370269dc1fc3298c63afd30dba30c8288
-EBUILD kbounce-19.08.3.ebuild 993 BLAKE2B c5f81def13cea02e3b680c96627f9e9be0b5ef3c88b086e75f6329d10e350267b412c994412e7648b6231ab7cfd51ba1b50c18e7654a406490a7ed3ec4d10bc3 SHA512 3143bb0936db194c16a2288e74f0fe8bc48613a30ea4161fb1ffaaa3018cc64000abf20955addc7737a01feb4b34fe00b52f482fb778c749e6107d14fe12127c
+DIST kbounce-19.12.0.tar.xz 3468908 BLAKE2B c5a01140047179e87410337a6fe05bb1bfbe6fd1a445da5b284011cbbce8eb827a5a289009ecec759ba34b3cfc9df95d9efba03c5caff5e398ccbe3b9571ba5f SHA512 e0537a1772da61dd6bba258a0700a5c4ac9d9a49442cc79dfccf064df7b6a19aac58f913dbd241043c851b2fe7bbe160b956360f1ff706a270762b55652a8d22
+EBUILD kbounce-19.08.3.ebuild 990 BLAKE2B 9e2485d2bec682282aaa532db8debcae8428959ebfbcc5ce6cb2964eb574fe436ad9fca6f7ab89ce43731a049803c1cb04e5c9983cacb2698ae55336b1bcec4f SHA512 32c928ed6f874247717dfa1b9d037bdfb5266382cf52963d1db2e54d62e990377b9a77a223faf261de3ca10f6de7d3ea30580842e64ccea4feb4bf92beb90f12
+EBUILD kbounce-19.12.0.ebuild 997 BLAKE2B 24f200e6c31aace4e3fd6e5f2c166daffe53bebd3b6e0ca6f9b4ab94225bc73d61ac67385361d393b3b52ad6bc7a306c510ef301eab719f88dc6fc9a9426f603 SHA512 0ac9a7985060ca92e499c354a5b1936efff516b9937b14243832d33724607976cbb4de17732fbac8243e9d3aad7fb0ec17e8a6a67baa1e838cc41f1dc66c8227
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-19.04.3.ebuild b/kde-apps/kbounce/kbounce-19.04.3.ebuild
deleted file mode 100644
index 4bdf3a00e271..000000000000
--- a/kde-apps/kbounce/kbounce-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Bounce Ball Game"
-HOMEPAGE="
-	https://kde.org/applications/games/kbounce/
-	https://games.kde.org/game.php?game=kbounce
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbounce/kbounce-19.08.3.ebuild b/kde-apps/kbounce/kbounce-19.08.3.ebuild
index f49c763a3dbc..447aeb4c2fc4 100644
--- a/kde-apps/kbounce/kbounce-19.08.3.ebuild
+++ b/kde-apps/kbounce/kbounce-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbounce/kbounce-19.12.0.ebuild b/kde-apps/kbounce/kbounce-19.12.0.ebuild
new file mode 100644
index 000000000000..dc7daf59d31b
--- /dev/null
+++ b/kde-apps/kbounce/kbounce-19.12.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 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.63.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 e52c80ec6323..97d65433e19e 100644
--- a/kde-apps/kbreakout/Manifest
+++ b/kde-apps/kbreakout/Manifest
@@ -1,5 +1,5 @@
-DIST kbreakout-19.04.3.tar.xz 2273652 BLAKE2B 1ae66d49480b1a9af00c70a91b92e2243d447c1bf118f63e0c58dcb6b65c4134952253cc6201cc64e52bcda64de441b80007319df237a32fb2dc09df86eccefb SHA512 b48a024afaa7fb70043583cf5842fc7ce56e43e3b6f60515f70d8144b9a168009431b5e6b9391aa4c0cbd40a0c6b3ca9ddcc68d741d0849c854896f125c19c28
 DIST kbreakout-19.08.3.tar.xz 2276292 BLAKE2B 53a0b4545e88dc4e0c0dde7ea2d6b01d3c2979478df84e39f452129325281cc8245d6656de258dde4aa6d4cb451ea7a30a994e318a10dced4867cba1b327271a SHA512 070f02b8d83304c36a22579e54c0f1b2b971e1123c45617312528f2d05a572ea69e2237b4de6b263922852c89bd71c44b5a0434c38585be46b542ae60a2a9cbe
-EBUILD kbreakout-19.04.3.ebuild 765 BLAKE2B e7f30601c6d13d2b8e8a24ed8f970032e5912ec4bcceb540a2fe13f2d228459e93f3d114f3053e5f5fef1de1ead8646ad376690dd866b83a4a7033b2efcf3d3e SHA512 1d0f4780cb7fff5cf1ea9037bba1f8700d692ffc426ecceeb6cc8acc19031340fceee7b073c69e9fb3c4218d4440cb3d54cce24bee3db734d61712b733cd4278
-EBUILD kbreakout-19.08.3.ebuild 936 BLAKE2B 51cad858466af9ee9fb0e69cc8870b2915571de343a4f91ac03dd898c542e6f9e5e12b3d77e3170d8c831488e326dc996c3759297b783a13396fa3564b37246a SHA512 100810dce6aca64460b098a37663ffb5bfeec3f4f4fc7f6d4131fc42b57a6dae92ced0bcf09915c35de18d7df90fe9604effe7c446e05a8b115703c2455f94a7
+DIST kbreakout-19.12.0.tar.xz 2280612 BLAKE2B d52d973a41d9d43035f9f31c5d30098a80c420ee2f19f54c5737fcbbb71b63d119f1a77874c77a5e78fa5ae33589c4705b004b1f74f07e67920cf91ee777117e SHA512 ad0f4b3f23befb0a1bd52cd50e054611d7c39fdf79e9d595f6e26117f80a5800d81249db00d6920eb769d3a000f9da190fccfb0c7e14c7dc12da8706356725ab
+EBUILD kbreakout-19.08.3.ebuild 933 BLAKE2B 064d6401d58d4747944403c1feb936e9c0f326d414badecd7816259f111a824d84899921b2dcdc28a7d92ac550b794e692f6e6b55d5e05c27846612dbf6ec86e SHA512 70ee9a7f777a85adaada18209c1dbe1a839a91b4bea7e9d63a4a2e5fc626b890a56603e668c1783b586647dd1087c95f66921102ad407980526c6b1be6946538
+EBUILD kbreakout-19.12.0.ebuild 940 BLAKE2B 65a9052dc853419adb1ae48e6c0e4b842175d380a0f648e9d9c809374ec7a8333486caa1eb8080479f6d03cddd9851837684f5e51fc0c67e44fd04269a14eaa5 SHA512 9a012044f2921007fa9b0538ae36d512c801d79c9e1a961d4a7b2b41877cfcd6188cabd16e4d7225357b1a610d5996d60dfca1dc627f6e11e66705f7e79bd7fb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-19.04.3.ebuild b/kde-apps/kbreakout/kbreakout-19.04.3.ebuild
deleted file mode 100644
index 769c495831a0..000000000000
--- a/kde-apps/kbreakout/kbreakout-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Breakout-like game by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/kbreakout/
-	https://games.kde.org/game.php?game=kbreakout
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbreakout/kbreakout-19.08.3.ebuild b/kde-apps/kbreakout/kbreakout-19.08.3.ebuild
index 33bfa4f5982f..3b889e61abf5 100644
--- a/kde-apps/kbreakout/kbreakout-19.08.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/kbreakout-19.12.0.ebuild b/kde-apps/kbreakout/kbreakout-19.12.0.ebuild
new file mode 100644
index 000000000000..958beace1dcb
--- /dev/null
+++ b/kde-apps/kbreakout/kbreakout-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 a4283734325f..e4d8c35c2aaa 100644
--- a/kde-apps/kbruch/Manifest
+++ b/kde-apps/kbruch/Manifest
@@ -1,5 +1,5 @@
-DIST kbruch-19.04.3.tar.xz 5600228 BLAKE2B 9bbe20b6680a02583a68ed6be5fd8ecd0a7608b3e636f3c851078bf618cbafe892a79a8b9778cef9b3934102d2627f4c5711964ac87b563ddfd19b4439c7c4e4 SHA512 fecc34e6a829b49396d527d397879d491e746fa261b7d08ce9b2d8f2002278297928ce7070d9139aa919b6bd2630c740c24a2f720430ca24b26c8e9fa19b84c0
 DIST kbruch-19.08.3.tar.xz 5602756 BLAKE2B 8026881012777b39dd2233b8deee0a5789f528213626fd941fd855bb2061c0d8dd1fb3c082ce6b737699f0391d2dad8416972eafadb4fcaa60ebdc34d2f43755 SHA512 21a290bc906bb1a9ad93dc6b21e9fe22433679bd74b0484b2060feac74bc37b3b0880032f9d61fc6555b32676707570af4590727299de4efc8b6fd88a0e8fd80
-EBUILD kbruch-19.04.3.ebuild 630 BLAKE2B 0de91fdb7d5cd2cbeced5f9a8cad1090b116ad268394f00944adf7193447753c15d5b3d20c26d4d9d4871faa2fbb133fba9e88e8df581a91b7a6ea52592e97f9 SHA512 4a0fe6c6997b745de388e762c554776d96952f1484c3ddc30fa910080ce99c75a7c489092cac786eac328e18738fb61a960902aef7ed467e308e5d3f7568c4d5
-EBUILD kbruch-19.08.3.ebuild 753 BLAKE2B c3d200cbc2929a305d9f3653b7a1e506f0214451ae1bfada31f5557ff387332557ab2306ea8470268d4b2392e5ae08854a8b4293fe429ddcd9a9c162314eef48 SHA512 9a5f74139aebfaa922965ef567a0e8c422b0982373fdefb8729207d1b1006db01e86a1eb2de10ea76b35a5feb72c9e323322ff311da6fe1df84433d7bcebc9dd
+DIST kbruch-19.12.0.tar.xz 5605596 BLAKE2B 6a71fbd92cecab725d4fe0985cccebfab8ec08af5daf7847dcbb413d461dfe95b2e05eb41f78755975bc8e6c7ae238ef576206560ab0c1b60a2f785a488a1233 SHA512 e49d479623835477970305222c6f50a584b90ac0e6a7e3e45fff75892e8e0212d5277a788471a3265982e4ce6bb7aeca2e8aae9bcfecafad0a7772c79b1ea281
+EBUILD kbruch-19.08.3.ebuild 750 BLAKE2B e43b02eb8b0301cd5f6963143d9c6de88a6f1bc2dfefb68e20db78002b5b49056be3890ca475404c85ac818fbc9d46fd650da803c09de3925850f3b7de6e5c92 SHA512 6a9b7319437fa951c14fa0c82eb99c9bc81333ef1f850cdca3cf8bde171f4374804a0a27caf3bd9fe2798b3f8793fe50d3c9070effbc5ab641de82f16599191c
+EBUILD kbruch-19.12.0.ebuild 762 BLAKE2B 0003bab9b899ad16f5423e0ae5ba33eb6c3b47ac07316e3064f993f14e7bf23971c905eb63db6556e9e63de66e71f7883c0c6cdd8674bc10ca49850ec75130dd SHA512 18b4a2b4060619f63df8d220fe85d5e43ce5896a8c955fed3bc12d9b49cad201b27dcd8332c4218a18eaae333892fbbfdd9ee6c6597cd6bbec07f03f6d3e0858
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-19.04.3.ebuild b/kde-apps/kbruch/kbruch-19.04.3.ebuild
deleted file mode 100644
index af56a748e5a8..000000000000
--- a/kde-apps/kbruch/kbruch-19.04.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Educational application to learn calculating with fractions"
-HOMEPAGE="https://kde.org/applications/education/kbruch https://edu.kde.org/kbruch/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kbruch/kbruch-19.08.3.ebuild b/kde-apps/kbruch/kbruch-19.08.3.ebuild
index a9a26fcfc165..3c9cddedec1c 100644
--- a/kde-apps/kbruch/kbruch-19.08.3.ebuild
+++ b/kde-apps/kbruch/kbruch-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Educational application to learn calculating with fractions"
 HOMEPAGE="https://kde.org/applications/education/kbruch https://edu.kde.org/kbruch/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/kbruch-19.12.0.ebuild b/kde-apps/kbruch/kbruch-19.12.0.ebuild
new file mode 100644
index 000000000000..d700c677f1b5
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-19.12.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 a3c189bda919..347569901378 100644
--- a/kde-apps/kcachegrind/Manifest
+++ b/kde-apps/kcachegrind/Manifest
@@ -1,5 +1,5 @@
-DIST kcachegrind-19.04.3.tar.xz 813188 BLAKE2B 88dda5cfdc140df9234a117592ad5ff14dde9f20161d7fa8695c221000d7651750a98c1685f3704039bfa365c21af67458d5dbe29fff1b35019b79b31957f8fd SHA512 a49212d7b3667a7da028e48e03813bb985c08ff6e533bc572e884a297780d9107e8c5496433728d2d590b7ba9a8141f6e3a33c6e6443c1c62ba86af1787cfa0c
 DIST kcachegrind-19.08.3.tar.xz 808788 BLAKE2B a53470383c4d9476aae1910775e8add4c8fddfe4e40068747278a43591219a58326f9e9e061eef75f63c886e6b5fd7f6729c4ad6e08de58a8789501aded055eb SHA512 9275e43dd156c661d4aca8d004d75f6822e66c5ed1fe46fb3bc6c30630334ed1ae069c01128d4097fad13e5126f63c0aa56e9bfb5a6f22ac54200f74dfd00f43
-EBUILD kcachegrind-19.04.3.ebuild 851 BLAKE2B c916dabd4f762b6a15f99c3547b5f1c40981d49965fb1f31b230546030adc9a2e96ec8f71829936cddf1ae7b9082e7b5dcdff6ac3a48fc563ce60a08e4b3e232 SHA512 b35e0964fde073490350475894ada30fcea66a95ae5ff08a07a12ab7de321671ef535c0b7a20733270a1532bc989bcaa904b6f03c7bdc58bac906260022a98a1
-EBUILD kcachegrind-19.08.3.ebuild 1010 BLAKE2B be966e5385e316e0bf82852209cb35883db704c17550107951133a648ab36eb9b63984fb86874696f90f9ddf62d2ea0acde0a38b6a3a87451576c8bd589d5c96 SHA512 78fde076ab4205cd161c702391327ec24adc68d76e36329fbdece0dd2117cab7204bcc10f131efd42dbb9f277a7f47af0e6c78d18f8994bd6215d0f4bed1b7e3
+DIST kcachegrind-19.12.0.tar.xz 809760 BLAKE2B 1f83497cdea0667eb75303a6fc83ec2b13b9f8b072e4e8dd7bab81669c002f0eca473720ba4e06ac1e725664fc1ce7b2e476e8a3a3325b32ca5b839c8d3f435e SHA512 ae511c229dc5dc18187bec8cda6a644474456ed320582271aacf1fec7f96db331d9e27e604a87b4acbdc8bf90fa0e39d8b5a15f2a8dd8eda5cab0be662d283de
+EBUILD kcachegrind-19.08.3.ebuild 1007 BLAKE2B b6d1c48d4ef983cbe8034f2da71c06ecf5214b811f68d096119b76e2e1b5a35a66d5e7aaeae12f6002059595723fba599d955710f408053f5f4f9baebad2a7c4 SHA512 881bde02924c6659aa0d62d762595827afa3d9e2da8e4a4b8849203651435ef23b7189e7e7171c14077b3e2053a2d993c67cb905117479357cae247e24c20991
+EBUILD kcachegrind-19.12.0.ebuild 1005 BLAKE2B e353dde0965222a3cef1b059e3d96cbb37d3996ff81454db0bcf0678d7185bfc0953d448aaa6ef5769f2c4a9bd5530b61be902afa71d6471e6839faefb10b1c9 SHA512 f4d6242d62776fa4058fb2623e2816975aebe50b736dbaec71055e31cb7dfb5790f1ecc90a98ded4ce877ffe5357deed6bc1495f3f4922c97b31c8ca385fbe96
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-19.04.3.ebuild b/kde-apps/kcachegrind/kcachegrind-19.04.3.ebuild
deleted file mode 100644
index edd3c2271519..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-19.04.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Frontend for Cachegrind by KDE"
-HOMEPAGE="https://kde.org/applications/development/kcachegrind
-https://kcachegrind.github.io/html/Home.html"
-KEYWORDS="amd64 arm64 x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	media-gfx/graphviz
-"
diff --git a/kde-apps/kcachegrind/kcachegrind-19.08.3.ebuild b/kde-apps/kcachegrind/kcachegrind-19.08.3.ebuild
index e4134fa65a56..631cda92274e 100644
--- a/kde-apps/kcachegrind/kcachegrind-19.08.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/development/kcachegrind
 https://kcachegrind.github.io/html/Home.html"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/kcachegrind/kcachegrind-19.12.0.ebuild b/kde-apps/kcachegrind/kcachegrind-19.12.0.ebuild
new file mode 100644
index 000000000000..ad389c7b630f
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 b3005bd1adc7..901244fcca1a 100644
--- a/kde-apps/kcalc/Manifest
+++ b/kde-apps/kcalc/Manifest
@@ -1,5 +1,5 @@
-DIST kcalc-19.04.3.tar.xz 366516 BLAKE2B aa1d91982b671bbf7e3520200ff85dc3dd6c8172b81903bbe93a0f613eee75e8ca9758cfdfeb80473d67bc3564104f094944f2fb85f46f34a305e419612c16e0 SHA512 7751ac0ce76aaf99d237c39deb9d25c058c43edb1ef31f03a8d222477d3ae32e2bbae9ce6ac5251f4a981ba25309481af40cbddebfce5ad71d9aee9568bda5bb
 DIST kcalc-19.08.3.tar.xz 372080 BLAKE2B b0215734c8952dd6c787bce46fda5033758b8264b1b6f5bef78e71bfd7e6511b489f53b315c661c8dabd9da82389ea70982fe85a52e85cdf0175bacaff891b48 SHA512 e27eefd90f3b32db383305e1eecade41545dfe8f9dd9a6c5b4f48b2082a7323e5a7d812ee54b45cea28c76ba6e82104e1fd2d001060f1588b4b1d62241421e7f
-EBUILD kcalc-19.04.3.ebuild 810 BLAKE2B b19fe876a877a576d2f0bcc7e934c5406dba0ca32c8a4e7d95e9088f092feb977c1f1133c35d05d9ed9a7084780cbd957cd676466d4564e2fab17c47853b404f SHA512 7c475f7e4cbfe941376143f2cd2df6a812f8af5b45aa0fb38e037bf7573849a9fba168a279200a39906bd2b9c74e083a7606073de31c54d2050e8e1136da8506
-EBUILD kcalc-19.08.3.ebuild 981 BLAKE2B 36a0ab624228834f26021b086ce2628000409cf029df7c7d6e7b2b84e41fe957dbef342d4415f93bef6801f674609dfbaf25101ffa469f23c120d2caf1c23498 SHA512 df3837fdcaf0093a18190344fae80f076f8a76a16cfc915b231818f14a865b5c2cbf8b4c5476e571a4ad210605d3d3630b1e19752d5c104c803cfe392eb5cd0f
+DIST kcalc-19.12.0.tar.xz 375596 BLAKE2B 8824fad936185624533d0819e84cbf225826e1f228fb72f4c3b6897afba3d643affc76963f4c59db53be4d481e606fbb80bfb9daa8e5afcfd2ba3723ae9d29fe SHA512 148424327d86b691e16ac4cf2a9842ae1003d212ba399ba0dad8e0c33c91f89326cdf2b1646bcb3a3c9a4fe9bdab74205770d93ff620a14fe0f92836aeab54b0
+EBUILD kcalc-19.08.3.ebuild 978 BLAKE2B 3b8dceae5342111276037771246df4f6f5d9958a8eabd924b2e27f673b35f671e27de0dd4a4632da57746a45be0e2bd6f5f6e25a64ef78cd42e1bcc75a77568a SHA512 5b17fa27d2267876b2b7e3763db885ac39713194cca9c42f75fee08c4108d5bbba5575dd3770632599f27fb82a15c96e650b6735fd395faece4e8846ff38aa42
+EBUILD kcalc-19.12.0.ebuild 990 BLAKE2B b289e9a47c6be7a3df83aa328c6b2e5e9b33e1f543933f90c9e7501cabf0cfb28148e31c71c257282b533094ccc5b4d8c091d0c621884197c91f81f23b9cde85 SHA512 e61aee7f45ae980642c7abbef42cfff818a2582c412e3a852f2b41b43e45d861b8e610461446a9cbe567a039db866721c1d3ad0aa95c3fd57e1839b2c97095e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-19.04.3.ebuild b/kde-apps/kcalc/kcalc-19.04.3.ebuild
deleted file mode 100644
index 871ca105acb5..000000000000
--- a/kde-apps/kcalc/kcalc-19.04.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE calculator"
-HOMEPAGE="https://kde.org/applications/utilities/kcalc
-https://utils.kde.org/projects/kcalc/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/gmp:0=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalc/kcalc-19.08.3.ebuild b/kde-apps/kcalc/kcalc-19.08.3.ebuild
index fd84b5b0a8b6..6e62c723e089 100644
--- a/kde-apps/kcalc/kcalc-19.08.3.ebuild
+++ b/kde-apps/kcalc/kcalc-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/utilities/kcalc
 https://utils.kde.org/projects/kcalc/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kcalc/kcalc-19.12.0.ebuild b/kde-apps/kcalc/kcalc-19.12.0.ebuild
new file mode 100644
index 000000000000..d69b1bd78377
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.63.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 ~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 20c69320754d..432fb4f0a173 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,5 +1,5 @@
-DIST kcalutils-19.04.3.tar.xz 327592 BLAKE2B 33d64039126c48588ef831a037e43926a279cb314f31f4402f697f46015cac74269cd81c7a59f12e4a017842eea22a33225824a7ff1389f9df97fbbf83d95776 SHA512 5e6397d6f7e9e5e9599df5195b4cdd32d88c7f899b212c95c21cd733444f5e3d1120f293344d4eaba32ee5f1047328f88ec6c915af089dec605129ea899c2432
 DIST kcalutils-19.08.3.tar.xz 323380 BLAKE2B 15781ced84c9eeb2ea043a7c39346b5c05248145c63ac2df1c7f94c913e243c027b70ecee104536164e3ceb256c6fb1f0e0b332e743457effb43147b191f48af SHA512 0ff96dfb9cb4a08d982d6c27a2351c703e30f040055ee4c662df7465c4a1656eff369db0bba39e4fec55777a1671c997e6095d7159b36ffa597564c2024d7d84
-EBUILD kcalutils-19.04.3.ebuild 854 BLAKE2B 607ad4c691cb6965002600a45aeb959c334bf4261b48d008ca7f7663af1af718b6c90d8d0d368bcf62a4332f2ed8c5ec0e01f2436ed266e53c91dab419d0acde SHA512 8b8856a21a007ef441eb8f1ec65f33c43dbf7708d1ad76b1db82e9a888cd423528afef1aef7566ffab30240f2a0ee44c09f03e1d5f30e4b2a92593a51e3212c4
-EBUILD kcalutils-19.08.3.ebuild 990 BLAKE2B 4b1a69e4397717a58ee270a270f9b588ad0898f9b4476301b6de4f75289e8ba3dea843079a98d0251f8f9f82c16356b58e90c641fbc48f95ac9d96b55ed29aea SHA512 4461131b3e39612e96d0685194f01c187b5492059011be13efe1f460dcf37046cb878cdb1f6947e7af4368fcb936de5508d2b718b3fc3c018f6a7418bce21d5c
+DIST kcalutils-19.12.0.tar.xz 322156 BLAKE2B 2d4fb0ab4fac64ebcb069042d43311a3cbfce22758cf72056f263f951ab7c9b631b13f3ddc9303d8cdb05b2920d71a06fe7d678d6bf2219f390caed8b2d5033a SHA512 5353d4b7f7b48fb046091390d7211dba19b313467a5bde4350305fd979d1bba5a42f7b751d05a4e3c812d93cd35845c67f8ad942f6d781d8867b212b0ddb6f50
+EBUILD kcalutils-19.08.3.ebuild 987 BLAKE2B 5edf94058f96318187f5d4fdae97a810cb517f1a6f5364239f519432e39bc48bd22aceb2d364b7ddd701ffba949512c1c90f8140b52c8fae0da8a1822cbcde18 SHA512 31e2dd634ae2d2431e55f0d74b9b594f2e434beb3c9f8be62ff1d555ad91a7fbea2ba0a5cce19ba16b3c037f95ac163288405a3bd9854fa1e9d77adb0f243cd1
+EBUILD kcalutils-19.12.0.ebuild 1055 BLAKE2B 14f00ea547396edf57c56eda7c60f1fadf04755ca73fbd02eb88beb910b2e0c15c9bccc320a04e1f8bfa56c789d51926be9e52e3ab1f35d42f92eab99a88e960 SHA512 35eeca17be81f4b80755f9e574126b77b30d5e5242d45ee65e76badd153727b5cdca4c98cd63e23c293517b5c178e3aa8567c9bd78c6ad764686385370bcab6a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-19.04.3.ebuild b/kde-apps/kcalutils/kcalutils-19.04.3.ebuild
deleted file mode 100644
index 372d76db4d43..000000000000
--- a/kde-apps/kcalutils/kcalutils-19.04.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 653616
-	local myctestargs=(
-		-E "(kcalutils-testincidenceformatter)"
-	)
-	kde5_src_test
-}
diff --git a/kde-apps/kcalutils/kcalutils-19.08.3.ebuild b/kde-apps/kcalutils/kcalutils-19.08.3.ebuild
index c612f8ca748b..b169567fc775 100644
--- a/kde-apps/kcalutils/kcalutils-19.08.3.ebuild
+++ b/kde-apps/kcalutils/kcalutils-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Library providing utility functions for the handling of calendar data"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcalutils/kcalutils-19.12.0.ebuild b/kde-apps/kcalutils/kcalutils-19.12.0.ebuild
new file mode 100644
index 000000000000..517b024b9bca
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-19.12.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/grantlee:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+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 07d015ba0ceb..0704b0dff975 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,6 +1,6 @@
 AUX kcharselect-19.08.3-qt-5.14.patch 883 BLAKE2B e36b8ed12dc80512080e3025376b2421fc016381a736271ada23a4b3f27aef19720045fc8eec306e3b73a73133690389b285ec410707ab20f9ed28a7137e7de6 SHA512 e5116469f91135842c4cbe18a20a63c58fe83faf1d0972f54761ea1de6fcdccae3a96cefeca40cc00d3782691ecca04eca731a60610d58261d2340262efcf3b8
-DIST kcharselect-19.04.3.tar.xz 334100 BLAKE2B 1c0cebe254ffe002f7e0046057223d405e3c76f1187b905175f3ca00a8a37a9740fcddd6a41ee9ab8f583f2d1c03a2c3bf96f278f0293e69189c7f46be68bd68 SHA512 7909a5fe140da1026ad4ce96ae5932d7b20a6894c56f4088445a2fea3bb52d2da9014d76bbaac45b6f503985474ca1b84c2e6764fc5b5ac2e0f5c58f383f9c9d
 DIST kcharselect-19.08.3.tar.xz 334588 BLAKE2B a402cb308f97aa80f1eee4c82ae07b45241cc446c4c49fdd45b895fbd15696a2b8606a10ee7cdf6ad037c2e7faa58ad862475a114269b388d2d0e6d9c09acb64 SHA512 55c20dc0cacd01f27ea047cf8845c47c93d973b954f3a7481f7949417066b56b031c5bacbf39356f92b785f6ad7113aacec391ec81fafafba6a49dd44366855c
-EBUILD kcharselect-19.04.3.ebuild 657 BLAKE2B d1d07ab10548b2d7f7c9744198faa7d41539bf628566ee7ed9ab19c4b610f0b487f76247b55cac944c71d165e14e8c15850e56495038f1dfdc3941058a2b7be9 SHA512 15527b03a922250e45c95a70c6de2525faef1fb210f5630525d52a4f20c117010f9ccf7e97e3b34d65d52342036e2969ee0e06d1322036a496c890e17af3724c
-EBUILD kcharselect-19.08.3.ebuild 832 BLAKE2B 5dfb04cae83e5e3a3e4010be4091ef177dca77e772a9d06f0e4ea6119e49946cb8c59a36d1e2c3a42ff06985f53ffbeb39bf45207ded38cd178ded6b3623d9cd SHA512 9a3a5482636540463952f483b2a79c0dbf7ba0ad5e1e9ae0c5e4579956a3640fa75fd6bce9ff92a68c3aa4ff3468f5821da9667c7bc38082874c98624c772e28
+DIST kcharselect-19.12.0.tar.xz 335508 BLAKE2B 0c910dda56479df3174f7f7a7ea21e38004e22e20800b4804d30bd687d1d7e6b819d45e39817619dc34d5cf0c6fc404fe6fe6629e932c9af39b2418d3e73e820 SHA512 c9b1e0a57d48b354824041c91039f0d9e9275707687804e6608a12d8f449dfac9609b4b625a4aa32565327844bd5210889ea49bf49e3628eca8719a3e5ad5041
+EBUILD kcharselect-19.08.3.ebuild 829 BLAKE2B cd1555b8a83789a141702249772d5524b7b8a3a4fb9a5eb41a04f621ffc0d854ab88cf38446c91c3bedd118ee9f0eac82857f23b64a0393582458f6a6b34a24a SHA512 d489c2b878c1395f47b8f5a18de15429cd8dc02d066ae6ec8e606ddb3db5e7653a8ba363bb49ebfc5c553769d40b8866d7e4602d7147737444558289c9ee0bda
+EBUILD kcharselect-19.12.0.ebuild 795 BLAKE2B c84f6cf0c74f93c72255ab4b059d89c8c6c18162775a91d2b9db5e51df2d76542adb0ad574d8fed9d0c99304ce6684461286a43fb748f85ddcf22e6cbf405683 SHA512 80050ebd47759a4cb8a8b8a190dd8e367d2be2936476d78269f5faf80951478550cf8249b54224206528e9d18e3517640858b2efecfcf1fb5b702bee0e6f0efc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/kcharselect-19.04.3.ebuild b/kde-apps/kcharselect/kcharselect-19.04.3.ebuild
deleted file mode 100644
index 7c00ed6c2593..000000000000
--- a/kde-apps/kcharselect/kcharselect-19.04.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE character selection utility"
-HOMEPAGE="https://kde.org/applications/utilities/kcharselect
-https://utils.kde.org/projects/kcharselect/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcharselect/kcharselect-19.08.3.ebuild b/kde-apps/kcharselect/kcharselect-19.08.3.ebuild
index 848cd028f8e6..6b131d719c69 100644
--- a/kde-apps/kcharselect/kcharselect-19.08.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/utilities/kcharselect
 https://utils.kde.org/projects/kcharselect/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcharselect/kcharselect-19.12.0.ebuild b/kde-apps/kcharselect/kcharselect-19.12.0.ebuild
new file mode 100644
index 000000000000..241b0652ca00
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-19.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index 5b56e1fef9e5..66f64d1c4f38 100644
--- a/kde-apps/kcolorchooser/Manifest
+++ b/kde-apps/kcolorchooser/Manifest
@@ -1,5 +1,5 @@
-DIST kcolorchooser-19.04.3.tar.xz 20344 BLAKE2B fbdf9b5f90ee8912d592743d88be74cd1594f37ea31a1def25ed1cefec97eecf51d78765ee4309081a3fe2f7dc61246e63315f74a99fa1dfbf76b0317a321dd7 SHA512 99ffc055bfb69cf8ad686442afa6a4e0d6aef0ef345f1cdc590b1a4f569b545e2fd05b6f794ec57e1fa7a210d893122a733c048b12ecaad3b93156d1db01e682
 DIST kcolorchooser-19.08.3.tar.xz 20984 BLAKE2B 4d1d6581f55462645daed880cfddabcfea7bafb5c36f440bd39ab90ed2b09df8c9d6109ab5fb42d5cd6d13671cb2dba4ad3218fbc61ca11e816399d8de4bbf99 SHA512 5f76dafc07597a25126d8faafe8bb88ee16029cb775e47aeb47c440a74f6d7f1b585d6a72fdddb05136e164c6cd61a58b6a74538d7cdb46d388745b44bed81ba
-EBUILD kcolorchooser-19.04.3.ebuild 454 BLAKE2B 1233698f5eddc38b608e63850061e3f09cbffa70e974e13cdbe842fe0067414fb96cdc84955a795d227b81095cf1fc0ae6449e978f8256a333040d2a1dacffc5 SHA512 578e89292202518293d153e999516a2fdbf18ead8fdc6f9aac018aba2685469528ad6be07e3f1f488ebd452fb53601029dc41edb655d067ceee3d626ec1eb8e9
-EBUILD kcolorchooser-19.08.3.ebuild 529 BLAKE2B c8c615206da1c1560e933d259bafe0ef2a486f4d6fc6b45d996006b287278bb58387043b833ae7b625609677a7f2bec03db30ad0ca32e3cffd1b2495d405c037 SHA512 61d92b6a38ebc1c50d9c73f62c8265e84ab1acd797706c13032f14a47abfb2dd1c2ce0c331b63a4ecab87c45d01b4a21bcb49595d32bdf01bc29251490d348d2
+DIST kcolorchooser-19.12.0.tar.xz 21480 BLAKE2B fcf710e2862f1ebbacc545bd613ee538f1c43f2287ec748ba398fa532b2033582d40e1d779ce724a536ad927bc79ea2e586091b91461fbb81a388f28538cb73e SHA512 65588efb51f56b73bb9f287b4aef034b85b33b6a6d93fbe3e6e9d102204ece86b8d605551b87b2a74bb4829abf601de5183d4534e59b9b3c200ff3b3fdcddece
+EBUILD kcolorchooser-19.08.3.ebuild 526 BLAKE2B f3678cfd431f88be3cca9ce37ec945d54472e09e7d31df90943b93f378e3d4b5ca806e75f6271537d9ce82c77a89e13f54606887a7c9d8faa46edfd4708a8def SHA512 16a2cecde877bb32b1d094f0b171b7027f6e78b09782842247b6760abfb2e9f73840ed1bad2e0ed9b21590a753352f300c8e5e60d4fedd903220d83f117d0365
+EBUILD kcolorchooser-19.12.0.ebuild 536 BLAKE2B 1c950318a03f437e347860bd7f2d0e1a8506903ef58505415e9173d5ad5320b6748bebf55a2b4337bb2d261b760cfbfce25ebc0fc1c7e3eb23997afb4d2b12c7 SHA512 8b237acc78b1e1f7cd32484d3035e62e59419c03ad94b164ce233621ea26ee91ddc692c2966b7450ffcecde1434962916a0f82f202ac4a837fc877900abdc42d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-19.04.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-19.04.3.ebuild
deleted file mode 100644
index 811824ace561..000000000000
--- a/kde-apps/kcolorchooser/kcolorchooser-19.04.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE color selector/editor"
-HOMEPAGE="https://kde.org/applications/graphics/kcolorchooser/"
-
-LICENSE="MIT"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcolorchooser/kcolorchooser-19.08.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-19.08.3.ebuild
index 63181f384dcf..435f0c907954 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-19.08.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-19.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://kde.org/applications/graphics/kcolorchooser/"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcolorchooser/kcolorchooser-19.12.0.ebuild b/kde-apps/kcolorchooser/kcolorchooser-19.12.0.ebuild
new file mode 100644
index 000000000000..123d2813f631
--- /dev/null
+++ b/kde-apps/kcolorchooser/kcolorchooser-19.12.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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 ~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 7665e87446b7..ac3652635f8d 100644
--- a/kde-apps/kcron/Manifest
+++ b/kde-apps/kcron/Manifest
@@ -1,5 +1,5 @@
-DIST kcron-19.04.3.tar.xz 887528 BLAKE2B a32292cd4523db162e657cce67bebb60b83bb59b51bc63f49bcfaa6f8628704789c3b62384def3b4e0556d076d297283d2c1d6b4d63bce1ba4573db875e97c65 SHA512 a1b2bfed752dba928c3e7190a4535b087c6947795cda3d40f84f11f99667ab645e11122345ea54077d523de53cf6e8387db7a3f813bdb712f0059d81fb6b9456
 DIST kcron-19.08.3.tar.xz 888268 BLAKE2B add2a4ca160863816825852806246aaaebfba44a0541e3d8f3562f939d377bd4607f100e0ce9fc77a441b10298fcac2b852657f035168a24ccb79aeaa56c628d SHA512 44a08ec81d0cf075f17a192ba88aeb6be71c356aac27e3cc8f69ff21295d14dd78fb3ebb19d78f7f669631805259f8eed24705714722a410b8a01fb20793b90a
-EBUILD kcron-19.04.3.ebuild 549 BLAKE2B 04758e768bb3edfd270506784c3d93e47ce10166bfe6913c89f41421653df12cf65bcfda0ad41d33e9fc4a09c98805d474b027c06b9816eaa56b69d03daee488 SHA512 1ad9c3145182b523e093ff11afa9102d45febd3b12b01424da3fad8e0507f2995d87b8713498267d9865692b101448e9e32d9376203cd6f10b56ee40d1b2c5ec
-EBUILD kcron-19.08.3.ebuild 678 BLAKE2B bea5e53c1191d93f675c9c599790556e7381abd62bc158df87b67555a968db1abc46aacd0d378d98e2e6d1ea2c558683c44e5b7db8e8b75b503d94d1ee8afda4 SHA512 8344893fecdd3398d3c339b3de6ce6546cb4a355d967220a24e8e29ccd811b19dcb30ee8d0c14f9065252ce37a02f3b22aabd9116afc24747284ee472e90fbed
+DIST kcron-19.12.0.tar.xz 890916 BLAKE2B 8519d31a4931f7352c24764bc9cbe54e029319327f4d32aa4cf90f354803487d56c168eb84889ca87a48af097cc7764e769a2bb641d68570c444d7dc28569e9c SHA512 40611f33f822eb61b63a8631cb76bd2b45b504465cba19277b9dd6cd4d2b8e3e02baff14fb5c6fd86182bb6e726dcd5b9bdaecb2f0056695691446686df4c430
+EBUILD kcron-19.08.3.ebuild 675 BLAKE2B 4acc1c59c6507bd03e16fe21d24d8504cb8a51b93be0de2dc070c3cf8325e4569bfa21ff71cdae91881da3b0afb0564cc4cecfac19cba273cb5507a42749a7f6 SHA512 0b52d361dabe0e474b810e3260b193abe37094271f5e5cf19bde355a50f760ffff05e61a4cec1486718f47684d90fa87a45ab9f154e31e55df798905391e7d84
+EBUILD kcron-19.12.0.ebuild 743 BLAKE2B ed20aa1ab8deff2acfa32fc1e445fb5638e6155f967e741e2c5997db7acb744c590e7a72e669fb75707814f26916f4c289b60a0459f2e5b82fb5d0f0d704d679 SHA512 64e2ef301fac4b7c0761e5ef1ac6ed967d12e88105c0ea69c9ea01c079c6f240f6d365b991e0e10a01fce1fd5f4575cf20707d4b17758f1599ad090a36a6df9f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-19.04.3.ebuild b/kde-apps/kcron/kcron-19.04.3.ebuild
deleted file mode 100644
index 57578d9267c7..000000000000
--- a/kde-apps/kcron/kcron-19.04.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	virtual/cron
-"
diff --git a/kde-apps/kcron/kcron-19.08.3.ebuild b/kde-apps/kcron/kcron-19.08.3.ebuild
index 1f68903ed101..bbcd2c1257a1 100644
--- a/kde-apps/kcron/kcron-19.08.3.ebuild
+++ b/kde-apps/kcron/kcron-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE Task Scheduler"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcron/kcron-19.12.0.ebuild b/kde-apps/kcron/kcron-19.12.0.ebuild
new file mode 100644
index 000000000000..72eafcff35fc
--- /dev/null
+++ b/kde-apps/kcron/kcron-19.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 124394c590d7..347c8f0bb983 100644
--- a/kde-apps/kdav/Manifest
+++ b/kde-apps/kdav/Manifest
@@ -1,5 +1,5 @@
-DIST kdav-19.04.3.tar.xz 49744 BLAKE2B 9f863547136e525db09fad131593ee00a6818ce1dec224428b05adaede96c0f326a59203c492ad1d77c2dc8d09d0d561b3a17739668a7b494cb3919a24ec1693 SHA512 b543ec28a9cc41b15af4857dc567086b6c2928138c8934598b860def901571edc38a0342678f2931cbc8212d26c0a58353793bef211fc7e9da22296a94be73e3
 DIST kdav-19.08.3.tar.xz 49824 BLAKE2B bbc0c776c853daf826b2f9152ab5e62c1d031715899b89edd7de7bd0d1ff5bbcd76e3ac7f337e5371730ae99b8e00cbc5b270c21cedcce731d552d9327a3093f SHA512 26cc41326816236896cc5917aef432e6b378157f8b1cb32d6217cbac8166039743450d26228f13027022c1a8064edba8e861ccf7e5af4107c8e07af02d2e9b2b
-EBUILD kdav-19.04.3.ebuild 684 BLAKE2B 8c0707020db18cc038dbd22a09690873f65f88dcf4d7e41466361e8ea1904cb79827f676ca708d9d12435c72fe9aa2925f827c0b1d7f0522f987fabe729c6566 SHA512 8881a9e6b9ac61a3515ea087fdc4c4e9ddda3ca022300510ce56b57dbdc66538c98aac7b69c91ab31e829219cfd4e088e5997c04c35e52710db2104e75bec7a1
-EBUILD kdav-19.08.3.ebuild 758 BLAKE2B b886c5888afbb264a727b8b01f261955e444b90cc63de887c1cdb962eb4462964da48e96d1ddd899bbb7a1440b891ff314a7136ec300ceaf0d435abafa6c47f5 SHA512 171159bf2ff2487a64913c90aa7b1403dff42eb154204552a99ee6a32918b09769ef997cbcab44f9f360325d3b9f19ff35e01b92dca9b534f3a017be8894aa04
+DIST kdav-19.12.0.tar.xz 54460 BLAKE2B 3d75b03650a518c928dac60bcf89683c63b6ecd4be0e1c1e76236c7d18e8ced24a5d4330c50e507931ce6dd72233cda8da060e2190fc548388fbb9980471453f SHA512 e8711bce23a97381b559ed4bb49395b1cbf477e4bc54ed8505767a8c3735f6333c3c333e98d1d07ac57937a730e9fb22029d13218104c178a9064b013236763c
+EBUILD kdav-19.08.3.ebuild 755 BLAKE2B 07429cf18d1e31f0aa9b1ec88085d1635327b80819e95dfce0872f18a4e85f85d035248444121d4305647b32486bbafb469fc624a4593c127edb172a93265fdf SHA512 3d5a467b0b436ed1ffd27282b7c93a3c41661b6c62679ead5bda1f37e2fbef44f6d24b42c236237a469ecb7d58363b9360b15ef8d66fe892291897e184812343
+EBUILD kdav-19.12.0.ebuild 819 BLAKE2B fba9ccddde0323637a1324967bdfb912cb84a7e0f80b38d40ed4b47fd4e52a7a6dfc3816e96aead25a27882374d94ff653e344ce47252ecf636680c4107faeb6 SHA512 0f74430b0f9ef8234feb38d12c303716099bf1fb3b268ec28f81b25e9c682d6e420499078b3955bedca472a5aef8bb05aaefdeebde4a29ae767b5c7a9a32d7ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-19.08.3.ebuild b/kde-apps/kdav/kdav-19.08.3.ebuild
index 7c134ce14518..dd368baa1e64 100644
--- a/kde-apps/kdav/kdav-19.08.3.ebuild
+++ b/kde-apps/kdav/kdav-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="DAV protocol implemention with KJobs"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdav/kdav-19.04.3.ebuild b/kde-apps/kdav/kdav-19.12.0.ebuild
index 3cdc84b8a257..be389bc088fe 100644
--- a/kde-apps/kdav/kdav-19.04.3.ebuild
+++ b/kde-apps/kdav/kdav-19.12.0.ebuild
@@ -3,21 +3,26 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="DAV protocol implemention with KJobs"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
+HOMEPAGE="https://api.kde.org/kdepim/kdav/html/index.html"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
@@ -29,5 +34,5 @@ src_test() {
 	local myctestargs=(
 		-E "(kdav-davitemfetchjob|kdav-davitemslistjob)"
 	)
-	kde5_src_test
+	ecm_src_test
 }
diff --git a/kde-apps/kde-apps-meta/Manifest b/kde-apps/kde-apps-meta/Manifest
index e9dc3bb730f4..e24e3bdd6c8e 100644
--- a/kde-apps/kde-apps-meta/Manifest
+++ b/kde-apps/kde-apps-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kde-apps-meta-19.04.3.ebuild 793 BLAKE2B 22cefeedfc170840ca9eccb5e9eb502764383c7f80000a850d8e5dd9d9755c12bf3f77632695ae81d5101ce2e3959dd3348a5a3c97991dbd0e646beaa076ec22 SHA512 4d06696d96f180a84c216dc3b158cfe49f5a111556b8f13f3223af6d9ed722dbe96ee6cfc3c0c783a5945fdacd8c36c82114bdd046e129cd5d830fce2530ab72
-EBUILD kde-apps-meta-19.08.3.ebuild 796 BLAKE2B 6a5c7c6c60aa150ecb503610d3a3a7c5272434aec51b5c12840fe113a24e696b75b7624a5a632ee604a39df01d3853a193747c73fc0f650aad1ec0041dbb96eb SHA512 ad399695f9e715c197f60cec440bd1b95c7807c2b2c459fe13eee0ddf60bfd29c90d1ff17ae5f12a19d29a81fc9dbaebc0d9c3860ac62fb74866cb4d2ac7c791
+EBUILD kde-apps-meta-19.08.3.ebuild 793 BLAKE2B 22cefeedfc170840ca9eccb5e9eb502764383c7f80000a850d8e5dd9d9755c12bf3f77632695ae81d5101ce2e3959dd3348a5a3c97991dbd0e646beaa076ec22 SHA512 4d06696d96f180a84c216dc3b158cfe49f5a111556b8f13f3223af6d9ed722dbe96ee6cfc3c0c783a5945fdacd8c36c82114bdd046e129cd5d830fce2530ab72
+EBUILD kde-apps-meta-19.12.0.ebuild 796 BLAKE2B 6a5c7c6c60aa150ecb503610d3a3a7c5272434aec51b5c12840fe113a24e696b75b7624a5a632ee604a39df01d3853a193747c73fc0f650aad1ec0041dbb96eb SHA512 ad399695f9e715c197f60cec440bd1b95c7807c2b2c459fe13eee0ddf60bfd29c90d1ff17ae5f12a19d29a81fc9dbaebc0d9c3860ac62fb74866cb4d2ac7c791
 MISC metadata.xml 379 BLAKE2B 7144d7c2d05ea49b428bf76314c83a1150296ea19006204241298a707ae28fe67a6feb328f0516cc34859bc1af61df6cda3074d58f96d61be1ef1c21892468b4 SHA512 9dd851fa81ee09c64dff5019b7fe60ff945159b14cf92af707df486969d72a0896b2116c4b203afccf056ff4b2e9704d29022ed0b5d8fb60f65c1cf6d6935ed9
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-19.08.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-19.08.3.ebuild
index 5c6da48234b6..e504b9352254 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-19.08.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="accessibility pim sdk"
 
 RDEPEND="
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-19.04.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-19.12.0.ebuild
index e504b9352254..5c6da48234b6 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-19.04.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="accessibility pim sdk"
 
 RDEPEND="
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index 7a27aaf4e8c2..845f7741dda5 100644
--- a/kde-apps/kde-dev-scripts/Manifest
+++ b/kde-apps/kde-dev-scripts/Manifest
@@ -1,5 +1,5 @@
-DIST kde-dev-scripts-19.04.3.tar.xz 377552 BLAKE2B 3ba248f80547154fe88a8a721e430f5f9900ebf092f0b43c219aaca1dfa5624dd8d6ad40c2e8e6a56b72854610cfe87317c390edecc146c6866ac982b35887d8 SHA512 a74c6a9366950de6a610de9bca9eef2deb119e2dda48b406ce4c8d49c046a4710a481eaf41033914b8809d6e96e8961eba6d3772bf1de4943435090160839524
 DIST kde-dev-scripts-19.08.3.tar.xz 378160 BLAKE2B d51290ecde81016dfec6d83b6d2176f52dfa2396540b00602b60a2687021a0dcbba880f7517fae5974a818fda6faf36bcd9261fb139d4092592e822ce4ba4a32 SHA512 3e041422830d1a6a9ed70e86875e9a1b10fbdff3a2189d0a8554899a007e9700e1791f88e0701426f7a8d49da89341283db7f72686acced5fc5b26e7301d191d
-EBUILD kde-dev-scripts-19.04.3.ebuild 562 BLAKE2B ffb1609e30444c8853e4151e28b83ec9bb614e7ff1c86ac8cdde4acea1d5b84ee14799b8efcaf26a3102f05118327bee8e7d5ee10044ff19a7011bb77feebdb5 SHA512 844857551709466eab7021cdca1a69f947d5d1951de953fdc2540ec948df2ece3200167f1d659f4088e7c4d50e093c2d387006f0f49cabe40daea2f0f4178f2a
-EBUILD kde-dev-scripts-19.08.3.ebuild 635 BLAKE2B 2a18cc7aeec35277315212ccd4d3b234e3c6c23eb195d7514a6e6a7f3016898adbb31970341cc0d452e8155c0e3d37990ab07f5e7af5474b455574cffe9b05c4 SHA512 864e08bc6a0cfc55816d2f36ffde055afae95474b86e3038fcdcc451d4c05aadc6803a51547e5cde8dc05c55e26563afbecedf429a77085b9ee72314e03a1e8b
+DIST kde-dev-scripts-19.12.0.tar.xz 378528 BLAKE2B bd08227ee436f77214dd9c700520bccefe9a027794a6b53d4e6366d00733fd2bfcd2b660e336bd43b2b8a66adb3c44634fa5f35fecc9ec9e4da7d2cc629970cc SHA512 f5c0d6d9a5fe6f3e09b9273ab6b8e1d42784c1af86088284a438e06035d8cbad08be9b0f31b97190aa754cb27019b2cdfe75e42fb3702bdcf5f0bad4d6fc64ec
+EBUILD kde-dev-scripts-19.08.3.ebuild 632 BLAKE2B c71ba73a8fed4f15044a47f4084a3a1a4a6f1217a737ad570f1c06b321403f6a9527e40a3f964f6a9e23da20ca4e9aa7a93867b18f59e1f24349e4b7885d51f0 SHA512 c5a238ad81723f89765e6b56af9ae3cbb587101a0f3b0c504c8b7a9dab6c4d7d9e45d303513d2013020eb2c83727fad64e657c80dc8a77f7aae97a3ee7a1b375
+EBUILD kde-dev-scripts-19.12.0.ebuild 636 BLAKE2B e3d7aa66bbdf9cd095f13c60f30eb59e48e38e34ba0f849d6c92361451e72c32b57cd5af562094bdb40f96338e046e7fb17b69e2153e7cb8a2bef5b862a27b04 SHA512 8b9130ca788cf75b7d52751b583f4cd2faa7b92f91b8b875889631e6aaa158ff7f2c61a09327631b2dd64225b7a5b93c0eb48f11d0d85bc2c0c771380dfd296e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-19.08.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-19.08.3.ebuild
index ceb8f9c262b2..1533600a9d5f 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-19.08.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE Development Scripts"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-19.04.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-19.12.0.ebuild
index 8ee8af84abd9..eb3b61605fa2 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-19.04.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-19.12.0.ebuild
@@ -3,18 +3,22 @@
 
 EAPI=7
 
-KDE_HANDBOOK="true"
-inherit kde5
+ECM_HANDBOOK="true"
+KFMIN=5.63.0
+inherit ecm kde.org
 
 DESCRIPTION="KDE Development Scripts"
-KEYWORDS="amd64 arm64 x86"
+
+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="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdoctools)
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kdoctools-${KFMIN}:5
 "
 RDEPEND="
 	app-arch/advancecomp
@@ -23,7 +27,7 @@ RDEPEND="
 "
 
 src_prepare() {
-	kde5_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 7c978cfb1e27..335d948fdc96 100644
--- a/kde-apps/kde-dev-utils/Manifest
+++ b/kde-apps/kde-dev-utils/Manifest
@@ -1,5 +1,5 @@
-DIST kde-dev-utils-19.04.3.tar.xz 61564 BLAKE2B 2fe3bb79ddb673495260b3e8fadf2f4f142fc782bfc1e4f3852c0ec76faf3da429586fc25f6d5bfca328d079b44a46b1d684ab09f9e4156dc4cae78fb91dcdad SHA512 df6a8001823a0dc1afbd35f6e1d8c0ed5552b68214564b5a5be97801d91f2a989b6f72231dc3aba327006cfe940d09489b4597187376b2413950648c6a6a7598
 DIST kde-dev-utils-19.08.3.tar.xz 61556 BLAKE2B bdd30dd5d14938616565b2edcd0c24307e355fe487ecc691f2cec6263da1b1e722ac6bb712a7de6b55ccb89f6e58d7ce51bb7cca8a28a49eabbf202957ac1edb SHA512 272baa3f325cae611dda982174edba025ade4cccde6737b5bbccf426142a3bf4c79b4006bcca0aa57a28947947b9d9d5eb5d565385050e5f2e468bec4094f1aa
-EBUILD kde-dev-utils-19.04.3.ebuild 615 BLAKE2B 4701a293c3a0c7dcbacc0d850ba8da5d3ce30f9e5b563d7b935c8e57226812d0e95cf1bd1eeb43e51874b6e0f22bd31fa383dd7f707b970771414a871dee0172 SHA512 909816be7996ecdc838004de726733b8432a2d58d2f8c67ed3b777c64162820932ab8dfe15656db16d440868db219ae9608f4bed3a0178f99007f570fd54021f
-EBUILD kde-dev-utils-19.08.3.ebuild 732 BLAKE2B dca17ffd747cde8714d54e950c95ea6eeea98a87d06f84a20f96e1eaf46bb144c42ef34ec3e6b74925a0fb62c7eefc0703470aeae98003a908b7d3d96e85a287 SHA512 089f65a5f70ce9acd36d4fa87959af8eabdc18d1108a90a0f0aef8efea25e73444df4faf2d7ebdc5916ece3ff2872826ad4bd70d552df2859cbc252b68202103
+DIST kde-dev-utils-19.12.0.tar.xz 64272 BLAKE2B ca8c24d155be7365be039ce0aa78b89e9ed7801782a29435158c99e6208507c65a7439802404993a4751f140bc5d2fa84224668621fde741106246154552b3b3 SHA512 dc5878b89d91ecbcc465facf3a1de44bea207887ec5b4ca36f6865a5e10da392c199d7c60e20b3d02877b5615d15e742096947cc7ad5ed189c8fd69dae7fc7f0
+EBUILD kde-dev-utils-19.08.3.ebuild 729 BLAKE2B 74bae515fa982f0fec070e8f4816003cfff63465741b533b5c182b2a97f12e064e8aa1dff33dfb613a0163807e7101b79b0bc617d872b7026107fd27704683b8 SHA512 201e77a441cd060f4126a4ffd777a77528cb0b19a1b6c58e3329c90c1f1711437790fe948892ec3c8bb4f737c88ce0951ee8ad644bcda83c444cc823cb0e908b
+EBUILD kde-dev-utils-19.12.0.ebuild 733 BLAKE2B c602c5a6ee582dd6d63ad379aa11565e46d9ff24897476bde7648f0042019c0cbf48bf8c3ad88cd85873898356bbd1619eed3df43988c926c44d3e53ebff1aad SHA512 727c7073b1ea8ef5aed0c68d5bee1e9ffa8cc00ba831e4300ff484b757774c77f714ecf7cd229983b29e192b3982dbae9a27e2b8a4a9424cd60552bfc5effdb4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-19.04.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-19.04.3.ebuild
deleted file mode 100644
index c6875fcaa7b9..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-19.04.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Development Utilities"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-19.08.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-19.08.3.ebuild
index a46abfb8f364..90c80437786b 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-19.08.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE Development Utilities"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-19.12.0.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-19.12.0.ebuild
new file mode 100644
index 000000000000..549bc873ab87
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-19.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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/Manifest b/kde-apps/kde-meta/Manifest
index e8999e8ee1d2..5d77f6b6f6cd 100644
--- a/kde-apps/kde-meta/Manifest
+++ b/kde-apps/kde-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kde-meta-19.04.3.ebuild 364 BLAKE2B cc6297c21de671ee79b7229f58a7ac4839d97c1fff800070ca5a48aca732d23a67e41af7845463d3deb33f98bc3cf443f6403909d192d6506dd9685eefe9dd1c SHA512 e4310bc15e6676dd794fb165cca64f100a2029dcc50544509eb23ba3c5f9aac65629a668bef6f584d6a7e50d710125c507fc50815e288baa33fb7a9e04fc25e4
-EBUILD kde-meta-19.08.3.ebuild 367 BLAKE2B 7ea7261734528fad950da6ef0ed8ba59f33b2c3e262a048f44a44df75e8e5685d80b495f590bffbf0da9541955aca8ff1bf19919e9ef96254236189716d1871c SHA512 0b60ca00da44f6a7c041d9f6ae920330598171780787206ad905ddcd1a29bf9445d94fbd4a815d85a90eddf7de91a31cace81624d3f425e8b65149e8137b863a
+EBUILD kde-meta-19.08.3.ebuild 364 BLAKE2B cc6297c21de671ee79b7229f58a7ac4839d97c1fff800070ca5a48aca732d23a67e41af7845463d3deb33f98bc3cf443f6403909d192d6506dd9685eefe9dd1c SHA512 e4310bc15e6676dd794fb165cca64f100a2029dcc50544509eb23ba3c5f9aac65629a668bef6f584d6a7e50d710125c507fc50815e288baa33fb7a9e04fc25e4
+EBUILD kde-meta-19.12.0.ebuild 367 BLAKE2B 7ea7261734528fad950da6ef0ed8ba59f33b2c3e262a048f44a44df75e8e5685d80b495f590bffbf0da9541955aca8ff1bf19919e9ef96254236189716d1871c SHA512 0b60ca00da44f6a7c041d9f6ae920330598171780787206ad905ddcd1a29bf9445d94fbd4a815d85a90eddf7de91a31cace81624d3f425e8b65149e8137b863a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-meta/kde-meta-19.08.3.ebuild b/kde-apps/kde-meta/kde-meta-19.08.3.ebuild
index 44a5c489c099..266df38d2dfa 100644
--- a/kde-apps/kde-meta/kde-meta-19.08.3.ebuild
+++ b/kde-apps/kde-meta/kde-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kde-meta/kde-meta-19.04.3.ebuild b/kde-apps/kde-meta/kde-meta-19.12.0.ebuild
index 266df38d2dfa..44a5c489c099 100644
--- a/kde-apps/kde-meta/kde-meta-19.04.3.ebuild
+++ b/kde-apps/kde-meta/kde-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index 965136af8396..4a75b11edea4 100644
--- a/kde-apps/kdeaccessibility-meta/Manifest
+++ b/kde-apps/kdeaccessibility-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeaccessibility-meta-19.04.3.ebuild 414 BLAKE2B 175fa48d376ecc7f34044b22332b222346f407dfb5af47207bdc8e26d228a0d118c4d8b54a9f8eb652671316902822ed38b9abcccab26f1d94b3e32b5f267acd SHA512 fc831517ffc09a62be45ad56b51c08d6659c2107b0a66eeb833980d61bd133acb8270e0712443ee5b406c5e534233b7c03cc3e74e0d4a69d133582e132f5148f
-EBUILD kdeaccessibility-meta-19.08.3.ebuild 417 BLAKE2B 4fc165baa1cf7627d496606f3f98f3344dc57dd24f5f5b83719b8aacf931b657ec7c95499fff3aba4f96c3daf97b64d6ceba172406157b294bba5760e142d23e SHA512 4a3b08571198062171ee734e763e283ea51c37c9b64aa852e19a942d81945726d99f534b8ed9b09c9e555cf98c2a79196af6899dd46c7f091c9f89dd9995cfeb
+EBUILD kdeaccessibility-meta-19.08.3.ebuild 414 BLAKE2B 175fa48d376ecc7f34044b22332b222346f407dfb5af47207bdc8e26d228a0d118c4d8b54a9f8eb652671316902822ed38b9abcccab26f1d94b3e32b5f267acd SHA512 fc831517ffc09a62be45ad56b51c08d6659c2107b0a66eeb833980d61bd133acb8270e0712443ee5b406c5e534233b7c03cc3e74e0d4a69d133582e132f5148f
+EBUILD kdeaccessibility-meta-19.12.0.ebuild 417 BLAKE2B 4fc165baa1cf7627d496606f3f98f3344dc57dd24f5f5b83719b8aacf931b657ec7c95499fff3aba4f96c3daf97b64d6ceba172406157b294bba5760e142d23e SHA512 4a3b08571198062171ee734e763e283ea51c37c9b64aa852e19a942d81945726d99f534b8ed9b09c9e555cf98c2a79196af6899dd46c7f091c9f89dd9995cfeb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.08.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.08.3.ebuild
index 42c3e4b11dc7..d93a73cb6197 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.08.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.04.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.12.0.ebuild
index d93a73cb6197..42c3e4b11dc7 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.04.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 00a8ca707941..bede8150814d 100644
--- a/kde-apps/kdeadmin-meta/Manifest
+++ b/kde-apps/kdeadmin-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeadmin-meta-19.04.3.ebuild 398 BLAKE2B e92c78325a8373e5ed684ccf94370b4d8a6b3cc94768c8c7951de423b6ff9add63e0980bff74a20816e69ea8d87eb7e244bac21633a2d3d74b3e353e97f6db78 SHA512 17037a80be080757eaff42c9737cfdd4aa43cd9ce2966e0a85c3d7f21af310ffd773f8a4c844c1c000c365c6535e3d800d02c1a7ca1011cbfb4ea2f8b20ad3ad
-EBUILD kdeadmin-meta-19.08.3.ebuild 401 BLAKE2B 0225bace8801d67ce4f803704290439df8942112c7b8a8a5af4170ec60d7d2fe0836776708a7e584df1a077001a9770ae9e5ba2e03caa644e42348bbd2f9a4ef SHA512 e2dbd8a80be6f9744e859c7324d828cf3c75bd29502dc9a02af06c44a19c6e5dd0dca6a5d6edd8ccd760008f2eb02ff757f7a925942941f88864df351b61ac72
+EBUILD kdeadmin-meta-19.08.3.ebuild 398 BLAKE2B e92c78325a8373e5ed684ccf94370b4d8a6b3cc94768c8c7951de423b6ff9add63e0980bff74a20816e69ea8d87eb7e244bac21633a2d3d74b3e353e97f6db78 SHA512 17037a80be080757eaff42c9737cfdd4aa43cd9ce2966e0a85c3d7f21af310ffd773f8a4c844c1c000c365c6535e3d800d02c1a7ca1011cbfb4ea2f8b20ad3ad
+EBUILD kdeadmin-meta-19.12.0.ebuild 401 BLAKE2B 0225bace8801d67ce4f803704290439df8942112c7b8a8a5af4170ec60d7d2fe0836776708a7e584df1a077001a9770ae9e5ba2e03caa644e42348bbd2f9a4ef SHA512 e2dbd8a80be6f9744e859c7324d828cf3c75bd29502dc9a02af06c44a19c6e5dd0dca6a5d6edd8ccd760008f2eb02ff757f7a925942941f88864df351b61ac72
 MISC metadata.xml 358 BLAKE2B 5830492c2dd2642c5142d8743c6f34006fa8ed9738bb8f3302c32d1a85896b36eac19d5e0464827f0d1b60130bb3249dd5ce30f505ce37e49032a06f9aa969c8 SHA512 32bf1c86b117619bb8dc5629a5d5027bcaf5f6c3de5c3aca895fb2eafcb40079638a10e6e27b3a4f2f22a5c40e365f1fb683148dfe3f0ebf7372eab8191725fa
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-19.08.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-19.08.3.ebuild
index 4498e75ab33c..9bb0bbae0392 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-19.08.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-19.04.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-19.12.0.ebuild
index 9bb0bbae0392..4498e75ab33c 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-19.04.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+cron"
 
 RDEPEND="
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index 634158a59100..a372448a26f2 100644
--- a/kde-apps/kdebase-meta/Manifest
+++ b/kde-apps/kdebase-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdebase-meta-19.04.3.ebuild 366 BLAKE2B f31da0c93efd8f0c6de9114376d1a514a9501f1d570331ebb5ea155923031931f39ae71fc31281db3ab5ced8d5610e0a491d585fa985c8c13548090aa6bbc21d SHA512 2e390f8ee93913e36bde9f6d3689843165d87946bd985bfad636f22a888e87f1819199bd84feb91ebcafdeb40ed4120a7a37f81abd31e736233f6c890cfa813c
-EBUILD kdebase-meta-19.08.3.ebuild 369 BLAKE2B ab9b1c8993a0f16462deb4e8414157497387c43a57b96eeb737702a1a7f794aa2a69b4a2b8da07848ee2ba36f196ec618a0258882a6f147cddcb7b470cda5a37 SHA512 05e101208cada601d8cf86184d0e385a615512284645da99f6ad715612b8cae00085384ccd2075ae9a30cdbe03fb9ff615ba29ec136d7e4deba398b088f42f1c
+EBUILD kdebase-meta-19.08.3.ebuild 366 BLAKE2B f31da0c93efd8f0c6de9114376d1a514a9501f1d570331ebb5ea155923031931f39ae71fc31281db3ab5ced8d5610e0a491d585fa985c8c13548090aa6bbc21d SHA512 2e390f8ee93913e36bde9f6d3689843165d87946bd985bfad636f22a888e87f1819199bd84feb91ebcafdeb40ed4120a7a37f81abd31e736233f6c890cfa813c
+EBUILD kdebase-meta-19.12.0.ebuild 369 BLAKE2B ab9b1c8993a0f16462deb4e8414157497387c43a57b96eeb737702a1a7f794aa2a69b4a2b8da07848ee2ba36f196ec618a0258882a6f147cddcb7b470cda5a37 SHA512 05e101208cada601d8cf86184d0e385a615512284645da99f6ad715612b8cae00085384ccd2075ae9a30cdbe03fb9ff615ba29ec136d7e4deba398b088f42f1c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebase-meta/kdebase-meta-19.08.3.ebuild b/kde-apps/kdebase-meta/kdebase-meta-19.08.3.ebuild
index 77499731d30a..9a6c71b54aa3 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-19.08.3.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdebase-meta/kdebase-meta-19.04.3.ebuild b/kde-apps/kdebase-meta/kdebase-meta-19.12.0.ebuild
index 9a6c71b54aa3..77499731d30a 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-19.04.3.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index bddf8b15e398..c8c07de0d04d 100644
--- a/kde-apps/kdebugsettings/Manifest
+++ b/kde-apps/kdebugsettings/Manifest
@@ -1,5 +1,5 @@
-DIST kdebugsettings-19.04.3.tar.xz 55324 BLAKE2B 66e6bdad2851d89825a8e03b1460115744fdbf99644a85dd66748b6352c4131c5aa625799f50c28ddcc71e3a5ecf3c4dbf2f551e79040b4f85f692a9a3d5039e SHA512 f6bb3475ce8c56798ddb8bda933cebd1637c64f748743014379a54a5662525ce7f2bb0f039e7390756c12c6fc12d6a5b0c167a0ea16f70d9d5829b7a675e40ff
 DIST kdebugsettings-19.08.3.tar.xz 55472 BLAKE2B 719549d047cfa771936efb556b032c31cbbf5e996adfa62b4ec2a07b15887cbd2347ba96e4bf642ec51d7bc60dfc16b77e9c8e86a8cf552eb4bc3391d5501b3c SHA512 08201452ebfe8889eced3f2182092a21a839cf717ee8c52b1e26499eaf9541009456397511ec0698968f9767725bff1e4682a603a03654233381509c66aaf514
-EBUILD kdebugsettings-19.04.3.ebuild 598 BLAKE2B 2b2024b8f029c3217ec5b6e84bab6f803dc8fbbc3014f0d6c5268c99894d2ce3029ab697df926c4eea2d3092de8e688f1132518707c410dc43ee902ca5a199d2 SHA512 dcf8c16db7d7b0e5c6e55e947ce2e5e3a4ee0ff7fef43e89ab0661f75a4c883619ceb847b7d9ae12593e33ed98c93165652e22a2e007d7d3dc7f16458331a267
-EBUILD kdebugsettings-19.08.3.ebuild 727 BLAKE2B 69f3ec3288e4b83a59b61847a9ad79ec1bbb51697bb2754042d0182b608245c5a8622e995cff9679f7672b03106099f04a0bb6f3960ae505867528f39bbeafaf SHA512 f6b2ba14c7289c2157dc504b5e3bf381c683a81afc67019650e57406372de6549bd850e7ddf6d76b4205ffb4aea2af8504f5c6438cb3f7fa88382947b6ff2a4c
+DIST kdebugsettings-19.12.0.tar.xz 63196 BLAKE2B c0765dbef61c1e8d032c304c2af25dbc75ab3d42fe8695733168ae6c9554ddaec36f97a5678dac6fea6c291df14d24b80b9e2ddcd8ae79362bc8d9cc9758fa1f SHA512 0570bcbf0e66ef74d22ac3016fa6d77a7d42f72ad25b47008a146cd3753e3ee9d4474e9c8981440097b5757c5997b60aae523939f9b49df85b1edd85922bdfd2
+EBUILD kdebugsettings-19.08.3.ebuild 724 BLAKE2B 34c705413780b7d5441f88a11b01df4b2a434b15f6ba363b7d19466df6700575a223682cbf626105c54f7a537f51494a25e47256e805b453645e7e488631bb1c SHA512 b7e9f5e9eccf9661cf15773c50b054ae8c75178b214f318dbcf7f479114df509ac1e4aa8c022a90f94bf937eb8661e5afd7720359eb168fea69bc15feb61e85c
+EBUILD kdebugsettings-19.12.0.ebuild 803 BLAKE2B dee081c02a0696ea526cc26dec11ab11ef0eb58c2ecccf7d181286e52575429f69dc94be7ba6c33959bddf4e4fb4638eecb3ce8879b4b34c22eb5afaa2a5b795 SHA512 f66109fedcb09fe1cb7fee2d22b8fb4fb36e60b9d667345ab81cc61fa15277df2d970154cfa9b5e73fea05e48a362e2cd0823d49b748a9f8bd94d73cc14851d9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-19.04.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-19.04.3.ebuild
deleted file mode 100644
index 06107e12f418..000000000000
--- a/kde-apps/kdebugsettings/kdebugsettings-19.04.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Application to enable/disable qCDebug"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kdebugsettings/kdebugsettings-19.08.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-19.08.3.ebuild
index 364a3aa72ab1..edddcbb298f7 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-19.08.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Application to enable/disable qCDebug"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdebugsettings/kdebugsettings-19.12.0.ebuild b/kde-apps/kdebugsettings/kdebugsettings-19.12.0.ebuild
new file mode 100644
index 000000000000..9a3955c5bd8c
--- /dev/null
+++ b/kde-apps/kdebugsettings/kdebugsettings-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.63.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 ~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/Manifest b/kde-apps/kdecore-meta/Manifest
index 8f876b2d49a2..e4d8d8d26ea7 100644
--- a/kde-apps/kdecore-meta/Manifest
+++ b/kde-apps/kdecore-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdecore-meta-19.04.3.ebuild 704 BLAKE2B fa2151521216b06ec2dcb6bb788b9ee51fa9f5b29019877f8da8221778bc65ddedac5f5279fca32ecf77433c8ba820983312fe654664b4eb472171e1d55d55b8 SHA512 3eee8394d672a86531e186ba2ba618b4ec62a1bb41c3694c545c8ce2507e4e3613d0f146d57e2b54a7de58560a4cf090cb8437ad0940069b2ce7d19d8d2070c8
-EBUILD kdecore-meta-19.08.3.ebuild 929 BLAKE2B 477ee7e8492d09290050760b998f0ddea78562fa668c516d7c4e79e41b21ba34e7f0033e04bacbbcd15c2420f2fb2eb4853f63d546706df6cf380ef18c708906 SHA512 785e8906b77a343a02846096b56d0225bf7b6e43c4cbf0e770f9704eaf559e2369066586bfdfe7e2b001905a524e67d7fc71d5e5af8fa27db2a55036344d255b
+EBUILD kdecore-meta-19.08.3.ebuild 926 BLAKE2B 816af01d2cf5ac69561edd438f0c9e7cbf97ab0ad37cb75ee59a3bde213921924fc2ab70ef9b31478cef8731fab421d9914cd607eecb0534941239cec4230356 SHA512 4bc06e16ea0cc93fe59721675a8c5857ec3e59e63e07afd92328e8a14f3ae6b64ed8be4cb65b2726bba16e57f75be23739e35e2c789506dc0b0cc79520130d3a
+EBUILD kdecore-meta-19.12.0.ebuild 929 BLAKE2B 477ee7e8492d09290050760b998f0ddea78562fa668c516d7c4e79e41b21ba34e7f0033e04bacbbcd15c2420f2fb2eb4853f63d546706df6cf380ef18c708906 SHA512 785e8906b77a343a02846096b56d0225bf7b6e43c4cbf0e770f9704eaf559e2369066586bfdfe7e2b001905a524e67d7fc71d5e5af8fa27db2a55036344d255b
 MISC metadata.xml 828 BLAKE2B 62d5af7d5413a38e7a0d04df003a80a7f863abb11b35e1c16fde156a06667e754b23504d550d585b03eba979c5d3a6d379a1aec4d8d56c54951a63d5b3298287 SHA512 557c5a2ba75b21a8a8f13531cf6e252b5e38d0e0b0475038968ba5bbed1672dceb7518791e88ee01a94966108e2b315aa67341d775fcded1a5e43a5858c902dd
diff --git a/kde-apps/kdecore-meta/kdecore-meta-19.08.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-19.08.3.ebuild
index 154e7c3ad61a..5575e6f572c1 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-19.08.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+handbook +share +thumbnail +webengine webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdecore-meta/kdecore-meta-19.04.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-19.12.0.ebuild
index 99182a9a43e3..154e7c3ad61a 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-19.04.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-19.12.0.ebuild
@@ -8,8 +8,8 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+handbook +webengine webkit"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+handbook +share +thumbnail +webengine webkit"
 
 RDEPEND="
 	>=kde-apps/dolphin-${PV}:${SLOT}
@@ -25,3 +25,11 @@ RDEPEND="
 		kde-misc/kwebkitpart:5
 	)
 "
+# 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 c530c960ac11..026fce8477c0 100644
--- a/kde-apps/kdeedu-data/Manifest
+++ b/kde-apps/kdeedu-data/Manifest
@@ -1,5 +1,5 @@
-DIST kdeedu-data-19.04.3.tar.xz 327396 BLAKE2B 9555028b22ade5db6b54e618510844499f6f4bae56fa5a48428ec358c9c166bda21cce003a12696802d188f1feebdc7bc9bcbc7e609da045a9627cc030997ff9 SHA512 32cd497f6fa6b139737526d20640c93bb1abaccb239c4b636cde0ff1202b468745a3f35b2d960e0204b2d81ce9a0f6311ed59fb3b01d5149c6e4f0161ab18ec1
 DIST kdeedu-data-19.08.3.tar.xz 326784 BLAKE2B 99b751c96a4a8113738ef7ec23b252be00e8a286e2d52caa8f1107a3250a2bfbb318cbbc4e9c21a2b7c788ef8e5d759f671a460ebed5f84e1a89e3bc2595ebe6 SHA512 647e1cbcd21dbd535e6462f701a183a670f02f00533c274c10b0da3a3e6d2978836b070ff46e824e68a9f207f7e2461c091e981db26c093d5ed94d5835e49613
-EBUILD kdeedu-data-19.04.3.ebuild 391 BLAKE2B 48b8603a31f60bf24ca536f081ffc59cefc61d039de9006ef8569e86b9135d977b9a62d10fec54348b6b596263b1437e64c0f6f2c58189790bda2012845e0b90 SHA512 e4b94aa6157f40702d44baa042b55fa97932d4279d134a74d2a75efea78a4e02ce0daad7f3f979cd0a0eaa9ae82cbc47cef183c6ddff6428be7bcce2be087cc9
-EBUILD kdeedu-data-19.08.3.ebuild 342 BLAKE2B 2143fe68591931f8d1dfe0693ef111b1caf475d3fae3df75f087e3e7e98a4359f3ca6fe81e0511395273b9bb0d51868d7254bf725bba43ac49ebdd5c2cc2597c SHA512 17a6a66c66bf011e28d911b85c6942efc1b7a6f21bc8027b8114d3f91f58c43896d313f0a990b422a32a85a00842d33c484eaf5921cba7a53a808ea38955f315
+DIST kdeedu-data-19.12.0.tar.xz 326172 BLAKE2B a861e4ffe491b90ddd8bbd930821d60484ef3951d51b2535f1fc60540be1aa3aa82b362fa3b9e470e8dbcd23c1d8fa2fc6fa69f5eb3a3b6d945d4ae9dc3fca40 SHA512 e6d8519a0ca718d49a8bd05733c7c6c76fa17ad93c642d9135c182183e2bbc57375e1750a82dd510b654b2aeb555ca181ac396d36c98fb85bb4a3be3a07484bd
+EBUILD kdeedu-data-19.08.3.ebuild 339 BLAKE2B a8e6814bf20e989c82154ba24b81adf73a9d4adec2a5658caa00987624841ca69967a2341dab0c366c88f5ca683a934d94e5e3d50877bc90913ec4b5178cc6bf SHA512 c2cc5fa5dd0b4070e44f60bd736161f539c43d3383e58e58254eedc15d9ef117a6052499a1ef7fc9b1aa7fef770319f5cbe57e648d52ce3f316b6aa3c8941aa1
+EBUILD kdeedu-data-19.12.0.ebuild 342 BLAKE2B 2143fe68591931f8d1dfe0693ef111b1caf475d3fae3df75f087e3e7e98a4359f3ca6fe81e0511395273b9bb0d51868d7254bf725bba43ac49ebdd5c2cc2597c SHA512 17a6a66c66bf011e28d911b85c6942efc1b7a6f21bc8027b8114d3f91f58c43896d313f0a990b422a32a85a00842d33c484eaf5921cba7a53a808ea38955f315
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdeedu-data/kdeedu-data-19.08.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-19.08.3.ebuild
index aaa79343f304..1c654103f6a9 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-19.08.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-19.08.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Shared icons, artwork and data files for educational applications"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kdeedu-data/kdeedu-data-19.04.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-19.12.0.ebuild
index 8315c7787dd6..aaa79343f304 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-19.04.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-19.12.0.ebuild
@@ -3,18 +3,16 @@
 
 EAPI=7
 
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
+inherit kde.org
 
 DESCRIPTION="Shared icons, artwork and data files for educational applications"
-KEYWORDS="amd64 arm64 x86"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
-RDEPEND="
-	!kde-apps/kde-l10n
+	dev-qt/qtcore:5
+	kde-frameworks/extra-cmake-modules:5
 "
diff --git a/kde-apps/kdeedu-meta/Manifest b/kde-apps/kdeedu-meta/Manifest
index d902a4b5b606..65d3524f9883 100644
--- a/kde-apps/kdeedu-meta/Manifest
+++ b/kde-apps/kdeedu-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeedu-meta-19.04.3.ebuild 1226 BLAKE2B 01f7379c8d0f11a198c04bb6cb59f91968dd224ce1d3caf44cd885ee324219d15c4bf723e19bf54119677ef8690c92f961456d7b19b0f6d5ae885aff37fe6eca SHA512 e1f43afef30a686d3110f5862027d184da0aa1130b5d8c09adfae7caf6e76354538174946de734aaaf7bf1fef7a7f54f81495a32ba8f20d64737b273dba1144d
-EBUILD kdeedu-meta-19.08.3.ebuild 1229 BLAKE2B 21f255f6d3ccb41710f0d437dc9be3a6948d0bb5e5322d66a5f436bde33512b88d747d5400d7efa3d34bb02bfd6db0e19c9f7333924d92b5d008db9462f94109 SHA512 010cce8c5edd425cc4636ac044cab91530579bf8b390ca567443e9887fc69f39cbe7485ee001e9d99596f53cf63fdc486f1e53ea29b44ed6666a93286cbad059
+EBUILD kdeedu-meta-19.08.3.ebuild 1226 BLAKE2B 01f7379c8d0f11a198c04bb6cb59f91968dd224ce1d3caf44cd885ee324219d15c4bf723e19bf54119677ef8690c92f961456d7b19b0f6d5ae885aff37fe6eca SHA512 e1f43afef30a686d3110f5862027d184da0aa1130b5d8c09adfae7caf6e76354538174946de734aaaf7bf1fef7a7f54f81495a32ba8f20d64737b273dba1144d
+EBUILD kdeedu-meta-19.12.0.ebuild 1229 BLAKE2B 21f255f6d3ccb41710f0d437dc9be3a6948d0bb5e5322d66a5f436bde33512b88d747d5400d7efa3d34bb02bfd6db0e19c9f7333924d92b5d008db9462f94109 SHA512 010cce8c5edd425cc4636ac044cab91530579bf8b390ca567443e9887fc69f39cbe7485ee001e9d99596f53cf63fdc486f1e53ea29b44ed6666a93286cbad059
 MISC metadata.xml 403 BLAKE2B 0cd42ab85cbd256e6080ce92fd939e8138a9639832c2f0a87ce4fec0364ead3a180d344c16672a2631dd294cbb7f50f9d748a6a3d0585c6a834bffb05469792c SHA512 50f9c120fc6e8705b2b40f21a3e119a1a52fdb1bafcaed645f41bd13311cac342f4ccff3090a9fa3ba031904871954f81ef3301c73a58e0688d071ddba5d0152
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-19.08.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-19.08.3.ebuild
index 24a6d7958cea..e21998c84c8f 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-19.08.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://edu.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+webengine +webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-19.04.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-19.12.0.ebuild
index e21998c84c8f..24a6d7958cea 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-19.04.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://edu.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+webengine +webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index 142e049c79dd..b0822b850233 100644
--- a/kde-apps/kdegames-meta/Manifest
+++ b/kde-apps/kdegames-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdegames-meta-19.04.3.ebuild 1804 BLAKE2B cf7a80b49de349f66d567e40d977f8f5a6903a2f4e9b0f4a6fb1dad9f3eb8080b735c2034564f8c66ec64fbd18b4dfeb39f130c97b1c505d32a3f7ec83a3e668 SHA512 65ae1f729ca29694e752897a3934a6a1084fc6c072b4cdff8f0e982d6294098d904f77d2f2b7b1feae74719ce5d94d5ba0a43866373992385e0b563bf764f4d5
-EBUILD kdegames-meta-19.08.3.ebuild 1807 BLAKE2B 915a35021c2e0bd23cb675ec6430d841967e5415699161f31399b6aac311c1e7ab50d7d47d14c95f3aa449339c0e60dbea7c39330497d719d478622a2f7dfa2f SHA512 229186f00d719ef951b533a53cb3e77379c5fae67337e44dca81b2b822022c11c5f2f755d12072bcd7a290dff376b2bce549f1bb9502ec226f4d2663c51cca47
+EBUILD kdegames-meta-19.08.3.ebuild 1804 BLAKE2B cf7a80b49de349f66d567e40d977f8f5a6903a2f4e9b0f4a6fb1dad9f3eb8080b735c2034564f8c66ec64fbd18b4dfeb39f130c97b1c505d32a3f7ec83a3e668 SHA512 65ae1f729ca29694e752897a3934a6a1084fc6c072b4cdff8f0e982d6294098d904f77d2f2b7b1feae74719ce5d94d5ba0a43866373992385e0b563bf764f4d5
+EBUILD kdegames-meta-19.12.0.ebuild 1807 BLAKE2B 915a35021c2e0bd23cb675ec6430d841967e5415699161f31399b6aac311c1e7ab50d7d47d14c95f3aa449339c0e60dbea7c39330497d719d478622a2f7dfa2f SHA512 229186f00d719ef951b533a53cb3e77379c5fae67337e44dca81b2b822022c11c5f2f755d12072bcd7a290dff376b2bce549f1bb9502ec226f4d2663c51cca47
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegames-meta/kdegames-meta-19.08.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-19.08.3.ebuild
index 91b0db75ecfe..bd66e63c8e5f 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-19.08.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://games.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegames-meta/kdegames-meta-19.04.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-19.12.0.ebuild
index bd66e63c8e5f..91b0db75ecfe 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-19.04.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://games.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index a89faa0df57a..c30253b76162 100644
--- a/kde-apps/kdegraphics-meta/Manifest
+++ b/kde-apps/kdegraphics-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdegraphics-meta-19.04.3.ebuild 857 BLAKE2B d8943c43f707b0d3637164dee843dc9fc8a434fe0255904c55ef54aa1f18a38e8253e57d5c3be648e1767d655c0e81e5dbe963359dd04a97aadce6b0b055b3b0 SHA512 62337f1080091e90909d3f32683ea49d19105e2ed2bbaa907abd68186e86a8dac1e490a9f81d3c1818125bf60a2d4509217bb8942caac20ed385e4b9db8c81aa
-EBUILD kdegraphics-meta-19.08.3.ebuild 899 BLAKE2B 518f528f7e4bc44fc2c3343c84f8bc4dc3370bf7736a51da1f1c4db2b30cae3c6419ad5c38c98a08b9f0c1f9abe3c8789ffc6587b3742ac6b911a5be95cfe4ed SHA512 2efa668bdf28f3ca44afa77be1c747d31889bbe30817510421e93f5a29710ba271bcf88e36272d5905a75e4fa2ac14c94f1e19e8e29f4c1daa7c61794e2d24ff
+EBUILD kdegraphics-meta-19.08.3.ebuild 896 BLAKE2B 9f3d9ef952bfaf23c9c67d971b86b273cf391966fb95050bc5621fa1587f8f675cb1029bb1eaf9559bdf02c7569bd5fa71b3f67fdf9b246a5d31e2af60dbce2e SHA512 c745c30a402596ea6ab0782c5b52b868dbe09a8f31d42280beff220ee21a9d3d2c5e876189af2895ecfb7c9487a56df8fab1dc1eac71371fe4428b24b004d157
+EBUILD kdegraphics-meta-19.12.0.ebuild 899 BLAKE2B 518f528f7e4bc44fc2c3343c84f8bc4dc3370bf7736a51da1f1c4db2b30cae3c6419ad5c38c98a08b9f0c1f9abe3c8789ffc6587b3742ac6b911a5be95cfe4ed SHA512 2efa668bdf28f3ca44afa77be1c747d31889bbe30817510421e93f5a29710ba271bcf88e36272d5905a75e4fa2ac14c94f1e19e8e29f4c1daa7c61794e2d24ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-19.08.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-19.08.3.ebuild
index 23762131d38c..138d8f76475a 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-19.08.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/applications/graphics/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="scanner"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-19.04.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-19.12.0.ebuild
index 89df845ce648..23762131d38c 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-19.04.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/applications/graphics/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="scanner"
 
 RDEPEND="
@@ -16,6 +16,7 @@ RDEPEND="
 	>=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}
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 28ae36f36656..0a70297e52ab 100644
--- a/kde-apps/kdegraphics-mobipocket/Manifest
+++ b/kde-apps/kdegraphics-mobipocket/Manifest
@@ -1,5 +1,5 @@
-DIST kdegraphics-mobipocket-19.04.3.tar.xz 13424 BLAKE2B 4d6e02cefbfc36f9e4942b060ffed80f25b82b629c6ffe893f1f7525c594cf1113fcd822ac44db9c8cce8dc6c94bed581e70a0edb88b57793554dfed3882e57c SHA512 fb37bfcd86ec09f5298ed7f4bf9d2ec2e54087617d51c676cecd94b96b56e55b4abd6dcd84d8de17fe54536244de3ffc8b4823d81c5337191364283f450b8a1b
 DIST kdegraphics-mobipocket-19.08.3.tar.xz 13496 BLAKE2B 926c79fb21543f46ed8372ce8f41902e25ae3e6363d1d9c8dcd79c5e68f93d324f3fbc18b3d5ce2e9520b238155bc480c847dad31096a602c0741d1f588b5b43 SHA512 7cb8c853d4eb3216c302dd5754b2bb999805399cb8559bc0b90d83642973ca6cdbd14552d7735d2d4156d043c73177e8b3484f37dd92d3eb163839041d11477a
-EBUILD kdegraphics-mobipocket-19.04.3.ebuild 425 BLAKE2B bc04e29778692fd5993d85f50a75f4ecc48623a6ed824f9c382ba5526f652fb27ff83dd8c04c7c6783e30d78e25c15f94d82cb8eaa80a43268a9a1cd2e994665 SHA512 65a919fd516eee0d8dca92f4134780ce8d80e0fb6e5437ce9032db936a01e7412de4d1041c9ebaf6f8f9b9c729ba259d09c20b24a3ff8e0f4878319a09b11d59
-EBUILD kdegraphics-mobipocket-19.08.3.ebuild 511 BLAKE2B 3a6c2ce05ce308e50766068345b16e7ea4620680a07cd1678ba3149c0b2075e7f2d14273fd7d8a6e711773f7a6a9f4751b68565633aa1a778b253884328a6dc2 SHA512 277135d49a3273d73daa8033f5a885164e9aabe9d5da1fd655a4dc866465aadb8513c5085d513dce549563c593ded9b3dc2e96b0919e8160265881d26573cc88
+DIST kdegraphics-mobipocket-19.12.0.tar.xz 15840 BLAKE2B ca29b23608d5b73af9084577db3007be361f2bd6554308b888e91bae18337897419545bd005896d450d34c768355497de4e8baab1c47ab8f4189fdfe27c611f6 SHA512 d7ebe845be9db4495653cba0626b608e90d238683e626cafba4e816895f9c6b9a00c5ed5bfb10be1b012f7d29a92fce4496a5941fccf12b5b0b437ce3dea9faa
+EBUILD kdegraphics-mobipocket-19.08.3.ebuild 508 BLAKE2B e257c4d776ab56f669b5b4003b76aa4de57a0d7e98a8d20ff666e57f341552a88175fd733739e06c9a4bce993cd5dce52e17720b8a9dba75c33059f887dc9d2e SHA512 27c65012ed8756551f7aa6fd424fddd6ed99669787313b454de118448c2113453c97d2b6c940f56f2e901b495d0cc5ac16f20b6f8990dceab28a75a6c9bd18d5
+EBUILD kdegraphics-mobipocket-19.12.0.ebuild 512 BLAKE2B 68a0559f4c914fb4ba976f6231cf0783b7f8483cd47dd2fa375e4677d7a480c7eface42a0cf372875b090217999de1cd1618918f13c3384d37ee1e6bfd810a9d SHA512 3a860c04716ca787f76c85a8d05da729b305581a74fff7666e04915414d6c6907f8bd628086f7a3b88f8552bdf9b3f72e558d3353fb84ce9734dc5290c48d108
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.08.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.08.3.ebuild
index bd81f7234916..6a5bfe511e90 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.08.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Library to support mobipocket ebooks"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+thumbnail"
 
 DEPEND="
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.04.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.12.0.ebuild
index ab023d46823f..e42abf2c81bc 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.04.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.12.0.ebuild
@@ -3,15 +3,20 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS="amd64 arm64 x86"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+thumbnail"
 
 DEPEND="
-	$(add_qt_dep qtgui)
-	thumbnail? ( $(add_frameworks_dep kio) )
+	>=dev-qt/qtgui-${QTMIN}:5
+	thumbnail? ( >=kde-frameworks/kio-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -20,5 +25,5 @@ src_configure() {
 		-DBUILD_thumbnailers=$(usex thumbnail)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/kdemultimedia-meta/Manifest b/kde-apps/kdemultimedia-meta/Manifest
index daac1b651087..e004b13ecb34 100644
--- a/kde-apps/kdemultimedia-meta/Manifest
+++ b/kde-apps/kdemultimedia-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdemultimedia-meta-19.04.3.ebuild 809 BLAKE2B 09e88279c65a35cb16b470fd19ae7ab8b6cb4dbf57f30fea68f3197889b6aa41c05e0bbd6c58b49547db5e60de2a7b65fd8132488f0c221d5ccd6e7ae9defdc9 SHA512 dff184b1e8552c4ea7a0a42b8c09b3b9b2d5a2ceaf0f3d1d08e8118a433990b0dc8221934ac86febd46d5369c1f1491b79d4d5618c7f7ebeb68c82ea216c5437
-EBUILD kdemultimedia-meta-19.08.3.ebuild 813 BLAKE2B 3d961fe44f701b8d7cf6d3b0fd62cbf2756c17b3e7de18d5cde73a538d0185b1fd897913c7af6527c1fcfcdbdd743d215fc3a93027d5753ccde097597abf3ec4 SHA512 125ed12d192bc61f4634beb1889b273ffafd4ebb723b63762e82826fab53fb4db851dd74ae301457f76d88fa5259e265ca6a1ea2531c401889659aa090340fe8
+EBUILD kdemultimedia-meta-19.08.3.ebuild 810 BLAKE2B a27d34d31667dbd7e699a73c5f8bb19d4ebcee04abb7d19388d878b6ef3c23d9a00a739f32d0d8932085ffa6940d0234095bf50e0f5cc21cb2adb8f0021aa104 SHA512 f7cc25d8fc3ec363ca696ac6a9490f9eeb6d8ba45f018bcee366e8d51df4183c75144e3b1472365402ff3ce0a06c32207475606a7486b0770eaee75f50e4f70d
+EBUILD kdemultimedia-meta-19.12.0.ebuild 809 BLAKE2B efd02a671d2aca2de4e6c3c6c3bdda67890ca31c82dfb2f05654a2d9e8384b32ad02a1c4a880a7cd812947709dda29b8feb86897cc4b0772e31e9f61b7244c98 SHA512 d91ae28408324aa4faae56b84b677b7168f89189afc965190515eae9cf8ce22f4cd725bd161c41e539768a572f5e93520562e187eb19bdd8c582687e93ac5a63
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.08.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.08.3.ebuild
index 8051d3dc3ced..67e6518a4f6d 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.08.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.04.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.12.0.ebuild
index af2c005b12ca..332ed55a7425 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.04.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.12.0.ebuild
@@ -4,14 +4,12 @@
 EAPI=7
 
 DESCRIPTION="kdemultimedia - merge this to pull in all kdemultimedia-derived packages"
-HOMEPAGE="
-	https://kde.org/applications/multimedia/
-	https://multimedia.kde.org/
-"
+HOMEPAGE="https://kde.org/applications/multimedia/
+https://multimedia.kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+cdrom +ffmpeg gstreamer"
 
 RDEPEND="
@@ -20,10 +18,10 @@ RDEPEND="
 	>=kde-apps/kdenlive-${PV}:${SLOT}
 	>=kde-apps/kmix-${PV}:${SLOT}
 	>=kde-apps/kwave-${PV}:${SLOT}
-	>=kde-apps/libkcddb-${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} )
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 0cc720641a4a..8fa7260b9639 100644
--- a/kde-apps/kdenetwork-filesharing/Manifest
+++ b/kde-apps/kdenetwork-filesharing/Manifest
@@ -1,5 +1,5 @@
-DIST kdenetwork-filesharing-19.04.3.tar.xz 312512 BLAKE2B 43435b80c64b446d63ba6db3248f17f7eade8cb63de4ecb61c5799beba23b781ceabe6bf439c45d7d81defff874ced174fa5fe050938a4c40c422e5edc79fd82 SHA512 0e202393c8a138c97aac8512352364b61f80c8f08f02e1846abcc9dfb3d8ed7c40b2cfc658a99d0d0dbdaad02af8045ce45bcb49da19da88ab7fd712b0a560b0
 DIST kdenetwork-filesharing-19.08.3.tar.xz 315492 BLAKE2B 0c05508718e924a36e3354969300b21902e64ced803567aafc00121bcf766a30f8a7197dac84fa1597d4b8dd3bf6b2169e1d91d74adf8766696449744111a40e SHA512 d75d3579c9c0d83e79bb7731273af01c3644ed632aae7141952586a67d88618e08a92ecf4fe6089ceefc8d5a0c7c5f57afff367bc2162e4a127d4d6958717c8d
-EBUILD kdenetwork-filesharing-19.04.3.ebuild 581 BLAKE2B 6ab96099ee21998087031dab345e95bdd932938e5eda61c496d542d4c963d9c8c9b46293efa2ef4f97f438a5d6827b6a85336c760b417cc480d54f3c9054f700 SHA512 38fe2b9595ce8f15af3fc312b543cb2b28c9eb7b5edf81bcfea78d52148786421ebaf270851c1840ffdf827938c94da9f7bebdda7fab8f8479a58498d6fd4855
-EBUILD kdenetwork-filesharing-19.08.3.ebuild 697 BLAKE2B 967b7e5bca02c0a4c46c7f6997810c118756853acf37e761f8af76701289be25448778bce9dd1099cae059a4660919e62a33d576855bc11f0a21f35c7461575e SHA512 bc2dc4c5a3f3c99530aa296320299676d70b7a74dbc8ad297742bc3cf92ce8a17e98cd3d6fcb4d501cb80be7a119d324b180b4d778f0c3760d4bfe596820f273
+DIST kdenetwork-filesharing-19.12.0.tar.xz 317596 BLAKE2B 6276b1b959440229e70cda40607be143e7265ed9aa977e3991eab9f0a87f8131c59a60f3e4408f927edb1958eef8f1ebd251231c3dcd198e0c40d5a42a1e9a63 SHA512 790d017d37b5b1ae8d8e9529d703f490cbfb8b37c81d5ff6648e87e286dda17e67d2a1afc1e7df7fe5d5e1f707154505953a45197468e21eeb332004718ba58c
+EBUILD kdenetwork-filesharing-19.08.3.ebuild 694 BLAKE2B ebb67c0d9e1e27ad45a0889bac13745d16ea73e554a3a2f888e0beb491195764c8730cfe7516f45b4dae5c862e95d8b0f79c39f6a533a88c58a240f32360df58 SHA512 b389ad6ecca74183e471050e8cec0978ef94466f01e267ff2e22b69370f65c71010242b61fc0dbd49b7b6816b82af3c3fb4a8976afad7e6ca6c937697e484a8b
+EBUILD kdenetwork-filesharing-19.12.0.ebuild 776 BLAKE2B ce7ee675eaefb5a95d224a786871ef757d3e0f924a598f8110e35256304655f869e3a420b020c4e27dd7a468286d36dbc605d437b2423610bffe162d65992e07 SHA512 b9f1fa5c82c911c22d9876f2a6f3e042802175651035f377831c5dadf5c3bbd58bcbb226cfd52891b82defb3ecc11e2c4a7d403b38d74632b7254c7117dbbda1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.04.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.04.3.ebuild
deleted file mode 100644
index d3b67821abd0..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="SMB filesharing config module for systemsettings"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.08.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.08.3.ebuild
index fed11d615cc0..64e3344ca94f 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.08.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="SMB filesharing config module for systemsettings"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.12.0.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.12.0.ebuild
new file mode 100644
index 000000000000..15c13ace4a3b
--- /dev/null
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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/Manifest b/kde-apps/kdenetwork-meta/Manifest
index b36b68f556cd..ec892218dc2b 100644
--- a/kde-apps/kdenetwork-meta/Manifest
+++ b/kde-apps/kdenetwork-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdenetwork-meta-19.04.3.ebuild 664 BLAKE2B 65d1caabeed754b40b2e34e31726976fd7cf2c6348031f27526a674a773950a672b9f448ffa96197a9945e4c947263d1027495616a4a19649fc7ce0b02b09275 SHA512 0a605caeb586fd29f9d447335130fb7b13ce0e16d0a9c256eb48cd19561a351a81e05627a47b6b309aab2487a6a6cd26299c9f7d7101b9ee265aa2f07364b46d
-EBUILD kdenetwork-meta-19.08.3.ebuild 667 BLAKE2B e548e019c4eb6217f5064550a85ade08c940500aaa05c0bcbb6fef7bb8cc2d2afab6d81c3e905e5c17c389f7a82a692b84a54dbf9b06fb08868bb1aa9a6b2668 SHA512 3ebc40d1c2bc73daf4a74a85c3d61b41d10ee1926184b3bd9e36fbc5c5d6202f49ebc028f59862d189bfdeb43b8364fffb493dd2f7f51b97096edfca12575b61
+EBUILD kdenetwork-meta-19.08.3.ebuild 664 BLAKE2B 65d1caabeed754b40b2e34e31726976fd7cf2c6348031f27526a674a773950a672b9f448ffa96197a9945e4c947263d1027495616a4a19649fc7ce0b02b09275 SHA512 0a605caeb586fd29f9d447335130fb7b13ce0e16d0a9c256eb48cd19561a351a81e05627a47b6b309aab2487a6a6cd26299c9f7d7101b9ee265aa2f07364b46d
+EBUILD kdenetwork-meta-19.12.0.ebuild 667 BLAKE2B e548e019c4eb6217f5064550a85ade08c940500aaa05c0bcbb6fef7bb8cc2d2afab6d81c3e905e5c17c389f7a82a692b84a54dbf9b06fb08868bb1aa9a6b2668 SHA512 3ebc40d1c2bc73daf4a74a85c3d61b41d10ee1926184b3bd9e36fbc5c5d6202f49ebc028f59862d189bfdeb43b8364fffb493dd2f7f51b97096edfca12575b61
 MISC metadata.xml 546 BLAKE2B c0eaa549235c2cf501ecfb5eb2b39bf466193e892715224ff8979528e49d2dd129873714302505f54ea200707eba0682a75a4232bbfe89b78244b5483d93a2dc SHA512 a423dbfbd45bd72c6d5aa9f196c9a4f1b4740400ac31112f358246e40f22ebaf76d3fc66136b4f477ebdfb59c967b45351841718621fc88f5576b71338136e6a
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-19.08.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-19.08.3.ebuild
index 093236da6986..f5c7d7e780db 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-19.08.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="dropbox +telepathy"
 
 RDEPEND="
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-19.04.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-19.12.0.ebuild
index f5c7d7e780db..093236da6986 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-19.04.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="dropbox +telepathy"
 
 RDEPEND="
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 4aa5be9e9354..9aa270d5fd5e 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,7 +1,7 @@
 AUX kdenlive-19.08.3-qt-5.14-1.patch 7106 BLAKE2B c2c3e00603ec83fd98af7a4350f08e422e4e6e5f086119d30637608d10229f2cecde5789af060596bd51991c1f28bd88aafad945c1278266800fcf0282cc1194 SHA512 9076bd07c418be6376d83e223010bb0e64e159a0fb8aef9e58479811158ca851fedd9cd30c42086bfa13edb230dbcf61ad9bd1be4e6570c76d0abab92a685d9a
 AUX kdenlive-19.08.3-qt-5.14-2.patch 1038 BLAKE2B 2e45cbd32a81fd70eb6794ad4aeaf87f9f5dddce820237b00a4aceaea9a02c212cdd7727c414788c23baeebd52231e8fdbbb80a79b85ae89bbc93e0606bcf816 SHA512 0abd4615c6eaff86836220cb39b2785a40436324c701a253a4d1cc8f6aad37a7d11a3c75338f34a1f50cab68a869230af5c74d6d00e8827f77b4016cc877986e
-DIST kdenlive-19.04.3.tar.xz 11071112 BLAKE2B e43563e8ab679e08b7d654e38e7b092c9e919c46ec1f62374f29fb2210ba447ae8183afec2ff31472d64d557393e71f775175141e526923247c3624187bfc3fa SHA512 de8d7147a2d5f3b70bb1fe3f5e73acd3e3fe6289415c9fb68a5b4850e43ae55ac9e00d6143e1c717c5efc4e634be84626a2bbfcd460deee39e5638002f043aa3
 DIST kdenlive-19.08.3.tar.xz 12418064 BLAKE2B bf0765e28f374a21371a9bf3fbc6059d6ac81118d79b0978fd10a3c4959f1343d06773ae278cb6e9a3890c1c1daff79f0a709cebd186b1bc586318e5384ca5da SHA512 187651de7542b86f9332c3eb79e2a27b664f0b4ead19fbb6035963b7be41a2a53b65de37e8c18c50aa794145cfaa2ebaf1b9f721d379c014da9c5f9475048738
-EBUILD kdenlive-19.04.3.ebuild 2325 BLAKE2B db1e14709b4a783b29f717173368cfe8921a1cb62eba41511f76bd5aa20a45987f0edaf3abe63bb2d6dad8d4ddfffda7c15e2066c767a109d3768451d21b9ebb SHA512 afb7e58c574a5e1604be0afd15e76df587fa998f08d0e5ba80ac279aa0555ca49758b9191e6b25960685ba5c3e5d1e5cc2d7cfba451baab7f827cd18620b4d84
-EBUILD kdenlive-19.08.3.ebuild 2586 BLAKE2B eed47dbe78a92c6d6a735bf8bb5d7cebc51d913187af137b41223ec8a7ab306a3288696d36d7a7ccb4d32b42b911fa35a9f54815b8934a0b38356781f3b96be6 SHA512 e6aadb625f9659794ec3a64bb47f61929672215010e9b43b8f676fa578aaabb0ab52cff6ee6f26c1677146fb8c9d1fdd365e59b84df8b92bf8f0aa221ba21347
+DIST kdenlive-19.12.0.tar.xz 11428756 BLAKE2B e76153fea8be842cd130067d39ac8571d118267d3dfab15cc1e0346690ab2f0b2db16d7f64a59d96d89c4062859d6c1d379ce9cbeee0c63ba67fe2f8e0d2a875 SHA512 dc692db5dc4e0c7c8daa51fb8722d5d60efc22bb10b61c1048a67a50c15e9bac44bd009f6379153f1e1c21c12cb4b88f56ebe2db21a095c00bd068d0c1bbcb61
+EBUILD kdenlive-19.08.3.ebuild 2626 BLAKE2B 8ff4702ee1474f3e613c0f029a4594d93f5d4ccf9f24bd84bd54295b6839de19a79c26c216bcc2385b21491d195da291068adf3ff9e6df127c36d11aa78ff872 SHA512 75db879700acefe1283d8a6d13339a8ea197833edb4a7669fd05aad34d9a671dd0b48ad29ade1c3ae95c31f5e52d1de90150e9748b9887b7959f55e9c2b90ec6
+EBUILD kdenlive-19.12.0.ebuild 2509 BLAKE2B 821af763958da4998adeea67583ba051f6a38735a3c236fbd1651ac3bf608b8f2be142a23d7bd168bca96f53b865438bb6a467fc9fde32ccb85395b23705d49f SHA512 32ebc69d1a8c43280a004490855315849b220a783a4bf9ca42d5dc974a34334f84eef798335e3eb90b4fb17d717cc39b3df844814dab0a809c491a6f47cafbb9
 MISC metadata.xml 559 BLAKE2B 4fb6ac38398866a869611dcdc0d9513c5618e7b1864b221d155e5bf1200ffd1081ff8b7dc408d85a97be6146eaf60b1ff1ac695c02e22c2a1537b18a8a1d8f4c SHA512 b76a5322a9fe2a6b7597ac7a6c45525e921cd0102e156939e013c96d876b355b258c0bb917e72a73686819672a2a5a47e7c7d0232468c709e4e88f888ee26cbb
diff --git a/kde-apps/kdenlive/kdenlive-19.04.3.ebuild b/kde-apps/kdenlive/kdenlive-19.04.3.ebuild
deleted file mode 100644
index 701ef28aea80..000000000000
--- a/kde-apps/kdenlive/kdenlive-19.04.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://www.kdenlive.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 x86"
-IUSE="freesound gles2 semantic-desktop share v4l"
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-cpp/rttr
-	>=media-libs/mlt-6.14.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
-	freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	share? ( $(add_frameworks_dep purpose) )
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtquickcontrols)
-	virtual/ffmpeg[encode,sdl,X]
-"
-
-RESTRICT+=" test" # segfaults, bug 684132
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package v4l LibV4L2)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_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/kdenlive/kdenlive-19.08.3.ebuild b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
index 8e7dadce7f30..e32cf708c943 100644
--- a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.kdenlive.org/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="freesound gles2 semantic-desktop share v4l"
 
 BDEPEND="
@@ -66,6 +66,8 @@ RDEPEND="${DEPEND}
 	virtual/ffmpeg[encode,sdl,X]
 "
 
+RESTRICT+=" test" # segfaults, bug 684132
+
 PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
 
 src_configure() {
diff --git a/kde-apps/kdenlive/kdenlive-19.12.0.ebuild b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
new file mode 100644
index 000000000000..ebe92f742c62
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.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 ~x86"
+IUSE="freesound gles2 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=]
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/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.18.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
+	virtual/ffmpeg[encode,sdl,X]
+"
+
+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 4f30169d7682..cc1daab091bd 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,5 +1,5 @@
-DIST kdepim-addons-19.04.3.tar.xz 2076656 BLAKE2B 1b60fb43489836081a4456836d9c5e521368002550ce2b451ca13565519be04a18e08f5ca7e02ec63ae25efb9614f1fd5da2a519361c4cca488d10e711448fb1 SHA512 b5111cde99153939fb7bc4165331467fcaf607098b81be5ad711ddbdb953f93612ace52a76c6b784060b212ca84af3e1034180964cbc0397bfebf25274509dc9
 DIST kdepim-addons-19.08.3.tar.xz 2091080 BLAKE2B 172e8f80dda538d413f85f998657b9882f2fbd61afeb58be3026c12e080551da2a5237a344af6f45b57e6e905c5c07a37b4d34fc3785473b82984620df38d7f7 SHA512 bc9d3cc80a50a758052d9f67fbdb26f9babc8f03e3d83928b63040dc5bc96bf38e76664ced3cc89025835850845d03386093705996dc757e6d46c02a7eda6425
-EBUILD kdepim-addons-19.04.3.ebuild 2406 BLAKE2B a0369974a7c15003602461ef3c3f59cde976aeb229136d1e4cdf474183068778c070573ecd04ede4e91ffd9d72a4d0036c2c5c767c975f85315cf64c8b90c740 SHA512 90223da6066fdea518da99204fa4e3b3f2e0ba1c134e7f50b6d8a586b63e3b89dacd82aaa23812719e212398f1038913188497e10fc91f4a25586af80ecb4f03
-EBUILD kdepim-addons-19.08.3.ebuild 2619 BLAKE2B 38b521390b9714589fe7620f532b1bf9b068bf7ff0d49ac5e64994598001dad8af8086bacd4d3b8ee91cc14833f3a4c60de5106d21407f81fe7b957048782033 SHA512 94582d7422057615934d66fc5a46539912847de7696a2c37655ec91ea1af77d125c0f1fac3d54d7a7a2bae8b34d86d5e980219e6335bb3a896e76b679566d63c
+DIST kdepim-addons-19.12.0.tar.xz 2105188 BLAKE2B ce2e1f1544932ed613a463b068791e6bab7d9ae480ceade9ec9748ddf3407cb351d2bcb1dda4e5c626aeded01bdea252235c6aed5212d051497700b21179922f SHA512 b841cfc05d732979dc9cd58cad8ac2f62610915ba6542f0956491d292b18c28fd0695655e2fcccf7e4352a6b8e14f16153c2689c6d94a8d9e54ffa0e148ffa54
+EBUILD kdepim-addons-19.08.3.ebuild 2616 BLAKE2B eb032121cf681711d26d645a8b9e4ead87a8de20aafb6cbf962b76191ecd5b7a03dc28a4eb54f8cf826ce56d65cf696ecb383467c4c4f7038497ae09b7c32b98 SHA512 38116a532dc33f1112f2d8d14e65c2b9dca53718c21bae0b127e687604cbfab7a4ffab53037166eee56f4e3c18ee0c686c581ec5f1a154f44b0aacf0a376512a
+EBUILD kdepim-addons-19.12.0.ebuild 2715 BLAKE2B b3d738db10b91350470c7c6cfb6b6e05a6f418f0597e7dbbc3479002f2abe2aaed2193a6a30a8c05fb0fe38f4e4af6b8a6000100a6d85937853da59cebb15aaf SHA512 4d364fb054382954c4b10e299f30284f21663e1ed12c091fbf73b4fb8ccd9f76dacac39f269dc0a49f263e6de56b5b1f6d1d143910077549668550679e8c6604
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild
deleted file mode 100644
index 3108de034476..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-19.04.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_EXAMPLES="true"
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://kde.org/applications/office/kontact/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE="importwizard markdown"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep prison)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kitinerary)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	importwizard? ( $(add_kdeapps_dep akonadi-import-wizard) )
-	markdown? ( app-text/discount )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kaddressbook:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-		$(cmake-utils_use_find_package importwizard KPimImportWizard)
-		$(cmake-utils_use_find_package markdown Discount)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_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-addons/kdepim-addons-19.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
index a184d41ba592..102e1ad40f50 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/office/kontact/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="importwizard markdown"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.12.0.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.12.0.ebuild
new file mode 100644
index 000000000000..2a2d1c5f34a9
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.12.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_TEST="forceoptional-recursive"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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
+COMMON_DEPEND="
+	>=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="${COMMON_DEPEND}
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kaddressbook:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
+		$(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 e647bdc33635..b83f3ba38857 100644
--- a/kde-apps/kdepim-apps-libs/Manifest
+++ b/kde-apps/kdepim-apps-libs/Manifest
@@ -1,5 +1,5 @@
-DIST kdepim-apps-libs-19.04.3.tar.xz 86144 BLAKE2B 1f029f2d5ba62cfa7e732411fc272ceb187bff653710f11312579edb7dd28f99c0b31c5d254adb3adefac98e7e834f2a90cab47d6e16ba308efc7fc05c46045f SHA512 ff9e2e95b8234d4ff61e2edf960a7bdcf196546dc1c9f213bc35870f8ad860cef96e78f1f953976c763a591c879029c08703d8cb4e2df26d789a844570fc8855
 DIST kdepim-apps-libs-19.08.3.tar.xz 82380 BLAKE2B c3ada3bc94a1a072b601206dd8e2227e62ced0b06065d0d2f81f70a5f5cb26de0249d09c97d73427d133bcdb0ee5e152d015ce7db5306a4e191053fc901fec4f SHA512 9abdb259134ab357c11f95923afe44f5a7508f7f1da61f8fd5101a49935612f20fc26237791abfe90d337c7ca7dfaab1774d16c1e0848faa6ae9c9faf29c425f
-EBUILD kdepim-apps-libs-19.04.3.ebuild 923 BLAKE2B 0ef5d2d43b2f6bd1b95925c16d1a8abf2c1b8c7ddb247a08836e71138d57e4b5649eb39bf41aacaae2cad414c27d1542b9203878baa262ecc32b017f2f37293f SHA512 7a4f9d861314ff5f781354575126cd7027affc47359a0fa8a1c91b122089d598575d72ae01a8b838b426968b82aef71aca57209bda0df6339dcacaf89b44611e
-EBUILD kdepim-apps-libs-19.08.3.ebuild 1085 BLAKE2B 43b65e65ad761cb8f59491d27df18ef991b6dcdc90180bd945cd5178c30dc65b982eccbed9600584c18311704a6a6bd83f87af80e807070a75ebb6c185401fd0 SHA512 06e5ca7921458015a4f525e580e0721332b5146bccdd2f6c0cc2c4548fafe810f571a9c24dd0ac257c3800cd790b95667f95933d0142838154c1c7e3db83235c
+DIST kdepim-apps-libs-19.12.0.tar.xz 83080 BLAKE2B 118c1f9d7a945d35ad28dd1371aae95efbffbda1cbec70b696317e1382ddb060f33659e52ba14e7cd4cb24e8c5c72b55662210f31ac998a5ddec0f6c08dadf1d SHA512 d13ee041a319a5283b76e9d4323fffa7bb083e44a082e3d1d73b6fad4cb5a9988dad74fe8949f9d7b835497ef52ed28a64992f23ccaa4bf973347aea8fb3a82b
+EBUILD kdepim-apps-libs-19.08.3.ebuild 1082 BLAKE2B f5728a9baf30ae09af7967d71a878d00f3a216b87049f64484d4bf7adfaeea02fa4cde651cce2bdae14aec56bc236d1ee2ab2ab2dc1a3072b0ff4b09b32cd741 SHA512 99187082cb6bc04a67acc6d842548d2ebd185f175abc52be917524d1e436afc4b4c655413feb5a3f7f9b74554754cc9ac5557a067ed192eeaf2d930c280d7447
+EBUILD kdepim-apps-libs-19.12.0.ebuild 1108 BLAKE2B 5de7b706b0f1bbd9b45f25682b9f92907a965cc57e2785a32314f5dc297e025e66b5f09b404012c74a42be2056971e7690d67a945978805aa2921d84bc475964 SHA512 90916f07a1096401fdb51bebb8eff88f763a183601442d54534dfe857383d886c32233122a8d2b3ac4e8a4497a5a5bef94e29e464d34326f82925792cad94917
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.04.3.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.04.3.ebuild
deleted file mode 100644
index f2ba90639ddf..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.04.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for KDE PIM applications"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep prison)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.3.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.3.ebuild
index 2d5eab6ab965..56847576c3b7 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.3.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Libraries for KDE PIM applications"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.0.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.0.ebuild
new file mode 100644
index 000000000000..143770c7f9f6
--- /dev/null
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kdepim-meta/Manifest b/kde-apps/kdepim-meta/Manifest
index 9adbf7d2361e..98f84fae2e37 100644
--- a/kde-apps/kdepim-meta/Manifest
+++ b/kde-apps/kdepim-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdepim-meta-19.04.3.ebuild 2662 BLAKE2B 269bbdc1f21663d46b2dbacb1c6a435b113ed7bc255226844791850fd3e059d883dc80caa02001f415564bd1b17e128f3df7346de91ae0d785bbf0fb118d5c46 SHA512 f5921ec5ece7b6b8146ed72e6fd1948189de5e687f9767c6afebc30d02e2cfd0ec139b06f6d43fd9006c9c1f1dba0a70bcacbfcda115fd6d681533c69601918c
-EBUILD kdepim-meta-19.08.3.ebuild 2594 BLAKE2B 3405bbd1acb985b75ce4bc38429cda17dd963986a0a3bb74265556c5c8999948ea443a5dd2d864a230f58118d8afa527cfc50f75b51703f13166d308a0ac8137 SHA512 61a493b99c058e618dcf55dca89d67afd3263d5cc5e2f78e5f77555c4ae112bc8ddc5655f90289fe9725ec4a36114f7346463dcf6c3fd1a3ee5c06e5b12fe037
+EBUILD kdepim-meta-19.08.3.ebuild 2591 BLAKE2B 5495e8f39925cecec7a6e10a29b654f3f6ead65755d55a2fec5a047ccdb17deee42db80a29a9db4ed58357947ac25a453c868aa0b8c72af98278bad7d39b4d49 SHA512 27658705193ec557e6bbae15066b60ee8c43585e294b39f34d89100a5529dd05c6053004272df50ef420b0404cdd47575c5d84e8a8cbefc5f3620172376552c2
+EBUILD kdepim-meta-19.12.0.ebuild 2605 BLAKE2B 56c5cc9703be9938c5a719423642956126617a6f70a39ce4e5f8e97b7ae53566d67758f5a8372c2d4a6ffcac94679f3baa71478d2b79f84786de73b7c8ace77d SHA512 11c7fa8d1d28aa3389ce0fea697a657cf96284e7c7122d2b1704935f70df03efaf1581530bc8a1a31f4f1b334670bcfaf2fc2064cce3e1d925c6683ee51fe499
 MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-19.08.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-19.08.3.ebuild
index 798a32b82045..65d33fbd3809 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-19.08.3.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/applications/development"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="bogofilter clamav spamassassin"
 
 RDEPEND="
diff --git a/kde-apps/kdepim-meta/kdepim-meta-19.04.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-19.12.0.ebuild
index 3d3ddc217e4c..54adfb904e6b 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-19.04.3.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-19.12.0.ebuild
@@ -4,11 +4,11 @@
 EAPI=7
 
 DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://kde.org/applications/development"
+HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="bogofilter clamav spamassassin"
 
 RDEPEND="
@@ -30,9 +30,7 @@ RDEPEND="
 	>=kde-apps/kaddressbook-${PV}:${SLOT}
 	>=kde-apps/kalarm-${PV}:${SLOT}
 	>=kde-apps/kalarmcal-${PV}:${SLOT}
-	>=kde-apps/kcalcore-${PV}:${SLOT}
 	>=kde-apps/kcalutils-${PV}:${SLOT}
-	>=kde-apps/kcontacts-${PV}:${SLOT}
 	>=kde-apps/kdepim-addons-${PV}:${SLOT}
 	>=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
 	>=kde-apps/kdepim-runtime-${PV}:${SLOT}
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 4512b6f2780c..48d9e9ff94de 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,7 +1,5 @@
-AUX kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch 2069 BLAKE2B fa9acfe1cac9ae5985c7c2142e4ebf85a04af7ca0bf71ac2aaa5ff78dc308cdd46acfc4fc114adc8a78a32a3124881301c25edc1f7da137a054390fcf3ad574c SHA512 4d99c1927265e49a9b18d20ad7bf29847a0e062a6a832c41b44315a1d5cff60125e3baf9486f9ddaf9e4fbd773aab2e39635af66c78ec2b4b827f22030177d2f
-AUX kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch 1166 BLAKE2B 9934885d03138569c68d133cec4cffd79e8612e4f7c3054be1a1e767bf82deab71c9b9a1a7928966b69f46ab14b7eb303ec337d12d273e37bc40d300efeefb03 SHA512 16ae60212b2aedd6108f249d18d08d6f7acda1d26594cb3660b98dff1707b9434b5326f613f4d241bc936a57b906ed480419fd2d2ee6d73929fb6765e9a89ffd
-DIST kdepim-runtime-19.04.3.tar.xz 1762728 BLAKE2B 29e0226af7044ad595ed7ea547e73efaf234abcf4b643d6b0fa38ae5148c27ba603115d28d6f0eb15b196ce8a8054697e61d3dd89783bbd24d79f1cd197bc060 SHA512 4680954fdec3a3c37dc4947019188ff8978ecf6bf6722e89c2613887104ef7e41c6184c5c061a60664785152c1d590889cb35332740cfc5da56c901aa164ba41
 DIST kdepim-runtime-19.08.3.tar.xz 1733348 BLAKE2B 4c78c0e4e3fddbb9694fb877390a6f781e822b4152216946c86da01a29fd55ed06bddae5e159d1e0150ed5dff92a2061237c38616b087ebdbace3a7bad4c6433 SHA512 acdaca2111e2e9542a6c13dca6f43dda5a82f9c6a3905a2f3002c93abb6481e405b6f318c7a3424c2d8aa214b579894a31a3fe86703c479bdd38539f27579098
-EBUILD kdepim-runtime-19.04.3.ebuild 2375 BLAKE2B f969c73e048eb3f2a7d067a7e760bd4b02db3990962ddba8d3690648dceccc9d7e8850fca243fb11d764eac48197779f0b0b8182cc8bff2929bed49c45c34351 SHA512 6ff7d679669e61e8af338b2cfc308384392d596d531cd1803f2b12960cce749aa5b7a13f7a9fb1d7e88df82416a597c9976507de4564d7c8f9e9e0a93157505f
-EBUILD kdepim-runtime-19.08.3.ebuild 2555 BLAKE2B bdd3bc769d4aabb1c5162bbf9b77eea0a6e326219753c6ec79716b59db528d7955802a87b586b51ff7d4623d438b1d0838dfc173738345cd961fa7f1ef62197c SHA512 022e851ef2d6146899c2f361e065c92fdbee558b5ebd66e08d5e09c1e87ddcdddd06aaced2ebbca97eb2853688681d95b0cce2b02cf42d23ca968368fbfdd248
+DIST kdepim-runtime-19.12.0.tar.xz 1731636 BLAKE2B d34180014941107cd05b061fa4f7a2397a158b94f85c3eaba2aa7bd935aeb03b051831f34f07a4fc5824c5cb31854633acd6a8d5d56acc09d2f41ba82240df25 SHA512 c437285bff1a12fc62f722954d7df927282c463d90069bd08fd7dfe2cd566bce3d333fd6498ff0c2964f1c6a9809f9e0ca457ba3c8bbd6021bb84b3676f58b18
+EBUILD kdepim-runtime-19.08.3.ebuild 2552 BLAKE2B 1a5069076bd9d59b20ec8474ae7264d845aadbc89dc1522dcdee32f9e8016689f09878bc087f9543aabf2f445fab6e04c1a53ff46e8ce2464fda597bc09a43ee SHA512 2bbebfb99fee7f57ed961e799589747c5b83c6126271da3b4167f1688da520396826f02257767bd3a8f29db4ca05e0faffd5dbace5e59ec617feca082852afe3
+EBUILD kdepim-runtime-19.12.0.ebuild 2494 BLAKE2B 949e4569c48e4b3de02493986d5839a3554d1af1c3b496d087f0c5fac7322643d6b2237588b0a731842b711f379afd50b3441d0c75e59844366bce5406597ab4 SHA512 6e76756b9f5743fa150eb5f3d148dcf13e45a217950cac027c6a3f73ebb96f2aaf319f1323863ed64c839f825dc14a83bd4b8c013cc23611bda217ba72bbe00a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch
deleted file mode 100644
index cfee20094953..000000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_compactpage-race-condition.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 8ec4db907c403b24685a961b48be5f8a288d9bd9 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Wed, 2 Oct 2019 11:26:29 +0200
-Subject: Fix the dependencies on generated files differently.
-
-Some Gentoo users were still having build issues with the mbox resource.
-
-BUG: 410474
-FIXED-IN: 19.08.1
----
- resources/mbox/CMakeLists.txt | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/resources/mbox/CMakeLists.txt b/resources/mbox/CMakeLists.txt
-index c52230f..ca8bc1e 100644
---- a/resources/mbox/CMakeLists.txt
-+++ b/resources/mbox/CMakeLists.txt
-@@ -14,10 +14,18 @@ set( mboxresource_SRCS
-   ${mboxresource_common_SRCS}
- )
- 
--# Fix a race condition. mboxresource.cpp needs compactpage.h which includes ui_compactpage.h.
--# Make sure the ui file is generated before building the akonadi_mbox_resource target.
--set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h)
--set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h)
-+# mboxresource.cpp needs UI files generated for another target. We must be sure the files
-+# were created before building the akonadi_mbox_resource target.
-+add_custom_target(generated_headers
-+  DEPENDS
-+  ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h
-+  ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h
-+)
-+set_source_files_properties(
-+  ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h
-+  ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h
-+  PROPERTIES GENERATED TRUE
-+)
- 
- ecm_qt_declare_logging_category(mboxresource_SRCS HEADER mboxresource_debug.h IDENTIFIER MBOXRESOURCE_LOG CATEGORY_NAME org.kde.pim.mboxresource)
- 
-@@ -29,6 +37,7 @@ qt5_add_dbus_adaptor(mboxresource_SRCS
- )
- 
- add_executable(akonadi_mbox_resource ${mboxresource_SRCS})
-+add_dependencies(akonadi_mbox_resource generated_headers)
- 
- if( APPLE )
-   set_target_properties(akonadi_mbox_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template)
--- 
-cgit v1.1
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
deleted file mode 100644
index 850c65862be3..000000000000
--- a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4585292dd34f894505f8fc19e2bf51263768d688 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Fri, 9 Aug 2019 12:54:01 +0200
-Subject: Fix another race condition found while packaging the 19.08.0 release
-
-BUG: 410474
-FIXED-IN: 19.08.0
-
-CCMAIL: cfeck@kde.org
----
- resources/mbox/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/resources/mbox/CMakeLists.txt b/resources/mbox/CMakeLists.txt
-index c6fa693..c52230f 100644
---- a/resources/mbox/CMakeLists.txt
-+++ b/resources/mbox/CMakeLists.txt
-@@ -17,6 +17,7 @@ set( mboxresource_SRCS
- # Fix a race condition. mboxresource.cpp needs compactpage.h which includes ui_compactpage.h.
- # Make sure the ui file is generated before building the akonadi_mbox_resource target.
- set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h)
-+set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h)
- 
- ecm_qt_declare_logging_category(mboxresource_SRCS HEADER mboxresource_debug.h IDENTIFIER MBOXRESOURCE_LOG CATEGORY_NAME org.kde.pim.mboxresource)
- 
--- 
-cgit v1.1
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
deleted file mode 100644
index 418ba9202700..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-# TODO kolab
-BDEPEND="
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep kalarmcal)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdav)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkgapi)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtnetworkauth)
-	$(add_qt_dep qtspeech)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtxmlpatterns)
-	test? ( $(add_kdeapps_dep kimap 'test') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-misc/akonadi-ews
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch"
-	"${FILESDIR}/${P}-ui_compactpage-race-condition.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	# We don't build kolab, so we can disable this
-	punt_bogus_dep KF5 KDELibs4Support
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.3.ebuild
index 361533872488..0bc9250432fb 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # TODO kolab
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.0.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.0.ebuild
new file mode 100644
index 000000000000..fd31f77b9fae
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.12.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 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.63.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
+"
+COMMON_DEPEND="
+	>=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/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
+	>=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
+	>=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
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-misc/akonadi-ews
+"
+
+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 b41d0e60a364..da5eb0f988de 100644
--- a/kde-apps/kdesdk-kioslaves/Manifest
+++ b/kde-apps/kdesdk-kioslaves/Manifest
@@ -1,5 +1,5 @@
-DIST kdesdk-kioslaves-19.04.3.tar.xz 37144 BLAKE2B 1f6c7afde1bf62b0e73240da130acc3387cc315e4b94b41764430c195481818cb457f3d076aae421adaae2e762b5a8fd59654b0159c3b26680dc77b2c8c38b37 SHA512 d4d16740b0be399affd1197d6e08d98c77d9410400597ec7b9e48aef79313dfb0898aee9662c8bd0e4475fd443da6942a2a87170f262f2a3a864221e83c8c3bd
 DIST kdesdk-kioslaves-19.08.3.tar.xz 37280 BLAKE2B eb5ab4a1d16e4f8a2b64712e2688563a9d33b9482c88f9d1e5e76c89c7d19957254acad205b706bc6576c7b20e384427bd9a6d6affb0b7efff7b86a29308731d SHA512 f3824c6c9b72e7b3eeb1ad049d04c1e1b05b1ba08ea11744983f884a0dc71ebe6efd93fabdd7236f0bdf71fcb2c98008c3d5a0c784a480c9b909389cc6a78dab
-EBUILD kdesdk-kioslaves-19.04.3.ebuild 344 BLAKE2B e065564a812b08fbd4cc8f58671dd272bcc795344faba63901a3c53dace4196f2b089dec08c63ca6fc2dc6ea98512f4964bf93c679a07290920d8e0f65cea331 SHA512 1aacff13dbead4edd7c2956498833f69c9d4850bd16163a923dc6a818fbea9722907e164aaa2494e87c1beccef4fc59f080a40cf1b9bc1e231c0808b81fd0865
-EBUILD kdesdk-kioslaves-19.08.3.ebuild 424 BLAKE2B 6c4e4d6b329c71fef7e13c6e942964035256ac927b424c411c51b611b8ef1563da74b79e805558fa1a31bc1a820cc6c1e3baa07a43e85a79bfd6b989361507d9 SHA512 98b89260919f285568b65f2ed2e4c7a38e789c38166c86141c14dd511f67b8633a345848e1f25d0a35dad2748f086618f1059780fde35d510ce1e03286db0889
+DIST kdesdk-kioslaves-19.12.0.tar.xz 37368 BLAKE2B 6f0c4b8473a1219ba32acdf492bde53e8171e4021b0133682e63682b7a77eac950ab7140db3e20223b7679948240c6ba110fcc460db43fb98132cf09cd69f58b SHA512 83662a57af4ba8f1c9f98f6fb511223bb97bd61e92952b1b938c8c15b8c91c6592118e8fee1756a6a73ede15ed1db186dc2e75f894d89a131b10d2a48c3e8b0c
+EBUILD kdesdk-kioslaves-19.08.3.ebuild 421 BLAKE2B 3fea6cf9d082d055f6afff1657d1ff984f5c935c29b783b9df2bc1348472ac8fbd6639cf9723ba9b4e8c4f7b3743da699aac28ed68d3c47533ea685046280a4a SHA512 54765d54362851eb2bdb73111fcbf0a2a0c33a97f94743fd2c78ad3a83ec5f3e5931a01115be3f5c6aea3a4b629a2c7addab381ddf195832a0276a681284496e
+EBUILD kdesdk-kioslaves-19.12.0.ebuild 425 BLAKE2B 6a53f916afc4ac90d6a6cb6940cc028f329dc92df1e5c64d21154ae9a29a4f460c8c1c92ea7daa37aeb9dbf327127d30a34e8ae1353f8af4203b6d3ebe0a72c2 SHA512 f441f0f03b5bbd93c7f97e84addd0407051bfcc991b09e72d89387de8fa3f85799dc00c0def6dba64dc837d189b78cd7d88dca72b809b862344f6b955c43bfa6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.08.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.08.3.ebuild
index c388474613d9..42c39b6bde90 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.08.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.08.3.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 DESCRIPTION="kioslaves from kdesdk package"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.04.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.12.0.ebuild
index 5db90c74d9ff..dcfe904947f7 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.04.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.12.0.ebuild
@@ -3,16 +3,20 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.63.0
+inherit ecm kde.org
 
 DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="amd64 arm64 x86"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
+	>=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/Manifest b/kde-apps/kdesdk-meta/Manifest
index ac50a7171f44..84d941007af0 100644
--- a/kde-apps/kdesdk-meta/Manifest
+++ b/kde-apps/kdesdk-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdesdk-meta-19.04.3.ebuild 1141 BLAKE2B 5c205c2c799e90d66ecda901b913c7d2d72f77bde4d96968b243e4bfe3f1fc4272a7d6dbe0284920561572965e99399188f1cee551ece6516e83e72f84726332 SHA512 39fde328a2fc2c68db96c288e3d9bd5f6f2eabaa030388706dfd057898f0b41422d0bb9d97ca035d03cc7c522741706949f1b6e41026ab47a4c6d3a19cee9c32
-EBUILD kdesdk-meta-19.08.3.ebuild 1144 BLAKE2B 23c61ce4b19a4cb6fe334d615571f72241bd6c39046c001dc8471efb29ed278cab89c5be16c73f311468b43dfa687a22de6b9cb6234b379633074239841e35e4 SHA512 4129ae140494bd736f37e6b2a10fc03c72e00d6d6ecbd0d9066a147405c759973e22ebc73ec31d475043cb549ceec4a60d93dc4dda8d7d02e44d9dafac4ab00c
+EBUILD kdesdk-meta-19.08.3.ebuild 1141 BLAKE2B 5c205c2c799e90d66ecda901b913c7d2d72f77bde4d96968b243e4bfe3f1fc4272a7d6dbe0284920561572965e99399188f1cee551ece6516e83e72f84726332 SHA512 39fde328a2fc2c68db96c288e3d9bd5f6f2eabaa030388706dfd057898f0b41422d0bb9d97ca035d03cc7c522741706949f1b6e41026ab47a4c6d3a19cee9c32
+EBUILD kdesdk-meta-19.12.0.ebuild 1144 BLAKE2B 23c61ce4b19a4cb6fe334d615571f72241bd6c39046c001dc8471efb29ed278cab89c5be16c73f311468b43dfa687a22de6b9cb6234b379633074239841e35e4 SHA512 4129ae140494bd736f37e6b2a10fc03c72e00d6d6ecbd0d9066a147405c759973e22ebc73ec31d475043cb549ceec4a60d93dc4dda8d7d02e44d9dafac4ab00c
 MISC metadata.xml 831 BLAKE2B 3ff18fb8e3bd5dc045b904b841e1ed10639381802d746be424ec00dc40e3119fb6f3c066f4706aede87b1e659f4978c6b5a573ead33851983db01cde8d54d566 SHA512 138c632546c3860be6daafdf94c969d2c55e837bb2da18c112d5835511018399ff180ef3417727264899fddbfc3291845420df37c60853a6c9d6b9db5b758349
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-19.08.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-19.08.3.ebuild
index f5a72f83361f..372985482b75 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-19.08.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/applications/development"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="bazaar cvs git mercurial subversion +webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-19.04.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-19.12.0.ebuild
index 372985482b75..f5a72f83361f 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-19.04.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/applications/development"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="bazaar cvs git mercurial subversion +webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 73ace4cb7575..dc2b49c8321f 100644
--- a/kde-apps/kdesdk-thumbnailers/Manifest
+++ b/kde-apps/kdesdk-thumbnailers/Manifest
@@ -1,5 +1,5 @@
-DIST kdesdk-thumbnailers-19.04.3.tar.xz 17320 BLAKE2B 7e929ab23c365cd1ef4cabfd7b62e0a7721f68dbbc5301fa93cf12381dd9b729939ab4ba004ade09d989369dd8544e3705ccdb398426283f0ccafdbc50255584 SHA512 b47e574bb12b00ab8503de4078547655d9884624c5a055d8e859cfbb0f33a9b49421918719f494402c0b132f26ceb8259acc2006662417141000df0b80c84337
 DIST kdesdk-thumbnailers-19.08.3.tar.xz 17292 BLAKE2B bc634494bf28b4a1eb87d34e81207930707272db9ff621d66741130aadf2cdf101d6fe037b6564f5024121192b726dea50ecbbe24cee4b50adccc5e78c42e162 SHA512 ab0e4ad63783365b846e39dd0b0329bc6bd367e879c4847291b096d6f989d1b4fc43f7838d2357a33fd79284c44d76f4faefa0c7890a26317ad6420fafd16bd5
-EBUILD kdesdk-thumbnailers-19.04.3.ebuild 431 BLAKE2B 198982464f3fd243b2f272b6bd16708cc187aff329abaa34a34f290d260cc9f30b1d459fcf2ad2e6e8b721fb15f13cb0da168cf91991e344decfc298f64979e1 SHA512 1e4db23eb39dc45298219b9ed1a69dc1b7fdabb22454de9e6a9e988062aef02eff91b05d1a01760988cce5b726ec462543dd7878a4947ea6b564170b24819834
-EBUILD kdesdk-thumbnailers-19.08.3.ebuild 542 BLAKE2B 29288449ded1870f054ffedfeb3c9baf5199be839c2e632c6669deb6a92bb91539e2b8d7aae4871b3bdcbed349982690f13b424ab334927cac065272d4d0f75d SHA512 6bbc8a23a5ba569f42bfa418dcbfa2f7d6eb2a21a0a315bfc1b5c21e8380202682139d4092d50b00c331965ffc2c5ea991848f2017ce1fd60046e4e48eaaa918
+DIST kdesdk-thumbnailers-19.12.0.tar.xz 17464 BLAKE2B 597139432c5ef916c59b3792e867bdbd01933c9ca0bad90a6275505d8cc9715ce14394a190ff8af86308b75e8e319417e080f47f30dd1ac3f9f543df2017d907 SHA512 b77c520838746838d5e90991520c53f50b47068d65a8ff1a95d53575f56d35ac6adf815993125291b0c734b334af60aa44fa1fc35f7f5d8eb9bc278d69ac5783
+EBUILD kdesdk-thumbnailers-19.08.3.ebuild 539 BLAKE2B 1536d5ad86a399458ecdd63f7fe3b66ee388b08a4075e69792c14f38d5a9bfaae419d31e760d0fbecdd17ff0a76bc5c1c7fd0cf333641ab8be5f548fa75edcd1 SHA512 6065f74a0f8f9217727835341f9dfc6914b08474b960eeb8ba1fe54f182cfc673e060db97f80edae1e4072fa51229854cea079e95387dafe45f46bb669aaeb6b
+EBUILD kdesdk-thumbnailers-19.12.0.ebuild 543 BLAKE2B e58e22c0392940ba4847a3805fb00c4881d3983c8b3a2a90685268ce5a0a48e76d217f96790d4a760176b401994e51d029a46d9221fcaf024a38ccfa6ad4b083 SHA512 207ba60703a81295d394d9e34d68b954ba57e41ed509c0d14f301d8c6628939e227c9af742e511cd3d8c4059c2111c246c307f9f97c3f3748edf02d3111ebf66
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.04.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.04.3.ebuild
deleted file mode 100644
index 8d33da807868..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.04.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Thumbnail generator for PO files"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	sys-devel/gettext
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.08.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.08.3.ebuild
index 02a6b03101c8..ea7684f5f32a 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.08.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Thumbnail generator for PO files"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.12.0.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.12.0.ebuild
new file mode 100644
index 000000000000..254ed85346dc
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.12.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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/Manifest b/kde-apps/kdeutils-meta/Manifest
index ff3d3357b727..3549f75a8fa2 100644
--- a/kde-apps/kdeutils-meta/Manifest
+++ b/kde-apps/kdeutils-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD kdeutils-meta-19.04.3.ebuild 1140 BLAKE2B da71fb45e26639930c25c5ac6d86b7d50ec9dabd64bd179bc2c9d6f4cfef26f857f6ff6c0e17409bcc294bc3783d1d17fcda6219d3c8801d0a0c5939153195c5 SHA512 bfbc39a59a1877a188519f2be911227c719e9e07653567456c580f9b2ecd9e9122e32a498cb58bd68654d546909a3c0b76fb55226d77ebf0da4b0024ec819b91
-EBUILD kdeutils-meta-19.08.3.ebuild 1177 BLAKE2B f60be7d97c69e68bd87fb65e6e0405796294ac04003745344b13dc6d43862555d62e6a2749d773ea8785fcf3966147f128e690ff94f8bee1578dec4fdc423dc6 SHA512 c629e84323a087e3ba44c60cccefa37a033c81b21270ffb7756d0bd0eb56f1841ffcc35354427121df437d5e6aa5a26fedf8fcc9b489a2a9eb1e34d351558039
-MISC metadata.xml 888 BLAKE2B fd3defffecb29b53e6f964f18b34fcd05b1c197fbc906172ada81b16f8132dd539f3bc14dac2a179765fd7f06b326fb4a548734cf68cb54bf95ece6aa2a86d71 SHA512 626f2a0e2b2bb876ecb9ec935089c90c83ab9899a3bf843f1c74a70ba183825c9b0be4411e67efdb6a184c92431fceaf1a5ef1dceac7c7d1884e06c0b4548ab2
+EBUILD kdeutils-meta-19.08.3.ebuild 1174 BLAKE2B e933463d023b96ccc32612b3615bb2ff7695ddde0a9e7d6df6e018aeb51a8dc763b9d127acc8d2ff5eac1bb0aeaad0621e27cc9e6b17c42acf47201639f1b4bf SHA512 44982f87763497f4e595fe4e1068091ed7bba45391c324b7b5b3b19ac20bd4de08ad2138d34e9d92911f12d7e1fc3c48f8b912a204fb91b86581e2d6c31ed07b
+EBUILD kdeutils-meta-19.12.0.ebuild 1203 BLAKE2B 39dcf7a2b627ccbf537f946a65ecf1020e6901b0e3ab92a40fb5f424b73206c1b11716e558a6d1caeddb0d7f49cf80ff7ff98e7a870c584a1d819ad28e85b1fb SHA512 963ed9263dbe24976fcdd8229b69fd4c995a0472a894dcc52e49d4a173621a856e6f5e49e50c6ea2ccbb018d9ceff69d739bece9867eb9a5f6ba13818c25beaa
+MISC metadata.xml 1004 BLAKE2B f2fed1a10b7eb10ba9016b72fe9c4863e853882e6f66790ffe70e21aace4e10b0fc5c699559934121b071c2e260a83b19d50b5d14adc53dff25d933ea0e8eae6 SHA512 d8f248c827327c4c855cc1ba7c6c9d31578b4a89ecca6dbc0ffde3f2b73b10f66d9923a907dde88481ee933a6047fb18089341ef49b8146836a00cb341a23f7a
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-19.08.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-19.08.3.ebuild
index 22148c799064..4809e20082de 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-19.08.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/applications/utilities https://utils.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="7zip cups floppy gpg lrz rar"
 
 RDEPEND="
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-19.04.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-19.12.0.ebuild
index a0d9a09e737c..9240ed95ad86 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-19.04.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-19.12.0.ebuild
@@ -8,8 +8,8 @@ HOMEPAGE="https://kde.org/applications/utilities https://utils.kde.org"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="7zip cups floppy gpg lrz rar"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="7zip cups floppy gpg lrz rar +webengine"
 
 RDEPEND="
 	>=kde-apps/ark-${PV}:${SLOT}
@@ -20,14 +20,15 @@ RDEPEND="
 	>=kde-apps/kcharselect-${PV}:${SLOT}
 	>=kde-apps/kdebugsettings-${PV}:${SLOT}
 	>=kde-apps/kdf-${PV}:${SLOT}
-	>=kde-apps/kimagemapeditor-${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}
diff --git a/kde-apps/kdeutils-meta/metadata.xml b/kde-apps/kdeutils-meta/metadata.xml
index 085e3dd25283..7262a11e01b6 100644
--- a/kde-apps/kdeutils-meta/metadata.xml
+++ b/kde-apps/kdeutils-meta/metadata.xml
@@ -11,5 +11,6 @@
 		<flag name="gpg">Install <pkg>kde-apps/kgpg</pkg> which depends on <pkg>kde-apps/akonadi</pkg></flag>
 		<flag name="lrz">Install <pkg>app-arch/lrzip</pkg> for LRZ archive support in <pkg>kde-apps/ark</pkg></flag>
 		<flag name="rar">Install one of <pkg>app-arch/rar</pkg>, <pkg>app-arch/unrar</pkg> or <pkg>app-arch/unar</pkg> for RAR archive support in <pkg>kde-apps/ark</pkg></flag>
+		<flag name="webengine">Enable <pkg>kde-apps/kimagemapeditor</pkg>, requiring <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 7c7293990e54..9c93c8777028 100644
--- a/kde-apps/kdf/Manifest
+++ b/kde-apps/kdf/Manifest
@@ -1,5 +1,5 @@
-DIST kdf-19.04.3.tar.xz 461476 BLAKE2B 0132c1164a853d4bf175e04f6385532ebd5055063711ba0f6323db52f6b720307b4cb71779416d7a4e820a74390790c66c60361445f9568809ce00eff82098e9 SHA512 45a4f51677abaf105166129196c8369a2bf91d1b27d2321d959f23c9b97d2c8a888bfd252e7c839311af32508d0b6549bc326a1bd3b08ec924db751f87abe996
 DIST kdf-19.08.3.tar.xz 461848 BLAKE2B 896a0c7556a5dfc3ed69f7024dfe731d245d27c62cb674019992a7b517c953d7d728f984aad81eb857c42b97c3c4e823ac5635a7ac7300f7d07f9b7e8863aa69 SHA512 038db4143b5f657f5cc988bee40bfc6f66809abd535d944427b4fa042ade539125249c914ab08ed36569cbc72483dfcf95ff0949e385952af5ff58d5d3abd9ac
-EBUILD kdf-19.04.3.ebuild 727 BLAKE2B 27653e3000887e2ba9b4c4442340dd3645d91bba10a63975449b92597a0251c803d3d998b6e2904f3e1c7af0a44422379b8d99869da6a3a9275bef2d2bc27c0a SHA512 b6baeb2db0981d4fb701d87f9a1bb5df51bc9188b5c09635c158771a5cb9d5a413643d83ee13069b9b5bdabafe6227623ec1599c061774106ccdbdff5dafc76a
-EBUILD kdf-19.08.3.ebuild 880 BLAKE2B b2602cc4584758ff18e414129cb7f5e4f1dfe0fb7d5fa9fe96d301f147e6edf92e56561811d5d28ae96c39108c5908a1ddd9b3cb24592812cc4d04f4a6d462ab SHA512 1cd377773673676936da164b0a09fa34c75e2e95ddcf7a87ffc9cc398d761591e4802892fdb5e755da4d765e794ff51686935052b978a1d154fdff092995924b
+DIST kdf-19.12.0.tar.xz 462008 BLAKE2B 5c96f840a63974d04685ce16eaeff5e35e4cc0a413ac0f1d405ded765c8449248d7ce4a379d1360ce0ce9af451fddce015b701cc8857d07cd8698f415a31543f SHA512 5cf0049533c0e92179e6ff528f3a986dcf15242539b668d0f0dbb6893d456c3f1a2e882c08e23bcb58f44e7a3fdc3e28085320725dce61da98d91aea05d39607
+EBUILD kdf-19.08.3.ebuild 877 BLAKE2B 741b7e211ea0a3e0db2e4ea50fe6c9ee4e3dd615126c1c2db4590974571b4aa34a69396f7864814db36567ca74888a0cab7da1ad31d34884a66825f64ce19d1b SHA512 f9729a2c42a32b864bcbf770d058b6ca7845da142f740d16f32e818f2e439eabd78c373101e08f4988ad7ba878c1d36efd86ab86f6e3caf4e64a938c3e2b7994
+EBUILD kdf-19.12.0.ebuild 929 BLAKE2B 25cf83b0fcb268222653fc6d78f01724e36ba3e852fa23223e9883ec1ce457def3ea164cf193d8e5e3793e99598e62fcdce136f4c49131818a6647719903e76b SHA512 ed4da0f0649e3523164f2f3f113d8024805ec925c77b4683f282d615aaa54f9ae0e5f8682ec9d433f22656aced369b810b7d76c2c0cce443cf8d4bf92e951921
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-19.04.3.ebuild b/kde-apps/kdf/kdf-19.04.3.ebuild
deleted file mode 100644
index b9a683c4556a..000000000000
--- a/kde-apps/kdf/kdf-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE free disk space utility"
-HOMEPAGE="https://utils.kde.org/projects/kdf/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdf/kdf-19.08.3.ebuild b/kde-apps/kdf/kdf-19.08.3.ebuild
index 85cdc941f7a1..89394224c3ac 100644
--- a/kde-apps/kdf/kdf-19.08.3.ebuild
+++ b/kde-apps/kdf/kdf-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE free disk space utility"
 HOMEPAGE="https://utils.kde.org/projects/kdf/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdf/kdf-19.12.0.ebuild b/kde-apps/kdf/kdf-19.12.0.ebuild
new file mode 100644
index 000000000000..355f8dd504b7
--- /dev/null
+++ b/kde-apps/kdf/kdf-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 03704a650210..ee05125c0493 100644
--- a/kde-apps/kdialog/Manifest
+++ b/kde-apps/kdialog/Manifest
@@ -1,5 +1,5 @@
-DIST kdialog-19.04.3.tar.xz 98192 BLAKE2B 241cda2c97a5db5911b40f69dc2d5e9290d031dd2fa2e019161980f8b3d60485c0203de9147c138bd3a50eab39a7ecd254b3e6ba74331185724941ed5131f293 SHA512 aa74792d0270e9d3f40a6b055494e204868f39057f7e1e04a187a17b55c36465ae11a989aed1e820d91f43097b294664a4131ebe258297113d29dc129becf6f6
 DIST kdialog-19.08.3.tar.xz 102480 BLAKE2B 8e948999fa3108cae254ed8c00c1ee68f97fb1aea59b2bf66e069068502f14157de95ea2ad66b8203010b3f1db095316393ab0ebdaef7c127e835d6f1ddc5ec2 SHA512 35690c7522bf96ee82081e7ed618205493efdbcd1b91c8a1ad975ec03f9d88b87f58b459f193892519b2deddcaf53d81dd36e271b25ecbbef01463fc51913cbe
-EBUILD kdialog-19.04.3.ebuild 838 BLAKE2B fa84a47f00656540cd05abbd2174368293a055233f3cdb6559f602d63beeee708854c0d9469adf6eefbfb3dd6b6839031842a9f52fafce289609ddadcce28390 SHA512 97479d9c055eb0c2583234033076ed441ac1381ee4dabbba7063827a3597c9bbb6596f0d2b3ac559a93cfd2ee6e347878ec79b86dd1da4e84d3a8b113b2c72db
-EBUILD kdialog-19.08.3.ebuild 996 BLAKE2B 2cbc2146be66fb2021e3b18ab2a5658656dec85e1c447f799e36f727fe4c16408828f8bd161ba1c09479acadcf683f571d3e548726fed306909a7ba2cf253b6b SHA512 e00ca74a19119110c16cc4aef0c680713c1b11bc35bb3d2ac822130f6aa106545d98510954681f07d80cc97d3948ee0941ad6d84fb85cc84d127b899387a5802
+DIST kdialog-19.12.0.tar.xz 103792 BLAKE2B 8d9ebe6debc38c0ca05cf1765be9f98b7b6fe5bcbfe3d4d0cbd85fe4e393bdbcf5e00f96106ab851408fc3cac64c0d33257c2c21e9212cb2bc11b5f53fac2968 SHA512 19ff31e4ffe1c019c9ebcef1715947a886e375e55a70a5411cafdb985cefe91d082196f09ab9d5b580c82d2f3c73075630f16c144e731e3a0a1b9a53822b8905
+EBUILD kdialog-19.08.3.ebuild 993 BLAKE2B 07805dae0e79420710fa7d8f714d7a3f6d8ed6deaf5087d85ce44c53bc326b96d268bbc8ec27d4da9411aeb5c51aed5d97288d10fc7f0b962f757aa1ce31d857 SHA512 2c572d11d4c49d1bab31003355774bac8a553274f739e20908f9ce9b24ddd8526480c9634ccd0b0da8f1e72a8acac74a2704beaa2475e4c16432a8cb017c78c0
+EBUILD kdialog-19.12.0.ebuild 1057 BLAKE2B 1b35604eaabc6734c79c17333511c70f08e8f52dacc9be1356a4b5825323b6d14beb6616bfc63a64314ad77d4faefd1c6052954f2f2c41fa8b2cbbc491575c93 SHA512 25c2315ec9f525c42ead5a989b2f6371ca0393ecd147c226624adbf6d65e19e3f979d357b05faf689885475b02cea7c831b491d5e59afbbddd9f151ca6776edf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-19.04.3.ebuild b/kde-apps/kdialog/kdialog-19.04.3.ebuild
deleted file mode 100644
index 1d26e18d1882..000000000000
--- a/kde-apps/kdialog/kdialog-19.04.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kdialog/kdialog-19.08.3.ebuild b/kde-apps/kdialog/kdialog-19.08.3.ebuild
index b9b8be2dd614..60c1cdb8a556 100644
--- a/kde-apps/kdialog/kdialog-19.08.3.ebuild
+++ b/kde-apps/kdialog/kdialog-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kdialog/kdialog-19.12.0.ebuild b/kde-apps/kdialog/kdialog-19.12.0.ebuild
new file mode 100644
index 000000000000..3fa1eafb0557
--- /dev/null
+++ b/kde-apps/kdialog/kdialog-19.12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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 ~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 8c7871178242..62a156a9b1fc 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,7 +1,7 @@
 AUX kdiamond-19.08.3-qt-5.14-1.patch 1202 BLAKE2B 68f49cd83d8b5a10621e4f39c41dd07650c826592d89c934d811e49115d5c52ab9b18a4c59ce140c8c10ece68df3f9b22b96501f38eb8f09dfbfd32f2cfe783b SHA512 65c5909419b30fbd38f676c0db31be527a4a43bb2a087f929e9d7c972d149ba9a9611c72661d6478c368308569cc2c7f70dde1f0604e33e4d9744e065e0e859a
 AUX kdiamond-19.08.3-qt-5.14-2.patch 787 BLAKE2B e39a46a097e40381cdf8bdc1035e2bdbf0b8910b247b0c4f69886073ea4da8b81743e8a9c7725191fa0c500b5c497468c808a3b4acd2c8c13348b14d40539eb5 SHA512 4d2c625eab936b09f5e93b392521eb4e93a6d2c0396a270ba41861b9729d3b96fee4bde356ec842cd49ecc2a2e0481e99b2060f660fe4e177d0d3c57ce37959f
-DIST kdiamond-19.04.3.tar.xz 4720096 BLAKE2B 82918744f40ac9688263b4d326c51af90586fcf1732a35c43fa7942893a602813f510687c06cc73624de577f6294be8454f481be814d2985151c5bf56ee9dcc5 SHA512 04888283d7efeff81e9b5354fd8b1ee64e66100a36d247182781a40c74b73c3ce485c54f2e3d840297d5863a37eb2b8e849316b8acfbda6447608ebdc86f5c87
 DIST kdiamond-19.08.3.tar.xz 4694440 BLAKE2B c5026fb0afbde5368cbc6efb658ab692e6e7d941bed40e10279f4027f335345838bc64d804cc2ac2c52b846380355ef069b817aaaa2b932cef7ea1fe227dc39b SHA512 68fd61fd0212a6605ac891b845b763f4fa9c1b6dae7906d67059d85d99fd7f3a4e30e2333e06dc7c1e4fb026f7ebab9d5cc951b5251e25381896cd52f9b7741d
-EBUILD kdiamond-19.04.3.ebuild 792 BLAKE2B 924f6a703f485642675f1f3942c64d5e2e2a3cef485c959f6753e37c808ac7603b5086a44af1ed2e1aa1e126dc8d997f191cc2d1c1f807f8e2539d20e9db894e SHA512 5c2866f5850bfdb7a6b555ae3af3c0e7787ba1755e6119be0df7c357539c179c8df94a87acf813199b8e6c7038c2bfd9e29164a21b73d950c7ac215894e205fa
-EBUILD kdiamond-19.08.3.ebuild 1015 BLAKE2B 72792b8e3e0df505ca5de86791e419da18984d3cca3b6c4802072f44157d9f6e9674542901f104be24f4b737ab09bba182a6bdd6e3e10fd270d77750e82fb49b SHA512 7c79fa738356c29c491e92539fcbc6e7c0714c1848b98d77554bc1be56eeecbb850eff5724b0991b9cd6fc8794f3d3ddd34f015db05a62f9809ccd5cee0fea9d
+DIST kdiamond-19.12.0.tar.xz 4694340 BLAKE2B 755cbadd75e549b1e37da04bc87c57204d5654d105866208d05f2302189d389ea7d99b129e6f4d7835b9a00580fb6b3992b264d795c10700e71bdced2165ab8d SHA512 dba10a80839daa6e05b2531e10724996895e23c167d8865b752db9188072fa7b36ef6fb56fd774485bc4a2113eae5e7c5bda0be66f41df47712378ccbd507f15
+EBUILD kdiamond-19.08.3.ebuild 1012 BLAKE2B 55735ce242777e827a64178ca807231636d0fd2e3b310faf052327f62fb7bfb1ec2c15831204f534c57fa65a1b9f5a0693c5d3c506908929380877357316d1ee SHA512 27a70e84ae0a6bea56e69cb7b3a4efad13a34185d213302b10654d874bc83f61925172bf9a9f0e28d5a900ef95c46d57d24f15816e514049722fb1db20bd01a9
+EBUILD kdiamond-19.12.0.ebuild 971 BLAKE2B de930da9629c36f0fe972bb412ebae900afb623c5294b3e7196f00d2a64bb37caefff9ccf7070b8c4ab1642cf25923579776102af2a5db7cf938813173654add SHA512 380156efefa738a89df2f2b88e855af0039d68730482f6c2b6eae9f8682813c4903704b0504832e279529e0bde7b9252bac53ea3b58a1991ccc706d089ba53bb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/kdiamond-19.04.3.ebuild b/kde-apps/kdiamond/kdiamond-19.04.3.ebuild
deleted file mode 100644
index b03552601a95..000000000000
--- a/kde-apps/kdiamond/kdiamond-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Single player three-in-a-row game"
-HOMEPAGE="https://kde.org/applications/games/kdiamond/
-https://games.kde.org/game.php?game=kdiamond"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdiamond/kdiamond-19.08.3.ebuild b/kde-apps/kdiamond/kdiamond-19.08.3.ebuild
index 3ec0152cbb2f..2c59f5de0778 100644
--- a/kde-apps/kdiamond/kdiamond-19.08.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/games/kdiamond/
 https://games.kde.org/game.php?game=kdiamond"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdiamond/kdiamond-19.12.0.ebuild b/kde-apps/kdiamond/kdiamond-19.12.0.ebuild
new file mode 100644
index 000000000000..c32392e82a55
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 3a1da9879ab0..a328bdd66458 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
-DIST keditbookmarks-19.04.3.tar.xz 184160 BLAKE2B a51e4ace794efec049c423a4408ef2d263923a2f034250e5162936744ca9634c2a75777cc18a0499ce8dca0bce6f796625d17d32348357c42ff672091419d963 SHA512 11c441a9153928b267cec1525875f854991c3e1a807b0bfc8e18e2afca441a0a8b8de36b675129e301fad36c15f26637e8dc23ced2287d7c2e5a5ea3e17e5587
 DIST keditbookmarks-19.08.3.tar.xz 187176 BLAKE2B 35872576bb07105f72474bb7e2a52b0bcb652e699ee4828a39747519720cb32b5d664f4ba9a8205085aa7f86928f258789f2ab5bf3ef7e10e44210d54e479632 SHA512 dfe6637232b33b01ca74626225c9040f462d4b8db59f10c97a505f3caa56cac07a7a63c154c3ba5be2832a1fa9be9080262773edd8b37469c92288b1a38a397c
-EBUILD keditbookmarks-19.04.3.ebuild 980 BLAKE2B 9b876ca8fdaf5ca819b3449f395076515e59e12b288bc264ea7a4b07589e9fd1392ef7ffed5ebe5af7534211c2659dc5d04ddad14a9380d1886e9107fa8dd978 SHA512 e5b9cdbd7de2176e95cb624a1300f8072eb9e626323d5e66337bdcef18c8665ea848254b846c7eef74a415783117950d55a77f0f6baead76f65be75f738915b1
-EBUILD keditbookmarks-19.08.3.ebuild 1156 BLAKE2B f0ca0567761e7e0e2d5e3cc16dc8c382f53ad879360204f41de1885135df3ff10e4250f60c7099b8fde854f6ad547430ee3d555ec06d2f315c822e6a4550423b SHA512 a4f9a35ab2c33f782d998eb21631f91a6b0ee4e6d1d47c80a3d9468e667ef0c425bf0f7aeea6a2715f61af4024c9daddf8470351731583c28f9e9b9d87a8665d
+DIST keditbookmarks-19.12.0.tar.xz 187376 BLAKE2B 5c9559d23da6d53e8c8c7c44ed7c89bb5a6949e2149f0c875a3d7bf3e05a0048f6555d6f2f9a3f236eb21e0e94c892a08da6f3df3a9d5ae066352d65bee4706f SHA512 d48791672609ebeeaeaee21814fd8392240a6215fa26a763619161ca13b874bf6154c3385a7868da939be165f635bc16c27badcf549c660b7a0f4170eb1ee4c5
+EBUILD keditbookmarks-19.08.3.ebuild 1153 BLAKE2B bff119eedab6c8fe5f60b439a79cbc7489675f467d9305d193d548e8a6fa5f258999c0438bb719e59a65160acac23d46921a2c8bcd5bec9fdd990c386d1e97c3 SHA512 1a6fd43c26b2a14332200b56fc10abedbc93e95fb7de20e16c018b3007750bd88434653374f23979e607c842cb0b12e0620312497893067cc50829ba74aeabc1
+EBUILD keditbookmarks-19.12.0.ebuild 1157 BLAKE2B 11441f290a4c61104dffeaf64e4bcc4dd2095e9b576db22a8321ecc617ebff194066dec51da3e4c1c63610af796b258788c37c1849833b9060e59fddaf44418d SHA512 51bfe8733625b7ed7bf69a5ccb041732284ac61bf70f3d8266e496347ebe222d331c45cac390e93b6a7a096d0174014388a1b2ea8de19d1f1ae678e7c6d8b77d
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-19.04.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-19.04.3.ebuild
deleted file mode 100644
index a3a7418d3ee9..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-19.04.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+man"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	kde5_src_prepare
-
-	if ! use man ; then
-		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/keditbookmarks/keditbookmarks-19.08.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-19.08.3.ebuild
index 402e5d21e843..316916f73d05 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-19.08.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Bookmarks editor based on KDE Frameworks"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/keditbookmarks-19.12.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-19.12.0.ebuild
new file mode 100644
index 000000000000..4d1c3fba57df
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-19.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.63.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 ~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 b15539042af7..f6860719ef73 100644
--- a/kde-apps/kfind/Manifest
+++ b/kde-apps/kfind/Manifest
@@ -1,5 +1,5 @@
-DIST kfind-19.04.3.tar.xz 267120 BLAKE2B bf44a486dd9470dce48cd68ae6a608b53321950b9d893e1aec166082a5ee0397a7f6d0c308d481713a90ac9652357d00e9e291a50284945cfb360fb30d0c9078 SHA512 f42f9f70dfc8aaeb2c1554b999eb18a73167c5d66ddfb8ae2334f8823c85565d8a2d460801b7da9e204244a386d8809ee9ae47865ea0958ab824befd7bd6db6c
 DIST kfind-19.08.3.tar.xz 269316 BLAKE2B f1c8b7a93085945ce746b3d7eabb687fc7eb625c74bca2f8fc02bdce5dc2ec38e105d87f4632767a4faf9be9afde161969671d2cc6080ea6fa4e89fb8ad3dadd SHA512 d78f00640b40f7143299f3aeef9c16eaca30893daab4d5153c6e3fd2683383e79c2c992cfdc0fc1311386757524dc7e7896341d8b2c1869f5e03321b5f66432b
-EBUILD kfind-19.04.3.ebuild 814 BLAKE2B aab8d490055b498326af6548f51b07c88f6b4c3ba4db55923188b0460153562ed26628f462b3d8e85901bdf7ca20bc06ed7f31996cc46041716f2a031d7d01de SHA512 f65998985ca4e3a77152c2e4cd8318b2cf8ac8d515f5693bb7e660bbd26f2d6d5e4b5054bc5aac2e489c15588db3fa224d4d4e8bfa3d5342e3bbc2e80baacf72
-EBUILD kfind-19.08.3.ebuild 979 BLAKE2B 6ed1d8614088b45900a020de9c34bde4f18f8d23836da0d484b89a4059523e2920c12f60d1d7256e5c05a4f70d1fb9aa118ac51cf441f6af2a82a4920a204953 SHA512 4e9d49b043b3cb4465794cc70d0d51c6d64d605b28907075e35f093b9502e5bbf1fcfa627c2601d5af6ee8590b9a9e9737725fd1ac9dfce605075f1dcd784d28
+DIST kfind-19.12.0.tar.xz 270092 BLAKE2B 76ad867a37bd0a82d6337062c59e6b0403958799ee8e6c238ebc3b6b0451c65b9ec699cf00407a23732c9b014ade21b05db5e13bc1c6286082aaf3abf3847505 SHA512 7b5a65582d553c4789699c1b53bc2521ca839db3ad3485de10b9d9417f7cead2b2027e93b948689f3913d4994673c90744fa11344a3fe5368d8199f8354c5cf4
+EBUILD kfind-19.08.3.ebuild 976 BLAKE2B 0d36893aaccb37b5e3d1704fb652a6596c9515e33afcb3b564ab52ac59fa4f8f92f32a9b38a5e5913927bc40f65b3d5723a1736466abeadccb9e56d92590c966 SHA512 68d28e6f489c5eb337a01e36f67e4c40822ac3fbf05f5d4cc2c0d7de8ec5f88461b3e0a3f6a02c45d1d392f4ed4e31d318f9d4f88f05f7ae2e344a3437a56716
+EBUILD kfind-19.12.0.ebuild 987 BLAKE2B 71e2803c0246bb94448a29aa3559d50d87988a3514900bf326244f8f44a4cc4a92c9dcaaffe8c9b3b0034a5fb963727b3310bd1102996980099d82df069aff69 SHA512 19b05e3543e67b339534bc7017f3b573010cce4628d30b89e94e3ae463dc67d213a13ca4526b8f2b0e4541fa7828fde220308243b5a15850a94c25479e19e42c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-19.04.3.ebuild b/kde-apps/kfind/kfind-19.04.3.ebuild
deleted file mode 100644
index bb1cfa8b5386..000000000000
--- a/kde-apps/kfind/kfind-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="File finder utility based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/utilities/kfind/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
diff --git a/kde-apps/kfind/kfind-19.08.3.ebuild b/kde-apps/kfind/kfind-19.08.3.ebuild
index 933481ea6ff8..1a4f15d69966 100644
--- a/kde-apps/kfind/kfind-19.08.3.ebuild
+++ b/kde-apps/kfind/kfind-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="File finder utility based on KDE Frameworks"
 HOMEPAGE="https://kde.org/applications/utilities/kfind/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kfind/kfind-19.12.0.ebuild b/kde-apps/kfind/kfind-19.12.0.ebuild
new file mode 100644
index 000000000000..9882817bc39c
--- /dev/null
+++ b/kde-apps/kfind/kfind-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 8c550627aa65..6fe5667526c3 100644
--- a/kde-apps/kfloppy/Manifest
+++ b/kde-apps/kfloppy/Manifest
@@ -1,5 +1,5 @@
-DIST kfloppy-19.04.3.tar.xz 198868 BLAKE2B 66a667b512c2528ec0220012ebd0e8d8d02f5d55c4873ebc88b72ca31a4ddfe36963dcb2e4d772dc16fb19d19526ef08acfe58c33395649747fe4d677afbfef6 SHA512 59a466b82321d021343446c8a7e8c2e6479c1fe74644dd008cf65c44cd0ab7ce414a6d377c73299949b7f32d2341895a8b8c62fa5a1aeff707d44995284e26bc
 DIST kfloppy-19.08.3.tar.xz 198760 BLAKE2B 42f547306ff27bdfa57825812a9a286cdbe786451b7703bcf275ce0827240e3aea5ad734b44cab4d5bcbbd415299cdcec31afe660926182ef0ac53db08d1c1fe SHA512 533542c053b3128059188599cd024ed328a72286919efc7786d4c95fb08c602a966a7497788d046d4daa92473c06c001af6740fd1c00ed7aa10860ac1083c335
-EBUILD kfloppy-19.04.3.ebuild 748 BLAKE2B c47cf6e315a95106f6f4fe15a9fbe1fc70c48b0d5327269a82936c1fba16a6f89ae0834197108dfbe87f958ce7430df34ecb9c5d28363066c068ccffee11f41d SHA512 3e835275f2c4767d2c39b98ba47143cc2a928ff873c88800224ae7f11dc720cfd8938ad7c01ca5404c139f2e68e856364f31ed3e3c930dc5171e4f41b6f40e11
-EBUILD kfloppy-19.08.3.ebuild 889 BLAKE2B 608d7dd83da28b4a508b5a08c0b8c165fbe83076c7a49c408d475e3ac66064185126ebb2e3435b32f5d4a15ab8b78c665312298ad201929ba895c56433fe0efe SHA512 2a484f9429e0306d037fc83cad4a875179e2f92a98acc371fcfec68280575e8f41faf32d6bbe7766862425763a92e8e7e79bfdca32efac741c1c054a888718c1
+DIST kfloppy-19.12.0.tar.xz 199308 BLAKE2B da1741d4c9de25825ae2f9aae280f73c79939fb6ad06363313d3e7d4953d4cc7cecbfe8b46dbea981f3f3cc19d125776ed0b9f7b708a64a93154db32e983ff56 SHA512 c252fdd33e58c621f2cf63c54b5f81451603c301841b1498aadba6fee205a164d4a647a73fd199a0877f6408a0a4445bf36e0b32a557d953ce06b206660c486c
+EBUILD kfloppy-19.08.3.ebuild 886 BLAKE2B fa19dcfe18c6470ac26fd6a06dfdd6341b2643aa35a66625bc0e4a9628306e04cae57952912a3a4ae86eba69560c78f66780d477697524a42e5901537e16c4b4 SHA512 242a8a923c673d89521d8a1a4b2c50f1f780726fbdbad1042c41b8251c7c52438dfd23044e1a4ba32ceba4bf828779e21634c6c6c6ccfbbda3b7696204129215
+EBUILD kfloppy-19.12.0.ebuild 892 BLAKE2B 65591ad55bbf3c908f2e4520655c704a29919ae90fd0d2f9236b6c5bd9dbe75bcc474fe61ce26d08741fdf4d8394540f15e803d1d70946848f5ee06174e47eb9 SHA512 f8d260dbf0f4f4d90a5fe50f74c6772921f192ddb0167e5df01044fa6c7dca3b2c91fbab76af45d41477d8c163853eda85d647cda896f0c04c27235a2f31b6a3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-19.04.3.ebuild b/kde-apps/kfloppy/kfloppy-19.04.3.ebuild
deleted file mode 100644
index 4474b1825f0b..000000000000
--- a/kde-apps/kfloppy/kfloppy-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Straightforward graphical means to format 3.5\" and 5.25\" floppy disks"
-HOMEPAGE="
-	https://kde.org/applications/utilities/kfloppy/
-	https://utils.kde.org/projects/kfloppy/
-"
-
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfloppy/kfloppy-19.08.3.ebuild b/kde-apps/kfloppy/kfloppy-19.08.3.ebuild
index f533ca8c7e10..00bc8f5354d2 100644
--- a/kde-apps/kfloppy/kfloppy-19.08.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfloppy/kfloppy-19.12.0.ebuild b/kde-apps/kfloppy/kfloppy-19.12.0.ebuild
new file mode 100644
index 000000000000..940b6a23bc07
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 b769369fb98c..96804dfbc87b 100644
--- a/kde-apps/kfourinline/Manifest
+++ b/kde-apps/kfourinline/Manifest
@@ -1,5 +1,5 @@
-DIST kfourinline-19.04.3.tar.xz 635864 BLAKE2B 8a066cc10c081552c37b5290a40e8f44e19e8af2fca95a657a6c11c2ec6c9dae97ac5efe5b033d416e13d86d0f21efde0211cfb7e599af2518cf9a4565be8430 SHA512 e08e11ad0e97bb88f2180fc72a02f73892614002dd0b2b1de307a4827850d0091cc82195b23d90ebf85579d40a934ce85172233a1bc3338b9511a40fe7ed5fd1
 DIST kfourinline-19.08.3.tar.xz 638368 BLAKE2B 14b43f85698df427adb536b2f0d6278cba6fe2701c87973dc4e20682211f5b3e51c09a18a104a1740d537d3604b5296ae28dea97d9bea79ccdd4a48350d4284b SHA512 c500ba027bc0e773f4ef35cce8d7c9124ef4cc7a9cdf942e236483f37215085e120634895fdf6e958934d69535497952cfb001f3331a6e90bbdd57f823c17ce7
-EBUILD kfourinline-19.04.3.ebuild 728 BLAKE2B bf0ebff8c213381abaa2101da549ec2539af14fc2c263e7f8227b9f8e6ac4ee97ebc204b9f91f4e2994738a4f3c2f0e142a7d19c187865d935dd36d769b32eda SHA512 9c4a7dda6e47b5d8185ea019f72781273980d9d17f2db7cf7446a840c7cdb9204f13702c31d6d5a81fb50d0388d03f0a8a8d83a2bf5e0d3e93b557de7c6190da
-EBUILD kfourinline-19.08.3.ebuild 893 BLAKE2B ed3e18ba7a0fea8c76fd3e0b2125c9b94bd9feaa01dc881072172a7e75aa8fdc3b0ba1e30a6d2da26f8e0bd1e2d54d8895fca405505648ee0a0dc8ee1e50ffed SHA512 38614e0e7bf358d9a82e0f883b549638ace09142a4bf245447f247a499e0dc6be4484941528d5d4e62174707f8f18fe158db66c93bcf3264cc0a983e50249d7a
+DIST kfourinline-19.12.0.tar.xz 638496 BLAKE2B 1e4dde38d3931771c583a09460e01fb1680326fa8e12797c5ac838457e12fdb4f1d421254b8b546f487ef65278015c7ba5369908b74cfd78962baee42929306e SHA512 af6a94828f1234e9b2df08b5030e53421a0a579388bba4438220cc3c45bf2f099a3b09ac0cf182f7c72c8784f9b483258b8a384a033ab929ce25b78b419e51fd
+EBUILD kfourinline-19.08.3.ebuild 890 BLAKE2B e3ba5efbfeee3821da3e3252c72d78070b5dfda7eb1c97ecdba89699bc374ee21398b8754495e44edc51fecb995de39836d7c22733ada158ad67b5a8ed8a4df9 SHA512 83a69b694b976340ec8c62ec63d111e15845d55d973844a523849b64786e0215d2c32d7d5e818e06a6ab681c39caeea82c3625cfdfa6b7152dce86b333859359
+EBUILD kfourinline-19.12.0.ebuild 901 BLAKE2B c230e6f87bc338d080235b6cd406167734c2c19a3db0414e99aa66dd843fa725bce795bb64e44c18138724ac9001a70a748f1bce43e91ef560a78d98e26acdb4 SHA512 611d63c7bc9a0f7ce188b6638b495b560d2c7b9a8f0f7a5a2f8ee58c49b6b4730661b4d90f02da464a9449695af85bb371129c2785299fed5667275b96e56dea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-19.04.3.ebuild b/kde-apps/kfourinline/kfourinline-19.04.3.ebuild
deleted file mode 100644
index 772c61acfa8c..000000000000
--- a/kde-apps/kfourinline/kfourinline-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE four-in-a-row game"
-HOMEPAGE="https://kde.org/applications/games/kfourinline/
-https://games.kde.org/game.php?game=kfourinline"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kfourinline/kfourinline-19.08.3.ebuild b/kde-apps/kfourinline/kfourinline-19.08.3.ebuild
index 3edfe3507716..471d0cf92dd7 100644
--- a/kde-apps/kfourinline/kfourinline-19.08.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/games/kfourinline/
 https://games.kde.org/game.php?game=kfourinline"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfourinline/kfourinline-19.12.0.ebuild b/kde-apps/kfourinline/kfourinline-19.12.0.ebuild
new file mode 100644
index 000000000000..14c49b3a8486
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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.63.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 ae21f2c0144c..c9894723f260 100644
--- a/kde-apps/kgeography/Manifest
+++ b/kde-apps/kgeography/Manifest
@@ -1,5 +1,5 @@
-DIST kgeography-19.04.3.tar.xz 10820872 BLAKE2B 2d09154e3e549870803a27ae475dd053e3fde7ea7377cd44b70912997045df171fa72fdba1c6a995d5f9861829b931fd1199a109a288e5acd40c64d62f74ca35 SHA512 623b315371f3d627da25dad22452e058077fd0eb29ebdad14ff76e5db60c6b9c14058ce3560607760f217b32d1cb27dc50e2771bcf41f75faecde4a9ac0b35f0
 DIST kgeography-19.08.3.tar.xz 10888780 BLAKE2B 9ed7ceb67b86186fe7afef7f5d23789e9e5ffc31c4fd85fd6402fcade31752fd4a15fe7936f364d7a3dca3e68b45fb123c1dc9392fdcfc32d273f7ba59e5247a SHA512 d975bcce54dcae7a8d6ae28865b4a0a195163bfbef3741636e8cac547962013d7a9b58fa20ae3ec0b3b59d1c9370a350bf2f1d75733e53e18357b1e81f07c4cf
-EBUILD kgeography-19.04.3.ebuild 746 BLAKE2B 2213a028d89b9463f76595962418ed9d51c0d39144833bd031baa3045cc99a62e22d18bd971ba31c888ee5ccc82f42ca0970a37f01f1396747618b27b6621608 SHA512 ab04c5ffd8d31dd3b5d768dd900ee9882eb6628444f44e429bdda4cd970b590e0de816720d2b65e755fd84baa3b203977a5703b7a70672fb248601262760a4ef
-EBUILD kgeography-19.08.3.ebuild 893 BLAKE2B f50e2767eb35281107fc70086e18e0dd1d031b5e1672abd834236e48c4502366957aa99b2c6535536a66cfa77c2de058b2ee98265a2c69cad454a57b148b66cc SHA512 3514762084a9c7893dd4698696c539d1015b5e2df54e4942e33c0c333dd0a760d4a516cecc2618b8bb2a4b89d02cd727bc357af2f6215b9e5b75b0cf2a5b4e7c
+DIST kgeography-19.12.0.tar.xz 10889136 BLAKE2B a1e7a6f0850d0cbfaed51bd4acfa198da97286941b01ff003928f1855b39ce1ba2762445846198d7a2e7d7d2b81fecf4eeafef42f9bf1c55007937e95bb9c57c SHA512 3cd4bfeba0ff82e14530848d3e48d89519efd72f8c332689bf5ccebde520048bee57df8f2f838eeeaa3d873e941850b7ca82a8d97aa4b77c8a747e5fee216261
+EBUILD kgeography-19.08.3.ebuild 890 BLAKE2B d9187861bfb424a1d164741846251c1a2f89582bad5819cc2402fd718af3acb38c47ede95caf11a1a3e9ead2243eee29f391cb6c8e2d8230d268c3d45628aac0 SHA512 db28eacd6b9e64b7471f578284a43d6366a5f11c9b58e12100f4931283ede25bb94ebe47487db114469d665b113a0ff05be2c4ca167c2e665aefac8e90e10073
+EBUILD kgeography-19.12.0.ebuild 846 BLAKE2B 95cc882f103f1b5502058cb2d1da99847082d1c1d43a9af860acd8a807a366f5dc0acb7ce751ecf119a98afb877c9f9b9c26aad761ac778dc18a2ebaf6b67da0 SHA512 bb2c3a584b2ba1cbc771fbfcaa1fb21f4129ee3845c16c2a09af7b18c69112f44eff0a35f43b23f86924164879ea3e856d9e54ebe277673e97446f2d4e8ca9bf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-19.04.3.ebuild b/kde-apps/kgeography/kgeography-19.04.3.ebuild
deleted file mode 100644
index 99a1268a37d6..000000000000
--- a/kde-apps/kgeography/kgeography-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Geography learning tool"
-HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
-https://edu.kde.org/applications/all/kgeography"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kgeography/kgeography-19.08.3.ebuild b/kde-apps/kgeography/kgeography-19.08.3.ebuild
index abf2f11a6877..adffc78c14dc 100644
--- a/kde-apps/kgeography/kgeography-19.08.3.ebuild
+++ b/kde-apps/kgeography/kgeography-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
 https://edu.kde.org/applications/all/kgeography"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/kgeography-19.12.0.ebuild b/kde-apps/kgeography/kgeography-19.12.0.ebuild
new file mode 100644
index 000000000000..f772bdfe0709
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 4e09b49d43ad..5d9f91f2f8ca 100644
--- a/kde-apps/kget/Manifest
+++ b/kde-apps/kget/Manifest
@@ -1,5 +1,5 @@
-DIST kget-19.04.3.tar.xz 5235812 BLAKE2B a42f78ab645b73f98d882f2a91dc756b91a5e4501ae86f092cf84f1d4aab64845e8824308fb89319abb349b7770e7adffef48a8a599e0fe53f52001818bf7e49 SHA512 c7779f1dc2e4eb81f763026844c547e7d16e12d62428c62dde2077a2220a2bf79688bd04db3b359e775ab704ef1c9dfd4dfb8ccc41ece53fb51dbca28fbd6a0e
 DIST kget-19.08.3.tar.xz 5232796 BLAKE2B 017d1c8f2afadad476dc09751c69d5611c736584ee0a502be01c21ac60ca2bade31274565b4fed2206733952142ee23b090d8ec42a7f81e9461bc5411b1800f7 SHA512 436139a56f7c7eaaf3983693f455a172d558e7706e5212c9396fd0bde122f7fb3665689b6b81aa8098a20c228d7e9eea8a309c84ab70b325947b2cc11b4718a0
-EBUILD kget-19.04.3.ebuild 1749 BLAKE2B 60aff9bc8e18902f9cabafad4f40faa9c7483b441affa224cba707c6bddd88ccc8e0a12038baac62bad8f1ebad35743599e4ceae16c16ca40072ac2fe502aaa4 SHA512 cc91214743e4bfbc448e42f39004a5bfb2310ba3928fe2f53cde8ee59b9ce7b531945d147bca110a1017b901f0174de753cfdf147bd4f5826ebd81415e1e615f
-EBUILD kget-19.08.3.ebuild 2022 BLAKE2B ab5d0d17f3c6908a48ad6c0e055d653db4f20dd3feb75bb4b1cc6d7f35eb4a57b7d3e9ba9ac74bdf92aa7b9aebd4088b3d48b50368f33f97ef2cea801171448b SHA512 f25c2f9c4283842f592ab5e57807333ca1974a2ebdbc3e2c3d3e205a07a97ba605c8ce07aff7648400284a4566f2bdb329bd624d9a025be8bb48a507d7f1619d
+DIST kget-19.12.0.tar.xz 5238488 BLAKE2B 98fa40d5a5e22293586baf2ed902bcc85936e3a61f172bb4b935ca91cd0accb41295a2aee4542408b34c09fd4037b2b7fed69027ebdc5a0732908e3569b45d44 SHA512 5a512a53d0881dba4ad8c1a31e18cdb55ef9df14a1a6d747740351f92b495a8a446cb1b7faf452facaaa5fafea59d0e5d800a218a3420d8452578f1ecdd75cd9
+EBUILD kget-19.08.3.ebuild 2019 BLAKE2B 3ac27b1a6d066a3fef4f9b37e319b929e416307e89d2303decd9a15af04a4772df0601fb5ba64bf08e60e6844e9b045c9d7bf5e3d3847dcdc0490f3b60222fa5 SHA512 4f81c5b150b8b8997954e68261877d167654ce969d8408e426fdbf2eee11ba30433105e20ccb707d85c016d4e0ae75e665b9f4fde77873587e4c9bbbb82f8811
+EBUILD kget-19.12.0.ebuild 2000 BLAKE2B 9361868f92074c98be9d861a3abde08ee11e69e8051fca3ded5f9dcd6cad2c361f3304cd81b5c29e5e6a8317c4304c7a8188cbe151818a16d257a2ed57fe0861 SHA512 004d9efe168f3d7ace91d3c8555e36dc5e668e8cd92221fd1db796d6930d07911dd7802f21cfaf2ff921eac977e9636f7665c367fe14e9995f0c7f4ac716a642
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-19.04.3.ebuild b/kde-apps/kget/kget-19.04.3.ebuild
deleted file mode 100644
index 56597c8d109e..000000000000
--- a/kde-apps/kget/kget-19.04.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Advanced download manager by KDE"
-HOMEPAGE="https://kde.org/applications/internet/kget/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="bittorrent gpg kde mms sqlite"
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	bittorrent? ( net-libs/libktorrent:5 )
-	gpg? ( app-crypt/gpgme[qt5] )
-	kde? ( $(add_plasma_dep libkworkspace) )
-	mms? ( media-libs/libmms )
-	sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bittorrent KF5Torrent)
-		$(cmake-utils_use_find_package gpg Gpgmepp)
-		$(cmake-utils_use_find_package kde LibKWorkspace)
-		$(cmake-utils_use_find_package mms LibMms)
-		$(cmake-utils_use_find_package sqlite Sqlite)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kget/kget-19.08.3.ebuild b/kde-apps/kget/kget-19.08.3.ebuild
index 69f3233003f9..d9e229bf3684 100644
--- a/kde-apps/kget/kget-19.08.3.ebuild
+++ b/kde-apps/kget/kget-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Advanced download manager by KDE"
 HOMEPAGE="https://kde.org/applications/internet/kget/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="bittorrent gpg kde mms sqlite"
 
 RDEPEND="
diff --git a/kde-apps/kget/kget-19.12.0.ebuild b/kde-apps/kget/kget-19.12.0.ebuild
new file mode 100644
index 000000000000..5b13bf487fd9
--- /dev/null
+++ b/kde-apps/kget/kget-19.12.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.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 2018607490d5..97f66e9026ed 100644
--- a/kde-apps/kgoldrunner/Manifest
+++ b/kde-apps/kgoldrunner/Manifest
@@ -1,5 +1,5 @@
-DIST kgoldrunner-19.04.3.tar.xz 4417116 BLAKE2B 13d83bc2a9beace284368986b220bf6b2bee392e761285a4597ae8da58128de9f76d50310d22e5d269c98662463003a3f14462f773b12256cffb4b4eb53a314c SHA512 153346ec5a55ba6ea5a695a5fe575a24463975555fefc1a7e90538fd86c40965a6c41553ddf67136c18d71b2d5f70c16f44f0564e976365eaa03940a44d36eb7
 DIST kgoldrunner-19.08.3.tar.xz 4435920 BLAKE2B 2d95f14f41958c4650d59e45b3193b5de4178fce3f3b6ab37bfccd55ebd781c9f2c478e1fee5e381179b3e20fe86b26d49137087b57c976877a4b8e496cde1c1 SHA512 2a9b6b288766e0f2f952df47b0ec5cc58b92c1a96ce2d11a5e74c82f74cb695a5629fa863cdaf5570d4fbf15472ba3100f916a82636f1ffde31b20e1b6a6daed
-EBUILD kgoldrunner-19.04.3.ebuild 848 BLAKE2B 8feb142426797d5ecacee41c855743925ef96a67daf3058aecb9b62a27d1146b648cb7668ee830959afd2c477e78118574d53e9e4550fbe3669a5b2cf2e8d534 SHA512 301e2bb6709d6dcfe6746617c4b9abf98cd549bb181e520c8b05f3dd494913e7931de9725486836ff17e70a89adfbef680779583f014db73ff6127397e2d3fad
-EBUILD kgoldrunner-19.08.3.ebuild 1019 BLAKE2B 879f372534e1f19aa8eb4d118ff3eab5ff74199103305778b9d7fd674c58d2d5bb676a2b24f7fea8f8a0d1158f15bf8d7684616543bd8d4ef2a94a3793095b00 SHA512 16444ad4dbde71d9b2565c94fbac7136b89a84d641a32020e282dca5509f3630c97b837fe2b4132f3664cac39f467f4573756983c35786a135bbcc6b51091b7d
+DIST kgoldrunner-19.12.0.tar.xz 4431120 BLAKE2B dfeeb472e1a2d41f8603932b7461d8edab2e1b006e05fe53b0d007ec3ed9744531107dc64a9dc89570009d1b1d41a7561383a365c5c91ba7ed7f3e975f8c4c9b SHA512 2acb5a76b673b298f8c4fd547a13516b184011ef283dc56a177435a3b3c195d80ae7392ed15cd6fe2795b45f5183bdd89432679c5cdc0b9251f2f9a30d2693b3
+EBUILD kgoldrunner-19.08.3.ebuild 1016 BLAKE2B 6698004c8dc1ed57a05b1fbc91d7b201dc39a041128ac10cb955476f6d8ce30d518d318d942755b2c1a90aaaf39491ef19db6f3dff336589d296bf5fae982fba SHA512 4e0ceb36326ae156381c27464af8cddbdba382952d31f4321463d5cb467c5bf23e1ba175843a004d24da40e6c8d94d7de3cacf767ebe56c62e185fa74d3ceddb
+EBUILD kgoldrunner-19.12.0.ebuild 1027 BLAKE2B fda9e2f5bec6ba1b10ce8624848386b2891e96b9016f68e48fb4e7e418fb61e98e02b1d9c37f9561a41f56287597ef72ec649150befa5709442b64542c8fd995 SHA512 d7ebed4d4df2b3085cce16e2cae9f1be2ba579c5e5cae1ed23a252e91424225f56d1dddac6e745123e2ec66c8b0d1e140c344e0e09b4474efccb8ff0b4748525
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-19.04.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-19.04.3.ebuild
deleted file mode 100644
index 8c652f54cf83..000000000000
--- a/kde-apps/kgoldrunner/kgoldrunner-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Game of action and puzzle solving by KDE"
-HOMEPAGE="https://kde.org/applications/games/kgoldrunner/
-https://games.kde.org/game.php?game=kgoldrunner"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtsvg)
-"
diff --git a/kde-apps/kgoldrunner/kgoldrunner-19.08.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-19.08.3.ebuild
index 64145d2c6c96..e7c0087431a6 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-19.08.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/games/kgoldrunner/
 https://games.kde.org/game.php?game=kgoldrunner"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgoldrunner/kgoldrunner-19.12.0.ebuild b/kde-apps/kgoldrunner/kgoldrunner-19.12.0.ebuild
new file mode 100644
index 000000000000..2e85e9b3eb90
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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.63.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 bc3f91462c9d..b238541fd0c5 100644
--- a/kde-apps/kgpg/Manifest
+++ b/kde-apps/kgpg/Manifest
@@ -1,5 +1,5 @@
-DIST kgpg-19.04.3.tar.xz 2786024 BLAKE2B 860b38d7412d0f4b13de1160c39c2d96398f736a0c21cc88d48c4ad09041ed3da5ac8d28ccf95badb4bc5904cc5f3c390a4569dbe5b65a562b3e3f2c4bafde55 SHA512 b9062896b9f90c52535ada3fe66a7b4f21054e229829217b1d8b2df00571ac483c0c0eee464e996b4f66edc3c2fd56e2f73fa76824f679eaf8fe69d3f200f1a9
 DIST kgpg-19.08.3.tar.xz 2786856 BLAKE2B 38efb63afabb7f757fb76daab61ffff97e7e3a419bb2fa79d779f82d338be8a52eabdcc15da718347ae8a55fbab639f0d2814d4ec38593e830a763013c3449fd SHA512 fc4aa8bd94ed1e11790828a0a38f03bb36b3b866d7702a92dbf6a02fab87beb48997eac1e077d462456aae23182cc792a383b37695b3e6cec16760db494352db
-EBUILD kgpg-19.04.3.ebuild 1275 BLAKE2B d8689bd627beac45d7fbeb6f70790074ffc4ab04b34cf05c917d2a76e0154c32327dc013c74f6fbd1d0ecb93e47f7436712232a5e0fd8bec37e30d297ccefd2f SHA512 854676b8f8c86e159188bac38ed5cdbee9ccebe32c44c65bbd6368e8d6da7b9a286bab8eb3efdb46632485b35b552bc1e6a00732365b8394e2ae5f7d672b70c2
-EBUILD kgpg-19.08.3.ebuild 1518 BLAKE2B eb91a6338d17a9d448af18fe32c261a5d4d0330ec762685a9057a733ecd6aff05508cda90b337f9455d93e22ae9733128f178189a18c7b139f68068669d4eb5a SHA512 9c50c86e670fcbe55dd18317331f680cd7cae91a416af73ab9eebc4407c67d49471459b479948735b406b4b296ce96ee21fab31c9c7611173448028de3270b37
+DIST kgpg-19.12.0.tar.xz 2788980 BLAKE2B 26b900a55f8542c92f14c38c399cac1c141f1e660cf03479e88346dc3956391182bd73dddc08856f2cea857905c9b347b11117bcd3c77caf9290839ea5ee250b SHA512 0cf6fc8516ddbf92a1ab1967940a0a26cb9661986cdd96a878450a64e1ee47745cede5f3b4963bd896ca697d5ebcc52c1ff8105e5ea1057f3eee9fcf3c4195d0
+EBUILD kgpg-19.08.3.ebuild 1515 BLAKE2B 7e3209d90511f5571703b430037f19da05d8d6670e82359ee77a6bcf88b7f01e8cdf5acc3c6cce8a53e23c946899fb63357b1c99a815ea9219804c212098daa2 SHA512 086e4b2245064b98652d7a0ccdbb9dd67df01e32ae7c0e013f0d68cd048962edd3ed7590cea9ca46873337fc2c318583d277adc5c2f0242dd314c903ac9018a9
+EBUILD kgpg-19.12.0.ebuild 1527 BLAKE2B 9c5f3f04ecc8182169b85263bccd3d07c194e542c2e933b3c33f1e3ad4b84b0952b8d9f937562fc080920d95a1556ffb811e13368355a33ecaae61216e8466ea SHA512 23518fad5c4b84729dabcbfec4e8943be849a36cdeb9009901d056be2df23d372b4adbe53d4616bf90caca5ab5b9bcda31f86b16978b7dd9a04c66f461181e31
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-19.04.3.ebuild b/kde-apps/kgpg/kgpg-19.04.3.ebuild
deleted file mode 100644
index c0f7c820d80f..000000000000
--- a/kde-apps/kgpg/kgpg-19.04.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="gpg"
-inherit kde5
-
-DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
-HOMEPAGE="https://kde.org/applications/utilities/kgpg
-https://utils.kde.org/projects/kgpg/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	app-crypt/gpgme
-"
-RDEPEND="${COMMON_DEPEND}
-	app-crypt/gnupg
-"
diff --git a/kde-apps/kgpg/kgpg-19.08.3.ebuild b/kde-apps/kgpg/kgpg-19.08.3.ebuild
index f1d68658c3cd..af30c2c6a883 100644
--- a/kde-apps/kgpg/kgpg-19.08.3.ebuild
+++ b/kde-apps/kgpg/kgpg-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/utilities/kgpg
 https://utils.kde.org/projects/kgpg/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kgpg/kgpg-19.12.0.ebuild b/kde-apps/kgpg/kgpg-19.12.0.ebuild
new file mode 100644
index 000000000000..cc5134811e75
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-19.12.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 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.63.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 ~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 dfe9ea340bb0..c45c56901474 100644
--- a/kde-apps/khangman/Manifest
+++ b/kde-apps/khangman/Manifest
@@ -1,5 +1,5 @@
-DIST khangman-19.04.3.tar.xz 7120720 BLAKE2B 57ca23fe276186d692268e9100abe70a26afd25f637e784cc878033fe5ee959783dd62f484ec4f68df9ca70dc2f4aefde6ecea2be16a023371101d7d5d9b525a SHA512 986f2628ca9c5c6393ad0b563ee422375f7b888a9f3549ce32ebca61b831fdc124b48afcd293ba1308c2f8242199ccdbebe04ca934f5f1395e55761cef0d5198
 DIST khangman-19.08.3.tar.xz 7116224 BLAKE2B 60d777b920139a40674a53c0c8c8bc368bb600d7a5b005d38e8c35e5087592013dac0e4bcbe71c0221c3671a0a8c194be3e5ce55e9213cd3092e19d094913841 SHA512 c2b389caf6858205de6a30f77c7423e9cc7da59bac20ae0dbc8efe267363ba9e522ed3f985ac78e818d68e18f19a9920419bfdb059acc77de93fa7139777ec1e
-EBUILD khangman-19.04.3.ebuild 1039 BLAKE2B 3db83d82f51748b4c37c4823988409b7dd32902ce5bdc322a55647a1c7875c72ca1a37cee7dd3841d467e3919d23ba05650e1f593a899984a9116ecdb02c37ee SHA512 74f9230108e25d3efdf0ab7046e6e8ef1c1b749a0dd052af71851cd34b174f613a263eba5fd4167eb572d5fcbdbdbd00da4cc371cd2b8bb9125716faa6a7a8c0
-EBUILD khangman-19.08.3.ebuild 1255 BLAKE2B d49f9f863cd1b3259759becdb4685f367e6de85b7008e9d87f1af41fa529c1d2c499c7058606368da96316f13fbc9ae520e5da8d47a9b0ce4a0968df3f665263 SHA512 ed5e16b35d577f5a5050d26555b3dbaf180c4c368d07d06c6518ce2c446bf49cd404a35d7f6c735c88c7fa60a94274a7a944e67347035efb288d1a60ef9b3fe6
+DIST khangman-19.12.0.tar.xz 7118956 BLAKE2B 9194c7cee12f9a36b0f144868bba97e8e44a8c0b6eda4ce5d18943d1eb01fc2fc9562a3f0253839d8c033423f78a33a9a21c5c097be6b6d5e11fa73256d85f30 SHA512 888a0bab58ce28c1a1542b30c48a6767f0f92dba61b30682bdb6b3918c78af0dd528ffd836e818c49fb204608db6ebb750474b4d3edafbbef00b84068d9ad496
+EBUILD khangman-19.08.3.ebuild 1252 BLAKE2B 42965df5a89a25df3ce7c4fff2039d90056c3474d11fc673962f34b1d21951f27596189fdc62712dbee960604bf044aabc93d7e45ce5e55e9959885b2c52a9ca SHA512 65c1d07db7de47042ab9a38de06b36e1d1c9dd389b2c41317f945e974524065a3364f2cc1147b274170b647314bb2f2151c232a7456e6d927826aae704623b0c
+EBUILD khangman-19.12.0.ebuild 1264 BLAKE2B aa2f520417a0b3da04ad5e3fa63635d5f5c017d260351a39c6dc3f1c5a8a54a068fca6216b900265026e76b51d1f9a6698ec14f35458a859ad15febbd02dc570 SHA512 a7e03dab2a6c478a95ce7dbbef1f15121cf0716694c3d59c8e96004a3b35155f51c2a15c4fd02dd43f754419ba2a06b690730d86a235a7fe28bee9b45d40ac3d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-19.04.3.ebuild b/kde-apps/khangman/khangman-19.04.3.ebuild
deleted file mode 100644
index 68a18301215b..000000000000
--- a/kde-apps/khangman/khangman-19.04.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Classical hangman game by KDE"
-HOMEPAGE="https://kde.org/applications/education/khangman
-https://edu.kde.org/khangman/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtquickcontrols)
-"
diff --git a/kde-apps/khangman/khangman-19.08.3.ebuild b/kde-apps/khangman/khangman-19.08.3.ebuild
index 44f7bccd45ee..5e6d4d6185fa 100644
--- a/kde-apps/khangman/khangman-19.08.3.ebuild
+++ b/kde-apps/khangman/khangman-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/education/khangman
 https://edu.kde.org/khangman/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khangman/khangman-19.12.0.ebuild b/kde-apps/khangman/khangman-19.12.0.ebuild
new file mode 100644
index 000000000000..a5b715353551
--- /dev/null
+++ b/kde-apps/khangman/khangman-19.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 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.63.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 9aacbe93bdcd..f11b18e2ba85 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
-DIST khelpcenter-19.04.3.tar.xz 3851316 BLAKE2B dbdb96e3f0306f8d3019386c005fac6ca88ca072b4f3eb2ae80469dd5ae739cf99dc1a37cee48697f9f7cc7217db53e2fab3a5e97e8304de2df27a5a0cbc990d SHA512 33534097fa8c318a24fd34c173ae7ac9f739363fd4e0a148582984b8ae36e481dd5065d1306f570fead503c7b85ca03d4890d7bbcf102c50b6614d4536775c09
 DIST khelpcenter-19.08.3.tar.xz 3846196 BLAKE2B e7907395c74047e2f0426b72e65bb3d82fdde551363640eb281f281ed11e59d5cf8781c4c9b139084cb1896c9747dc52c8a38cf8b125e4ee8c4677aebce2196e SHA512 8d495eb4d6387bfb7f567c4b9f1cef3d48d1ef5317692a702c8c5e983c2feb209b1bab981d40064b4a0ab31063ec5fde24f77223e052f5650dc42b199dd2fdaa
-EBUILD khelpcenter-19.04.3.ebuild 1159 BLAKE2B f0deac6f1871a6aca5a33fa0a3745db95d2a57dd7ac5eb316c12c5d6d0cb9808414384b10a9814bc951305614e790cc242977a71a845c78aa04d900209cbfd34 SHA512 158a9911268c56571f0eeff10dc1d3a14ee5f936487e7c10b249f7b38fc9b378b93a336eb4c814e5c1e52a8bbd9af7edb68d8deb0eaa2bd2ccd504653dde77b9
-EBUILD khelpcenter-19.08.3.ebuild 1402 BLAKE2B 6ccc247451a56cdd8b86d78a67965cd1d292ef4c7de46dce4cfa0ab00ac650948cd319aac68bb71b9ac518b0190ef03df2df05b8ec2b58b3d6c1971e3a81cbc5 SHA512 85ad2cd4f5880d8d810fde9598a2e0f3ce7132c601aec4ba3c94595872cbe403ffd74bca962cde4013116434c078fc3abb7b31fd924c2886afcb29a4930f47f4
+DIST khelpcenter-19.12.0.tar.xz 3849120 BLAKE2B 51ec0917cf02e86d9dd7f6247ff4208055f87c7b9e249b1729a82e14bc27399412881d4b629f01ea1ca7b9a2d2821d18991020c3e43559c28d31a1cc92470e00 SHA512 608cb9f54412471cb1521083224eb5c499a788f5814232624915cfa1261fb2d3b4b0fa3b8fe585c72eda8f04beae4e07c6954a6edaaf19709a10e2c35631b4c7
+EBUILD khelpcenter-19.08.3.ebuild 1399 BLAKE2B e696b43c2065baebcfbc670f364968dcc54e660298d34f8f31821e36e0e735fff0fc3d13ea9f878b5993f9a4b75ef8e00564720103a431e6b7b4f342899869e0 SHA512 427cc6a04fe5f70592f6ae23cb388ba3d62c8c106533c43e13e4051c4b9c7e078dad6e86ccb8b1551c2bb078600cbf76f0d6c31177599f2c8410a02f7aa6cde5
+EBUILD khelpcenter-19.12.0.ebuild 1504 BLAKE2B 9430ee15dd18d1a4839850badf8933cb0728d8f0d69cb0fb75884ec1014cc5ba7d2b32b163cee267b3610c917f20f1d0043efc02c1b26ae2f06db3c19b3ef784 SHA512 50e3cde701160b1d839d2a4893bf7e2f44b6491d6469fd72b4b49c76a7ff4a2e740f361e366d7854d0c4e3eaed6d747f1f88d499e10a7385dcadff8714fe747f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-19.04.3.ebuild b/kde-apps/khelpcenter/khelpcenter-19.04.3.ebuild
deleted file mode 100644
index 5dc755f57bf4..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-19.04.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="The KDE Help Center"
-HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxml2
-	dev-libs/xapian:=
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_prepare() {
-	kde5_src_prepare
-	sed -e "/^install.*kde4\/services/s/^/#DONT/" -i CMakeLists.txt || die
-}
diff --git a/kde-apps/khelpcenter/khelpcenter-19.08.3.ebuild b/kde-apps/khelpcenter/khelpcenter-19.08.3.ebuild
index 8dc9a868310c..fea21d28c5ca 100644
--- a/kde-apps/khelpcenter/khelpcenter-19.08.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/khelpcenter-19.12.0.ebuild b/kde-apps/khelpcenter/khelpcenter-19.12.0.ebuild
new file mode 100644
index 000000000000..7a4a7f6c1ca6
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-19.12.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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 ~arm ~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/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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	dev-libs/grantlee:5
+	dev-libs/libxml2
+	dev-libs/xapian:=
+"
+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 bdfd5492eab1..d80d64a5fdbc 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,5 +1,5 @@
-DIST kidentitymanagement-19.04.3.tar.xz 149320 BLAKE2B 12e3a4997a13a60b34668b3276be296e1c9f10abe78095bf6ee216881e5304b0f616684a3d59eeafba48fee4bbe55d7b97cc92cfc4dfa2d72323e72d710754c1 SHA512 89bf636d61593462d10e3986a508e63dd393a0f32bfd24a103703dedac7746c82fde243fa8c44d66200daa4362035c8d085eb04ecd098e349be8e5af0f68ff68
 DIST kidentitymanagement-19.08.3.tar.xz 149208 BLAKE2B 38ae6417e72a0d601f75d066b0efc126063abe8b21df2f57ae0a80b4f338cef70322f4aff41e180671ff3780707235c3832da8b2a581e30de7abb152bb63d2c3 SHA512 495817643fc01081c81cacb18810ea04d7705d37693cd8e0f3904ef08bf4d71f51f924d1c8640746f9ee6b0c92854aeee8bbda18cdd1ab2d7844e7d2afdfb76d
-EBUILD kidentitymanagement-19.04.3.ebuild 771 BLAKE2B ed5b0c22081b22534a15e77a2f7f9eef12683e9923fd36d8b3481a5034eccee25420123335e17264b8196fc03b048b29bab86e52c0fe995c33d2abeb46e2d43d SHA512 147bdf038d8e7c927a78e3f4653ff0c723a0c3fa4db8d21f14cf68ee7f7a41c117e110b114d815a9068e654f859deb1978728cfa8c1f438fad8e6ceccfb9fc90
-EBUILD kidentitymanagement-19.08.3.ebuild 918 BLAKE2B 435c2d5f1339118da6c7a8aeeb10ca2e61c28dbefbeb44be295a8003b594b1256b7e257bb784ac2a815ff2a547e2e2b70d023bfeac2aa6d4cbaaa704efb8450b SHA512 c0844e81e4ffca4f4d8c9eb1fd43c625a21fcb16fc51abe101ecdfa9882a4f7f35294e0342c59d15c6b2273441bf7c56d159bfccaf0a962e4f33617572d5b62e
+DIST kidentitymanagement-19.12.0.tar.xz 149464 BLAKE2B cb820aae2d6243b58f430ace743152949b8254264bd6c94b9a088cbd86614c1723620d57d27d56496e756d77a4dc95c110cc6e655435f76cda2d085cb3ec06ac SHA512 84362a68b04d005952af1695c5c8177f6282d91d7343d0fcd31d72790568cf0b6d1c2882267862c09907f1f8694a07f09cbface274b7e83b39112615c402fda9
+EBUILD kidentitymanagement-19.08.3.ebuild 915 BLAKE2B 33eb1df6d68d9172b8a40ba09cab1c7d6a3f4fb99d7d9c7c130549b4992f9594f9444e0a031636ebd00dc31a8c3c3221db8a614372048c494417897504201f30 SHA512 8ab5e60538ad37048da04a37c73916a7ce734b81daa0f20fabe3db65f90dcdaa36f2fa5e6a6f038a934774e3a2cf4a34a7a2860a0f8e4eb498398d410d14329b
+EBUILD kidentitymanagement-19.12.0.ebuild 919 BLAKE2B f3722d85b88661d84a30c3ed5a7d5b1995378d152334cc4dc37ce8242cee44c21a56e77a31a21d3896b16b783e9e6b025308bfe8b60396c4724d9d506885c1e8 SHA512 0d74d9db103325b837535e43ea3787d1112372df4af4c212fc835a72fc831098dde2504def7d75e6255ac115dffec2bb606c357203f2b5c7ff2184c861c53122
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-19.04.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-19.04.3.ebuild
deleted file mode 100644
index 53ea6f56424b..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-19.04.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for managing identitites"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-19.08.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-19.08.3.ebuild
index 7d69c7b93f69..529adc9470db 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-19.08.3.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for managing identitites"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-19.12.0.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-19.12.0.ebuild
new file mode 100644
index 000000000000..76384011f83e
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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.63.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="
+	>=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/kio-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kig/Manifest b/kde-apps/kig/Manifest
index ab8a42b6c61f..ac1180b81d01 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,9 @@
+AUX kig-19.08.3-pykig-python3.patch 4617 BLAKE2B 6c10c34462ef5c0387e35cdfe79aa8144474675f0ec565fcefb4c90d6ae182340dfc619afd823a7df8357b529c10a4a68b7bcd99e5d540832574a0a51d41e52b SHA512 c405b90184456066f085563637ec8c6e478d8bcc200e2d17baa32eb7dd3a208ec2f2d79b84777ddc8b0722819a6ac99427e8d5f2db31b89b0a9e37f38eb7fa1b
+AUX kig-19.08.3-scripter-python3.patch 981 BLAKE2B 66a23977cbcbfaf7965d1264c1806991c8ab1f7636d7e8da83bc218efb011992f63c43b9b2ebadc5b8c21ce114f6a06c93b7c9a531372ac1abaa608ed9288f30 SHA512 a82612a8cb8e95e2a5e839d27bd27fe0f7942df6cf777ea10653791e26a4175fbdd47981c50ab3d5091831f58555c5b3dba94b4b383a916b21482176377bc21c
 AUX kig-4.12.0-boostpython.patch 1012 BLAKE2B d2dc90dfbdc0e361faef3506f32b37afae4a35a8c1ed0c16f0e52b9b56b33cb4b355ae313b2699125764508008bd75cb357ea6a9b020773e0faf88f208dea9db SHA512 0e490efcda1d61b9053fd4eec45e872db62b2f1f543378fb397bde65cb79e575a9268a2e2dd18e2b5590f60ba6f72954612191d0cfa1b57a697b627367a7c18f
-DIST kig-19.04.3.tar.xz 3492840 BLAKE2B 3abfbc6d5278fda490a6211b545d431430ef7ae039237ed4f138b74ffb835f4e8a18b843463d8f016832d948b728894178130ce39adadb53a29ceb09c0932da6 SHA512 ade87a3138e017a954fb9a7610e3032e61bf0b275973b5cba2ee0c254abf0d86446a4663e288cfb8bb294f69edbbf80a9993f3eca52f845edec5462f440e4624
 DIST kig-19.08.3.tar.xz 3497128 BLAKE2B e6611dd70ef47d0c710b5127b01532da4dc0841dbbfd8a151a9a867970389aa3c46d74a1347504beef5ca3c6fbcfaf2521923d7e34306eba580d88ecf002b1f8 SHA512 7e5f315695e9678c3e95822da3e86328dd8d6521d83697c623ac0175ae96fe13490d39e8a338c2112939b6b808fe8a213fafdcad951731b45902d9a2a2807b03
-EBUILD kig-19.04.3.ebuild 1495 BLAKE2B 954d2408a18fafa3d50a814e224dc585d6351ab0fb3adcedc1038db0760f32aa4a91b9e925e7171d34eafe60a8ae5da515398ddcf18dc73432057f7907b152a1 SHA512 1f3b3257dcd611992776e3701767a56abcd9f45b8875d7c66ed429cb3fc4e09073439c2fd90180efc5f2b9d0a06d310a957f932416d33ba169ac55bd2c7f9184
-EBUILD kig-19.08.3.ebuild 1681 BLAKE2B dc2d2295510a43497e19fde8f6e0ca17d675de327fa1742300c2eb1d20f006763f0ad64ec91e0b4227d84bf06c9bd8c3226158f3cb6a6aa2da09fe2e65380c90 SHA512 313d2e1e2fdb8037713049765894e6e8ec7c476e9244d4ffec1d80713cbcb206ec1c00e68cfc4f655055cce7bac86de915658fad4e12d23018bf3959515b663c
+DIST kig-19.12.0.tar.xz 3498676 BLAKE2B 0a8e4778f935e4de3ea005031292b06b998145df66b3a8cd9b873e36288e164938895e81226fa26db3c465dee311fbde19a78414f09faba619beda804486ae9c SHA512 aa48dfce5b0888142f67090526e33e86ee80f146f5ec52b00ca0d4db476fb1898c8d14159e66801c346e50521209466192956f70fb42bc60075633d24437a2d0
+EBUILD kig-19.08.3-r1.ebuild 1768 BLAKE2B 1d3c14170d695952234ed5e172908e0294db851d44519527f24269ceea09af8f6919def36354b40ce59217be6dd150264c7eca2e25cb091b46913557f5967796 SHA512 8323db3f0b5a00147b9e6d79677df5706defcae62e968ed9b88182896349cf1758b87d3d1c95da56a934aa2ed286e53d5d216ab2defe21130ed73aa969f20b95
+EBUILD kig-19.08.3.ebuild 1678 BLAKE2B e14809f96ebfa43a0a335de3e77d54996f6738d427fc56d86de9899f50f40b4ea9121561aaabe992fd944493bf12b823526dca0259a03e6575079cc09de72ea6 SHA512 fb0aafe66dad8fe7575e33da1e77cdaa6bef17a1cdebe64762943a8e13d498158efe5f1795885072c35bd223124ceea7bca2d681b0621521f15baaebff10d184
+EBUILD kig-19.12.0-r1.ebuild 1734 BLAKE2B 491cf7002327d96dee1545ff491e93e5327054ea4e361094e4a066d20d44ebec9a5c407d5b5ddd8b4709c9ccda8022ee3e54973410b069bd4a8f090d8b73497f SHA512 f98cf3f829032e416cbc005a4f280037cdffb67e3e838832e36f6fa3e4381c8a84f4872323c4675ed840a62ad177255200666bff327e07bd9f32f74310b91e0a
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch b/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch
new file mode 100644
index 000000000000..902c138495ec
--- /dev/null
+++ b/kde-apps/kig/files/kig-19.08.3-pykig-python3.patch
@@ -0,0 +1,161 @@
+From d72f33a14c22480b28c0f35d53293826f6ec787b Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 14 Dec 2019 19:49:09 +0100
+Subject: Port pykig to python 3
+
+Differential Revision: https://phabricator.kde.org/D25982
+---
+ pykig/pykig.py | 42 +++++++++++++++++++++---------------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/pykig/pykig.py b/pykig/pykig.py
+index 02f637d..3ee6e97 100644
+--- a/pykig/pykig.py
++++ b/pykig/pykig.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: utf-8 -*-
+ #-------------------------------python------------------------pykig.py--#
+ #                                                                       #
+@@ -170,9 +170,9 @@ class KigDocument(object):
+     self.of=of
+     try:
+       self.outfile = open(outfilename, 'w')
+-    except IOError, value:
++    except IOError as value:
+ #      print >> sys.stderr, outfilename, 'unwritable'
+-      print >> sys.stderr, value
++      print(value,  file=sys.stderr)
+       sys.exit(2)
+ #    KigOut._kigdocument=self
+     KigDOP._kd=self
+@@ -212,14 +212,14 @@ class KigDocument(object):
+       self.outfile.write(" </View>\n</KigDocument>\n")
+       if self.outfile != sys.stdout:
+         self.outfile.close()
+-    except IOError, value:
+-      print >> sys.stderr, value
++    except IOError as value:
++      print(value, file=sys.stderr)
+       sys.exit(2)
+     try:
+       if self.callkig:
+         err = os.system('kig ' + self.outfilename)
+-    except Exception, value:
+-      print >> sys.stderr, value      
++    except Exception as value:
++      print(value, file=sys.stderr)
+     if not self.of:
+       os.system('rm ' + self.outfilename)
+ 
+@@ -501,7 +501,7 @@ def databuild(nomeclasse, nomekig, v="val"):
+ 
+ for d in data:
+   p1, p2, p3 = d
+-  exec databuild(p1, p2, p3)
++  exec (databuild(p1, p2, p3))
+ 
+ #####
+ # Objects
+@@ -645,7 +645,7 @@ def objectbuild(nameclass, namekig, params, objparams):
+ 
+ for o in objects:
+   p1, p2, p3, p4 = o
+-  exec objectbuild(p1, p2, p3, p4)
++  exec (objectbuild(p1, p2, p3, p4))
+ 
+ #####
+ # Properties
+@@ -688,7 +688,7 @@ def propertybuild(nameclass, namekig, params, objparams):
+ 
+ for p in property:
+   p1, p2, p3, p4 = p
+-  exec propertybuild(p1, p2, p3, p4)
++  exec (propertybuild(p1, p2, p3, p4))
+ 
+ #####
+ # Start of properties definitions as Object's methods
+@@ -734,7 +734,7 @@ def methodsbuild(namekig):
+ 
+ for p in methods:
+   p1, p2, cl = p
+-  exec methodsbuild(p1)
++  exec (methodsbuild(p1))
+   for c in cl:
+     setattr(c, p2, method)
+ 
+@@ -743,7 +743,7 @@ for p in methods:
+ #####
+ 
+ def usage(codexit):
+-  print >> sys.stderr, """
++  print ("""
+ usage: pykig.py [options...] file ...
+ 
+ Options:
+@@ -757,7 +757,7 @@ examples:
+     $ pykig.py my_file.kpy
+     $ pykig.py -o output_file.kig my_file.kpy
+     $ ...
+-"""
++""", file=sys.stderr)
+   sys.exit(codexit)
+ 
+ #####
+@@ -776,7 +776,7 @@ def prog():
+     _opts, _args = getopt.getopt(sys.argv[1:], "hvno:",\
+                                  ["help", "version", "nokig", "output="])
+   except getopt.GetoptError:
+-    print "GetoptError"
++    print ("GetoptError")
+     usage(2)
+   _callKig=True
+   _of=False
+@@ -784,7 +784,7 @@ def prog():
+     if _opt in ("-h", "--help"):
+       usage(0)
+     if _opt in ("-v", "--version"):
+-      print "Version:", version
++      print ("Version:", version)
+       sys.exit(0)
+     if _opt in ("-n", "--nokig"):
+       _callKig=False
+@@ -793,19 +793,19 @@ def prog():
+       _of=True
+       _callKig=False   # if there's an output file, don't call Kig
+   if len(_args)==0:
+-    _infilename=raw_input("Input file name: ")
++    _infilename=input("Input file name: ")
+     if not _infilename:
+-      print "No input file name."
++      print ("No input file name.")
+       usage(2)
+   elif len(_args)==1:
+     _infilename=_args[0]
+   else:
+-    print "No input file name."
++    print ("No input file name.")
+     usage(2)
+   try:
+     _infile = open(_infilename, 'r')
+   except:
+-    print >> sys.stderr, _infilename, "input file can't be read."
++    print (_infilename, "input file can't be read.", file=sys.stderr)
+     sys.exit(2)
+   if _of:
+     if _outfilename=="-":
+@@ -817,9 +817,9 @@ def prog():
+   kigdocument=KigDocument(_outfilename, _callKig, _of)
+   kd=kigdocument
+   try:
+-    execfile(_infilename, globals())
++    exec(open(_infilename).read(), globals())
+   except:
+-    print >> sys.stderr, 'Syntax error in', _infilename
++    print ('Syntax error in', _infilename, file=sys.stderr)
+     _info = sys.exc_info()    # print out the traceback
+     traceback.print_exc()
+     sys.exit(3)
+-- 
+cgit v1.1
diff --git a/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch b/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch
new file mode 100644
index 000000000000..19c5f9535a1c
--- /dev/null
+++ b/kde-apps/kig/files/kig-19.08.3-scripter-python3.patch
@@ -0,0 +1,27 @@
+From e0dae6b9938963c8f3c30ac7b8182452645e2dbf Mon Sep 17 00:00:00 2001
+From: Yuri Chornoivan <yurchor@ukr.net>
+Date: Tue, 22 Oct 2019 20:42:51 +0300
+Subject: Try to fix Python 3 build
+
+---
+ scripting/python_scripter.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/scripting/python_scripter.cc b/scripting/python_scripter.cc
+index e60a90c..62a7409 100644
+--- a/scripting/python_scripter.cc
++++ b/scripting/python_scripter.cc
+@@ -390,7 +390,11 @@ PythonScripter::PythonScripter()
+   // the newstring stuff is to prevent warnings about conversion from
+   // const char* to char*..
+   char* s = newstring( "kig" );
++#if PY_VERSION_HEX >= 0x03000000
++  PyImport_AppendInittab( s, PyInit_kig );
++#else
+   PyImport_AppendInittab( s, initkig );
++#endif
+   //  we can't delete this yet, since python keeps a pointer to it..
+   // This means we have a small but harmless memory leak here, but it
+   // doesn't hurt at all, since it could only be freed at the end of
+-- 
+cgit v1.1
diff --git a/kde-apps/kig/kig-19.04.3.ebuild b/kde-apps/kig/kig-19.04.3.ebuild
deleted file mode 100644
index 21e326006569..000000000000
--- a/kde-apps/kig/kig-19.04.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Interactive Geometry tool"
-HOMEPAGE="https://kde.org/applications/education/kig https://edu.kde.org/kig/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="geogebra scripting"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	geogebra? ( $(add_qt_dep qtxmlpatterns) )
-	scripting? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ktexteditor)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.12.0-boostpython.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_prepare() {
-	kde5_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
-		$(cmake-utils_use_find_package scripting BoostPython)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kig/kig-19.08.3-r1.ebuild b/kde-apps/kig/kig-19.08.3-r1.ebuild
new file mode 100644
index 000000000000..3d0c68469d07
--- /dev/null
+++ b/kde-apps/kig/kig-19.08.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 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.60.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? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
+	"${FILESDIR}"/${P}-scripter-python3.patch
+	"${FILESDIR}"/${P}-pykig-python3.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/kig/kig-19.08.3.ebuild b/kde-apps/kig/kig-19.08.3.ebuild
index 3563fa63f20b..c07c7f5c1d94 100644
--- a/kde-apps/kig/kig-19.08.3.ebuild
+++ b/kde-apps/kig/kig-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Interactive Geometry tool"
 HOMEPAGE="https://kde.org/applications/education/kig https://edu.kde.org/kig/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kig/kig-19.12.0-r1.ebuild b/kde-apps/kig/kig-19.12.0-r1.ebuild
new file mode 100644
index 000000000000..44b0902c3a3f
--- /dev/null
+++ b/kde-apps/kig/kig-19.12.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 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.63.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? ( >=dev-libs/boost-1.48:=[python,${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.0-boostpython.patch
+	"${FILESDIR}"/${PN}-19.08.3-pykig-python3.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 6bd45593485b..af18d5761b2d 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,6 +1,6 @@
 AUX kigo-19.08.3-qt-5.14.patch 956 BLAKE2B 79374b30f282e17933cbb7969c9ca4a4f4cde3ac402f7097f628ea1d98af9ebf0bb78fc928036c520e57620773a7098cff02b66319c1464646292fef6164596b SHA512 e79b6359b462045fa517778c57b6ac9b0637ab5cee8b39b27ac8e3a9c0dcca022b5bbf99eb49c89c9acaace96593ec65f93f564056bb31aa3ca87c9ccfc2e3ca
-DIST kigo-19.04.3.tar.xz 5224900 BLAKE2B 9a80d31147a8e49f47428a84fbd54a718eb0570eeda9aea3159ca2852289b7f6c84939b8e3fbd41253cacb54a45a90bcf640d857a56f4b8af8ec89e9ab215418 SHA512 fd18e7e0a2f8962d4a0474fe63306281c807eb38b886f59a7d1146f18fb52fc0fee5dfa3f1bef5aa67f7974d699ff4b0b0ce77aabab78b060337cad274e9015b
 DIST kigo-19.08.3.tar.xz 5227988 BLAKE2B 3cf39c9347c4f83fa810a3e06c6c4d593d233980e7b05dd8222f642673ba90597d124de65007fbbcb243be996a1a36d3b03e3549cb9758605a631b2943f0a7f7 SHA512 7b4eb14923668bbd886686ba3c17daf2a8118cc6988049780dc6e33649282734f2c58798f9e97ca8b9dde97d36d54790bdd5a1c75452adef726343c061d9e46b
-EBUILD kigo-19.04.3.ebuild 821 BLAKE2B 4be4786b182d0d86e63e9c343945c9400b613cc2a632ad917001db0513dbbc346868735ac15e7db51c66793b0df0d48b5ca7fc5d693efefd9b57d59374d09d0e SHA512 81ea424f5d6161e60ccfbe0e2a7d16a97775565ab66b3a8134343cac95efad9c89dc98d8cbf24b38831c0b16e76933b527b271a5c82c781cfe5507ea432b628b
-EBUILD kigo-19.08.3.ebuild 1056 BLAKE2B 1e462a9b87eaa1a8e0a44ab3c4ba12be02382b2b1f02461cd7ce60d2f2b94a3cd89486fcac9665b697e84686b5f398a8bfce90a22d72cbc03f1c62d9c99740ab SHA512 8cf44ab565e83cc27bb404f949748a1774d20e91ef7e4d65572a3e9db654a9ed40cf591dc8a2a49eeac765f2d86650ff562eb5474b8b1987274e4e569f700224
+DIST kigo-19.12.0.tar.xz 5227572 BLAKE2B de357859899be39d55971bd480f4149af6afa1cf1a99134996477f00f944c986d7aee08da3726df860136d41591fbe8564891c09aaeca06780622963656c1f04 SHA512 fc69c62f0fd914691de03ca726d7a831ccf2c224c75c46e122b02d2e349fa36280a0685fbb2e1701052efb3e92fc08f5f544ee99217139c74163d414fc719867
+EBUILD kigo-19.08.3.ebuild 1053 BLAKE2B 5f51ac33256885bd5c0ab79a227d0c6fc3bb3be312f38729e4fa218791ef4d5004bdaff579b371e97b6328070e88092a06fc95c7ad745639911a35f5d0c9150a SHA512 ee04c15495d0379a312f2c1abae33dd2776c64a23c2de8af1faa7fe73e15c1c394c8b3b495fc24233e796db30d921c0936e8c09b437f04d72439842830687663
+EBUILD kigo-19.12.0.ebuild 1018 BLAKE2B 67de126f9c6d8aa4920056bc501d4544c061ca9d930f38dfab8ce030996dd9d80609a6cb74e16e0390f0dec6e20e8a1ca5680d910daad0bd113ef8ec4440619e SHA512 a7fd8b6e2b0966704765543d0d144019aed3d419faf32fe5ac06593b90e2598a555769c4b57eead5a39ff832025f6f68cfc44e988338669e2660ad8efdb4a53e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/kigo-19.04.3.ebuild b/kde-apps/kigo/kigo-19.04.3.ebuild
deleted file mode 100644
index 4463b06b30c9..000000000000
--- a/kde-apps/kigo/kigo-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Go game by KDE"
-HOMEPAGE="https://kde.org/applications/games/kigo/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	games-board/gnugo
-"
diff --git a/kde-apps/kigo/kigo-19.08.3.ebuild b/kde-apps/kigo/kigo-19.08.3.ebuild
index 60e69956fc68..c14184c31c95 100644
--- a/kde-apps/kigo/kigo-19.08.3.ebuild
+++ b/kde-apps/kigo/kigo-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Go game by KDE"
 HOMEPAGE="https://kde.org/applications/games/kigo/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kigo/kigo-19.12.0.ebuild b/kde-apps/kigo/kigo-19.12.0.ebuild
new file mode 100644
index 000000000000..fa3d9ad7c611
--- /dev/null
+++ b/kde-apps/kigo/kigo-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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.63.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 b63a9df6eda9..1bf20ab035d8 100644
--- a/kde-apps/killbots/Manifest
+++ b/kde-apps/killbots/Manifest
@@ -1,5 +1,5 @@
-DIST killbots-19.04.3.tar.xz 1171900 BLAKE2B 90e4d3e7d5e1c47eb0bc3240868c24dc62e0d676f430028ed889b491501ee9b22b7436772923502a1e10b285403b39bda345f14c4cfade1173352d07033359a3 SHA512 af0263e9f5494aae44a170dbefe8001700dec3cb8d9f74516f7cbd9136acf6bbd8368aa97d76bacf6af9823b064974a7cb06e82e9e1d6a7d19b6ba2981fda923
 DIST killbots-19.08.3.tar.xz 1175900 BLAKE2B fa043574ee3267bc56c4927757e1d8d3491c29d92f3f3061467f634f89bcdbcff7e837f16818c05bd79dcb23ccb39d81f6145584136c32ca2e629f3c9e993579 SHA512 cc369d8c89081012aeefb811124bd895f9126ca8aa20c4d7e9132154e8d22f15c0246ff017c9a0f7adda03113a32a4d78ebd66b1af463e200284dcbdd93e43d2
-EBUILD killbots-19.04.3.ebuild 714 BLAKE2B 0309a20fe8c9055993287de499ffd71440c0fe93ff01fb552526f3654ec87a9fef77eb80f4ba26b777ca7d976d23480f6e3bbf5771dd649cfbd609decb34f26c SHA512 8e2d5ddff909447cebd157b5186a0292a4bd29a69f489960f9969ef5dc87a43a5c2b7b03306bea303d6f71a4e62f6cd386466f096ac57cd3bb9a39cb49fc0963
-EBUILD killbots-19.08.3.ebuild 879 BLAKE2B 70cf5d8edc1dfd2a8e80788ef24fa060aacd1d2a236d32e634b93895476a27eec8884c2250639993c8c2ffa0de5eb58a451e7b7f727c2aa24bf5a2d3ca7e66c1 SHA512 bf3ae779b9e2a1d8a2a9d520dc77ddd14601323360ea092576d89c26054efde86cb90dbb570e57096e8c02793ed6a19865ad22730f514290a6944437cc11a36c
+DIST killbots-19.12.0.tar.xz 1175136 BLAKE2B 916302b90db3112bdf3b251fa0732e9a966f4a8372bebb9db5614b4426dfa48439f3f760523cca1847556eaac5ee891f454b4fccb6f70dbcf23f215a0ac6cc4e SHA512 8e6b420b0ea1521461f304ad7b79718ee24949e95a173c6202dfbfef9031e50dba74851a75e2136a7a23971930488ba423ebe0079506c489200a0dac921c73e8
+EBUILD killbots-19.08.3.ebuild 876 BLAKE2B 6dba1a1f19c26dc9653ce24a1b419d922f45ce63e81bd9982561262eadcbb6756f0a2199c670bac2294235d6c3197dcf34ebb7e6718d0797049032a3654b81e6 SHA512 9db96111eab42086a82f418c039d74c6fce2983dbfff151f6ffa9d763d5d008290693d0086e6092efe2015089240f61c4ed0019b8186a4bc8620272ede4debca
+EBUILD killbots-19.12.0.ebuild 887 BLAKE2B 8cff8f91853e62388ef1dacd057bd10d24d45321debd743dca59633f10632dc3a87142f25d40ae8b310d0e4867ea5c5eb6d88908b324d92719337b78f13ae35a SHA512 f71473b9e4994748a4d4249b1fbfeaf3800429be31205661ebdd36f7f08a3361101e20f7d1997d90802d0dc60e154fdd3b043aaab514a922b9e247d2e826ab19
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-19.04.3.ebuild b/kde-apps/killbots/killbots-19.04.3.ebuild
deleted file mode 100644
index 7da67798904e..000000000000
--- a/kde-apps/killbots/killbots-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Kill the bots or they kill you!"
-HOMEPAGE="https://kde.org/applications/games/killbots/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/killbots/killbots-19.08.3.ebuild b/kde-apps/killbots/killbots-19.08.3.ebuild
index 4ff75b22bb49..0398b9385fc5 100644
--- a/kde-apps/killbots/killbots-19.08.3.ebuild
+++ b/kde-apps/killbots/killbots-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Kill the bots or they kill you!"
 HOMEPAGE="https://kde.org/applications/games/killbots/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/killbots/killbots-19.12.0.ebuild b/kde-apps/killbots/killbots-19.12.0.ebuild
new file mode 100644
index 000000000000..bd2c03eeaa36
--- /dev/null
+++ b/kde-apps/killbots/killbots-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 8ef5f27d627a..75af7a6e8a6a 100644
--- a/kde-apps/kimagemapeditor/Manifest
+++ b/kde-apps/kimagemapeditor/Manifest
@@ -1,5 +1,5 @@
-DIST kimagemapeditor-19.04.3.tar.xz 1070204 BLAKE2B 539423f04221abc7458d0eecb02eea29ab2349812db1ddaf8686eff04ba5c0fb6447b9b18a9a64c72f47d5c19a2caa383fdbf91059f6c6469de57975a65fe917 SHA512 991a101c6d5c9be02a494a8540b8c6cd2cc345cf23963d34d5d6951105d95f85d0ed748a286ab08c1b7cfe4d2b4f55a61f6d6c8ef76247cdd5ea869c47f57b20
 DIST kimagemapeditor-19.08.3.tar.xz 1070468 BLAKE2B d9efb205c69fe4a4860b7d24701f466d8319802994286cefcaa5deae283885c1525332c824c86927f53ed5e1e13526158a69e15bb5e85a57dddd4b0196784295 SHA512 8ff978bf252b230f213fee0bd4e29c4744e814dea54720c3d50b0faa88fe9bcce393c934d92e9aea4fa8af36bc174d4b4036d7a7a32230519b139af8764c3751
-EBUILD kimagemapeditor-19.04.3.ebuild 776 BLAKE2B adb336c92ed8aea2a02554f7540537d6b7f8843c03d94be4ca17c3891b26b3cf2d08f3e4cd380f902e7d7d61b365ee78daae7451a7fedb9503c41787b8ce2e9b SHA512 2146508da96708dbe0b0339a6144539ff7a67c000683ba14b1ff91bc0e8f53cfc336393127e4ecd8f4f80891496e3c245ed3e52f90bfe548c9e0414eaa37a06b
-EBUILD kimagemapeditor-19.08.3.ebuild 935 BLAKE2B e88336b08f412fb9d5f38347bae44e5cc4e88b80bb73966c6f473edc52e8b8ed950ee5f5ee38ad41ddc9995d0232639a7c2b373898b5365ca8317130da8907e4 SHA512 cc664674bb253ff7586e3b837368dc8e8b8bb789ba6e7cc20bceb6183fdb43c8c5b641026bf795cd9fd85e9e56a016816b1b97bca5ab0095d7a1ecd93e7d584a
+DIST kimagemapeditor-19.12.0.tar.xz 1071484 BLAKE2B 7f025e6897d1a6df98b3625bf7548b9ef13ddba7d9922b7560686862350ac2e580fc0e5047a12a5783171ee67fd6b818843eff47c7e6487eee5686a89c727fe4 SHA512 0e2d3ce6104de869a2cf12a661034e02a035d6698e4f62943e80e3901d7b8a299bf4f6683f19b18c93cb700cc30515e20dd2486356e704fefde96a63118e81a6
+EBUILD kimagemapeditor-19.08.3.ebuild 932 BLAKE2B 3acdfa5ef9c04cefbe2fb5bc60d35f85d53151c1f2a661661d70cb8d7d2da3ab8673bfeccbdd33b0dc68365363b73a022ba5392fc39139104e241da6ab54c3b7 SHA512 1d9a3c28ab5d16e07660cfb180e7cd3c00bd794ab96efc8dfe398c03a63ef7fd7a9f55932437a5c860eb852b68b503d8ec0f4baa15d0310b824b41843bed0a8c
+EBUILD kimagemapeditor-19.12.0.ebuild 950 BLAKE2B 5a1ec15897399496ab31afbd441caeaeed51b4afd1c102e70727f7bb9bfd2be864a56e5338da3e978bb24ce9ad2e80d55adcc1f0e2c19023461883aa517e6ced SHA512 e403a5010b442a8950bb861515f760870c1e933589c846effc97e7c9342330ea3b07fc0872d31bf72f0f6ee85330ca71cacde34a0cb9e2af1af7f1a433df7bb0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-19.04.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-19.04.3.ebuild
deleted file mode 100644
index 19d3ed969a68..000000000000
--- a/kde-apps/kimagemapeditor/kimagemapeditor-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Generator of HTML image maps"
-HOMEPAGE="https://kde.org/applications/development/kimagemapeditor/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-19.08.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-19.08.3.ebuild
index c67a459065c7..35d36d92adff 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-19.08.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Generator of HTML image maps"
 HOMEPAGE="https://kde.org/applications/development/kimagemapeditor/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-19.12.0.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-19.12.0.ebuild
new file mode 100644
index 000000000000..8c822c10fe45
--- /dev/null
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 055099444dea..53457ff33fb5 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,5 +1,5 @@
-DIST kimap-19.04.3.tar.xz 119616 BLAKE2B 7aedb732990a04b784b86529e4d6b30cac9809a246ae9207166b52701f075cd4a0e8f205df69724648b28c6b57cdcfb7c68316490d34bbccdf0ae4297cfb74cc SHA512 893320c0acdfb53ad382979cf31244941535793e39cd1853631a724c554f29faefe5504b3c48a2b3f9cab43e6ff839b9753d7963ddcf8cc8c7351b7b511a7988
 DIST kimap-19.08.3.tar.xz 119512 BLAKE2B 1a9436352115dbeecf85dddcecb1084ba8702264c1517438235d0785d914ebf94946111360cfa3d7ebd25d6b56b52d8739aa7b9889a3bc2d3149ba509701a580 SHA512 6a3bea5e4f442783fc4ab7b1f8b4425d75638edcdbb3c6f1d8c86e050b4b80deedca987cb868dc1190b126f04c70c55d660d2822929639ed70c359608543ea91
-EBUILD kimap-19.04.3.ebuild 744 BLAKE2B 43207a51fa6d30ac505b43e76813d5dea811b87c45b2809d1f29b0d8469e200263d1b8a29ac29759fdacb2bb807898f9131b6a7a278887e8d0fa2975123e000c SHA512 772f6240285edf55e7f914c95c22d38f15eec278dbef5ac04b8e8a51f7617763e5d6f31a16e452f9c3bb27fe015e0c62142de604b2dff7a2d61913f4964f6417
-EBUILD kimap-19.08.3.ebuild 848 BLAKE2B 0ec2da26a7e8e57b7b02d44c96482310d850b0b57121c4dcda3607c8a8c69c19d0a138863d0c78cc58d71b346326681cec6d58cf358c125cba5d5b52158e365f SHA512 a1719ec8cb385421bd6348d76e929f208dae6888f8eb19ec788f0e92633577376c4d5758d78d6f4461e84379997ec6a0b6246a768fa21ab007e6f09fa6a6362a
+DIST kimap-19.12.0.tar.xz 119640 BLAKE2B f91f5b35261a71ce3e89ab1c6388a6ceb1942bd00c73749d2b14f2cb8ff98f9c5ec7d37482b2330fbe236a0904af8680ff90dff02460b66bbead168833f18e43 SHA512 1ca537b5b9fad58c16342ad138626f7052428587a5084e694c50bf5588f053400d8ea87d02166eb9bc9de07d427aac019fe35e4fc192bc73c2f07c7a3bc19b42
+EBUILD kimap-19.08.3.ebuild 845 BLAKE2B 2ff1381b2cec73bca9190cf9ba9daee1162ac5c34f3f322fae1a30b083f5ed186bd09e107871882d33e65e7775e6cae25f1897b7256122c9b9f18b4595589173 SHA512 aebdc3c36780d049dedebfec2f375812dcad1978786cef52b8d5caf61791044e619f418d3a3a32e1d745108d8e8f9cf000a171262639d6c6e722c4d587015cb0
+EBUILD kimap-19.12.0.ebuild 909 BLAKE2B 20483297bcc345f64e48196023fa979791f7033dd83039aa72b74f6254bc6ebb9dea860813f4a45335b5d83838e10b2f6a90e4bd58ea46fd3957a8130545b464 SHA512 68595af2f2756c190ef30c3d00334fc8cd454e7222780dfa0e7536fe34df0eca6eb08a921a26c91e03cd680d57d5ca30673802e0035e057de08eb1e726d6bf99
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-19.08.3.ebuild b/kde-apps/kimap/kimap-19.08.3.ebuild
index 034392414131..a47c082b2834 100644
--- a/kde-apps/kimap/kimap-19.08.3.ebuild
+++ b/kde-apps/kimap/kimap-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for interacting with IMAP servers"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kimap/kimap-19.04.3.ebuild b/kde-apps/kimap/kimap-19.12.0.ebuild
index b5eb730db2f4..8800b907075d 100644
--- a/kde-apps/kimap/kimap-19.04.3.ebuild
+++ b/kde-apps/kimap/kimap-19.12.0.ebuild
@@ -3,26 +3,32 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep kmime)
-	$(add_qt_dep qtgui)
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
 	dev-libs/cyrus-sasl
 "
 # TODO: Convince upstream not to install stuff with tests
 DEPEND="${COMMON_DEPEND}
-	test? ( $(add_qt_dep qtnetwork) )
+	test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
@@ -33,5 +39,5 @@ src_test() {
 	local myctestargs=(
 		-j1
 	)
-	kde5_src_test
+	ecm_src_test
 }
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 919ff16ae4fe..e70e9cc43bab 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,6 +1,6 @@
 AUX kio-extras-19.08.3-libssh-0.9.2.patch 3114 BLAKE2B c09e9ab0d42bb51c8b7f2edc4c6dc00bad03de719610e95e45fae888bb2603139bbf801dfa891384c68612a215fb783367987dd13fed4da8846ae223d1828a0c SHA512 6c347691eed1154088feb7d4cac761478b7111ebea13d777a8058c1c2b701b1183f4e1a9d339e77423315252326fdecc825279def616c1f6bd0fce8ecfb8a0d9
-DIST kio-extras-19.04.3.tar.xz 570436 BLAKE2B d506bae6c5ef9b14600f0dd05e26dde7e9ae75a086dfc047ee9e0dcf5baac03694a75f8547b47550a2a37e9bfad040051abbc7b316965e0c7690d94f161e034c SHA512 68b9218ef86c4aabbf9d6df21da087b954469494fe50061d2e61da7d3a121da5afe9da967281626b0f17c19e7b5078a789c29dc08dbc37196a07a67660951ad2
 DIST kio-extras-19.08.3.tar.xz 577520 BLAKE2B 2ceb208b1860e83b818935d6890194d27ad05c2d058d1d03167969539c41a99172b08c7196ade159e332e562c5573614e79f920415dccf16e4e1918471d92c22 SHA512 e2e5c6e3a8487c7251b77283c63eae75ea071f9d9f5f4544690083ab7f834abf6b10c715cad4fb49fbbfa34d2fbf9de358a4c606b299b2f4bf44444a57cadba6
-EBUILD kio-extras-19.04.3.ebuild 2088 BLAKE2B c3e7b417859ce8b7a8ebea7c17a1b2a499dafdb87b60b0ac26938d77b9b0b57e45c55de5cf4aeddfa8c8d3a982baf7c282a5003813ed9b6a2efbdcf0da43e9ef SHA512 47ea42d25654f064d11329c135db3fb1516dec3b34cd4ddb64060b8146132b3b93af0eda2ff4f5804cb536d6597b5afdf2325f3439a63912a021fec051b5d10d
-EBUILD kio-extras-19.08.3.ebuild 2381 BLAKE2B d78b356c4d8f947ec03051750482eea41f65976d79f366c0971d923f9125262e155466e81f7f4055957e8a9da5907feed8a39daaaa7bce72cd95adc6cd146b61 SHA512 8d76662e9d9a628a3b1002074d579817a9a2f621959c2946f2f146a661888a5920049ef5e671a24ee2d88a56245c1deefdef3da24cf20db6f3d198d5d84b6c72
+DIST kio-extras-19.12.0.tar.xz 579188 BLAKE2B df0528728092366d10b9c9996aa389c707fef46606fd5c7378ec8616b7862b9d02d2305070351bd9e49c7161bbf37a4643bc0b4297fd070ba91c49e1bb4c6bcb SHA512 0aeb0186da8f4d24ba9020d49f9204ec3fdf3a20aa42a0e6fcc769ae99cba36b3e63d02d56cfd105c66f009f08274fc117219c0296749cf95aad52e4fb7e17eb
+EBUILD kio-extras-19.08.3.ebuild 2378 BLAKE2B 86b51c5a2d66075cb543e53aa800525baa00287a117b3e03d289f95590e45b8298679b3116bb18c91aea20e999762a00cbcf3914e37b09a18069815a4a941906 SHA512 79159b5dc07de2e8e9e0745ee5141e28f4c81db5b43b941968007c5dea1d11c66ebaf3f02b04fdf626ea1a3ab9b30c2917371bbf57bb2157ef4b7e7f5727ce85
+EBUILD kio-extras-19.12.0.ebuild 2344 BLAKE2B 933c9c7948234f57d44a235a0d0bd99b4a964326b652312446df988379c3a76f80ac31153aea923276c78e8c2a72d85630dd56446c4cddf08a2818e9f792daba SHA512 0a79b0eef944727485271c190f738e5b172c2262f18ee06019d23255df0350e0015b6c33682a906fa7c2473f4a686085895a47fec35bf728d057599c69f38fb3
 MISC metadata.xml 667 BLAKE2B 7f837cd50d37a8692d57859a3328770578e13052392bcee145c327e6a07d147f8194ae09ab0c6933fe15eb6964640e8b82495417b3776cac3fce0825fd1fd989 SHA512 3c14222010c942ec878bc049e2e92dc6180305de69804bc024bba1f159d08c97eb61b3e9ad68e14188515bde2b21a026c8068ab465ce8ca22e8e3e0190649154
diff --git a/kde-apps/kio-extras/kio-extras-19.04.3.ebuild b/kde-apps/kio-extras/kio-extras-19.04.3.ebuild
deleted file mode 100644
index c670eb14a322..000000000000
--- a/kde-apps/kio-extras/kio-extras-19.04.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
-HOMEPAGE="https://cgit.kde.org/kio-extras.git"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="activities +man mtp openexr phonon samba +sftp taglib"
-
-BDEPEND="
-	man? ( dev-util/gperf )
-"
-DEPEND="
-	$(add_frameworks_dep karchive 'bzip2,lzma')
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	activities? (
-		$(add_frameworks_dep kactivities)
-		$(add_qt_dep qtsql)
-	)
-	man? ( $(add_frameworks_dep khtml) )
-	mtp? ( >=media-libs/libmtp-1.1.16:= )
-	openexr? ( media-libs/openexr:= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	samba? ( net-fs/samba[client] )
-	sftp? ( net-libs/libssh:=[sftp] )
-	taglib? ( >=media-libs/taglib-1.11.1 )
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kded)
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package man Gperf)
-		$(cmake-utils_use_find_package mtp Mtp)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package samba Samba)
-		$(cmake-utils_use_find_package sftp libssh)
-		$(cmake-utils_use_find_package taglib Taglib)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kio-extras/kio-extras-19.08.3.ebuild b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
index 8b8ae07f60d7..a56211843edf 100644
--- a/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://cgit.kde.org/kio-extras.git"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="activities +man mtp openexr phonon samba +sftp taglib"
 
 BDEPEND="
diff --git a/kde-apps/kio-extras/kio-extras-19.12.0.ebuild b/kde-apps/kio-extras/kio-extras-19.12.0.ebuild
new file mode 100644
index 000000000000..8df8a8a4d9e7
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-19.12.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.63.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://cgit.kde.org/kio-extras.git"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="activities +man mtp openexr phonon samba +sftp taglib"
+
+BDEPEND="
+	man? ( dev-util/gperf )
+"
+DEPEND="
+	>=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
+	>=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
+	activities? (
+		>=kde-frameworks/kactivities-${KFMIN}:5
+		>=kde-frameworks/kactivities-stats-${KFMIN}:5
+		>=dev-qt/qtsql-${QTMIN}:5
+	)
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	openexr? ( media-libs/openexr:= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	samba? ( net-fs/samba[client] )
+	sftp? ( net-libs/libssh:=[sftp] )
+	taglib? ( >=media-libs/taglib-1.11.1 )
+"
+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 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)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index a798568b23a8..4ca02c348e40 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST kipi-plugins-19.08.3.tar.xz 1629776 BLAKE2B 36ca49c935c4f9bc8aa574e447afc59189a5193102265192ff1b8aab8380f6542a7f9f4cc896146c087b7cffac942bab1bcc1b50ed0e3c3d7378bd2a62bcac79 SHA512 58901a4c0ba40da99aa2d06381cffd61bacfec5ea040abab73044ab38241460b71421629390c93818c74bfee7f195ed29c423462a057f2b1b990e40edeae5c0a
-DIST kipi-plugins-5.9.1.tar.xz 1468084 BLAKE2B 92ae30ae4c3fa2af173b32b294a610c1670754be5e40d395aec939e192ada42b274572de3dd449e74f26f1680abe07cd3ba48f67d25b75541317e9dc7ac3b494 SHA512 7536602edc85464aa651f5134f1dc085141632775907603d738f3915c718df359adb155013571ab836f91a1fb597418a1437e677b98c086bce5ea884133cca51
-EBUILD kipi-plugins-19.08.3.ebuild 1544 BLAKE2B 46371288c75907353bc9b6cf5a2d837686d3a7936e1a0da93e25d2aebb206a66f93854a4ba626c9e172989ad5cb7c5fb6791fe1ecaf5674bde2b3d83ad09307a SHA512 623de5d3ba5d2252839531827287fdcc741ecdd9a3bd5950eecfbcac420dc077cd79b7baa41fd684ddc83a1a659dccc7e44b8710730eea0b79878f67ec658042
-EBUILD kipi-plugins-5.9.1.ebuild 1470 BLAKE2B b291a907b418ac93d8b1fe4a5e9f0e8b1c24209a02bb9938e2e7613a3cf7d07f160ea6ffbddc1693a2b6564db8e3e3cae0f8f9d78df2ff65a2fbb08fb915b3e2 SHA512 d1e97faea87418e28a653d64691de5d03560fe3de3df1a4c7ee0e996c7db81048c82905ba3f54aca4c52ae0abad98d19d4d7f854ce4e6f6aae1113dc50a9989b
+DIST kipi-plugins-19.12.0.tar.xz 1631208 BLAKE2B 2aa74098262c72af4069a0826a7d11c0ef0e6a40f2e2416699ce16cb6da848cca897197c7f916a49dc835d3372f316b6780e0eb9c6d6c1a13a91871d40f61e2c SHA512 84db7485deda06ff7326eaa5c2a949b7733ea350c47f4e98566b85dce4ebd16a23ebf88d66790dc7f1d4851f11bb13e7b140505a8b9d11c807300af74123cf1f
+EBUILD kipi-plugins-19.08.3.ebuild 1541 BLAKE2B b965ab025e3e20a11ad951d55aa808dd3741216c9bb190bd6fd9133db4ca42526d9b3cc99e2431b04212ec58b9e06624f8e0f1a5d89a3b08934c21518b78f567 SHA512 727339fb795b3a6dfa0e5b8ef24b6cad95e142b03779db6e8067462d5e0cb89b13f64d1f91ebf23905c2bfea6ce18166d02873f072611848c934ec5f24bea735
+EBUILD kipi-plugins-19.12.0.ebuild 1520 BLAKE2B e05f7d13314c23b328ef68bf60ebefe488b3fdf63f55fc84ffd8ce52cf66c86cb8d9b46d2321366253896c598ed2f04a88a39416b0e521af25104fe7e8a104e6 SHA512 3e66e786803e88caf64e272aafb75dab0d8e10a08c2ec277a5cb42563b4ddb3b9072797c520a9a10cdfeaa6fce375a9af71dacd116349270cb1503b1edc62292
 MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9
diff --git a/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
index 9ab937a7a9ee..42f68be24379 100644
--- a/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="flashexport mediawiki +remotestorage vkontakte"
 
 BDEPEND="sys-devel/gettext"
diff --git a/kde-apps/kipi-plugins/kipi-plugins-19.12.0.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.12.0.ebuild
new file mode 100644
index 000000000000..35fffb4c82f3
--- /dev/null
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.12.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 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.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface"
+HOMEPAGE="https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~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/kipi-plugins/kipi-plugins-5.9.1.ebuild b/kde-apps/kipi-plugins/kipi-plugins-5.9.1.ebuild
deleted file mode 100644
index 3a6717c63219..000000000000
--- a/kde-apps/kipi-plugins/kipi-plugins-5.9.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Plugins for the KDE Image Plugin Interface"
-HOMEPAGE="https://userbase.kde.org/KIPI https://cgit.kde.org/kipi-plugins.git/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-	SRC_URI="mirror://kde/stable/kipi-plugins/${P}.tar.xz"
-fi
-
-LICENSE="GPL-2+"
-IUSE="flashexport mediawiki +remotestorage vkontakte"
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkipi '' '' '5=')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	flashexport? ( $(add_frameworks_dep karchive) )
-	mediawiki? ( net-libs/libmediawiki:5 )
-	remotestorage? ( $(add_frameworks_dep kio) )
-	vkontakte? ( net-libs/libkvkontakte:5 )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package flashexport KF5Archive)
-		$(cmake-utils_use_find_package mediawiki KF5MediaWiki)
-		-DENABLE_KIO=$(usex remotestorage)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index e23e975a804b..90605399f2fd 100644
--- a/kde-apps/kiriki/Manifest
+++ b/kde-apps/kiriki/Manifest
@@ -1,5 +1,5 @@
-DIST kiriki-19.04.3.tar.xz 372588 BLAKE2B f2488d5d53052b1bb97031e8d065d0e4f1316a22b1c4da8b14155301ad29a30e06ba80a776bd42d4bbb600701462c4fc22d1ff0f055cdcd3e269db291a0c0e7e SHA512 1ebc3d076d05d3ea199f703d8aa9a7fed89d2e83b9080672dc227f94ca6c42cd7057d965e4e88dad4c3ba3e12c4958c96790f31177fefa0624dd25eca4517045
 DIST kiriki-19.08.3.tar.xz 373104 BLAKE2B 5944f46442d71acaf776e9ec6122f335727998641bce9f4d9a9dba67dfdc23bfb828259166acbded3c68fd3712a4882b12ebf4e55bce15d0c348d7aa717793d6 SHA512 4d1d706a46648c01827887bd07b25cc2ec5d12baef70ed1983befcdc36d801a3dfbacfc21a62657b8e3d5d5d5a5410b51cc97c10d4921776776d77247ca40d7e
-EBUILD kiriki-19.04.3.ebuild 775 BLAKE2B 91710d6a38f3be699026282369c06d07c23391018aa7603ab164bbe473971641497e9fb9080a95d6b6ba04507ddbdd308ea0a9ef8a406aa45b6c3a193b6e760f SHA512 0fa3f86f0971c8adfaf4bc5d7ee272e6002142bf653fa104c6e62267df2639f8abc0e7e0528b8eff4ec427adcc49519b274cb238ebb9d66f6e0a9df10ee52926
-EBUILD kiriki-19.08.3.ebuild 946 BLAKE2B f3628257aec6cb188898396cd363d7fbff94bf296b5b6fece0946e73e208a0fbc12daa1e47da2639d746bd970d03175f8aabdc4e833d49a01dff6786b7601cb5 SHA512 b41debd18104fc2c936f23f946d17d50f540a505a168a2a07150e3ba0a92fd1682f20da16930a54a10a477b599d7dfd3a80f3f8ab30f4ddd5b931e848310fca4
+DIST kiriki-19.12.0.tar.xz 373632 BLAKE2B 19e4cacb8ca2fc41d9b72d1f73eb45742ccacd6d2490548d969ace5569d36b6243516c81e37d454dce1713e9bdce9e2fcdb62da783085e0a7b208494ecb4ee4c SHA512 7e61fdfe0b9793f115542e0b51defaafe5be6feb1e409860860da019b17250bde2d83fb9d34f57af9d5e6d891de9035bc14ca7ded302686f0149bf4232d45497
+EBUILD kiriki-19.08.3.ebuild 943 BLAKE2B 76d601c9a2fc4bef037802c1bdc95b13fbc33711405e91d30b80912030bb6a7edca6dce70fe973c89ae0d1b3d3f6c64f66d94130a1bf231d40610aff85fe5ce8 SHA512 2bc26da050cb72a887537ed8460973770daaecc60e31f54bc4ee828ac2c0afbdc76d9989b0f3aafb64b8c72c741415b4fc28162c7c4b9e332f62c7681b460959
+EBUILD kiriki-19.12.0.ebuild 954 BLAKE2B 88591be5fbaa306b95725325735536972c96e0368c2c8286b758ed1aabb60ffe25bd7d8f2b2475c1646fe20e9a0860c621c036cd0c5ebd1dc46b372411267700 SHA512 4f868029a1c04054bd14dc6ab2e4a5ad6dd9d742f3618abeee461f55b217867b5b73cbb1801edbb340e1a9c46a43d969aec5b9ec4089fe765f3e92eaf02370fc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-19.04.3.ebuild b/kde-apps/kiriki/kiriki-19.04.3.ebuild
deleted file mode 100644
index fc6403849a03..000000000000
--- a/kde-apps/kiriki/kiriki-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="An addictive and fun dice game"
-HOMEPAGE="https://kde.org/applications/games/kiriki/
-https://games.kde.org/game.php?game=kiriki"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kiriki/kiriki-19.08.3.ebuild b/kde-apps/kiriki/kiriki-19.08.3.ebuild
index c0f4871b809c..a7bcc27fda74 100644
--- a/kde-apps/kiriki/kiriki-19.08.3.ebuild
+++ b/kde-apps/kiriki/kiriki-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/games/kiriki/
 https://games.kde.org/game.php?game=kiriki"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiriki/kiriki-19.12.0.ebuild b/kde-apps/kiriki/kiriki-19.12.0.ebuild
new file mode 100644
index 000000000000..24066061fc8d
--- /dev/null
+++ b/kde-apps/kiriki/kiriki-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 cfce77fc1906..36dcafdb2fd4 100644
--- a/kde-apps/kiten/Manifest
+++ b/kde-apps/kiten/Manifest
@@ -1,5 +1,5 @@
-DIST kiten-19.04.3.tar.xz 11288144 BLAKE2B 8c279218e24e461ad1128aad9ec3489679e398f3973cd2e19dd17d38a4e0a5a25cb990fed92917fe9f64c34ce0bfa539fdd6798ecd91dfb9c2013ea8a1439fbb SHA512 18d24ca0457d36d2c6bcc5c90a14c63f60612962a241d62afba67ca9e649a10d1a45ff1c906e480986a6e8e202d239e00978d7e340d5c77e8591da886ea568f3
 DIST kiten-19.08.3.tar.xz 11279532 BLAKE2B 1cb6ab60b310949b51ab0a1011228921bc2a76914595c2680d3ce68b2289030fa7c32ed60c21859cede4e08097899fb5bed7cae91493ed6bca669c5c420d85f5 SHA512 330544abf9fbf6723588f4fc476275500da90a03f61f55569779cffbb31d6fd83fb752d3bfa6393a4298bac34ed43b52581c4df3555d9ccbd80be4b401147dfd
-EBUILD kiten-19.04.3.ebuild 960 BLAKE2B 65d74c97e06d8be09b9f237f89a7c4b41eec140fd781307f493c9d7ca0f9548185fa1936495f2ccb1b632b01e22dd10dc785b5562d21cc75d5aad2760398ebda SHA512 70b336a14bb172f3e17af548c1609dca200221855bc936fc289b422ba134058e545bb96585384b3eb9b81eab65b6160bd3804bc6da9f22f3cde80a4a5c718670
-EBUILD kiten-19.08.3.ebuild 1130 BLAKE2B 6b03fc744dfa523edc5d472c37df696659060ddccb87caeff218be8737aca6e5f09ad46cf3a23a3479ad5ce0c72b0ce38a62bc11632fd51268ad9cc85f55dce9 SHA512 e78dce2edf2581d30cab898353cd142738c3e7e1e5c22fbc393f0600cf4868bcd3d8e3ab6627fb9b6eda9060c0ae9395779a5eaac9680fdc7d52a602684e72ea
+DIST kiten-19.12.0.tar.xz 11289024 BLAKE2B b6bb4b094907f2cfbbe1ec5270d651c8d4795a6badd82c150e7eb88e56b1208fa26e6f5d4202e37632c4ad7de3522b6a0aef2afeb16ed6d988f7e8a50ae9c646 SHA512 7462c3ca2f12091a60d007dd6b46f286d5c133d7fa4244cafda08fb65b8006084e4fe048f732a6434c37a09fc6033f6fc951063780af116962a76009f7508c3b
+EBUILD kiten-19.08.3.ebuild 1127 BLAKE2B 2555f0290de7eff557a2fd3037abf962f85b865727f58c4756b4375710af715a6fd242579f0d97b43f6425988204c944af752f43f14aaa444fb528ea89bcc021 SHA512 27170374a5df899eb70147fd3fa769c63f1b3aac3a31b01181d7d7ef110b9aa93afd556daea266b1d21b66293bf64910bed35937549766e9b5dc0affbcb617fd
+EBUILD kiten-19.12.0.ebuild 1139 BLAKE2B 8db690b9a150f7d12b12bfbc015e77f921beefe93d09123b128b2995ab02f0d890fe3aefd7dec9fa9d25ae8ab35eb10fc5333fde0b6b167f332c288864b7059e SHA512 a98745769b79766d008a3bfdf4253f5dab277e32f8c6c4573eb8d610157fbe336433b52efcccf1e24b6ada4480f7a32f43b5bc797403ce49752254fd70517248
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-19.04.3.ebuild b/kde-apps/kiten/kiten-19.04.3.ebuild
deleted file mode 100644
index 0c3ce36103e5..000000000000
--- a/kde-apps/kiten/kiten-19.04.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Japanese dictionary and reference"
-HOMEPAGE="https://kde.org/applications/education/kiten https://edu.kde.org/kiten/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	media-fonts/kanjistrokeorders
-"
-
-src_prepare() {
-	kde5_src_prepare
-	cmake_comment_add_subdirectory data/font
-}
diff --git a/kde-apps/kiten/kiten-19.08.3.ebuild b/kde-apps/kiten/kiten-19.08.3.ebuild
index ca09c8f746b6..054ea7d6fd58 100644
--- a/kde-apps/kiten/kiten-19.08.3.ebuild
+++ b/kde-apps/kiten/kiten-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Japanese dictionary and reference"
 HOMEPAGE="https://kde.org/applications/education/kiten https://edu.kde.org/kiten/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/kiten-19.12.0.ebuild b/kde-apps/kiten/kiten-19.12.0.ebuild
new file mode 100644
index 000000000000..372e058febd0
--- /dev/null
+++ b/kde-apps/kiten/kiten-19.12.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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/khtml-${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 e50c56351ef3..0d95a84258a0 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,5 +1,5 @@
-DIST kitinerary-19.04.3.tar.xz 689352 BLAKE2B 68f08908e4c8b18791988412ec0bee1fbf16cbe6047bcb6f9fffa469dcf9ecdbf0429b56622afb107cf83b645053c15e798ee27d2fd49807c78be42ee73344e4 SHA512 8edb33f42d10c62006b1676866707a45276259b4e2e3a53e318436a316a2a9da6d0fc8db8c104ee3d5b9a4fd383377fdd100f7d4e3e131c432e8acc5af04e731
 DIST kitinerary-19.08.3.tar.xz 955500 BLAKE2B 1f09ccb61ca37b44efad2af4b2e9adf48f3f60e7368847e8602213602f7d23f016a525fa9e7f0bcd644dbaf2c43bde53d8dfe52d8bf4941b6f2930b30022d774 SHA512 357c8e18353dea4fbf5c73d5948dc81c5ed620e3e43503b62efa6367c13d9807f9c3e6790918c02b968864eabaad12b4f1001f69d2f4cffd4845b40cbb7f2a4d
-EBUILD kitinerary-19.04.3.ebuild 826 BLAKE2B c521cbdc55ee9f36d851bb224973b18fcceadf9a84b07f3670813b9d36949a1d48479b642283ba6d732603626e8230d7c4732caa553eeb9be3c511b04b2af61b SHA512 d84c321683b2fd81f460ac7ac9f337c59b22efa2fd820299ec7800fcddaaeab7ebea8472e54e9f5cfe704fcafe90c177e0f4f7cd92ab28b22aa67431230a75d1
-EBUILD kitinerary-19.08.3.ebuild 1036 BLAKE2B 913a9d67877fbaa527c7204bec00bf6076c4ac376451187f9419f9ab53b1186a417b2ae84c7288afa4f9d3aba23289465c9912746cd28f4158222024ba3ed7b3 SHA512 6a43a3024977d635baaf5df51d931fa625e2c1d456b67563fa91ece475141b4987e368d32d11ba87934c1cebe6fa4e2adc5d6f731b13e8687e4ae71d07341f0c
+DIST kitinerary-19.12.0.tar.xz 1179884 BLAKE2B 0b4ac198c44b96fc109efecf2c80415c28e4367ae0d023758c0f9870c413f91758501449e62f3531b04c02173efd3041dde59b0da85b45f20487b2e028a4d46e SHA512 1bf57a8ac88261fe4759af13013e404677f0ffdd14ce0263938b99b828eb63a12d544a28554885704c53d683f17e47950ce4e5ed0767c1308838524c88c38d83
+EBUILD kitinerary-19.08.3.ebuild 1033 BLAKE2B ac838a47e7cd108d996be83e039e4c94a61d7dfa74bf8606f4c5efd3ee7ebd1ecb191e62089b25e3362c53fb50d4b86ff5446e4161da9fb7a012b9d0afa50ece SHA512 7564bbb1d09802fd6f57baf9ad92f43202a4330bca51f989a4bb0c4213f4434a1047e9f17b11e0457d3aa9ec3f1fe76bb9ff1e3a98d7f95ec23956ff0394b08b
+EBUILD kitinerary-19.12.0.ebuild 1031 BLAKE2B e744949b2236b49285cdf16dde01d5026595c75db30531eaad8bb3f59e6cf80ae0e55cb340763a5c2cf5fda86e45df3f55ce6e23c41f8768e23f7548092a930c SHA512 a3fe69a0cfe868a6feffc8c686588809fff668ce0d08c48a9681e0213cf10cc3d0937e0d71e38eaa5feff4795206a49bbd6d2f7857fe53316eb8bef58ff530ab
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/kitinerary-19.04.3.ebuild b/kde-apps/kitinerary/kitinerary-19.04.3.ebuild
deleted file mode 100644
index dae80b643522..000000000000
--- a/kde-apps/kitinerary/kitinerary-19.04.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://kde.org/applications/office/kontact/"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE="pdf"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	sys-libs/zlib
-	pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-addons-18.07.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package pdf Poppler)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/kitinerary/kitinerary-19.08.3.ebuild b/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
index 0fe8468b5687..976c60aad071 100644
--- a/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/office/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+barcode pdf"
 
 DEPEND="
diff --git a/kde-apps/kitinerary/kitinerary-19.12.0.ebuild b/kde-apps/kitinerary/kitinerary-19.12.0.ebuild
new file mode 100644
index 000000000000..ab2972954e02
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-19.12.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 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.63.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 2ce88455f212..a2d8d69f7424 100644
--- a/kde-apps/kjumpingcube/Manifest
+++ b/kde-apps/kjumpingcube/Manifest
@@ -1,5 +1,5 @@
-DIST kjumpingcube-19.04.3.tar.xz 287628 BLAKE2B c9ad9c77bac98db39f63fa222ba8efd0678c1c2818f775edbaeda94da97087cbeb73410d4d0876f35888a011816bb3f9fd2c769b927f54f4b2b5f77b2c73a091 SHA512 7d9f5e55b4a3f9eb685d51be84905f27c41d03200a33b4a6f3f44f634ab40f18f1aa68a087d93ab7ce8526733e2523d22ffd91fb86e788d704264cb81d637e3e
 DIST kjumpingcube-19.08.3.tar.xz 288612 BLAKE2B d62592ff84a535b6d7c6105c4fb5a87e889ff094322e874c7d3042c35b0bdac4fe12bdec15e168aacf57be4dea77883481ebb6fbd2994d390b0bef9cb1005f86 SHA512 5fe15f3d7b6fb1bc7936e147df3d82ed1b178035ff4c3a4e945837f50e8e45190a9a8219c8ee3f8233f8a252422a04fbfba8fb3300fba3c571697de5036587b7
-EBUILD kjumpingcube-19.04.3.ebuild 771 BLAKE2B b8c57931a587754b7a804cd2345731746c125b25e3ad146977e8157632e30194f9eb1246d86a6db81ea700bd605e88d8349240274735056d9d5d4ebbd8475f4c SHA512 17033634d1cb7fd72018d1f74044035cc34d86b511cafdc5afdd37c339dc155bcf61889c987691fc1af3278ab1189fb49e729d88b385a576ff1c50a0b69472cc
-EBUILD kjumpingcube-19.08.3.ebuild 936 BLAKE2B 2de0eaeb9d58e73a2a23c6409c0a98d5f2d71555426a2ac593910034dd2ba69ae2dd4d859d495739200457fcdcb3f240a4646e070525b782db4a62e0c97b851a SHA512 80ff1ce27104b5ca380790f05a0b2379b4c3f0d2109cc7b841516dd55aff4c6ddd92105bb8fa3e1dbe1cde7a602e520852f861a79dce79e972ba241fa04eb01b
+DIST kjumpingcube-19.12.0.tar.xz 289272 BLAKE2B 1ab654fd15249247be2ffc8e9fe5f12a84c112a198f43a7ae5c98e53a04a3ae88619eb11ed2b689a51b6666e4efd536ebce1182a3af989a561ac8b53a5651704 SHA512 a0b0cffe563ad5ee2bcd96ea2e78e672c2bbcdf0a233922638740d59e507128bc262382dc77ca7797701910779894144e24edbd86fc3551ad41d78700c5cd51a
+EBUILD kjumpingcube-19.08.3.ebuild 933 BLAKE2B 8725377be310789ca7a941941bf62d3fb81a4be7210b3fb4f8cc73003e60b9a96f0ed3402fb57bb450c2730424e1566456cfab364770e7ff6ad0361bde3b50ac SHA512 14992acbd5b505a1533ac8e230ff6a7cbe7ac28fa6e15310a7b2d2fff1295a6ecd59706bfd6936bfdd9c57d6643c4bcb642a440a1af89642127f9375fe1f728d
+EBUILD kjumpingcube-19.12.0.ebuild 944 BLAKE2B 6a0b5b37da3c4e4ed5893a64e1ac7c31234635005c11763af72d9584d0c656bd30e7578cc62d89dd7774d7d594e29c4f9dcf3e21e50fd176a8bfa0026ca14677 SHA512 2febe8b5864b7c6bb3cdb5bfa84114c55e5d829938e4ab70aaaf7dca772b3c2d873a588df058c119b4cca8edb6cdd4cffacaab4f8d3f82e8c72a9a06d2f9f8eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-19.04.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-19.04.3.ebuild
deleted file mode 100644
index 97ef766d5c4f..000000000000
--- a/kde-apps/kjumpingcube/kjumpingcube-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Tactical one or two player game"
-HOMEPAGE="https://kde.org/applications/games/kjumpingcube/
-https://games.kde.org/game.php?game=kjumpingcube"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kjumpingcube/kjumpingcube-19.08.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-19.08.3.ebuild
index 4b662d5fabaa..cb7577cd94d1 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-19.08.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/games/kjumpingcube/
 https://games.kde.org/game.php?game=kjumpingcube"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kjumpingcube/kjumpingcube-19.12.0.ebuild b/kde-apps/kjumpingcube/kjumpingcube-19.12.0.ebuild
new file mode 100644
index 000000000000..5bb0a6a7caa7
--- /dev/null
+++ b/kde-apps/kjumpingcube/kjumpingcube-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 7fa0f6988de9..79c3af6a26fc 100644
--- a/kde-apps/kldap/Manifest
+++ b/kde-apps/kldap/Manifest
@@ -1,5 +1,5 @@
-DIST kldap-19.04.3.tar.xz 155680 BLAKE2B f6f8c7197666883e3c707190ed8f342ab9ee13116dc625070800e8f0db61a9613522d50f93427b8d4552e840ea5dc507223054dc519a7445dd7b1c35cd0718dc SHA512 0e0d02cf9330fd34caf186bf1220b18a68d88dc12391eb6f7af4bea25a75fc187cb6c12fc359aebfc94d38c8d871cb481567432fd34bf489c316b45d3eb78480
 DIST kldap-19.08.3.tar.xz 155372 BLAKE2B df9dd8216da743db09e9e059067a91c4776e26847f1413f281708fdb04372aed7186e7a0b2d1d2bf04a5cca657cfee290c7fa14470c7d1b64244284fafb65213 SHA512 c2e21c0b3755228aea5b2612cb495565aa2161e3502b1d72b5063eb2ee15b4ea1ee820b8183b2820607bc1b0e2eaf33a6983eaa025c2224e557f10dd17fc9d37
-EBUILD kldap-19.04.3.ebuild 755 BLAKE2B 18a95a8753ad393f1289830bdc57e352f1002efbe28cf8ab6f8f7829284c93fadd9294dcf017363ab0ea9174cb3668f7baa41e765cfff38d2b6e87c82dbc150e SHA512 aad73de4cf00088ff8751e1f29779eabcc7f52ad9565c4fdeeac9d4cf701dacdf38769d5844e310e478d7706afcd615c144367e00482938a7090770e68de15b3
-EBUILD kldap-19.08.3.ebuild 835 BLAKE2B 75da00ab7be0ae629d2bc7160103e1ae5324957cc8b9dce958c4460ed44ec15d472080263a0956a02cbc3ca00c404d37ff28abe606295bc1ca0279b2dc40294a SHA512 4eedd569dca8a6827fe3845cded89f6f4e88080f2e68ef33acc6fe0274d8fec10b3082b12e24279b0d6bd3ceb04899f473c22127f75ae5a4bd90b2dbc6915107
+DIST kldap-19.12.0.tar.xz 155216 BLAKE2B be4747893cf98479c4d6efd6ca03cdc4b454c4eecec8da96aba05a63fe9841b8c466b3ec77ae0ff6580f5e0d5a500061bbec9fd723fa6d2d15a87cbb57cfcfcd SHA512 ae788a0cf42c26d5de832e50dc3083fee8f0a66a1e6a39f3713d26e037d379aab1accb351ea185bfaf3fc99b0fc366e6ae47fe8bd1534ca5bb118d6faea3c2f0
+EBUILD kldap-19.08.3.ebuild 832 BLAKE2B 011fe5616b28a97ec7c22adf46c09f565ef2eb6877d4069b390c3da2995a18ce1ab35b6475f7f369bed700da03379dff6f37a2fbe1ffc3be59e53f786d55abf2 SHA512 70608e7e010ecf7cc083c7170fee0b424d22408a92ade5c395597634aa773c2a8933a2f315de0bf7759c12b1336565228f0bdd753da1ec45dc92a385ed105cde
+EBUILD kldap-19.12.0.ebuild 896 BLAKE2B c6b1093b018dbc4e4a15e3a7600fb5093192b1b2ce8dc44ac7bfe3314a4535783e37b97a6362e389b5394e95bb49a3fa93048e786226b393ec28c2f0f887ea80 SHA512 85947251e2d634a1200da159ea0ceaead1edf223b1b27d9e00ab43d8d27faf9a3393d07a35d6b6c522830ccb03706cf41596c7f6424f902634aacbd065744cd1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-19.08.3.ebuild b/kde-apps/kldap/kldap-19.08.3.ebuild
index 5ebdfc0f149c..cd944e370194 100644
--- a/kde-apps/kldap/kldap-19.08.3.ebuild
+++ b/kde-apps/kldap/kldap-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for interacting with LDAP servers"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kldap/kldap-19.04.3.ebuild b/kde-apps/kldap/kldap-19.12.0.ebuild
index 199cd32ada78..23d6f94125f7 100644
--- a/kde-apps/kldap/kldap-19.04.3.ebuild
+++ b/kde-apps/kldap/kldap-19.12.0.ebuild
@@ -3,22 +3,27 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.63.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+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kcompletion-${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
 	dev-libs/cyrus-sasl
 	net-nds/openldap
 "
@@ -27,7 +32,7 @@ RDEPEND="${DEPEND}
 "
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if ! use handbook ; then
 		sed -e "/add_subdirectory(doc)/I s/^/#DONOTCOMPILE /" \
diff --git a/kde-apps/kleopatra/Manifest b/kde-apps/kleopatra/Manifest
index 7553016a07e8..49a42f83dcbd 100644
--- a/kde-apps/kleopatra/Manifest
+++ b/kde-apps/kleopatra/Manifest
@@ -1,5 +1,5 @@
-DIST kleopatra-19.04.3.tar.xz 1922504 BLAKE2B 660eb2c65942a3bb823fd1b245f035a519d0a078158ba599401bc5c5fbbfc560d082b2032ffcb4f59dbb32b5e7d62f67da983dd2e5cc4003f663cfbf9484d0f0 SHA512 cf55cb118f7f966e02f635f0a2412eb497e557f729aa1dbdb86839a49fd733f117119ca493b590a1e3ebc36de17c2a9467eef16d6377ffe27e7c3acb63094e4a
 DIST kleopatra-19.08.3.tar.xz 1928668 BLAKE2B d32556a3b259b8c4e1a25414f11babf0b33ed3c6bd56405771fe23b207084c12a8dfd9a54877cb2cf36e31608b2a163a42021d7d86002a8858405998a6c7eb98 SHA512 546f00e2e8d1bedc62bd5e809ef4b888e40b83b7af315f7d74b40e3579bb23f5b91e69f7d819333dbd3c261a7ea10498f29c06e9bd30b091a0b4f58906f6b63c
-EBUILD kleopatra-19.04.3.ebuild 1322 BLAKE2B 217c7dbeb80ce2f7973e81603085caf488efbb2787bcb78e387f16136c19ded66c3b383c13cbe88add361fad94414a3bb2580708334b9de919d5f68a53fb6c0f SHA512 9b3cc98e4277f56cb647757737fd50a9d53cb7b091d7b3553e20f57417b2b1f21505345bdf22d39e5c01b4295ce7b99378656499f5bbc7e95261c7108551a680
-EBUILD kleopatra-19.08.3.ebuild 1509 BLAKE2B 47cdfda087ffc186a3455d231dac62f16285b58ebcfe9f2c871b3a0a7b712788cbf9a93f91d87e8dd1305770c350c99fcf420fe45a9826a6e160edadeb940963 SHA512 b63a7a5245e21e98c256b1bf81c0731e2a235f7810ac89faffad2aab95146e369fab1dc124f67714e35768df9de57bff63d8e2b5526b33aa5e70362ee5f7b9e3
+DIST kleopatra-19.12.0.tar.xz 1941060 BLAKE2B b47a90a12d857d75f05fb2f6d55b9c57a738bc974bd3efbb43613d5a8440780e2f225a3f0b63ca9aeddebd4225f8dfa95f888590e18d2a4e2df1b4b4866eb052 SHA512 4f5710a5fd15ec8205156f45efba824da3a8c4dfa075f55367eff42a8ccb1e07ed519bbc8af2cc1df1ea058b67318cc40171134cfa4db3dd338a067c33af6035
+EBUILD kleopatra-19.08.3.ebuild 1506 BLAKE2B f03d328a984db916e76dd888de4dfc3a605d97094dca2127cd124b29b08fc60f3063e79aa96dcc11678b538a71797e3b420c791bd2a2874adbd32f9aaae2b496 SHA512 19ca6f1163389bfbc9d921cfb44e49ab5db5a1552ec9df47fe2034ac3df891b0956a3648d0a25abfc83bfb7a98b700d624d1d3d32597870053d97dae7f713227
+EBUILD kleopatra-19.12.0.ebuild 1517 BLAKE2B 33475feedeeb16eed96901f65ae09981988f5555a61790f3e811383e319adec53dfd73e3a641eb63e75a5959058f4a174de8d246770536bc2a8c86fb4b5b3921 SHA512 43b0fa092a025a3d84938d8b5abb1d014931203e609c99515ca0f4e5420ad24a479a6aa8f107e08de6cbcb827b9511fc91de794d2eefda5b06984e7cca03d4d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-19.04.3.ebuild b/kde-apps/kleopatra/kleopatra-19.04.3.ebuild
deleted file mode 100644
index a6d22a9c4a39..000000000000
--- a/kde-apps/kleopatra/kleopatra-19.04.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
-HOMEPAGE="https://kde.org/applications/utilities/kleopatra"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	dev-libs/boost:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	>=app-crypt/gnupg-2.1
-	app-crypt/paperkey
-"
-
-# tests completely broken, bug #641720
-RESTRICT+=" test"
diff --git a/kde-apps/kleopatra/kleopatra-19.08.3.ebuild b/kde-apps/kleopatra/kleopatra-19.08.3.ebuild
index d8bed4a5b60b..2673a8dde126 100644
--- a/kde-apps/kleopatra/kleopatra-19.08.3.ebuild
+++ b/kde-apps/kleopatra/kleopatra-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://kde.org/applications/utilities/kleopatra"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kleopatra/kleopatra-19.12.0.ebuild b/kde-apps/kleopatra/kleopatra-19.12.0.ebuild
new file mode 100644
index 000000000000..8359e096022e
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-19.12.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkleo-${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
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	dev-libs/boost:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	>=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 e888e6a03cce..5c0aefa669ae 100644
--- a/kde-apps/klettres/Manifest
+++ b/kde-apps/klettres/Manifest
@@ -1,5 +1,5 @@
-DIST klettres-19.04.3.tar.xz 21463020 BLAKE2B 392c325aacdd49353056b6c2bbf531b40f4519e6d7bae9ae177c3a1bdbc44ee9a8eccc52960998b19c9c154c167690f3b7c8578081da9798f5b4c68e2113ab8c SHA512 7bcd0dfa02b93f31ec69e72a74ab75da4f766a03c178c3bb4dda0536a07dd3d921da20b50cfbe722191bf7d7794d9785a931d63c40583da38193b15cf5654dd4
 DIST klettres-19.08.3.tar.xz 40135784 BLAKE2B 7c6d6d66cc8618c6dcf7a200ad804456140954d3e80e5e2431ab375b6b38c0ba990e5e401feb624b83a87e79af7fcc10070bc6f862b298fa2c9f8a0793f8d11b SHA512 bb6bf0f2b6ccde4b4f2196e9f0154de059420017352152b1059ab799af4c7c796caeb3539394722e97ee79be8930696eab4a22dc5b98f85d40185e0780c88dfb
-EBUILD klettres-19.04.3.ebuild 771 BLAKE2B 8b53cdfd7e2ec00a0e1c280e0f7da1e0f87f2b513007d7a12d0ea70d705550d7d70b235145068c41c22c9b223c1ce7842378003f208ddc6c0ef4fe7e78c6460b SHA512 8287b23677139cfdabce76e0f8d7187a06abc256bf9666e7f445f673bdc09bc14ce8b7650ad5fa226fbe1ba4cfff6d8d7ed895284f67f6bf6c9136eb616d19ce
-EBUILD klettres-19.08.3.ebuild 924 BLAKE2B 62633a5892cc097c41b713dcd6e060b10bb682e82993dbeee9865e8c17530045188a42aecb95bc84ae56baae99264403397d5de27b03e94609e198ed2503fe6d SHA512 8df7144df0fe5dc7970669984fbc712f0de39872f21739707aea35b40e29f440a611e015cc07052dc02109cc6aeaa276334e791f85ca2d1c6f3ef3a134585527
+DIST klettres-19.12.0.tar.xz 40139280 BLAKE2B c965e7d570fcb3a95c98dcd36985705a6c19703ec5a4baeb0e12bc19a8cfa43764e5be767a6be2592c1d82b404783ffefb0ac61e231f11f7f9a3af5895376a39 SHA512 dd881008e5daf8c40e74e427491bece0763671671a80c60a90e31d5eb0a808ca56e9d2c1ee14ffb60f9dc3721763162da977bc7cc4a1cb68b9df021b8783611c
+EBUILD klettres-19.08.3.ebuild 921 BLAKE2B 1751e19a25e7bde8ae0f25cc3787aa33a09d44d2572caea378722d0fb0f58fb73386c94767ee2500f8c258c07a2e15bf42c2ee4e7599be285a1e102a2255e470 SHA512 f7c5bf5d00d21098a77a4547c6fcaf4c16dc046441d814b72b49f3b56bbbf43d0ef8e189d88c048b3172a444c144783de046ea7dffc7c5eba56d555a17740230
+EBUILD klettres-19.12.0.ebuild 933 BLAKE2B 8004349539a5358329daa927d6460df6bc9538f28b39911e6e697d19fe5e0485862e2afd6e7f824a2c2a594bf1b23a67321a4f41a61b3cc9d64fe2e8266074c8 SHA512 13b8c4020d05e5261a9b4cceb4b1f5a5c74fba893b5b952ea818205c09db97d88c27b67077e262fd72012dcbcc8cfe45312a6e32b8dc4d09ff0f7a03b319a947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-19.04.3.ebuild b/kde-apps/klettres/klettres-19.04.3.ebuild
deleted file mode 100644
index 179000b1a667..000000000000
--- a/kde-apps/klettres/klettres-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Alphabet learning application"
-HOMEPAGE="https://kde.org/applications/education/klettres
-https://edu.kde.org/klettres/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/klettres/klettres-19.08.3.ebuild b/kde-apps/klettres/klettres-19.08.3.ebuild
index dedcf4b0d844..e9d28ff33a73 100644
--- a/kde-apps/klettres/klettres-19.08.3.ebuild
+++ b/kde-apps/klettres/klettres-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/education/klettres
 https://edu.kde.org/klettres/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/klettres-19.12.0.ebuild b/kde-apps/klettres/klettres-19.12.0.ebuild
new file mode 100644
index 000000000000..f315cecbe289
--- /dev/null
+++ b/kde-apps/klettres/klettres-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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="
+	>=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/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}: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}"
diff --git a/kde-apps/klickety/Manifest b/kde-apps/klickety/Manifest
index 5b620123dedd..4164caec1046 100644
--- a/kde-apps/klickety/Manifest
+++ b/kde-apps/klickety/Manifest
@@ -1,5 +1,5 @@
-DIST klickety-19.04.3.tar.xz 1389368 BLAKE2B 112da788f49599dddfd37123e47264ddf277c07b5ac523a2a9f2eed815e20732c18ab5bca29f1e72659661e87632f1b2e18657159b6f57109ebc40dbc60dddc5 SHA512 9fc2c5ccdbb9a90d9c6a8fdcf7fb97e064dc40ba8f47c10296f09f1b3d15971c9b83c9f8d613588d331b56e2f0540593400e30981b52090e4eb4b1941ba4ef30
 DIST klickety-19.08.3.tar.xz 1389972 BLAKE2B c5a4e1c7f0eea5e13948d15ebedbb2b584f06f9838cc13961c07c3b2d9ff708a45534f88f68ee3cbd8c865dfa7316666a6feab8b3adb498d7483c66b80e7254a SHA512 89bff8d42483a1af1c2ffcefcb04811c4a1e56a72f24c6d422bd3eaf6e729f3d9d7b2294b7b0cb4c56f00dbe37b9c5484534fc84f32db4b2bda730e187aa1b6a
-EBUILD klickety-19.04.3.ebuild 758 BLAKE2B f08661f92ca2d4839233aa6fe97e1f3ab8376c35259a43e4d93acc21be1c4bf0969d1158a8c69c258f24e3b4cbb82763528d4a6d0fa2c836745a1108616ddb11 SHA512 744f99d36d54406239f59a13446655503d8f79f13c516073c1bccb6b792d06837775ed209b3216fe42b33ec3e3d15d8e3b48e7e9aaccbb00fd0ccdbf818e58f1
-EBUILD klickety-19.08.3.ebuild 935 BLAKE2B 0b98b95ab080f123cc052609bb33832053d955cd852b858b49f7af6e22ae5e28a2cfdafd1c95b06a1f255ac4cbe966d72209823a011c878780dcb86325cf3116 SHA512 e982983eb7a58b625c55e6c3211b6dc46c183041ca543f984503e4e481cb7e04a67bae94447eceba4b9bc83d5ad7928d1c8335ca7d8fb7d8bd3be3dc2a484b16
+DIST klickety-19.12.0.tar.xz 1390044 BLAKE2B c4b99a90b815fd1764f9aac513b76bcda348f92b9e8872b0c247fc9f8cb0854af558fa7135f3a3073a3f5b40cb8a57fb0b590ba022327109960f14982890a824 SHA512 b960bccfa75442dd2d604d343a77c5edf11d6371e52b78550de39b7b867be85d8fdde58f14cda36a9f92983b4be05e73dd68020386b3f78afa43e8035c792572
+EBUILD klickety-19.08.3.ebuild 932 BLAKE2B 2b556c679ac79b5ec709510161173e7565ce93f78a29f5991d57401e645f90f5fa7165d07c14aad34bb56ad1725eb872c2eb111bcaf7a378ac7fb568de4265fc SHA512 9b7a31ca944eb7ac044690ca55d143f29f2cf9a7dee3bf6be069692deb6500143b6bcca3006c88f6705811058ea8085ae2fbeae95841de6ad4d45cf1d1197a36
+EBUILD klickety-19.12.0.ebuild 1044 BLAKE2B fb99843426697110d75caa3750e55622353cb09b0208972b261cf5a726724331eebe4b76889697af2a0d45ddc705131a6b87d3246e1d4561958e945e73da3a7e SHA512 73097bfff282b7e97f47411e05aebad1e20b6afde88b170df5248d3b4d8223e15e976d815507096dfc41634f090630e2b06fef934c00583ee01ee6693b27bbef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-19.04.3.ebuild b/kde-apps/klickety/klickety-19.04.3.ebuild
deleted file mode 100644
index 021980d46af5..000000000000
--- a/kde-apps/klickety/klickety-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="An adaptation of the Clickomania game"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=()
diff --git a/kde-apps/klickety/klickety-19.08.3.ebuild b/kde-apps/klickety/klickety-19.08.3.ebuild
index 11c8d47aa4f3..c0caca97a136 100644
--- a/kde-apps/klickety/klickety-19.08.3.ebuild
+++ b/kde-apps/klickety/klickety-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="An adaptation of the Clickomania game"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/klickety-19.12.0.ebuild b/kde-apps/klickety/klickety-19.12.0.ebuild
new file mode 100644
index 000000000000..2bebb1771bed
--- /dev/null
+++ b/kde-apps/klickety/klickety-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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.63.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 230cc5ab12ba..446d8c07b7e9 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,6 +1,6 @@
 AUX klines-19.08.3-qt-5.14.patch 834 BLAKE2B 8036d4f78b3f918f921bb35aaad6fa71462d60338ab4ac05a5f2ecaecdc75c6fb1cc153853a672dd50f489875a3a79b3846c00781cc7b99d574ec3baad739f46 SHA512 b93cf6995deaa6f4d6fdfb0cf5990a87c1e98e4dc59528b0cd6a6647470b5f68639fbbd06c72ca51d11d611ad517367e1432c9e9dca9f4edb85db2bbe02bcc7e
-DIST klines-19.04.3.tar.xz 1781072 BLAKE2B 0f5fc6c4ed932789ed005424d203a207868999f762c7335b5230d630fe262a0403a8e782213f10cbd92dc9585a66fb65d4656b7fdc5386c64b74bb98c2e4b02f SHA512 08062210b9dd0b47b3a9cbb022579752a72bd509e5f4e9d32242442b01f3e14eea1a0fd22cb77feddb98e82e5615dcb36830e0cf87767622ad25b5613a25aa56
 DIST klines-19.08.3.tar.xz 1781396 BLAKE2B d763f9f7e957688ccc5706bd0066e58e9c262c752b29d484897fe81666bd68fc795cea12ec35ab84a7fac9a674d732c87c88145230ff4c8bed545a3ff7cf913a SHA512 485ff5f504eaea9d40251428b48ea629b042a6b4ec58cf571510e1f257369030774dcb8861095eb7114e1adb09fb19d08d7e9fb14c91cacbf9d28c27da450f8c
-EBUILD klines-19.04.3.ebuild 781 BLAKE2B 1f51515e6a94f0be151eec9f54b986305effb35e25125bd9acd62ca12328a89e13bc5fa6ebaead2af79bbcc2b4b93304257355e71e1136d5c9768620e24d3d5a SHA512 e63aed688135da2082b27c5b475680f67eb39865ec87f7ccf02c3bc9aa7f56bef1ae3f6273bd941050d1ee9a41dda33dc2a5957211bd4ef526342a8b104978ac
-EBUILD klines-19.08.3.ebuild 986 BLAKE2B 7ca951e7e695dc433418372668e04bf79318c33243e6774d3964090a219249ac762f56a8ee92ccc441d8df38f38dc7153ba6bf929086abb08a0c6fc270a5f4a1 SHA512 b7ccfc86e07396cafc9e060faed3b6dc9739391d4d25432351b76a941657221c1e82cd013ebc10f881c62c211a54ea966703d07fef0a45c3e2bcd2147aa78b66
+DIST klines-19.12.0.tar.xz 1782432 BLAKE2B c40ee89931446dc8a55a83bd10831826f5fd8e26ac91423ad892195cd616bbedd71040ba6147569890ffebda05944eb5f609140eb3ad321da8297c9e5ec480a7 SHA512 020597ced7f057bca7cc1575b1f77594ecc01674b8bcd969647c3c47eea067f4480d79225019616636a19abdcfcb4e86e84cae9be4c40621e64322b293aa9f8d
+EBUILD klines-19.08.3.ebuild 983 BLAKE2B e9bd4ecad516f829f88ff0efe9e65395093178cd69fb13c881529846cae1d1306c628c8f835f064733a766b7f15d38face3b823b8c74eaa1b3f54046d9814cb4 SHA512 50e0d6d38917e85706e0dee01f1ffe2d738f3b43b9a2a7afbafb0c0b4dbfd70bea5188a50a8d1d0715e1e2eae953350f030d10361dde04e6dcce7bfa9fe2122f
+EBUILD klines-19.12.0.ebuild 948 BLAKE2B 4528cfb6891b2b4cb7976085357bda0e9a1485497fe920d0f969ae5035f3009988babde23defb8bf2e81d81d9d7dcbf3f4565a885b20ca324d728ba12c95b010 SHA512 a57191ba5e2e05ee1aeb408560f27b9dac4be4618897cf937c23ec96be91162f6e814e57eb5c7279f86702f68ea1d16db38fef2727acb3189b269e8a3e407b89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/klines-19.04.3.ebuild b/kde-apps/klines/klines-19.04.3.ebuild
deleted file mode 100644
index f2aae73b9346..000000000000
--- a/kde-apps/klines/klines-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A little KDE game about balls and how to get rid of them"
-HOMEPAGE="https://kde.org/applications/games/klines/
-https://games.kde.org/game.php?game=klines"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/klines/klines-19.08.3.ebuild b/kde-apps/klines/klines-19.08.3.ebuild
index 3aa2c7be5b66..d01b3e122d5d 100644
--- a/kde-apps/klines/klines-19.08.3.ebuild
+++ b/kde-apps/klines/klines-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/games/klines/
 https://games.kde.org/game.php?game=klines"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/klines-19.12.0.ebuild b/kde-apps/klines/klines-19.12.0.ebuild
new file mode 100644
index 000000000000..6ceea216ff74
--- /dev/null
+++ b/kde-apps/klines/klines-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 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.63.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 f161a88034fa..f59a455b8006 100644
--- a/kde-apps/kmag/Manifest
+++ b/kde-apps/kmag/Manifest
@@ -1,5 +1,5 @@
-DIST kmag-19.04.3.tar.xz 671144 BLAKE2B 215b7a893a0dd531a0a420e619446c71fc17841ca32fdd27a53b474f77bf4297bd4121a5f2389e2dfc2cc930ad76f249d5a76b6c61884e8b73dfeffbe3daa12b SHA512 d246e747601719934fcb217e111a9672f77dbfc51e965e6943cb2451524ffeb425c422f15ea67fa35ebf218a0085e0e61a4551546af73c623889afba333158b2
 DIST kmag-19.08.3.tar.xz 673556 BLAKE2B 1a43c25c807d9044275923b21b95526d6596de33c8105644384157c03efdaf45fa460851361a4f6e8efa5b830cacda73461867127ff865281b95050c00d3ab14 SHA512 d9ee8e1a12d0b1eb9e20923301094eb65bfd680676e57b4e75fe07448d5490bb0836694eed807b6b555ae119576367d15ef8bd6b4b9db011268ce4f2d2a3771b
-EBUILD kmag-19.04.3.ebuild 830 BLAKE2B 7c6c870baa3578391b9e6fdcc2306fd4223fc2cb081371ca3a65d66393f1721fd665fb9c545a37e1434cd27de6a77035f51e4644ba9edaf56679593c5eab2fad SHA512 e50832b0ae9c976d9616af2fa803f52153162980dbea8bf8ffd5a2d60e3488c04e81ccf046d30779258181f8b9924a95e514c66c07f0b1a95839d1e3a5da525f
-EBUILD kmag-19.08.3.ebuild 964 BLAKE2B f1d82417e0ad50ffe2f39848c033fccd13f4f2b55134390288a57d5558b0343f30a43abe0c316dc6ce64ea662dab52e46ec2e5ca83c89a3dbccf4570e44ae0a6 SHA512 8304be922025c2ea5b2f03670b4a8053862a5813309bed0ba939ef2a58af96ea3f1cce1661d6519073df41434373257410d8889423d89d9695e3666a6c93a1d3
+DIST kmag-19.12.0.tar.xz 674396 BLAKE2B 7100c8a9d72ecd2fbe6d7729e7363cb83031533af998c0ee5bd060bbd50ecd9bbbe7e3db4303d0edaf1b1069bd2e533d052796a30119b5944de5c086a89b0c89 SHA512 991b376115abcb30c766d4821b83fdcac41087ce7b6c9cc27d864a3aa4690f39057654524ae33a1dbd1070054716e1429d65d2d21706ea81fa27a1633b30e411
+EBUILD kmag-19.08.3.ebuild 961 BLAKE2B 92e33bfef87324ca413025788a65d0fe79882b9815e26951b3887c545b82bfd481d2fd4d73de1f277b74f57acc110e269b4c53307c4df54bdc0f6d7947895925 SHA512 c6c011de0a360e294fb5de172e21d1c89ab91d98d438306741139adbf3f9a5b21b4e99cb6d23834aa43d902fd41962340660340e9c4630d4e8c404e367bd4ff2
+EBUILD kmag-19.12.0.ebuild 966 BLAKE2B 49f79ec967c22511aecd0289bdf7bc8a57a208e44a5fd99891cfdb9b35ec1be2fb97a0a21211d2cf48d975f1078c03b1b2a4ad4d8d4eec3f01b2786b5b79a961 SHA512 883451b851b431bc07b9d2244d5b0e82d167870bec4b8cf794d95b59798a438d521875996a5a62e860c910ac80b736c1cb71153d6426663e328d6197c73d0f3f
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-19.04.3.ebuild b/kde-apps/kmag/kmag-19.04.3.ebuild
deleted file mode 100644
index a49a38e249ba..000000000000
--- a/kde-apps/kmag/kmag-19.04.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE screen magnifier"
-HOMEPAGE="https://kde.org/applications/utilities/kmag/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="keyboardfocus"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	keyboardfocus? ( >=media-libs/libqaccessibilityclient-0.4:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmag/kmag-19.08.3.ebuild b/kde-apps/kmag/kmag-19.08.3.ebuild
index 806d9f504854..d0416181a0db 100644
--- a/kde-apps/kmag/kmag-19.08.3.ebuild
+++ b/kde-apps/kmag/kmag-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE screen magnifier"
 HOMEPAGE="https://kde.org/applications/utilities/kmag/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="keyboardfocus"
 
 DEPEND="
diff --git a/kde-apps/kmag/kmag-19.12.0.ebuild b/kde-apps/kmag/kmag-19.12.0.ebuild
new file mode 100644
index 000000000000..b1a403e4f1ba
--- /dev/null
+++ b/kde-apps/kmag/kmag-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 7787864b8e17..527f37a8148d 100644
--- a/kde-apps/kmahjongg/Manifest
+++ b/kde-apps/kmahjongg/Manifest
@@ -1,5 +1,5 @@
-DIST kmahjongg-19.04.3.tar.xz 4064396 BLAKE2B 2c23292a53e8bd5cfff9b1dec164082484bd385f7a709c07166552bf134582c3af704b6f2a91d2dddd550d82855e516adc5c57599bc0fb87c5c408d91c326a4e SHA512 7fb13e7d8381f352e23e3723340b9e80a73219b291105ad8226b8b891433bc7ffabc27dff2adb3854314d62fc5de9b82a0afb98a050ee2749c63e97b68d8a484
 DIST kmahjongg-19.08.3.tar.xz 3379632 BLAKE2B dab79ace503b83032214621d4227bb63eb805cf7df28bd5f4ce63217a67d2fc8626185a500520618e67d3383a7a65f2e50779d5baef8daee7346ffc0a3288c50 SHA512 73a82a08f3ae89a96438f3bb4dc8df2a73efb08bd2a3583d3847ae2a7273838171c255e9275eab4a85661a4d1a4678696969a2f8372aef16d4f5618c497b7702
-EBUILD kmahjongg-19.04.3.ebuild 914 BLAKE2B 4b62559a6f82f29687e05b3ffc2cf64917b1bc673425320c79248308e836178cbda1249ab165f38586bfc9c1d83c0350a23fd36dcd995182525e5dafdd4d21ea SHA512 e12ea3ed9373239b1ca021058fe8f84cb680615f54e8479718d45710753f8495b8f03b282b8e273f5e638d2e04506427edbe37fb60168793ff3c28acaf34baac
-EBUILD kmahjongg-19.08.3.ebuild 1100 BLAKE2B 71eb607593e65cd4da0297d9a9f88f49abc4832df2f65bce935cc8562d41e8a110e585f5bca733f1cb0f55aa321113da93b115d66181a393250b5cf3a716e341 SHA512 884b1386d17b7abc826cdd17a428d0de17af1e7227befd13fbbcd80e5d57dd4efd6e54eaddfd9270514dbf15d9ec5525560f0515be79569b1d41b03980332868
+DIST kmahjongg-19.12.0.tar.xz 3424940 BLAKE2B ad248eeee57af3c5d4e82e5008e7ac160a8b5c5450f117efbf13eb3d76ecc3dbe9b4eff6ef3dbb78a646a17ebd6f1245aa1b0421d216c8b0dddb20f7151dcecb SHA512 8340e711c27048a5d308079e2c0a70d048c88aa5d7af660d8c24a5ee47252557babc4f1321f15f72c6c3cee17675887468c239aee936ad4f583cc91e92182896
+EBUILD kmahjongg-19.08.3.ebuild 1097 BLAKE2B b7b0210adce3cdd50838dcf81680f4d9e6a4a18a1f6c1781a6cd10b0bd1669875128e6c57b20f756fbb02f0d5ed832d6300f70492fd99a8a1029e05ad795845b SHA512 07a53f71a749a2652c2ad1b10bc21a639b2bb251004aca7784b763ba99f49c66d580e4337653af7bf558330dd971baf1f83788e6843f9226eae91fea63fae106
+EBUILD kmahjongg-19.12.0.ebuild 1108 BLAKE2B ef6c1fcccf9d3bdf36f4faf1c84d0f1ba88f5632762260d0e87c0a7c5518c223159fd7812897645a6af75f067bcc2ba9820ce36ec35280d7b1a64e1753682729 SHA512 735d7eb7029fbe234d7796830117d67873fae94b61a1602b8cf90d3a5639472d10126458818589ff9c5efadf4bc0d386b8ab9a8f2033e9550add45eafee91102
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-19.04.3.ebuild b/kde-apps/kmahjongg/kmahjongg-19.04.3.ebuild
deleted file mode 100644
index ed7b8455f1d7..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A tile matching game for one or two players"
-HOMEPAGE="https://kde.org/applications/games/kmahjongg/
-https://games.kde.org/game.php?game=kmahjongg"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmahjongg/kmahjongg-19.08.3.ebuild b/kde-apps/kmahjongg/kmahjongg-19.08.3.ebuild
index 6da8ecfbf5d2..391fc26922be 100644
--- a/kde-apps/kmahjongg/kmahjongg-19.08.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/games/kmahjongg/
 https://games.kde.org/game.php?game=kmahjongg"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-19.12.0.ebuild b/kde-apps/kmahjongg/kmahjongg-19.12.0.ebuild
new file mode 100644
index 000000000000..fdc0e5a808db
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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.63.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 59c724a803d7..37733d3badeb 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,5 @@
-DIST kmail-account-wizard-19.04.3.tar.xz 156172 BLAKE2B 0f67ba8f11cb4bafdaa8ffd0a353caa580536831da821949dfd077674751f4d43d384bd26116ab4efaa859e9c3ac6eabf39a4d59e3ecead87b78a94b6c76ba24 SHA512 7e7ead2473fb228ecc222aaf494ee6bbbe4b1a8d8da77910b83bcc2148d76b0414faea29658638412c423b72931d37134afeccbb28948191e44166f5268c6112
 DIST kmail-account-wizard-19.08.3.tar.xz 158132 BLAKE2B bee4936b376b23a5d0952497170f8de03723ad6f4e3298c887701c4ac01e055f980abb1044f4571f31ca540bcacb4872221698b739417267626c0b16f0472802 SHA512 17478c5611bba481f184acd043c8e21f02c832b8da28941ac9f41e37f5b8133c96c6944abd2402e7b42875c058028aaafcc117d5df465214dbae3a93e7e2596a
-EBUILD kmail-account-wizard-19.04.3.ebuild 1446 BLAKE2B 21336822e3067b26939ce944b72ebcf89ded5c36b75aca45c90b33f517e130c780b8328bf40681fb9d28f0310d4fec035659d89ad9900d03853fd15cf2c11a3d SHA512 a4c1073efd5916b3da993642c08b0148c8c06b1797b187370d873cdb8acbbcade58610cd9fcbb512d4dadff819f9c79bd88ad79412e13965cf082e3671ed8c1a
-EBUILD kmail-account-wizard-19.08.3.ebuild 1665 BLAKE2B b51ab4c1f6227d0f6538a192194c7ffa07a8ee0752825529988c9102342f33c18ff5a8f4ef03b0e708e5f13321b4bb23b42dc3b2b0801ebc0a4aa96fd3fbf255 SHA512 23ed5afa47c87001b450a64ecb4f01560a0163e8f953680001135dbccf228b3392c5823fd5a3746824261ce950be8befc0bf42c7ea6baf866a6f144586285d00
+DIST kmail-account-wizard-19.12.0.tar.xz 158164 BLAKE2B 69d285b903229778b4b21c1281be595fd53c5a336162b024ec574929fe41b63e22dacc617f1379825d97d444eb6ba83d720b15a0064531d79802ba525f25c200 SHA512 c4f3aadcaf1c60593a0e1c46c3a83aade0a1e5b5dba1b19d3dac22131eda913ce646d091d572c9d13e085ba26791bd42012b6693542af1fffa7dff3433bb9919
+EBUILD kmail-account-wizard-19.08.3.ebuild 1662 BLAKE2B 10617b9c762464bd811b6540cc54d7b39695ca794fcbc39cb0c8d4da0a3419da6ae5b1cc805f348f82e1cf972be1788172df6db0818f4d25482ff03869a600ea SHA512 188a26c137aeb9bc1028866193738ac2940cb72dd746e72fe6d0ba09ee158472a931f49050c6100a74194d1ccdf3842ab002335983de724661bd58146ee4c4d7
+EBUILD kmail-account-wizard-19.12.0.ebuild 1666 BLAKE2B 21b38bb68e064ae4e34b0d460ad55d88b4ee2f901ef1954bba3511c2ccb9dd46130c873b263994518d1a1637d3270fe395fc966cfdc741c9c15e9c8f407e1f3d SHA512 e18e079c165539bb80e8383e585e8f4a4cef247a7cb10bb794c5ec1865d742374daf598111cf47e6766d550b62d05e589a1ee02e65afe3f2926864436f4aa120
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.04.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.04.3.ebuild
deleted file mode 100644
index 181911fda2fa..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.04.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepim-runtime:4
-"
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.ebuild
index e934d8eece0d..d2459ed1f489 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.0.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.0.ebuild
new file mode 100644
index 000000000000..446a5778a2db
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepim-runtime:4
+"
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 5b69e96d77db..f7b1b433b85d 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,6 +1,5 @@
-AUX kmail-19.04.3-missing-header.patch 714 BLAKE2B fc0ab7dd44d7439c22001c1d72944624cdaa005faff4631e6bd673d15b896e9e87ca5b5bdbf2a1adbede7351112dc453e6c1b3a7d64bb6e7662ac4935daabfe4 SHA512 f1e56dc6ccace2e96527d74d848f53e99ada3a460cf0f73493acab6d10bf265fcc61dea3ec553a2214c0b54f03e19b35567249a222331aa12e8333849158d041
-DIST kmail-19.04.3.tar.xz 4717936 BLAKE2B ef449545ddc5be0789089626ca962bca7beea4dc3186279cc86483c443fb8f36710f30bbeb0bfdbd1edeca2ea9d7b99296b7bcc34632da0abe7f96f9c0f7d03d SHA512 96cdf824f16f29ae00d461986990524b22b3774bcda679db5495ab9b127eaf7af2e0ad127cbcb8cedc5b24cf8cbf94d5324d09781583affb140436f67290b08f
 DIST kmail-19.08.3.tar.xz 4728620 BLAKE2B d487a62df13b49b1d7d054a005481854f8636e72d13be882586f1ebabf0fe02b3c27d47b172da7e0785a905b39cd5ba7e8a9a03d2cefc6be1e542ce354812f20 SHA512 ba8804a47144b62d35a5fa777616426465d5da5d98aaf34d30c7863c12198139e34249315533752a897d48619eb5546810363d5f2bd50622f513e78eb6367001
-EBUILD kmail-19.04.3.ebuild 3334 BLAKE2B 612ac0a050bc7ef11c318ee57d6fb548647d26a29b98314e17647f0344ad2392c29d0361d60b00a738f34803a7d64e7a881458f8c3338b933029d4a00557b9a3 SHA512 72cef755587afd80e6d9d1002dd00e1fadd8a52f5a8d4bcf5a302db87647e2d5d55e385e15144108f4eff15608d6922cb2ae5bc2e9103d0c2c17274dda0eeb1f
-EBUILD kmail-19.08.3.ebuild 3595 BLAKE2B 8b2c84430a7cdba75ed6aa3aa1c1255e838f108e4ee029a3315f6f5de75fcaf15f3d6bf4f117d1a2d5d03015342e467be653542e15cc2895cf49ed4f1b19197e SHA512 70465e9d08a79c89dbfebb3c4781e1d5fb50a1d6f391171401d2b57cedb452f756b0905f428d389f99549f4ced8f3d9aac6757f6906c357fbe55fb0f31daf6c0
+DIST kmail-19.12.0.tar.xz 4712840 BLAKE2B a3a5e50c3e49c65d6554ef8ab9fce440cb39e3dc61b6343f37a07840fb514df2e81b26585093059df5f48aeb98c14f48af345cedd7c8145447f5a1eb8210a0b2 SHA512 48cec2af9d716da9755699f78039f67f9b6630fe97531ec28f57dc22dd93c44cfaaa56bacbcccddbf135e3b195191acd0b694ac95d298eb8a236606238778949
+EBUILD kmail-19.08.3.ebuild 3592 BLAKE2B 818294a2319408edea5c7e908d589d726b03aba6987702af830ce30c2538bfbdb06e9bb8ec20d7603d8ebbbaf02928d3c6bd700ce6034e77cdaf87a0d9badf38 SHA512 b1d9125a1fcc120746263c5e93fcbad105008a6662f038ab117f7376470e5ca6c444adee5dce5c92bdb1a9184f353a31944be82c4dfea682196ea534d7e815d3
+EBUILD kmail-19.12.0.ebuild 3734 BLAKE2B 6465dfb999b92e3a52f047fd1cfd763d6d3e5e544aabe587da5bc9f543bd2ee32cd09a42a235e59e088b1458c0904550209a22ca3b60aeb7cbd116762451cb63 SHA512 47005834836edff6dee37c8a8707bc230d978520579dc5116980e1dab13aed1ed1370977b987a37c8efac888f26f956d5624f610d4c8c4b87299e6753801fbba
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch b/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
deleted file mode 100644
index 6c6cc3092132..000000000000
--- a/kde-apps/kmail/files/kmail-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 201eac97eba591e16f0108e2605b9977e2db9a03 Mon Sep 17 00:00:00 2001
-From: Allen Winter <winter@kde.org>
-Date: Thu, 18 Jul 2019 15:35:24 -0400
-Subject: summaryview_part.h - fix build by including QMap
-
----
- src/kontactplugin/summary/summaryview_part.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kontactplugin/summary/summaryview_part.h b/src/kontactplugin/summary/summaryview_part.h
-index 542335d..b116e23 100644
---- a/src/kontactplugin/summary/summaryview_part.h
-+++ b/src/kontactplugin/summary/summaryview_part.h
-@@ -25,7 +25,7 @@
- #define SUMMARYVIEW_PART_H
- 
- #include <KParts/ReadOnlyPart>
--#include <kparts/readonlypart.h>
-+#include <QMap>
- 
- class DropWidget;
- 
--- 
-cgit v1.1
diff --git a/kde-apps/kmail/kmail-19.04.3.ebuild b/kde-apps/kmail/kmail-19.04.3.ebuild
deleted file mode 100644
index 3fb1fb73c9aa..000000000000
--- a/kde-apps/kmail/kmail-19.04.3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://kde.org/applications/internet/kmail/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'tools') )
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kldap)
-	test? ( $(add_kdeapps_dep akonadi 'sqlite') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/ktnef
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kmail-account-wizard)
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-pkg_postinst() {
-	kde5_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/kmail/kmail-19.08.3.ebuild b/kde-apps/kmail/kmail-19.08.3.ebuild
index a15244b79cef..76f90647ff53 100644
--- a/kde-apps/kmail/kmail-19.08.3.ebuild
+++ b/kde-apps/kmail/kmail-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
 HOMEPAGE="https://kde.org/applications/internet/kmail/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/kmail/kmail-19.12.0.ebuild b/kde-apps/kmail/kmail-19.12.0.ebuild
new file mode 100644
index 000000000000..5a8d62ba35bc
--- /dev/null
+++ b/kde-apps/kmail/kmail-19.12.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 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.63.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=""
+
+# drop qtcore subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+	dev-libs/libxslt
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+COMMON_DEPEND="
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=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
+	>=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
+	>=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
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+"
+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-common-libs:4
+	!kde-apps/kdepim-l10n
+	>=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
+}
+
+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 a0c232cb9829..2ee231689e4b 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
-DIST kmailtransport-19.04.3.tar.xz 166028 BLAKE2B 2c426f0826e4c21cfa4373389453a85f53ffe3b8c3b3bab6879e9fd969e6e880c2323882cdd0fd0ac7600a8b08fa2227d8019facde70e6af296ed125f75d2489 SHA512 0e8bb9f8f384d80bafc8598ac8cd3880b1c2ceb19263fdf44c4098fea0ac9bf7e0a93c754b7936e7cee2e19d7d8d8dd9e819cc8cd6a7901b837129354b7fc8e7
 DIST kmailtransport-19.08.3.tar.xz 166240 BLAKE2B aa05bbd90ac916ea044f1f84842d1f3433c5475b741777b9fc2428cf00f467370afd10273beff92bcc6f72acbdad236118d93d963be19006fdc72fe97c83f342 SHA512 9bc81f8f3ca281ea40661505a5bc192b5bc7cdc80c5556ce617b978c5803f42e8e718dda8530a62a944e156058c290f6b9739f1d6f65e03dd445792a6a1de3dd
-EBUILD kmailtransport-19.04.3.ebuild 952 BLAKE2B 1795e175424de19a273e1bb429e4cd337156b1e41a2c30248926ba6234700bf2c41500cafc90c6ce07296ecac6bf2b11b3d6ca8070fdfa3a3a879d50028c45e6 SHA512 f0d21c711ffa399f41e148557ff5f34153c1acf46eb772b4f1e8c15bbb4f592902dbb739043d5f5aff25e7e2aa6a46d8620572c16364ad92ffe76220b78d3193
-EBUILD kmailtransport-19.08.3.ebuild 1117 BLAKE2B e644833c458aaff56d9eceb1f4665bdc0bf46b5bc11c2ec8e85367486459f9dea03d4524c00e5550a499f09e83122b1837ced5700b94ee841a1a1132b1a1ebd4 SHA512 d4f2a3783fd928e66389f8a289accdc0d2d97669d5a721f5b2a866f4e9269f355b4d358c9c54116c34d39dc6a49b0ab318a2b1f863cc53f2f445b46d2a5e26b2
+DIST kmailtransport-19.12.0.tar.xz 167080 BLAKE2B 434e4502ee8461e6882f0e1639425ae9f32d389ee11913d987459d18a3c65d2ce98d64f3e68834d6bec8bcd3c5f8456910be9b8db9ee7d34b763fbd45cb18750 SHA512 b3970b54830f8e8c4dc57d42f9b454b5b59ec6b672a1033a1efb9dfe1d9af8f9243ddd979e8ef233790ba3b692b4bcd6a09739d581d6e74f700f14620ae651b2
+EBUILD kmailtransport-19.08.3.ebuild 1114 BLAKE2B b70aec1a821477b36377d034500c226ee2641e23583672a8211e15117028d2ee079e302377537213a41340203af3b8fd5ea06629fef130ecaa1d9c9e3d7f24b3 SHA512 e5f829ca339630cf098da4dac699c0447b1c935a818fd92f3a81e01199721ce8dae26b189ea196ec1311bae488266b1de4ff42c97ae72fc8a4e4d32271e8c11b
+EBUILD kmailtransport-19.12.0.ebuild 1118 BLAKE2B 987328a0c744559be680f05be4f85f8543d90e8937b4389f9ed3bd30d401996089170b8a425f039e74cee5c15baa2c503aec4b60dd0a29403be235480269f981 SHA512 40664bde693662c0e2d7475f1852cf66ba9f24d30508ff1a7a17bc6bd36694d3deaa0ee813de8cf17f581e61da56c26195189599ea108767fde898c2d5105a8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-19.04.3.ebuild b/kde-apps/kmailtransport/kmailtransport-19.04.3.ebuild
deleted file mode 100644
index d3f7ad9045e8..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-19.04.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Mail transport service"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep ksmtp)
-	$(add_kdeapps_dep libkgapi)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs:4
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-19.08.3.ebuild b/kde-apps/kmailtransport/kmailtransport-19.08.3.ebuild
index 8884c3669fcb..9e40d665b86c 100644
--- a/kde-apps/kmailtransport/kmailtransport-19.08.3.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Mail transport service"
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kmailtransport/kmailtransport-19.12.0.ebuild b/kde-apps/kmailtransport/kmailtransport-19.12.0.ebuild
new file mode 100644
index 000000000000..2ad8939f3be6
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-19.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Mail transport service"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+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/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}: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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs:4
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kmbox/Manifest b/kde-apps/kmbox/Manifest
index c38049131c52..b0b690a87e12 100644
--- a/kde-apps/kmbox/Manifest
+++ b/kde-apps/kmbox/Manifest
@@ -1,5 +1,5 @@
-DIST kmbox-19.04.3.tar.xz 24808 BLAKE2B 3944554c0bd156d3d972b8eabc955eeacf3bbb17b99ce8283b094e291ea0fdbcf991ec920656d2a74a0a80a4c9ecfed63b37dfcc0f4a53bc8fb9a14940f08446 SHA512 3e466d0706bf2e5fc38ce8dedf6546cf4bca4a6b04e52840deaaf217a16fcbc7817fdef6ffa78c2c88a1af8f7dd747bf19506089918068b467ee18fc2072f647
 DIST kmbox-19.08.3.tar.xz 24444 BLAKE2B 1af9208c9d9420f85b7ec2550deda2b3ae2d7621717d098b01ee64a26b0e8c744acae5a666868b7365851001ce064bdf1df9cf13d70adf73e25c86452fe3e1ce SHA512 90b0b171df44badfd4a584fe9b6b7d9a874f956eacf5af727cb1d6b019c24e965b7f0830177075ca20ccf7ff3721ed1fa493f34739852555b48a8ac08fc554e2
-EBUILD kmbox-19.04.3.ebuild 312 BLAKE2B a8108916435345615e74faaa26748937cbc840917a78db7620ec59872df66f25ea60083fce30e1e3f29407ef81dd12d80c7a89f83a3b171436972312e7158e83 SHA512 bd72508c14e40607b69590e7a67c1b93dec3dd234c5f59bd4d617c3fb9835e7b71f32a6b065ce6f3c09c5670ead410e1ae1f7ab2dee21873764aecaf01cbf380
-EBUILD kmbox-19.08.3.ebuild 355 BLAKE2B 808a3187527ee11c63d8960271b73d93e64bec234a02d96fd26928240a8bda65e97cc224e05a5994c0fd8bc88634214250abc32d9da0988cfcfc7cc3a8a982e5 SHA512 0328281a5b3ca0e361e98ce751f3a350b2f74e81ec97963843394619830c1d133c99937b7d0040d9c6084119cdc480ce631691dda247ac2fbdbbad0db7a1a178
+DIST kmbox-19.12.0.tar.xz 24628 BLAKE2B 60e144c9092be177dc5936d10208df9e9e19a0737bdb4e441d561d568be0fe0dc76827a9308d44b379e6a8b54a5f575717e83dd3029da5b8d4115cab7610e74b SHA512 ed492de6ec1570ff707ff2ab2b25f021636b19276c974555889e5e4ccbbe981580bec156c22a35e2f797a152018785b84fae92599c24cc6eb626fa69a43ec03f
+EBUILD kmbox-19.08.3.ebuild 352 BLAKE2B 709ad5b61b7f4bcbd7ccd97b0e923ff4a60427fd18611751f48315e4e3c6fef6e792456936b0f10e17f086b50fd1e0bf10d3fe228812aec7bd838eef0685b828 SHA512 1a6134642deeaefdd68219a508f6a02644808495cf8207614273e9c100f800ad81acd744a364541ab4b2f204ee9566de7e4cb0848a908f3037bcf29bb58de909
+EBUILD kmbox-19.12.0.ebuild 356 BLAKE2B 67d05d6601c0144f393b5c8598e6f20e5d3da8c92e5905a607a8f8ece5005255e6d879f9c02941630eb5fefbbc860fc877e380e1f8b8d735b56123442413afb0 SHA512 1fa085a71721b0d8ad8c82f97bd836c93d98430c464fe0a7897577650ef700a934b2db8f057e51a464d372c7f0f40e0ed088733b512479f7ab651d8d47d7acbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-19.08.3.ebuild b/kde-apps/kmbox/kmbox-19.08.3.ebuild
index f20a6e24dbb4..e61aea1bd9fb 100644
--- a/kde-apps/kmbox/kmbox-19.08.3.ebuild
+++ b/kde-apps/kmbox/kmbox-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for accessing MBox format mail storages"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND=">=kde-apps/kmime-${PVCUT}:5"
diff --git a/kde-apps/kmbox/kmbox-19.04.3.ebuild b/kde-apps/kmbox/kmbox-19.12.0.ebuild
index 6ffa5694f235..a3fea61115c5 100644
--- a/kde-apps/kmbox/kmbox-19.04.3.ebuild
+++ b/kde-apps/kmbox/kmbox-19.12.0.ebuild
@@ -3,13 +3,16 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
 
 DESCRIPTION="Library for accessing MBox format mail storages"
+
 LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
-DEPEND="$(add_kdeapps_dep kmime)"
+DEPEND=">=kde-apps/kmime-${PVCUT}:5"
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmime/Manifest b/kde-apps/kmime/Manifest
index 98034fe35ad5..e456c283e2f6 100644
--- a/kde-apps/kmime/Manifest
+++ b/kde-apps/kmime/Manifest
@@ -1,5 +1,5 @@
-DIST kmime-19.04.3.tar.xz 147140 BLAKE2B c7da6a425310d30a69846f2791f1e39527618e3ff398e1b790a630da41a697c5fdfc25b8d15cc802bb57824ae7feea339e476440f3e5731b18867d5ee56e0335 SHA512 3a8402634960cd021083227e1069e0936a5ee4b179edb65ea7a29a1f5542cddb9c1ba8b8475df8091aaa6495c36ae7a689f01a4ab36b66790f5a2907cc167add
 DIST kmime-19.08.3.tar.xz 146916 BLAKE2B 432a05165d3142892cc3ef1de34a420a627a801f04859c4ada8cef9f995eb9c072cd6ea065daf0f0a2cb337d42c044352871fe9acd1640aef6d49a31b0f999b1 SHA512 c8c03bfa7e716190e08ae05261226e38aafb4a4c86b3ce35ce9d7ed98c3a8a5a676d14894d4a206193e1ffbcfdd95577210d954661805d3ba901494f0cc70ee2
-EBUILD kmime-19.04.3.ebuild 382 BLAKE2B 5c63057427bce10b717a6317baddd483ad1337094c44012711f3cd3be4c13210771cd4af62f853ebcae6eede44e67550518185956fca7e15d92f69de7864be7f SHA512 bcd1e54e61e870d06cefd5dc752a9b345ba67e8c3fc01e09c326be68fbb1a5280bde235465350c2b8f21f4cbee3e723b65fe86cc10fa60d8eb1dddb7ae4b912e
-EBUILD kmime-19.08.3.ebuild 426 BLAKE2B 01711e530d2ed649fb86d7f8820aca5bde8e3926bec76ca84504cc957a906a460686d50ef925236a4d5eb3e7f629940fc042b2df26d18b14d2a3ce3ec0559d28 SHA512 cb3aa09b20cbf6018f167369e9952c9006aa9f0b3aad05209b9bd9bfb0462519d128f5bee1831345c6801817b2e0688500f9357d6ad3074569dfc8f78b908913
+DIST kmime-19.12.0.tar.xz 146732 BLAKE2B 9d9b36c63354daaeef2c46516987212d707e74821f505b8660e24863aae62cef9d8ec4e382f17055956184cdf4290e084d8fb297905848fa5f48e95dc08517d5 SHA512 a6f7b6ccb0171068c2c74532423f4ca0d98f60fa33014fbb39c54ea8b595a383e02bcb707f0049a6817676be87f902e237de148ff125f87bf010b78305b30f87
+EBUILD kmime-19.08.3.ebuild 423 BLAKE2B 71aecdf4c1ceae43d276ea0175ee7b8680a76913a49fdf5722e00e2946631efb3b100d9a59b930ad7edc6ed00f3cafb8442845f4a3535d3889619dcc448b248f SHA512 187bb1a60524768e81b75f153b2347ee1c668621e339e32169bef57a2228772889a2bed5e6974e44ef853452055bdd6c4d2f31904a9739696903dc9054248e96
+EBUILD kmime-19.12.0.ebuild 427 BLAKE2B 4988fcc7d90268c0f72d66e2fbacc3eb936ec625ed5d27d00272ab6d4ff8312b78283dd0081dea84f890df43193e8ecf1eccc36e18b742fa684d09a1b9bc0b00 SHA512 b90ccc8ad878a94895b0bd1d2e80e9853dc7dab2d32592cb463624a6025a5b781e9bf2ebca9f4a680eecf95127b35a6e7fe78976ba618c9da624c06026c99180
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-19.08.3.ebuild b/kde-apps/kmime/kmime-19.08.3.ebuild
index 1dfbfe5324e7..f125f13e7fe5 100644
--- a/kde-apps/kmime/kmime-19.08.3.ebuild
+++ b/kde-apps/kmime/kmime-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmime/kmime-19.04.3.ebuild b/kde-apps/kmime/kmime-19.12.0.ebuild
index 82242feae77b..4260277fe3c8 100644
--- a/kde-apps/kmime/kmime-19.04.3.ebuild
+++ b/kde-apps/kmime/kmime-19.12.0.ebuild
@@ -3,17 +3,20 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.63.0
+inherit ecm kde.org
 
 DESCRIPTION="Libary for handling mail messages and newsgroup articles"
+
 LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep ki18n)
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
diff --git a/kde-apps/kmines/Manifest b/kde-apps/kmines/Manifest
index 9baadd9e09cd..baca94f14d66 100644
--- a/kde-apps/kmines/Manifest
+++ b/kde-apps/kmines/Manifest
@@ -1,5 +1,5 @@
-DIST kmines-19.04.3.tar.xz 897072 BLAKE2B 0d8cb638c2723dcdedc7b7064067beb272d794356e51f4e6e71b5d46481ae7ae55fc52d906c1b3381e8cd317fbef81fbbb188ccb1ae8bcdc4ba8f5be90bfaea6 SHA512 cb5a7a15656c89b8a19a9b80295f6f5c187f281b1d98fcc5dd7e3d7aeeb878b2c3278819ee209e05c2e56e19619c9356927e443094378fe89208e5c927c29696
 DIST kmines-19.08.3.tar.xz 898548 BLAKE2B 115ceeb70657058c8129e2e0c16b8d896c86cddb6a1d8ca2186a05f3dc2ad31a92379c62c99c8b7daed5e27fe24cf47dacf4aac5876ce8e914baba60496ba87d SHA512 6af27ac194f798809aa2002909e9c54b17948b50e94c2846c8ad57f29c8210a1d407d7ba44d3f25b823b6d0a5fae0ad86f5325d9af7657dd394eb899e43856a6
-EBUILD kmines-19.04.3.ebuild 768 BLAKE2B e76dae52ead3f5fd26125a181d54d89a57586ded3040cb0919e92d68446418b75511572d93d1167688e1e35b99c805906f3f74f7b8ba90a050dd2e9e24f91df4 SHA512 844983e94decfd0ce8ee5decc6ac5dc161f0cffecd729fb41ffaa395e1a7bec3d03a9d920434523f9f17ab6adf420b76f02d94496fe464667b26fe56b2afea36
-EBUILD kmines-19.08.3.ebuild 933 BLAKE2B 692a9162bd882bf426acca31939cd8ffcd3cb6184482a8f273b9d5ebb56c48577a7fcbdc110bf7d60aee7313b46db5554e99d807c506de417adbd24eb1d6efdb SHA512 88fda193c8c9d7dd444311b25a35751f1e00a02f1eee90791d54c83f5cf126953aa25f6f73c5fbd3a7b71e5b5ff9a9032b5e5262efc374d7664b61ed184554f0
+DIST kmines-19.12.0.tar.xz 899840 BLAKE2B 6acc6220806588067b3abda793b353464675fa747231353f6fd92ba146b2f1cdcbdf285fa77bd762086260749c9b29643ff86cea633ceb29e888abe2e89a77f9 SHA512 41e27c15a9f5df8365ac16eed50da6434da54b6f6a0eec01c5648884f5822297b7bba7bc38daf347f7a7d0a0ec23933d7c357eff7fb6b897ddd2bebd48c1d1b9
+EBUILD kmines-19.08.3.ebuild 930 BLAKE2B f2b9f483a6e57581ea44cd67b336fc1229d97f6b46f05504f134fc320711965b9ed1d7beef0da0d6a93cb1d8e005c9026ac3dc4591f9748cde85ffca1fb558a0 SHA512 9728be485e4213d9d58562812a2901663a8e18d442047003f3aee50d44ceecb3b73709cfc9b7302eb1096efbb7bb9bd81acd24c64cf03a4e9814f7fbdc688d95
+EBUILD kmines-19.12.0.ebuild 941 BLAKE2B e96f2bc038bf58271a5acf469d81fcadc16a54c8fbb8adebc33c18bdafc790fd8b64383e9c6964ffafad38a3885c0a43976b26a625b9d8d57849e3fc8a375ad9 SHA512 3c3bb966213f91484e1e92f669fdd89c63ffeed47e6e1ee0a9a38062e756641d69bfe95436b983fdce73e0f1ec3592a3039ba0cee63f81e7c6aff67c46864d2a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-19.04.3.ebuild b/kde-apps/kmines/kmines-19.04.3.ebuild
deleted file mode 100644
index 7a930275a5f3..000000000000
--- a/kde-apps/kmines/kmines-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Classic mine sweeper game"
-HOMEPAGE="https://kde.org/applications/games/kmines/
-https://games.kde.org/game.php?game=kmines"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmines/kmines-19.08.3.ebuild b/kde-apps/kmines/kmines-19.08.3.ebuild
index 85ea0b01c6be..cf758f180cfe 100644
--- a/kde-apps/kmines/kmines-19.08.3.ebuild
+++ b/kde-apps/kmines/kmines-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/games/kmines/
 https://games.kde.org/game.php?game=kmines"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmines/kmines-19.12.0.ebuild b/kde-apps/kmines/kmines-19.12.0.ebuild
new file mode 100644
index 000000000000..e91c715886c5
--- /dev/null
+++ b/kde-apps/kmines/kmines-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 9e0ec5e7bd34..61c2df2f6368 100644
--- a/kde-apps/kmix/Manifest
+++ b/kde-apps/kmix/Manifest
@@ -1,5 +1,5 @@
-DIST kmix-19.04.3.tar.xz 1006048 BLAKE2B 028418d7f63c3e87fa23c1afc463210644d54da62624dcad676fa54eca5faa831984300d13e6edb791f235608e708e5675cfb468a06f979264f3238d2092bc93 SHA512 3f432d999c8db2866d490123f349db3d2450e956400ddcecb4aa7e50aff63947c8e607f579feb0b3ee76965a59b2fbd7cd9f9eba913c3f55adaed46cd83744f5
 DIST kmix-19.08.3.tar.xz 1005308 BLAKE2B 0012bba9b539d612452153c200a62adc3275d8a206b053b9b82f886d0568bf2be0a7a3642473d0145c37101ce00b864184e95a4fbf81c4add5645bcc3f860652 SHA512 d2fb9e02c9981974c3df5438fb3e7544d64a51c7fff6ca5565dbb7bd06beda6bef2268fc5f343cf7acdfc8eb7d0f21d10f85feb7222adaaef1305d587e31cad0
-EBUILD kmix-19.04.3.ebuild 1264 BLAKE2B ae29d62ff131910b427f71adeb026f5765fb6974d626cf98f780f517d5efd58acd422e37b54b275a1681cea0a8a90f914cdd804dff69c0111166d12f5afeb96c SHA512 b9f4eda44b0270a9e85b678914cc84442c480b3263659161ffcd2f82da4cc30ee0402cd54c1d4c370196cd3e56ba5f3f59015c7d01deae005f5eac4e3284ffa2
-EBUILD kmix-19.08.3.ebuild 1477 BLAKE2B 94dafe5f6300c17bcda00fe2903c5fc3f690fba046ec8df611f2481a6cf06f791b5bfa62ba7be0ca28a3b97dd76b2972020998f3a79488188f1c9d7fe2e396d2 SHA512 60edf234ed82f9510feca0325aab2d01eec7700b90173cc24eec53df7ef9caab6b1dc88c5462b232a7028f9a49859e516151a87c978f3e3f83284182baec8a49
+DIST kmix-19.12.0.tar.xz 1007416 BLAKE2B c009bd78dd2c92cc566ba2fcc76cdd19582956f6c6234e393fb7ae12d4b4e3a0aa85a7a34383c85714f7f058f444a3475b63b727315ed2dbbf84f1db3150149f SHA512 67f62094618491b634f1bc032bba367f8736b80fa46c0bd5a0c2690e8e8206ffa376e9f6b5110d02c734b70e00ef1e5fda5f1c3d1ca74c1cf51fbee1e15cda12
+EBUILD kmix-19.08.3.ebuild 1474 BLAKE2B f4174ee2393c7fac42f66e3b58420d7adf4b01c5deec098e2bec18a97bc6ab3322e472b606e3a237df0a5019872905e0f6f7c849a9b27d61be7049f8bc19b1cb SHA512 735617a02f07186bca56b129bff9f6fad1b5d16b558031c7676de5dc3712a8ced689211a7055748240a8d4aad9dde4f158b654e2207e424ca5192ea66865eab8
+EBUILD kmix-19.12.0.ebuild 1516 BLAKE2B b3b1c039f7f58e82e42d4452b0b198731326f3ec03816ec118281aa1ca5e3d532d15f94dc040536f033d6bcd81e7bb56a32d0eb7e62683c98447e05b53d05660 SHA512 6b500a825ec18b9b49e084d0acd8b7432671ba583e995df67d3c7af1f59c18b4d467f5d3bd5e37ca50395cb7f72ca24b353b99a4c4540e70485672afbfc12c8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-19.04.3.ebuild b/kde-apps/kmix/kmix-19.04.3.ebuild
deleted file mode 100644
index e0b3f07adbbe..000000000000
--- a/kde-apps/kmix/kmix-19.04.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Plasma mixer gui"
-HOMEPAGE="https://kde.org/applications/multimedia/kmix/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="alsa pulseaudio"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	alsa? ( >=media-libs/alsa-lib-1.0.14a )
-	pulseaudio? (
-		dev-libs/glib:2
-		media-libs/libcanberra
-		>=media-sound/pulseaudio-0.9.12
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
-		$(cmake-utils_use_find_package pulseaudio Canberra)
-		$(cmake-utils_use_find_package pulseaudio PulseAudio)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kmix/kmix-19.08.3.ebuild b/kde-apps/kmix/kmix-19.08.3.ebuild
index d98dd3412644..ac41d89c361f 100644
--- a/kde-apps/kmix/kmix-19.08.3.ebuild
+++ b/kde-apps/kmix/kmix-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Plasma mixer gui"
 HOMEPAGE="https://kde.org/applications/multimedia/kmix/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="alsa pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmix/kmix-19.12.0.ebuild b/kde-apps/kmix/kmix-19.12.0.ebuild
new file mode 100644
index 000000000000..ce308c8bf77f
--- /dev/null
+++ b/kde-apps/kmix/kmix-19.12.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="false"
+KFMIN=5.63.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 ~x86"
+IUSE="alsa plasma pulseaudio"
+
+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/knotifications-${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
+	>=dev-qt/qtxml-${QTMIN}: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
+"
+
+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 6c9539ac11f6..ce51bf4535ab 100644
--- a/kde-apps/kmousetool/Manifest
+++ b/kde-apps/kmousetool/Manifest
@@ -1,5 +1,5 @@
-DIST kmousetool-19.04.3.tar.xz 112216 BLAKE2B 5141b0e9192ce65083def28cd83bbe4b2c2e1e52a236ec27c8364dec0ae670a7413bc72fdad9ad0be05e6f6340279a60d5b7acfedf9ced52948ea0f6547ba4af SHA512 af3663d88b700805a8caed928d5337a4248f3a51847d303c8c13ba9836f60ab11d93598ceeba69fcbb41ed59e777a3d6f911d2197ed6ae028e4cc47070bfaa96
 DIST kmousetool-19.08.3.tar.xz 113556 BLAKE2B 1a80690a76bbd9ff582073b64837ae3aac1852d748b0d9d97c1f06e094c446be601da0888ea49c01273e190448bcf665f316e6107d8a464248a4539220fed8db SHA512 00d3afb4282a379d9771758af86a99ca65fdfce53482873bc32b8f9818ff56ce01350033a9dececbd89a4e06b15fcd21041a708eafdb74d516eed8bfe7ce69da
-EBUILD kmousetool-19.04.3.ebuild 747 BLAKE2B 193f36668025fdbbb12eaf77a7adc14db072396dc53ebc42dffb36615e6188d993082f4418b7a10511d78c93c4f4bb16328a6c4170949d76cd12b1b5de0e2783 SHA512 d8f411771d9610a5f5549fa324a8c2ba230ef032711801be168e07bb4f3787faf30567df189c9cd32a7f7756277f79105dde98333038b4de26fc2c2515806a9c
-EBUILD kmousetool-19.08.3.ebuild 876 BLAKE2B c4c22a401225e646489500a62aca125695425daf7845e913c43507a2ba0aaf380cfb24f77202cd032f1e451a5ddc34daa9dcfdb716cf0858d56c104859d2ba22 SHA512 f06f5b4f696530ecc90d772136769764c1f6eb4aa8b21cd59685dc3aacd4987e4fabec31463ab7a72166038572d9445a37b6055f31cd08e5af9a3d22d16a392a
+DIST kmousetool-19.12.0.tar.xz 114216 BLAKE2B 39d9456b5ce7ae3f91a4086c128be8ef19a87b0960f6944dc99a2fdfa5a45946e489f841be9535c141168a57b0a486cfc3050d62d4e65e314b213cb656ef5002 SHA512 40b93453104394764ad6ed86a0db6e3fee627c4d5d398ee34ee79a94b51c576dfa69a46fcdbf572da7715e4f5210c77c63a57491ad5dfd2a7052f8c5fdbe1c7f
+EBUILD kmousetool-19.08.3.ebuild 873 BLAKE2B 092809d6df0cafbe6973afe7f9a10139016b96d3abe62864bfd4cd8755eab0b3fd2de3f4378715c2047e0e2e3722bc249829ae883107abbba8262628f4a8600a SHA512 174acc8f4426956b70c34af8af1e39c7da49ed83294912be174b4d45cfe70099fc8ccf77d08845d3c4db6a9952fd44d36893feffe68e4a0fe95325eb25e6e00e
+EBUILD kmousetool-19.12.0.ebuild 884 BLAKE2B a23adf2c6449a372f270b0ff2c01ae120460e3ab9508baa48a9b2026f96f293d5a9b025b54fe8fbd006e5a8b9a4a5dfe9627b33dd53aca8ad94d6ee5e47237ea SHA512 0935a573e722c1c213d9ee5c7039dca3e2e491bdd9340581de02d72e4dcf82afd48024fd3be0fa69e6d7ea9b17f2489bbc735168b8302521c3771a1f030d2f0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-19.04.3.ebuild b/kde-apps/kmousetool/kmousetool-19.04.3.ebuild
deleted file mode 100644
index 274c1babd6c8..000000000000
--- a/kde-apps/kmousetool/kmousetool-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE program that clicks the mouse for you"
-HOMEPAGE="https://kde.org/applications/utilities/kmousetool/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	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/kmousetool/kmousetool-19.08.3.ebuild b/kde-apps/kmousetool/kmousetool-19.08.3.ebuild
index fcf015a34232..ca6224c370bd 100644
--- a/kde-apps/kmousetool/kmousetool-19.08.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE program that clicks the mouse for you"
 HOMEPAGE="https://kde.org/applications/utilities/kmousetool/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kmousetool/kmousetool-19.12.0.ebuild b/kde-apps/kmousetool/kmousetool-19.12.0.ebuild
new file mode 100644
index 000000000000..c698229692f9
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 10c2aa2afb87..1679149a2f63 100644
--- a/kde-apps/kmouth/Manifest
+++ b/kde-apps/kmouth/Manifest
@@ -1,5 +1,5 @@
-DIST kmouth-19.04.3.tar.xz 1958784 BLAKE2B 5da47a5b1f64609cf97c8671b7c6dd49102e3aa1e7b8b90750eaa2a22e17924625d59f5dec2956f2ad8d6c73f25e3a8ff725976a9a24364f6f7b9a0db28b1c62 SHA512 d8bbb794c74e6ca35b0d501d9c45eecc9fffd073f7d072f6e55042d59bbb78b9fde23926b35069c9c08937a30e471f19f2485fe7e2eda5e8c85699fce20bd796
 DIST kmouth-19.08.3.tar.xz 1965320 BLAKE2B 493f3483577e292e9199d699886988bc79a4d96a02289f3aa4943e6f07d9f7f2bff26cea62fcf7ad054754e834564d25e89188db1be4db58337a3b0cadfb6d91 SHA512 72643b0185a42614b41b6d575200037eee12492c77e5127624f014a5f7d56e885709b8e12731f434cbe28112fb90faa567c105dca83e6afbb4e75c74d843e76a
-EBUILD kmouth-19.04.3.ebuild 747 BLAKE2B e4ec693906d109d7c7417555cbe858135d81bf7c3033a6fb1c066573060e8014b69058d872cf4e1db7c16a438e14b3c5b55e8c79da077e6a08365a71debe059a SHA512 0860a1502f5aaa4efa4bb78bdb87b41fb3f91d0b8e5006284a7f7cb10f242e74c5b414cf29e3d4ded887089edbcbf1a59292b8634daab6f6e82896e3a3ac5996
-EBUILD kmouth-19.08.3.ebuild 906 BLAKE2B 26ac5de39f9b456cf40b361cd7519f475eb1a4ba3fc91952bcb918e01685d8b34eb3b1c254d2b405b49cb1b4959009f805c49ab9750d3b7e068a1b7f5a402f7b SHA512 594cd3d2386420457c61732d52512134dd165fcffba08bc2b23e6cfa9cebd1a2aa0d0d3aef12b1e2f964ebb0f471c3b23a4feec63c1e3f51995f877027a71163
+DIST kmouth-19.12.0.tar.xz 1964876 BLAKE2B 2519f6698bef908728c137a44dac6e1dff4d4dfd5ae5791979d175262f51275a5e78b78bdba4757fbf5947f64bf5f8307e55da2d09e96981cea80a46a2a58f6f SHA512 786a302edf647eb3be53e3173d2eb52bb29bd5c7af541503b15cd03fa546a2129c883fcc7d5e61a0bc837f8d0c97ba411e4677a782a6e5ed8d0be9c5fc08846d
+EBUILD kmouth-19.08.3.ebuild 903 BLAKE2B ce486a9290ec574a393c11290112ff99b31ab912f6401a5b331c8d995d34ef068ab815ab9a31066f3fc1016db9cacd1e39cccaa40d21c692a88f8e79f0827aaf SHA512 3bbe1758a44106b5081dc51bad76f7c9b7bde4d973e44ceeecc2bdb4ccf442dd5665f964d1adff1a69c458b2797d9c15e3ee68a4c4ddd894873fe026f67eb7b4
+EBUILD kmouth-19.12.0.ebuild 914 BLAKE2B 7bc452cf76fa51d2686c7b7f59cfea7df3d52f6fa4c75ef5a5d00c421c06852e61b4cea024b73e1813e8f56dd2e2499ec9e5394409acce7b266f01b6bf5f6a3a SHA512 0f0e036b50045b015c72fd012ed6487117a2f2d6c890225a281c775e7f59a1e67b6d398ce4c715d0fbb7a282a43cfcad4a16848eaf9784d0792c5da84bd951dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-19.04.3.ebuild b/kde-apps/kmouth/kmouth-19.04.3.ebuild
deleted file mode 100644
index 8e72789a0ee7..000000000000
--- a/kde-apps/kmouth/kmouth-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Text-to-speech synthesizer front end"
-HOMEPAGE="https://kde.org/applications/utilities/kmouth/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtspeech)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmouth/kmouth-19.08.3.ebuild b/kde-apps/kmouth/kmouth-19.08.3.ebuild
index 789358a6ed7e..11c2fa5b2c54 100644
--- a/kde-apps/kmouth/kmouth-19.08.3.ebuild
+++ b/kde-apps/kmouth/kmouth-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Text-to-speech synthesizer front end"
 HOMEPAGE="https://kde.org/applications/utilities/kmouth/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmouth/kmouth-19.12.0.ebuild b/kde-apps/kmouth/kmouth-19.12.0.ebuild
new file mode 100644
index 000000000000..1287d6dca87a
--- /dev/null
+++ b/kde-apps/kmouth/kmouth-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 c8860c427450..da5e7b10ad59 100644
--- a/kde-apps/kmplot/Manifest
+++ b/kde-apps/kmplot/Manifest
@@ -1,5 +1,5 @@
-DIST kmplot-19.04.3.tar.xz 3047220 BLAKE2B 17db90a4184343fd9a4a13d268d8d1a0d368bd0fb075a5809044367fe266edee5b2f94118dc3c9bfdc896887a47e5d85fadcb047fbffa9bc845845b69dddb980 SHA512 afb63178f5a871b3f52e56927a3d636729cecd485c29dca661256f6e73c506ed615ff619c22043ed5b714f3ba9216fc55ae63208e4117aa0de7ffeef0261fbfe
 DIST kmplot-19.08.3.tar.xz 3054096 BLAKE2B 473d87d5e98c1906cafec669e56451301787bee65e43e6fb77495fb76f3e36a2865b85234b6c73adf9999991a06a47c381c210d1566ca9ff4877127bc62b9a78 SHA512 2a2925658ecae3d976a81a3830f8aff71df5ab314f0326378fb2fa95b9aacb364ab5b5603a7bfbc36aa6f3ec88ee6ccdeda4283ac3a0d9c4bb12ba4bb1681979
-EBUILD kmplot-19.04.3.ebuild 891 BLAKE2B 3def4072abe0ae2d3c29bddf7554fe914857b7bb358d8886bb260d928974a94c466c442b597c49c6908e9606a865948efbcf963f7d90ca87fd2a114d4940d6b9 SHA512 a8dd8a2665f34daf14bf5a430fc222b2030c689c204714dfa28bee04b7856ed3670b73457cd31b209c7d2b041180267394ed96da83e13e387384665160991af4
-EBUILD kmplot-19.08.3.ebuild 1074 BLAKE2B 4563cf7991e2c2ffe2ea04628750a6beb8478320af39d0d62ef66e84ea5f682c1e7f33e4333c3be7f2dd770a750ce49252bf8b224a2490ccb86205f0a1f9d18b SHA512 cab34a6c4c5356c24eba613200c402faf0a8f115baafc8e6ebc18ad3bc14b0c8d1ec66caaa219e2a4a308f303e5fa8e9b154c290ffb00997fbfbb91aa37edea7
+DIST kmplot-19.12.0.tar.xz 3056340 BLAKE2B c84b54a2825733c7a6ae62819f7d1b4021cbe152c43778119318440c91d5eebff89c2c798c9a4333f9bc8049f9452ce299280df65fa575a1333cf88da4e7d31d SHA512 7c6f2d671c7e082d4763f6da66bbae9c2d2e922b3d51518951f4040ab5a6af692488565881f7168ec7edf4277bf0f351685b8395914c58173dddcd9dbd0e3b9d
+EBUILD kmplot-19.08.3.ebuild 1071 BLAKE2B ea6991edb5e38329cda5d29bc05449ddec6ee5970ca58b08ff0ea34c83aa52b63a429751f57e7ba8943ce639691e69f74a49144a4a2ff7e5c8198cd4a5f1aca3 SHA512 144692c7a7795a74ec28e878d6e50b9e3152d766bb64b7c40512a67b037a74e945c730a780aac81669296bdfbfc7f4b7bfb3b47f78a568164993ccce806d746c
+EBUILD kmplot-19.12.0.ebuild 1083 BLAKE2B 39324306a3a5f0923d0cc4137ea00a14737fbf358bbe0ae43795bfdeeb3a453ea6edac02a20953a88e130e0dbb47ecc572c8b388ead522eb706c3a7e0ac3c366 SHA512 4ef81d64ad18ee17b8b949e5c96a6da1bf3ef2b395ca664099665bde5cd969d5277ec57e221cc7e98cb933c3550012399e5d98e241f0623e2ece7a477c8bc870
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-19.04.3.ebuild b/kde-apps/kmplot/kmplot-19.04.3.ebuild
deleted file mode 100644
index d937d330c3c5..000000000000
--- a/kde-apps/kmplot/kmplot-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Mathematical function plotter"
-HOMEPAGE="https://kde.org/applications/education/kmplot https://edu.kde.org/kmplot/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kmplot/kmplot-19.08.3.ebuild b/kde-apps/kmplot/kmplot-19.08.3.ebuild
index 797bb443ab97..73ea0dc11958 100644
--- a/kde-apps/kmplot/kmplot-19.08.3.ebuild
+++ b/kde-apps/kmplot/kmplot-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Mathematical function plotter"
 HOMEPAGE="https://kde.org/applications/education/kmplot https://edu.kde.org/kmplot/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmplot/kmplot-19.12.0.ebuild b/kde-apps/kmplot/kmplot-19.12.0.ebuild
new file mode 100644
index 000000000000..94e64d48f0a8
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 5a1685d07657..21f104aafd61 100644
--- a/kde-apps/knavalbattle/Manifest
+++ b/kde-apps/knavalbattle/Manifest
@@ -1,5 +1,5 @@
-DIST knavalbattle-19.04.3.tar.xz 1281700 BLAKE2B 0f1fbc17977ceebdf791fba0a5d05bdae09623bb225532e445397d444904f3ef3e8b889fca58c02d32af0f3be01f847482b65eca2176696f3dd84e0d5061af92 SHA512 fbc6559c602982b218c555bdbd621975fbfd9867e3f3d19792c49dcf7ee4979a066436fa2eebf248b2105072747b199ce7128dfd78c45b06c82626cdd6c9d2aa
 DIST knavalbattle-19.08.3.tar.xz 1281260 BLAKE2B b446600aa8799d5198a2a0399349762fe71259ba08d86e705796ff2b589b0f88ea44bcc991bd6747307246b00ce93eb455052061ddb91a38faea4252205e7065 SHA512 e4e80f729698a9c0ddf6d71dbab9318f25e7b6b70f768b11a7738c21a89de62f08b36f42e226a86a54ff1df7d8c16ac8f946bfef96e4b8d6b00707648c971e7d
-EBUILD knavalbattle-19.04.3.ebuild 879 BLAKE2B c3c85d48ff7ef77940bbd8c053dc6bf1a5c6aee2ce245f6dd96b410eef91090d4ee379fde0e79fb4838d365cdb71e9f50a3861e90b71765600299e88457443bc SHA512 1127c7ebd69ea141ef85119202f6c3157f20498f1492225b97442a4b79d8fa1d689d2c36cd93e75ed1638bbe55ba59f0fe71257be9c6bd960e0a35613efc93dc
-EBUILD knavalbattle-19.08.3.ebuild 1062 BLAKE2B d79dd4de7c2ab7b51684834d433519dd19b3bda9f27179f81b0f7e06c206ad6e2af9e3c23a0a7e626e4cadfa5a94c375daa12511f8a19b756b7d1f3fc42a4cfb SHA512 2c597ebdc515a58fed9155c3e30790d4f13984ecb453c9e92d678f294f8405092904cf26dbf35964c3d69813e58720df42158b87e178778c9a9e95d5cc5aafdd
+DIST knavalbattle-19.12.0.tar.xz 1281504 BLAKE2B a0df775fd659d3376018a69b2932c0eb45637e0318e2a7c813b1ad53c7a27ce6b26d0275546b480c02a8e34139d4a1bec244578fb952d2e2cc97e0f7740602d9 SHA512 639a459776b2cb79abf50f15ad27b9b9cb34f8e96c325faf2e6679a0b2a1a57707b0ff2c2767878abfec376b0b9456fe79a85feeb66263293dfbe43fc20ef98c
+EBUILD knavalbattle-19.08.3.ebuild 1059 BLAKE2B 6879f59ce53dcf460b408712ed6e5b99ba5c2c957cd119cce6e3a063f8374b43cff4f3ad3be835a60bc03a92589e6519b67c9d349c6e59f2eaeb28d466dc39f8 SHA512 f2d2baedac10ed79695c6809e500c63a8cc7233fb9d3c7f9bc6ddb23051da9807863de0a47950974f3a13d3482b2f1a37480359af2cad3c3bfd8bce53bef18f3
+EBUILD knavalbattle-19.12.0.ebuild 1059 BLAKE2B d35e84113127a6611f885874743a5707a8c274764ea5b0752995a85a51b91227d376794af4cede8203315de6f4384087eac1daac205b3ba8b8fcf925fb9c7441 SHA512 1eacab7c3075aa9dfadc8f35c0ffa6bc7f838f506b41ab034c14a4757c0055d8326368dc691e570f449da5a106e5b1d31d617b63c62c31369219ba34d04cc654
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-19.04.3.ebuild b/kde-apps/knavalbattle/knavalbattle-19.04.3.ebuild
deleted file mode 100644
index 1e710881fc0c..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-19.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Battleship clone by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/org.kde.knavalbattle
-	https://games.kde.org/game.php?game=kbattleship
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS )
diff --git a/kde-apps/knavalbattle/knavalbattle-19.08.3.ebuild b/kde-apps/knavalbattle/knavalbattle-19.08.3.ebuild
index 0c8364dc70dd..d805233e010e 100644
--- a/kde-apps/knavalbattle/knavalbattle-19.08.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knavalbattle/knavalbattle-19.12.0.ebuild b/kde-apps/knavalbattle/knavalbattle-19.12.0.ebuild
new file mode 100644
index 000000000000..4ad447c52349
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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.63.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 39d10b8adc21..5cf706cddf40 100644
--- a/kde-apps/knetwalk/Manifest
+++ b/kde-apps/knetwalk/Manifest
@@ -1,5 +1,5 @@
-DIST knetwalk-19.04.3.tar.xz 1037300 BLAKE2B c73763a3bda3a7a1db567e43fabe46ae2ebeed9125ebe0272f8b6f59aa27286c669c0e21aa35cbffe5d797d67543b768f82f88f1c554b38c28c70465b941b296 SHA512 fcf1e6da9c1a1a0bd3eafe28c67599608d0f4ac8ebb14dc8ece86b4aa0a22d8287f00c1a770344f60bf91d6d75030e810baf60dc1b6e837530d6f9c353cf774d
 DIST knetwalk-19.08.3.tar.xz 1038688 BLAKE2B 61f2730f5d1281dcc5141c161fa4f7b5e618808c48beb50dba997a503ab32fde6c394380a466bcac93eaabcb51c93c0dc2222222495de8be6b8f76c4757bc25f SHA512 874af0de4e3808a1ff497d619c74b2c1d36f765e50b32dbef24bdcbc801d9756e64330465ae8604585acde43f6cd620c98b8896d1dec2c30dd49a821927a336a
-EBUILD knetwalk-19.04.3.ebuild 863 BLAKE2B 856590759667b89db26661fe86a954c08ed889c37a7f93993d2534d5bf255210e7bcdc41d6747eef80b1cfb1e606e5c7ae564afe343f74497e4cc0010c269b65 SHA512 974d2c0df6265ac19033fc290d2ee75c0ae98549d8a9506e169e51520a8b21a7611ac13d1c831bc12711ee2552566f0106a6f2dc8daae8fb6b6db2096ad71d8e
-EBUILD knetwalk-19.08.3.ebuild 1034 BLAKE2B 8ca00685c8efd94ea31e87cb36f02cca004ed00cf3828d90e38b8c3cbf7f60ecdc7e0800f1d2484e388519d8360088159539a5d70b62fafa005dbc074dcc6cce SHA512 cdd0ed92d07dcf6b67dd66f7410808855f48c29da188d2a9a0ee41516011f33232b01b6c40b1c158f831333bb09c36b08995cd9e29707ce7a212890301f27ead
+DIST knetwalk-19.12.0.tar.xz 1040756 BLAKE2B 48457467d00ed87462764d1c47ae8b1ddf6bf4724ea1ea9db0a8e4e6a1c5fdb33465aacca8083e7f93c6d741e5f720c068968934b1975ad60c857d1a5839986d SHA512 1e2f636699571bbf02ee49f260c4e7d5d7dcf1da1861a87e2d2091cbf52ec7a1f60e954f449aeb5d45641c86a65752168d501478477a9ed426184d472ae26065
+EBUILD knetwalk-19.08.3.ebuild 1031 BLAKE2B f5e610e99b472bd828d96f4466d89205a5613a672bcec0e2d13416a61375b90c169228763ee302fe2c4c166ef37a4a691324398910ee86951d1dbcf9a6d71f05 SHA512 cdac5092334e04f8b67bd0522e193652b8cb5b8158622c65c6e29c3847676e2afb76a66d4e788e74ed14e9a56f995f1f139b149d691eb1b51efc84c11c029d74
+EBUILD knetwalk-19.12.0.ebuild 1038 BLAKE2B 104ef67fbd02941848629dd1ab8786c09f0c53c3cf453c0af839be0ff080e040eb3172e01f0e1d20de142276b34628b39f4ec8baf3c1ef7a0875d9cb88d5814d SHA512 0cf0d054c2205acb7c38d2b0af0e3134be95060c85c7b1571d0a7871b854d81a59641f4735dfceb586c84ff98727101b7b8e1423bc790ace5cbc2f0cb3ea4ed2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-19.04.3.ebuild b/kde-apps/knetwalk/knetwalk-19.04.3.ebuild
deleted file mode 100644
index 1cdf6354eac6..000000000000
--- a/kde-apps/knetwalk/knetwalk-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE version of the popular NetWalk game for system administrators"
-HOMEPAGE="
-	https://kde.org/applications/games/knetwalk/
-	https://games.kde.org/game.php?game=knetwalk
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/knetwalk/knetwalk-19.08.3.ebuild b/kde-apps/knetwalk/knetwalk-19.08.3.ebuild
index 57047b258971..6aec770747f5 100644
--- a/kde-apps/knetwalk/knetwalk-19.08.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-19.08.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetwalk/knetwalk-19.12.0.ebuild b/kde-apps/knetwalk/knetwalk-19.12.0.ebuild
new file mode 100644
index 000000000000..a5e0a1a80fab
--- /dev/null
+++ b/kde-apps/knetwalk/knetwalk-19.12.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 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.63.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 2da2d9913d17..4f26638f7f21 100644
--- a/kde-apps/knights/Manifest
+++ b/kde-apps/knights/Manifest
@@ -1,5 +1,5 @@
-DIST knights-19.04.3.tar.xz 3508644 BLAKE2B c31dc5738cafba7d080a06d7a95927a41d5c885a55ee757e7a3257b2fe5acaefb62364c828c56aec3a72fd2036f60981994db4545fac453c4fb7dec7da67df0d SHA512 96c06139f74ebc09355edc0679f563140fb7d0c261abfe511396033b144e2844d1d216756a9e9dcd35aaa64b48a6b26f0cb7df4a6b92e1f28f0a518e4cfb28bb
 DIST knights-19.08.3.tar.xz 3515644 BLAKE2B c780c66b837b7edd86d2731af5202de18504b8ecfbc96f4267bc83877f2d650dcf548d3000c2ddd754a339bf92389f786b7d46159a642029b2c7c8af828eda46 SHA512 5108acbae50c86780b1c4dbcdef268af87593f65da2544c8822bf3de169ed1d5a2afd74edce8c35e4be9f9715cbc796ad8120daf198a8ad2d310dc7629094753
-EBUILD knights-19.04.3.ebuild 1153 BLAKE2B 36b70b3f4e748cbc9cf7e8d83cebb0455b1a299c4c6783b21224a20ec751f1366eb0ab37aa2b9c416690e58c021e0c1e6c34bda2c3c2f4fd44a334838dd4ead7 SHA512 070e44f15cde5bbc2417f3e30f2246d95eba658a6fa7d6bc9956898144fb477fdb13fbe7132d7e151c65ef90ef48247b80813ff03a9bee8463131227bc18c821
-EBUILD knights-19.08.3.ebuild 1348 BLAKE2B 963311756892b9410d22092f43c40fd7b58c80146986b51abc6fdf13f45814fe68c33352c115091ac5e3740360f868584fd8b895cd706077336a5062599c4437 SHA512 276705ded2d4d45b8e1ea332395a1bbd211ff09a4b3b088718072b8aedfbbb27ecc4942f61a8dac8a1fb9807700039e377690f26cc1d34774712ef0682cbf68d
+DIST knights-19.12.0.tar.xz 3516612 BLAKE2B 4fab7287edf75db57eb4eae30486900fd63f410cbcf88c78ab49e50f0debc4a1959aee5d29be610e21b422e7d808203feeccf326e012737267b8ca5d358161ba SHA512 2ec9c3d7aac0036117913f9bee6406aa1c7a856370f11e0ed110b5595fc80982429c339c01ce71f5cc55287d7296962628770eefe7a23822c88564fa7ab7d8b6
+EBUILD knights-19.08.3.ebuild 1345 BLAKE2B 40d2f58c755daa235f7faddd428d7af7e6a9836a1dbdddeb3c9e3cd7d1339b0aa681d7355e9f5df83c5890adedfa4b00e2b7897487976ba41b8b4135afbd4541 SHA512 ff8309f6d54d446bce86c4c4ff91f30fb1ac7b7477b8fef85559210ad0a28b731febb76b1a19dcf46b5b1fb2838a22fda7b5775200a809b168d4e0a9d8238d20
+EBUILD knights-19.12.0.ebuild 1355 BLAKE2B 26a1e13e62ea1cdda8d539a5cf06d47ddb1c3b6c79020f6cf5ceccf298960b4ac02d60bc3cb305cdb95d00f9b47bf6061f84c1a8d3020b284ffd72c6cadee42c SHA512 834d74e92d1013328a19331449a75e0f739654445e714d2ac0b2a22d476432375ef53fa9e4783a52d466f2029aaf031e08521c590e72ad66781ee08bf0ab01e1
 MISC metadata.xml 437 BLAKE2B 9c89e54279e181045c5bfdd8cf6586306d84fc37e5f087ba3f3e2db62430ee6654cdc0181c3690105a6ecb33ad584f827e96585314a25e0b5016b1ed51d43885 SHA512 89b588c23e621805fab8a15724dc03ae8eeed23957fe19415c9846ad027ac80a1cebfaafaea0e6fbf2a27c785c4e6dfb81892bcdee1b40ac6af7cb5f8350e0d5
diff --git a/kde-apps/knights/knights-19.04.3.ebuild b/kde-apps/knights/knights-19.04.3.ebuild
deleted file mode 100644
index 9b50c441fa1e..000000000000
--- a/kde-apps/knights/knights-19.04.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Simple chess board based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/games/knights/"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	|| (
-		games-board/gnuchess
-		games-board/crafty
-		games-board/stockfish
-		games-board/sjeng
-	)
-"
diff --git a/kde-apps/knights/knights-19.08.3.ebuild b/kde-apps/knights/knights-19.08.3.ebuild
index f8997e247776..cf76fb67b222 100644
--- a/kde-apps/knights/knights-19.08.3.ebuild
+++ b/kde-apps/knights/knights-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/games/knights/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/knights/knights-19.12.0.ebuild b/kde-apps/knights/knights-19.12.0.ebuild
new file mode 100644
index 000000000000..dd35d59336cc
--- /dev/null
+++ b/kde-apps/knights/knights-19.12.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 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.63.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 c3b16696266a..d16057b4f2f8 100644
--- a/kde-apps/knotes/Manifest
+++ b/kde-apps/knotes/Manifest
@@ -1,5 +1,5 @@
-DIST knotes-19.04.3.tar.xz 319528 BLAKE2B e665b66e531001cd377c9867c0d7d6ee3da5567c52f779d29bc4ae02189e4b5e1ea628070b66d8aa063b80e8bee04d9c4d6e4ac5a71ff139b09a35a4441ff817 SHA512 ed50d590e7a54c15d046f3e82436dea58f6f40e3bfa4541f67f12603915748fb27202a4d6276de44aaa2d23648b429e0b1ac0eb98787363c7bbce68cb2c4a180
 DIST knotes-19.08.3.tar.xz 319336 BLAKE2B 2ea763279e30399cb7b68895ac33c751c4da3a407bd73dce151ca7febe2054a40a83eee1fb3dfab530b3cc3f9b2b3b1d8c4b99cb8340bf3f77fc41e7a8be4a9f SHA512 abe5fc4306dce76a4880a1abc31a80875004ae6ab8709af4fb373c16d9be53cd7fd54b7e36d0dc405f3a2071258abaffa2804b8a42532a57adec7c90c3b497c7
-EBUILD knotes-19.04.3.ebuild 1848 BLAKE2B 22742e13bcbba22ce992ad9a9482ab03b22825a9d026d22cc307f4c10cf7b9d5237332be6cde3e56e99c1c74854306c1ea62558f626a78577e1f6bdfc2d2afa3 SHA512 f760dddf3aede463d276d319b3505bbe3b9150ec2f8738beacd1a40b43a5c42085425e2bc2af5118f21d2febaaca658d853e86fb38ea8abc70b307e7e41d01fa
-EBUILD knotes-19.08.3.ebuild 2111 BLAKE2B 93cd622f429b4fbe214a4fe371a20c63dd231bfaa5764f407886ea90a88ebf17140a27e5de20782bf447acbd07342395434f010b59d83cf95a76ecc7e0f518b5 SHA512 c102fc3ae821629ef345bca60df24dca71be68a0cdb0ba0c9a7e2a9d77a0959c0de7824d7d4fcd5277fb681daa5c8d934869cd28982e7cc98b97a783532b61b8
+DIST knotes-19.12.0.tar.xz 320516 BLAKE2B 8e4b63fc3853fb01b57ba5104955e30af3617576ff13a18e0eb13944f7087bff84ade637cba52ba7fdc0d27c9d34756fc9b95a755aec7bc3c87afe98c428c5dd SHA512 08b0cb18ab904093493d3de64997b0a0bcc92296233ad4f25101b78858ebf1ef0921c68ff5264cf8698dba4ea7a65107755d24f54c9fff7e3d80f85cd1c2a5de
+EBUILD knotes-19.08.3.ebuild 2108 BLAKE2B ed904fbf40cdb666ea971b0d05e22c9b4ba98cacfc1ab9127ff5b42447f91990e3045641d22520ad1cafee9a5a80f8078297c8db023a30d52ec6145195562109 SHA512 79e78c996bc36412022f5864abe203f5e5b01f7511279de8063ecaa2579cdc4fdbc354b9f22a97929e8231a365d7c06bb272d15fc1cdac39df544e4706e2d7a6
+EBUILD knotes-19.12.0.ebuild 2183 BLAKE2B 81f752c43db167f4e6c94869814ba3fe92bcae2fb65bb470c9bde170fe25f16ecf2d1a9663fdb09e6dca386fa2a7d1808b77e7beacd6389d907e3a754784587c SHA512 cbc258e69c7b5d3a98483fe43b4313b43908b7be60d426529a2d35ad5e0e227f2b8f80d90cf40d5559e99d1dc3b92fae562f3b173acb3f872a94046d104b0a08
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-19.04.3.ebuild b/kde-apps/knotes/knotes-19.04.3.ebuild
deleted file mode 100644
index 0a023adf6cb8..000000000000
--- a/kde-apps/knotes/knotes-19.04.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Note taking application"
-HOMEPAGE="https://kde.org/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-src_configure() {
-# 	local mycmakeargs=(
-# 	# FIXME: Does not build (last checked 2016-02-17)
-# 		$(cmake-utils_use_find_package X Qt5X11Extras)
-# 		$(cmake-utils_use_find_package X X11)
-# 	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/knotes/knotes-19.08.3.ebuild b/kde-apps/knotes/knotes-19.08.3.ebuild
index bba43d5a8cd0..f4ed9fedf665 100644
--- a/kde-apps/knotes/knotes-19.08.3.ebuild
+++ b/kde-apps/knotes/knotes-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Note taking application"
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 IUSE=""
 
diff --git a/kde-apps/knotes/knotes-19.12.0.ebuild b/kde-apps/knotes/knotes-19.12.0.ebuild
new file mode 100644
index 000000000000..196c6f314a5d
--- /dev/null
+++ b/kde-apps/knotes/knotes-19.12.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=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
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	>=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 f7c7ecc474e2..f74a0346814a 100644
--- a/kde-apps/kolf/Manifest
+++ b/kde-apps/kolf/Manifest
@@ -1,5 +1,5 @@
-DIST kolf-19.04.3.tar.xz 1031060 BLAKE2B 278011e121ebc44e8c50af4d00bf4184fb6872d323b619f14698c0f3f70d194fa3da7ba6185daab87ce3272bd8e42831c08c8379aa1a416bdc4bac2ea573ac77 SHA512 b8471ada423a2ec0ef1ccbf4d87adee1a91b7cce59b558587b43aaa47b91d8d57d159bda0d64cccc3119129f6f0a1bff1e3e03682678527502ed75bc8876c19b
 DIST kolf-19.08.3.tar.xz 1029800 BLAKE2B 693909f406e653aec6ebd78afcb30f69a604b93e54e3d88fdd36efe41be3d2c4d33602db3904b0c3ef8717957318317d2a89da299a4cd8b871540082d1d93a51 SHA512 0edc586c8232f0e02906f12331e2021aba2e7cf468a071394175350036b77cfd8d6cd54e2071860d25e796befec4f3a53b94fefb1fd66dcdf0a51d991f32c8bf
-EBUILD kolf-19.04.3.ebuild 833 BLAKE2B e9161e178253d93d3fb37f0a1986f948cf07996e9b1fab720789aa7bee0120b6fb7ac51cf3468bab68fafea1956a2abf3183d4ee9046221bddd20603edcfa00b SHA512 aac79bdf8e3eabbebea5ad6d2d265fc41bd95adc69dfe97c1b6229215114bf53d1f3343ecf134935f007998459ac3c41de35a83ab44dc4158968f320e357c55a
-EBUILD kolf-19.08.3.ebuild 1010 BLAKE2B bbe0b5384e845b84ed5425368aeb0151677316e0ccb74a19b1dfb84f486341d5ef58e65fc621511d165a0f2a47cae1be8fc93a1d09e94aa14414d8d5e611aec7 SHA512 fdd0fc42070d239287abd8f34aad48626939476c084416e5283299900278efb56f2f9d48160746dc73a6066d04581d13b5b48c69ae6d822f0d5c044142758130
+DIST kolf-19.12.0.tar.xz 1024888 BLAKE2B 3b25ddc11d5907c94d104cc01a59e2bb3a6d1132f2efe2871b30e1891ce73124f67461922c983f15a35344a6c9711867067e65da87d00df6c3e28e881628370a SHA512 7c289cddb7d9c9edbcf1ff9c73f098299a7115226210904985709dc0fb60e4c4c1505e7f6b5eea16d26bece350e1fbd72ac707049462ef148458ab6f792b376a
+EBUILD kolf-19.08.3.ebuild 1007 BLAKE2B eccdb8363dd1c7d70111139e45ca044b46b7d5fa6acc5f6b61a4452d0e0bdee1c773e07cef4b51f5ad3cae209919b7eee48cf6ff1056f603ae79bf359fafb0e8 SHA512 9f9cd07ce56a4fabd25c5ce4ad64c307d19903e80bd4b28aed331f3a2fec049e5a1984c37b4c793053cdfd8204ee7c05287ef4acce1655ae347b8978f14e75c1
+EBUILD kolf-19.12.0.ebuild 1014 BLAKE2B 29c8276ed682e581c7bb38fd4a7088dd5be552323f03bbf869e260cc25a31d1a60b1ced3230b91722fd8f25c8699975640738f41b8029626d277602b3bb56208 SHA512 fe0018c2977d527914bdfcece7b17290fcafb570fb2d366a03be863e98190c2edebefefddd34a3fe196db33ed487c87db10cce05973f5e26bc961556a092935a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-19.04.3.ebuild b/kde-apps/kolf/kolf-19.04.3.ebuild
deleted file mode 100644
index 4ea70e7733cd..000000000000
--- a/kde-apps/kolf/kolf-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Minigolf game by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/kolf/
-	https://games.kde.org/game.php?game=kolf
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kolf/kolf-19.08.3.ebuild b/kde-apps/kolf/kolf-19.08.3.ebuild
index 664b1b1905ce..ce40b002baf9 100644
--- a/kde-apps/kolf/kolf-19.08.3.ebuild
+++ b/kde-apps/kolf/kolf-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolf/kolf-19.12.0.ebuild b/kde-apps/kolf/kolf-19.12.0.ebuild
new file mode 100644
index 000000000000..314674e87a26
--- /dev/null
+++ b/kde-apps/kolf/kolf-19.12.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 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.63.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 9bd6294fc8fb..07a051b893b4 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,7 +1,7 @@
 AUX kollision-19.08.3-qt-5.14-1.patch 1197 BLAKE2B df4416d7c3462abde47b8b5ec4669ac69ae9965b8e267d4320775410df8a3090a3e9f28256ef6852ce9e76eda6498ce9dcdef455764e491e13d569cca1a95bf1 SHA512 a10ce0f97cb9658f13233aa32e19e47902ac90a74511c182263fe2ea0ee5c0e90e5061d9a9b8f23589ed6f501e7d927fd549f4eb011dbed2c992d18934883665
 AUX kollision-19.08.3-qt-5.14-2.patch 872 BLAKE2B ed7d8965cad72a262a6031b0925334864c05dc317dccfe8d158148be7c001375f4a3777e9e235297049ec15bff3243e7ceb77fd1a39aa9e588f2a8e0786a8eb5 SHA512 74b2849bc2f639457369bd7b56ab6db7f8a89d13be985eff54e8993308fb0a61d42a7eeaeb3c140d29c77b800e0b05bc1afba34e96bf4ddc4f14a0950bb35a8b
-DIST kollision-19.04.3.tar.xz 280592 BLAKE2B 067f8393159c12446bde93c88bdcc4e1cde2ac4affff5d4c0ee5d95a9c96b009af8531bbb40e9c48622be0b5ead8f18b9129529e42bee483362acb6420baa6f0 SHA512 5b18ab96f5227f2900dbe5a5255f5e837bb34990661273327eeef53cdba7aed53cdf282f7287ea2fd0fd4849aa3009f96dc3d59bb23459bcf6477d3338ade74a
 DIST kollision-19.08.3.tar.xz 280844 BLAKE2B e9f2aa8de4d414676775427c1940390db6298b9bc0aab338f57d85513a20d4efe0cf02b0ff5c755010d68b53b5db36a8c74661da64990b8a9a2fbaea5a96fe05 SHA512 e19d14db64942cc0c1355ba465bc64c6721fc3e723c60ab1ef7b48525747ddebb43551772eaddc15dccdf991e8c11452686cb5590c22b66bf90ca088850e133f
-EBUILD kollision-19.04.3.ebuild 676 BLAKE2B 9cd1917f198443f48cb64e7ec931f228ebe60ee4f80fb3f4f7c6f0aea2c3a1b5a9b85d3406ed56d22394f027b04cd5e13ec25477600819dc0eedef8bf00965be SHA512 a5b6c31ee5d06c0a2db7006756c88c1dc941342a915bc374eb7e803e8c6a344042a3547549667f95ffa6bd9c86720334a727375a43fde569491c9eb8e52d01cd
-EBUILD kollision-19.08.3.ebuild 881 BLAKE2B 2abb98a539f43d322bacdc0a18645802373bbc289dafa034c4526e0b9af43d209512204e91f622cb4a61218a4a52a90e3047033d33bf51288e9a47b6ab5c0b7e SHA512 4e860047d1a32dd1b97d4fc02da8fc89f95af82e8390041177d8ca7b97c3c58d3747edfe6a19e5b7d76096a0f4b8e42d7df0403c47ce965b6bcb42463cba86e6
+DIST kollision-19.12.0.tar.xz 280988 BLAKE2B a8ab3a70acf544a8894bed6383e851bccd9c5d07e45db699d18aec46a4c5e228a9516f60f56071bcc505ed00d0629125d7f8ba75f204ae34d28210222f25b98c SHA512 ed314a758936f728f2580cb0bc1107d8ef276e66ae4c489b7d45d3aa25ce1a551d637e35bfec883b3d9e7170aab42641a66cbade5bee6e19b6ca776f097d071b
+EBUILD kollision-19.08.3.ebuild 878 BLAKE2B 5ad93bee0a746a36093e96d705d51d79b0ba14c3c0836118074154a2ed0207dd6ab9f19a272ec9586a56a79e692e4b6f8964ce76d8842b79018449d6cba7342d SHA512 1e6ff73ab77480b1fd2ad70b2d186edb7ff4cd45b155ceee7596372de150c5c1f6a2a3e764a6dcf79ac1d2c0487175a3f62e3e8e01ace30ec69f44bf1ea9a364
+EBUILD kollision-19.12.0.ebuild 833 BLAKE2B b016de9f46f560c27d024239956c5a29291bf233842664b339b08d1da369084a2153cb61675cde038b8ce68595df4ead12713713646cdcc703fffaef1f49d1fa SHA512 4267100319633bf0849157e69c338ed7f9a8e28f802ac3feb1a95b8eeda0083c49fc5b99176c9331eb81a9cc4b1231e55228808c0d140ca2d2d7243fa7524c73
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/kollision-19.04.3.ebuild b/kde-apps/kollision/kollision-19.04.3.ebuild
deleted file mode 100644
index d0d1e39f5f60..000000000000
--- a/kde-apps/kollision/kollision-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Simple ball dodging game"
-HOMEPAGE="
-	https://kde.org/applications/games/kollision/
-	https://games.kde.org/game.php?game=kollision
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kollision/kollision-19.08.3.ebuild b/kde-apps/kollision/kollision-19.08.3.ebuild
index c36210ecc3ca..fdab34849958 100644
--- a/kde-apps/kollision/kollision-19.08.3.ebuild
+++ b/kde-apps/kollision/kollision-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kollision/kollision-19.12.0.ebuild b/kde-apps/kollision/kollision-19.12.0.ebuild
new file mode 100644
index 000000000000..011c57d4334b
--- /dev/null
+++ b/kde-apps/kollision/kollision-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 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.63.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 9c7c2338619e..dc9009c10a9d 100644
--- a/kde-apps/kolourpaint/Manifest
+++ b/kde-apps/kolourpaint/Manifest
@@ -1,5 +1,5 @@
-DIST kolourpaint-19.04.3.tar.xz 5652260 BLAKE2B ae87d7c345946be755dd95283f2c44d7367af7e0a49aee12ec2351df3d621691b1e6321c1e38008a6ff298730a8e3af3154fd8b7464fcffaf66c3a7046174b25 SHA512 bc9a5f081cd50b32b651dac12a6d2146f63788dda6cb7c8fe1c8f6ada99d422e13e0f9b512f8fb6e620ce70a63baca0a44bb5a1d94f0f90d3c0c4aed3705332b
 DIST kolourpaint-19.08.3.tar.xz 5654752 BLAKE2B 24a2700197cdec75201b0a51534ee5b14b13c94db82306161319e89db1ea189463e9ef8884ef9162195ca8c2c14ae073244dc6cd85b5c22045fb8905daa3c909 SHA512 97430f2a04d60bfe4d5131e961381b3390181a57cc4b6ca8eda048b60a32804dcd89fec5a69bc50383f88e1bce05a5b7a1dfde33292d0e72f6bda76cda0dd851
-EBUILD kolourpaint-19.04.3.ebuild 1048 BLAKE2B 8d209dbea8bfa2ed851d973c42f785ec6b5c82629428b077dce7a1595b0f55edbb49560b88ddd8292dc4a72e9da20492b35d7cbccb4ac2c103cb9741744e1fc7 SHA512 9294001a1ce2521f432b2b43aeb54382f97bfcb3a7280b7b2a86efad2204bf1eea0c3a839f12b1f8378349e63c2fc153a0892d8f84d263fe2a9de77c3e074a65
-EBUILD kolourpaint-19.08.3.ebuild 1206 BLAKE2B 7fb818cfd4bd648c69b5b173bd3bb2b16097750c41b89073c377a2c869246b12427926f4f91848310b1274498ac2fb23141d2b22d3bc3d1a9909e311b853568b SHA512 ca5e2d2330a55ced466be2c29802cf77dda2abf3ea7e4deffab69cc90254215b76cecfcee097a997bc87a12c5f2eef059e012ad3d544d04269b169b7d823ccb3
+DIST kolourpaint-19.12.0.tar.xz 5653480 BLAKE2B 7447a09e61477161596a0959533edd9c0332640cbb48c31f42f2ea9eb9ada2e0ff854c94ab1f33b73cb29d6a5c8d12abdfaa9d7b0b9b8a3255888cbe1311bdc1 SHA512 901152a81a302de808343774b238ab7693c4298888a815debac91fc43ec84e2c784a6c26420a703f1887003962e0bd4b60946fc8d8f2ba43748997922988557f
+EBUILD kolourpaint-19.08.3.ebuild 1203 BLAKE2B a05ff4ea34fd3b1b68a42b8757cccc343f9d2c19600837f26d7edcd6de07238cd1d8ed209e6abb0b2b8272bfc1f6f2231cbe6e688a6cb09750fdea84c1763f2f SHA512 8c9cbf064316fa74de189b6bd428e17875201a7ced375ef4a118a286c329f9648b17a931f0fbba5d04cb3b413d203651b3473a0ad680ba7734869d3f71c2a7e6
+EBUILD kolourpaint-19.12.0.ebuild 1208 BLAKE2B 47f959848ec416194282aa4e898edb654b1214dff87cf09fd6c68095f648a277e394d83eee241dbbf377c5e556c6400be25f63f67aa97ac81284be1921230d53 SHA512 d8620755fbd0ac39d6fa2e425827b10bb78495ab708c35fe54dc043016999175e7b6005dcab9cad14ebebc6cf80048eafd6b51c80143b40697e61182c119b943
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-19.04.3.ebuild b/kde-apps/kolourpaint/kolourpaint-19.04.3.ebuild
deleted file mode 100644
index dfc3f21542fa..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-19.04.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Paint Program by KDE"
-HOMEPAGE="https://kde.org/applications/graphics/kolourpaint/"
-LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="scanner"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	scanner? ( $(add_kdeapps_dep libksane) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package scanner KF5Sane)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild b/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
index 0524d9a1a609..415c5dfa90ee 100644
--- a/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Paint Program by KDE"
 HOMEPAGE="https://kde.org/applications/graphics/kolourpaint/"
 LICENSE="BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="scanner"
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/kolourpaint-19.12.0.ebuild b/kde-apps/kolourpaint/kolourpaint-19.12.0.ebuild
new file mode 100644
index 000000000000..1c557d134b46
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-19.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 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.63.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 ~x86"
+IUSE="scanner"
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${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
+	>=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 b7dd60c2f9f1..72abf6673aba 100644
--- a/kde-apps/kompare/Manifest
+++ b/kde-apps/kompare/Manifest
@@ -1,5 +1,5 @@
-DIST kompare-19.04.3.tar.xz 801804 BLAKE2B a0d8321fa9ea2d96196ec3872f9a68306f679b39020fe21fa58ce5b0eba9b76a6bffbf523e92295e463060bd8cc0013f7c0f2001e7434691bcf3ad56214e891d SHA512 53bb71bb67435d480d539355f7ba0a81968dede3e0d7a338564bde97e7c5103e4154380301b0cee92433644ccc81566b0508e5c6400f80e4312a95594de1e893
 DIST kompare-19.08.3.tar.xz 801168 BLAKE2B a300ccff3e41cd8fa9be9318c201fec82f9cc075bd75f4ff689f6a343d117151fb59015651ffeba26f6b92bb1a4ac335726f21cc8f9c4d4b885d3fec57c4f4e9 SHA512 9a4f78792f300bd20207c1743c07e4a4fa62d05549caf34388b02232395bfbb98eaf31099bdc9326a527d926550ef973426934aba1e1816b3ba78ce1ebb11f25
-EBUILD kompare-19.04.3.ebuild 919 BLAKE2B bfd1655e3836cddfd6305f721e542f162f8ef48403fbff0f6548ae6d169b54aaa2e130c159c232414e3f6eabf8fc3de19ecf2261b81f8a147d9db10dc64ba605 SHA512 b00ad2af3eb924dfe44bdaa1ce053fe479347b087ce26d914eb3916ffb50d6197e6d251ec19f832dbc94debef16db359f99d9192b6f4768b80bbe35ed85862c6
-EBUILD kompare-19.08.3.ebuild 1120 BLAKE2B 91630c247620b43393a093416ad6773bd6994e7ffcddf4e466bb9b028087b29b104bad36fdf71622fb42d9776c443b1a74f129923e5f0dc6556a46ccc1a8be2d SHA512 7cb39ac3122f12190beb8f62a7bcbc904e0da8ccdc7f6d592a75148a4de8b29b982593c2aceda1f18a375057412670d9b5a900cab2425cfcb858579e8cbcec4c
+DIST kompare-19.12.0.tar.xz 801436 BLAKE2B e8a0062bd45bbb749276b407fcedb1706ccf8ef9ee86497bf2a5662629212e50e9037e7e2a7cf7244c5ee924ce98211d75a0cb61215d6931f45ee26d9f84961d SHA512 7416434746f422730e0790441e596adc04b64dc7a1938222cd503c320cce87eba1a9f3576c27058dd88c0cbbf71341c278aa46953377b070c01c7faf3aaf629c
+EBUILD kompare-19.08.3.ebuild 1117 BLAKE2B 8761e5408de423833aff3e879f47088e7691e056beb9331c62df7ea13f229404e8da980b81f9991db5afdeb5f315eec20474063c0f82745a96f643a222da3b48 SHA512 5c471c78c765daf2af10373813931220702e636a10da5f8e090cc04c2811a021e9bea1863496518a1e09983ff50998a1480edae9ba399424fd0e626e2a90c54f
+EBUILD kompare-19.12.0.ebuild 1129 BLAKE2B 5bc3dfa458e5647d91a40c19575b41d4bd11dd3dc3d810968054ea2d6a3b2abd2cd07d6966069c5f013ecf49a4b93f82ea4316211bf40f3da9eb59ec18c68055 SHA512 f7c451ed915d8ad92e8b8cd04788ce2a581eb554614eddc3b37ecb729eca489b50f470b6aebe4048cf9f65d9ccf0d6b48f577738c9416ab253503765d8d08b82
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-19.04.3.ebuild b/kde-apps/kompare/kompare-19.04.3.ebuild
deleted file mode 100644
index 9a2a69a407e0..000000000000
--- a/kde-apps/kompare/kompare-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="A program to view the differences between files"
-HOMEPAGE="https://kde.org/applications/development/kompare"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kompare/kompare-19.08.3.ebuild b/kde-apps/kompare/kompare-19.08.3.ebuild
index 49c0893f2c10..ec1b1c2e02fa 100644
--- a/kde-apps/kompare/kompare-19.08.3.ebuild
+++ b/kde-apps/kompare/kompare-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A program to view the differences between files"
 HOMEPAGE="https://kde.org/applications/development/kompare"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kompare/kompare-19.12.0.ebuild b/kde-apps/kompare/kompare-19.12.0.ebuild
new file mode 100644
index 000000000000..b2255b2fdc63
--- /dev/null
+++ b/kde-apps/kompare/kompare-19.12.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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.63.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 18fd9185c617..2999a95b7459 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
-DIST konqueror-19.04.3.tar.xz 7578812 BLAKE2B 370ae99b1662cb3f548027718f4bf97d58bcab61f252fccafe2dce518543e90cf37f182d5025350405e2c9d120dac391f79a10051791f6f26a4b660659db8d1a SHA512 ac04f601ddcf711e70298a7af72aba6fd2b72510d62f0337f3df7422a09cc16235b624ce32e6cfab8c1768b8cc6fce9275529705fc73c07d6e83b725a51a5372
 DIST konqueror-19.08.3.tar.xz 7604888 BLAKE2B c66ebcdaffc0b3e502ce4b9bdd981cfd732d37dc7973f6f4f48b5a2a3ced98f55e9c14af699599d4dbb22d398999b899e89adbed72106fd2b8612e93cc682baa SHA512 ea2416fdcc102b41302635964983bf27945e49d53b237479f1cbe7d81a781671884c4e020295dc92d84e2eb14e7a503d0f994ba509eaf4372b8f2c63ae450728
-EBUILD konqueror-19.04.3.ebuild 2990 BLAKE2B 5bc4eb968b821345b21dc1f4af0f41a563ea8dc62098ea9607da8e507d266619c3e020db6dff8dd807b54e6a2b2dcbe52b5c5d585b54853192a8241b11e23075 SHA512 9321a9d6bfd7910e88bfef46a2f782240ceb3d2d92bf4608b616af381f651e05fce739eca787a517c426a4f14eba745d55c36939adf2c3750071fa0aa25ff222
-EBUILD konqueror-19.08.3.ebuild 3324 BLAKE2B a6f7d7e26ae70fc9ebba6318c0e9632b3033409898b83ce009a2bd23e178e319e77e6d8f545e4fc3517506119826df7df1886665cb3de97ba4614956c62f418d SHA512 aee4d451a7cd6f0f7c0f77c65295de95074710d2f788dc561ca92662f5976bb993bbd21a6696adc8fcac272162f1ead4df575bebf2f3a5872bcc1750882d353e
+DIST konqueror-19.12.0.tar.xz 7378460 BLAKE2B fc44607213ed0394f44cee39e1de876f2766129c2bcb88ca3be0de94542e2c689557cd1c7bcb5f1e11d76d58e9d056b906c8d2e9f881be1d0c4018fdcadd1902 SHA512 ce585ab7c1abaaa34579b09a5109497bbfac4a8caac769a13964053171af57338837729d5627caaaddd05678ffb59acb5baf603cb1f51814110dd2973ad28e72
+EBUILD konqueror-19.08.3.ebuild 3321 BLAKE2B 02151868526f38cd624dba0c646fa481c1246711b61caba3a491a9a725a22818b4ed2a4d917aac2cfb6d06bd9d9b9863ab8ba167b20121b26a67308f1f0c87bd SHA512 6454430327812b6f42c89fd938f677315efc7f6f2638d0de99797d883de329d44839112fdd4aa7d8e6b675ba4083bd95241e7c17dc6c7313a001e75220a36dd8
+EBUILD konqueror-19.12.0.ebuild 3282 BLAKE2B bb43db7464ae007cb3d4ad0eadb010d65578949c7e37e8bc7b83e7a14ea144a2ad2946ca8d79c3f31262ec17d6b9571d8ad975e76aff88a063d78c98f1a83945 SHA512 80fe1c4d212da95346fef45881f1eeab1ad1b0ccce413b8f127f384e426549abad30f07842041b9d43bae984e6e06410ac6f2091f81e3d25aeb4757b7b3087fa
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-19.04.3.ebuild b/kde-apps/konqueror/konqueror-19.04.3.ebuild
deleted file mode 100644
index 09642f435a1d..000000000000
--- a/kde-apps/konqueror/konqueror-19.04.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-	https://kde.org/applications/internet/konqueror/
-	https://konqueror.org/
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE="activities speech tidy +webengine X"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/zlib
-	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/tidy-html5 )
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( $(add_frameworks_dep kactivities) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kfind)
-	$(add_plasma_dep kde-cli-tools)
-	!webengine? ( kde-misc/kwebkitpart:5 )
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	if ! use webengine; then
-		punt_bogus_dep Qt5 WebEngineWidgets
-		cmake_comment_add_subdirectory webenginepart
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tidy LibTidy)
-		$(cmake-utils_use_find_package X X11)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_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/konqueror/konqueror-19.08.3.ebuild b/kde-apps/konqueror/konqueror-19.08.3.ebuild
index b65450437434..57da29eb84eb 100644
--- a/kde-apps/konqueror/konqueror-19.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-19.08.3.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="activities speech tidy +webengine X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
diff --git a/kde-apps/konqueror/konqueror-19.12.0.ebuild b/kde-apps/konqueror/konqueror-19.12.0.ebuild
new file mode 100644
index 000000000000..5c5b4e85515d
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-19.12.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+PLASMA_MINIMAL=5.16.5
+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 tidy +webengine X"
+
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	>=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/khtml-${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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	sys-libs/zlib
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	tidy? ( app-text/tidy-html5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-apps/kfind-${PVCUT}:5
+	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
+	!webengine? ( kde-misc/kwebkitpart:5 )
+"
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	if ! use webengine; then
+		ecm_punt_bogus_dep Qt5 WebEngineWidgets
+		cmake_comment_add_subdirectory webenginepart
+	fi
+
+	ecm_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package tidy LibTidy)
+		$(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 bdb6a35ee0f5..9b3e7bf9510d 100644
--- a/kde-apps/konquest/Manifest
+++ b/kde-apps/konquest/Manifest
@@ -1,5 +1,5 @@
-DIST konquest-19.04.3.tar.xz 658488 BLAKE2B c41ef9195efca35535aab14963cb8da05f41d40a23d4962754896a2a12f4b39812dcb14524963a214abc30e2058e9464325f5098a568ca12cb0046177a0e46d1 SHA512 7a8c0ca2c723e7175dcb1e19c6666e8e219ed96a6ca585cdd8951c375ae28b7aadc19f4527dc1a09faf65786b8661096b05de2b81e1878a4142f1ac0bb0cf8ad
 DIST konquest-19.08.3.tar.xz 659172 BLAKE2B c6a3b5fdacce8a22e820ab8aa922b8130792d4c91b3eb1c9ec0115fcdaefc29c04c0c6a44682e3939f20fe6239be8f01868c8d51c3d18ac516250f27f6fb0968 SHA512 d3537ca9395425bcc342884db76fe4db4208b4201dceee67c2203a9dbf3ea45c11826e5bbdb86533292b8c2c1aed8877bfec1a26cc0790be144a7399280cf837
-EBUILD konquest-19.04.3.ebuild 758 BLAKE2B c67e46535589f2d0aace9f6259c1acc177e8404a748fa47d85a8d67e7db9c819b7f37bbad254eea210ed4daa71532cd35c52cee6a07ba6499bd9bf1a28e60337 SHA512 8471bdc031fd7bc49db5d524e86ed5d223a617107860db95af32b96c3d088c48bac1ab76996288381976701bc92fd0c7c0e72584839ec4e37c6fc56fc1d5e37f
-EBUILD konquest-19.08.3.ebuild 923 BLAKE2B c5c899e38428aecdfaeb92b0f641894bfaa762c7c0c972e0831962bb614067783bb486d64000a9ff72df52421100d1ed6c94ee33e8269c4ac542ab5b4274870f SHA512 8303ebab96a6bf1ede73f071e3a06edd80644dd87b8b04092b4d1b7115160ad85107f71d61e4b15c823df67ca542c856217c5022da9bebcbdcc6fbf75d1ebdd9
+DIST konquest-19.12.0.tar.xz 659640 BLAKE2B b59f3c63480077d5853076e93690fa4668d00f99baa3a6596d72c295e4b0235275dc8e465ccef4594ce10b6213829e62f7228de4980b8350a2873a12ff28f835 SHA512 921fb6040c2173d2f6f0aac5fcdf2d03993ea836838c17de3302cbe2acc511e3e5b831f3af1fb9e82aea11d12eea9582aa4220be82e37ca13a8e0ad81144e010
+EBUILD konquest-19.08.3.ebuild 920 BLAKE2B 14e75bf7f2bc5aa886f086e7740681d77e3b428d47826b06c86c568558298c30fc9edee01d147c857e1744ebd747c38c2e19c002ccce4d8f78591d4b403e84b2 SHA512 fef88eed39b4dae8920af97b74437a81d1fffe61ef91d128ca30223357882f79a9c54688c3c236cc8f57eaec2e4f92b55bea6b4e513e621f042e77c5711c0abc
+EBUILD konquest-19.12.0.ebuild 927 BLAKE2B 8b1a554f23389393b1119b309c2c0bd487975cccda3ee9a3fa660f01493bc98e8c0ce1647a62287c9e985ce94e114bbac808e4f5230975121b38ded679240a3e SHA512 4d2190a1589a820beb2a75fd5f8affbc26f9c957ce17467a2b431701d2078a8dfdef2e3c3c6c14f14131c880e141f50de1ee8063992fe90839c74d7fc99324d7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-19.04.3.ebuild b/kde-apps/konquest/konquest-19.04.3.ebuild
deleted file mode 100644
index 9eb2063a9723..000000000000
--- a/kde-apps/konquest/konquest-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Galactic Strategy KDE Game"
-HOMEPAGE="
-	https://kde.org/applications/games/konquest/
-	https://games.kde.org/game.php?game=konquest
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/konquest/konquest-19.08.3.ebuild b/kde-apps/konquest/konquest-19.08.3.ebuild
index 4abd1959a783..a62c268dbc9f 100644
--- a/kde-apps/konquest/konquest-19.08.3.ebuild
+++ b/kde-apps/konquest/konquest-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konquest/konquest-19.12.0.ebuild b/kde-apps/konquest/konquest-19.12.0.ebuild
new file mode 100644
index 000000000000..f991efc7b649
--- /dev/null
+++ b/kde-apps/konquest/konquest-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 47dbac460259..ca5238405a1c 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,5 @@
-DIST konsole-19.04.3.tar.xz 1117408 BLAKE2B c5b0bf8800f24d464c4fd0c24203fe6df95f293959d3c2357c97323980c58bf034586ea9eee1c9bde784b754110d3520ebb3fb60d9b7815405a9d65570b06dbc SHA512 20ec8ae12268110f00999b9f1197aff667ee2af7d7c2747b4d142c9db48fceaca7c01ab8f12fbc541cfc79eaebcbd704e166610f263c46083ad9fefb3c5da848
 DIST konsole-19.08.3.tar.xz 1147832 BLAKE2B 65d781a3a571b2c80d496c5885d517c9df89623858ce0fb6954d05eabc497add8fcc546b7994413d93de613877e30edc7bcb4944a1d95fc2c443c66d95bc0510 SHA512 140a34b8f73786557b71ac5b23b500950c598ef88795e660c7fde3077c9f5d842ae1eed73966eb14dfb54d2833fa63c310fa2cb340a81c30f31fdd77e9f263dc
-EBUILD konsole-19.04.3.ebuild 1419 BLAKE2B 765b1104d279359f6b9622159fcfca9d53a32bf068439af214d34beb01b4e27ef6d4fab3a4193efeaffc1696b2dc36926fbba19f9708094441e73aca3e70401c SHA512 5f0dc638cf96a5cb27584446f79314cd06cf251a59be79494110e821ec02894aa518dd67cf400e610ca1affdcef0067955f0927965a1056b0bf4e4c243050e2a
-EBUILD konsole-19.08.3.ebuild 1667 BLAKE2B 07cab1e962a2585b7d089f9ee0b7c05a6010225f598d6871179e9b5f64a32349142eced7bd813c8ba992297ff1fe554b80fa71c86a0aefe6a6be9b0a39f74d19 SHA512 a2a897935ae53bc97460f76810fb70849686da7a5d032f4b59d526be9f89ec2340a9c59a2d280216f809ce0bc5e3c97c23d01b272f979c9c43ce752a0b162edd
+DIST konsole-19.12.0.tar.xz 1161060 BLAKE2B eaf6ede4a4de55ae9b4436c5dd29e3c002ef32e3d568775c9aebed679662b3ea3cd053540ff506134e55023c3ade6c10f4925e3602b42dff2aea34d454aa44ac SHA512 3a9bcbc9c07eafe178406d4ea5eab06c24ede5fcb7ad43dc8b0a46776cdd64ce6d2033ea1083f648370cdb50eda4e93ec1cdd76e318a2d7ec44f46b4be75e89d
+EBUILD konsole-19.08.3.ebuild 1664 BLAKE2B c5bbc16b2c9114fd2d186f1b5873652c0179589ada8c831ff280dbdd6ea1f6b6feaa4751955cfd0133b23a27c6d60eb08fc2a6daf7c0e40b111100ca17fbd70d SHA512 0c161200c93f59b49de2b0fd371eb6f8d28a172a8d14d6aab1ccfc21a7df1d86b0bd47eea6a548fa42d6f4b447381437d958cbb767308d72d91e489baa15e783
+EBUILD konsole-19.12.0.ebuild 1669 BLAKE2B f267af4f85b38e28a1b135c95f96542c4fdb1d3fa729d679f301bba9fda9b258a3986636adef5768db17eb08ae7a46db6da19fe5ed9b9026906935a13e15f220 SHA512 0aef44535867e16fe90ff032ae1842fbee678fd20204ec497494a6a5e8ee20f17766d6548edf7a9c9aa012abbbcb65d1dd4726cf0191782a3e3e53c529c98699
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-19.04.3.ebuild b/kde-apps/konsole/konsole-19.04.3.ebuild
deleted file mode 100644
index 149525ca79fb..000000000000
--- a/kde-apps/konsole/konsole-19.04.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE's terminal emulator"
-HOMEPAGE="https://kde.org/applications/system/konsole https://konsole.kde.org"
-
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/konsole/konsole-19.08.3.ebuild b/kde-apps/konsole/konsole-19.08.3.ebuild
index 1f6d3ecd4d4c..661c542361cf 100644
--- a/kde-apps/konsole/konsole-19.08.3.ebuild
+++ b/kde-apps/konsole/konsole-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/system/konsole https://konsole.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/konsole/konsole-19.12.0.ebuild b/kde-apps/konsole/konsole-19.12.0.ebuild
new file mode 100644
index 000000000000..893e8382e61b
--- /dev/null
+++ b/kde-apps/konsole/konsole-19.12.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.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 ~x86"
+IUSE="X"
+
+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/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
+	>=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
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index dc916d852c81..c4e6e204aa16 100644
--- a/kde-apps/konsolekalendar/Manifest
+++ b/kde-apps/konsolekalendar/Manifest
@@ -1,5 +1,5 @@
-DIST akonadi-calendar-tools-19.04.3.tar.xz 223328 BLAKE2B 47f16a483f49f27d203db3b0627532b7b928f18bead7e22176b340698e7c2e52322139ca92cae9a776b239d9d741656ec3c943eb997c1dd5064da4d818610474 SHA512 d4c61f04861b26fb01b0cd76056fa5107e0257e7b2c118596ed40d87a3cffa8526889bc82b45f9d3cc61d1d4d25518bbeca56edaa028d02f779b7880df2522e5
 DIST akonadi-calendar-tools-19.08.3.tar.xz 223564 BLAKE2B e0d9f01659a471307db2c7d8c0906297ec4a880cb0019414520b29a14eee68bf39b02d02dd4e5b3b03c3684022f675f30cdb6efb214adaca64dc27f5eec03c25 SHA512 4cc146da96f6a006749e4c3e0962155fc8bcd788d2ed39adbbe73f1d82bc4264349ce06a9b524ff4fb1a1675e0d66345e5bbad8044360b6fe28d9565672f3922
-EBUILD konsolekalendar-19.04.3.ebuild 906 BLAKE2B d39adaa126791ef561215ef2bbaabd40e033a7817e4c861c9713933b4350507138842c60cff0e00bb67fa31dc944d8a6fbfbd57fcf90ca2d89336f08125bf97f SHA512 a16ddf5977018065599b41f76455ec1042670a2a3b72ef1d98ac635ba7e87e8e7871ece48187cb7a5abbcf6e366e0a0388f1ee715313d550ab067241c58f62af
-EBUILD konsolekalendar-19.08.3.ebuild 1008 BLAKE2B e913a9658ad77ceab3df743350b791d8b95106a0eb6a902ea7c7495ad8113dff5774867eabb69f6dd5c18b27787cc7382bf12e4550b67c37186edc8a88ebf265 SHA512 c96092a978605d1006130755857c4815523b836fb51214c77fbc6cea3dcb5da765f1d1492f869f630b5869f457f5aa3ce6518e118c36d9a3c5a79d286cfef94a
+DIST akonadi-calendar-tools-19.12.0.tar.xz 223424 BLAKE2B 042182b9884f5b81f91eec2a92e37db9244ce30b4360358f958dbaf317e2bd6d1b5a8c40e8336d0560b4cfac9f3428511459435d40f723f9f9832b190efff601 SHA512 90df1342f3685df0c0496d83dc1b483d0c126bbc7ad03d6abd51c421c5edeae18b3b677b790e3646f55bfd37d27d9aaa0f484ac8983755de20b187efed34cd76
+EBUILD konsolekalendar-19.08.3.ebuild 1005 BLAKE2B 8b7cb9be10c44b63cff9a225b384bd290792bc89dce5861f49df72c47e3c26992b690a2ecb1b121ecb2b8fbcee278deb0ada10aeb642eb3eb695318a31ec9f76 SHA512 c70f745e3821e6f99c4bcbc749dee696a8762afff468f65f1ec19845ea48d806e107cefc37d2ec0de5cd388044e0577fe448533920c8c4e0f142cbed9943dde2
+EBUILD konsolekalendar-19.12.0.ebuild 1008 BLAKE2B 363f75c542e835fa9fce7c90db71074a7f346470c97ab757cf44f9b25b37d83c13d4524343823d1435f0b4c90a5bae313fca436305e18366e5215ad2e937367c SHA512 3c22c019b8bf83cfd0c9fab1f204e24104376a9415766efc5cc99cd3a247c262ce554ff60b2ead542aed641bf30c6a720be5c8bd140b8930d974d098898aabfd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-19.08.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-19.08.3.ebuild
index d59e0d58720b..1e11ae1e64ac 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-19.08.3.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konsolekalendar/konsolekalendar-19.04.3.ebuild b/kde-apps/konsolekalendar/konsolekalendar-19.12.0.ebuild
index a8f3fb3e4d75..daa297354896 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-19.04.3.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-19.12.0.ebuild
@@ -3,33 +3,36 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KMNAME="akonadi-calendar-tools"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KDE_ORG_NAME="akonadi-calendar-tools"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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+ )"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	# delete colliding calendarjanitor translations
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then
diff --git a/kde-apps/kontact/Manifest b/kde-apps/kontact/Manifest
index c3e27f9fb559..367f3c173271 100644
--- a/kde-apps/kontact/Manifest
+++ b/kde-apps/kontact/Manifest
@@ -1,5 +1,5 @@
-DIST kontact-19.04.3.tar.xz 793564 BLAKE2B c2ee2208337108cd05f450ecbdfc1cea210f93a1ab84cc09b40e32c3bfc699594d055938483f98d79c1dafe008d69b0a8c95a5564e46f434af5ad6ff423d7d04 SHA512 7fe6a773dfa329dc7935d7ce44906cc0bbbdb9b844a5927e07fd988a4c36dcedf3c01c9895d02bc97ac7ee0a5bbee0e0892ed5efdf794d6ff266ca5933782b6a
 DIST kontact-19.08.3.tar.xz 794920 BLAKE2B 516e3629fa76d123ad13f72899792542f25ea5f403cc6c2bceb2d21c6803c6f9cdff85dfa2a416b3a7a3e2fed527687ab4e3df80e3e8d6e9731c68ba7cfb0cda SHA512 1ff2e0abc2190b43dff223aa870901230cebb1e6badb7d50a501448e1c7def24b28149712c2856fbf312ca2005160d263f2b2920111c022f59c39e7edb441f74
-EBUILD kontact-19.04.3.ebuild 1204 BLAKE2B c387f726c8590b959c982edaed7dbbf1b890754a83f78a5a4910a04fcc59d74cc635b11c3b1a77ec801db17b1ce9138e71c302327eca4c3e835d2345ab277cd1 SHA512 1312b313b4439aeee416cc848d9de7fc0294f90a25d9ee8d65d1f140b2bb6396c04f8bd6fb7489e579a7bcc28e62c0592d1321d9621151b6ed1b0730f3564c15
-EBUILD kontact-19.08.3.ebuild 1404 BLAKE2B 61b1545bcb481851b9558f69850143f307bc17ec16ebfbd7536be9bebbb755b460d2720a63224f01848345954dc9511186d2950383627262fda22be3acb9634b SHA512 dbbc388a340ebf895ed4595b6d01e3b18b51681a114da4848a624672953bfbbabef956d5cb708c6f71fef0448c596ddf5339d425c1d62a60ab461ad56bc313d8
+DIST kontact-19.12.0.tar.xz 794248 BLAKE2B 8ac605293551a9ae318c365176b95ead4eadc76992cb16bf50fe1bf5151dcc29862e66bd3244655fe188f8e39580d18a069c5e544c2e4dfe1c1375c818c31049 SHA512 7cfec4b821b194746e203fd5e273c9d9643413e5441f357a58a2e9a29971a717271ed9803b91f0e71d01a4b6f3b92caec5c559f23ad433f1f503a06153b6a523
+EBUILD kontact-19.08.3.ebuild 1401 BLAKE2B 3ea5a55356972f03dc30c26d2e7e206cb971376c7a220ff4549e3550aa574285dc8e5ee21f0545b1dbbed50fb39ba1737560f90db9686e7a87d1b11b1c58ae10 SHA512 1ef980d849c6eb193d046785ea44866365375eff6d639c6cc37035f222a376f8f68fe84a7c93c9c51b5c4644d69557a5a297563fe216cded46e072d5ec6a5f02
+EBUILD kontact-19.12.0.ebuild 1493 BLAKE2B 7e8561dbae2ca0d31adb057832938a9b4817f5b4410fe6ebb49fe6d3c2ff7f162772c07d69f1c52821ef972e407aac540ad63ac9afd9542f50805db5cad5bc04 SHA512 0cb7dc00918065f321537745b6b0f717cb40bede51511c4f6cfcfc5668863b32bcb958df4d30c4be99ceb8f3b5206bb69ea8536d0141bd25a72d321914f6ded4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-19.04.3.ebuild b/kde-apps/kontact/kontact-19.04.3.ebuild
deleted file mode 100644
index 866056f843ab..000000000000
--- a/kde-apps/kontact/kontact-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Container application to unify several major PIM applications within one"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontact/kontact-19.08.3.ebuild b/kde-apps/kontact/kontact-19.08.3.ebuild
index 7d015af34bdd..e9615e603eba 100644
--- a/kde-apps/kontact/kontact-19.08.3.ebuild
+++ b/kde-apps/kontact/kontact-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Container application to unify several major PIM applications within one"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/kontact-19.12.0.ebuild b/kde-apps/kontact/kontact-19.12.0.ebuild
new file mode 100644
index 000000000000..e37bde2b7345
--- /dev/null
+++ b/kde-apps/kontact/kontact-19.12.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kontactinterface/Manifest b/kde-apps/kontactinterface/Manifest
index f4266ca9fc8d..c4122e1bd4d4 100644
--- a/kde-apps/kontactinterface/Manifest
+++ b/kde-apps/kontactinterface/Manifest
@@ -1,5 +1,5 @@
-DIST kontactinterface-19.04.3.tar.xz 33288 BLAKE2B 860f560c94755b6040b63029627cebd5007428aaff9c14379ca1c7be3fe0851044323ed3c29e00fd5dcdb0c1e3dacfa430e69d463b08b9397dba03f36a52c44e SHA512 f440b659cacf3e6ba16f0f7e412b7bd72d603412cf7cbe05e38211207124437f5ddd02b799895042246a75d31a554189e5b63cc5a8d881c066c0a76c48840642
 DIST kontactinterface-19.08.3.tar.xz 33176 BLAKE2B 9b9c3b644cc680e83ab6f11afe390c5d967318174a03a5577bc425f2a8f74d5202714d1877f48a17a5c4c16a431d2ab52bf194e615a020ba4a4311b8d74343b5 SHA512 b043fec0f67110f83830c674fdebd18413637542e975989a29e6ce1e1299637c5544b2374e07164af5cb3f19f525003e00eb318eec1c728cc508261b7b733ab9
-EBUILD kontactinterface-19.04.3.ebuild 595 BLAKE2B 60e01033cc6ccedd4f8cc6404160f0da985b083ddff4ebd7a867ffae02681b70e3cc0aa0d85137a0985f5d691a4cf99a31461d77c1812b8b9d12ec8b6d04ab87 SHA512 d0f5d266bd245a2c88e8233e01fab5b4306a417dac585eee97c20f3413fb1622c4011984f3ba0bea808d46523c80390c5b3f7f9d594ade69e7ac2eae11cf9d3c
-EBUILD kontactinterface-19.08.3.ebuild 700 BLAKE2B 1c1498c9ff13d4e331dc1a3e492f86d2c033fb8471cace962e257c76d32b0bc3df3d86890f5f075ecc66268ceae97541df571c745425ee865a9cde21af0faa98 SHA512 8cf416718bfb967ef0523afc403d803cdec275fae171d04ebab33cad218bc9a0c780be89cf1e0b39c1921fb537b1c75363cdd8f6b308900d2323288d106871d1
+DIST kontactinterface-19.12.0.tar.xz 33180 BLAKE2B 3845a1dc9eade56ba32d64c70c9e7a8f0ddbcbec67dcaaec085c9c7eeb551d3094694274e372ef53c53abaf4a983096d6cd5e764dd0e819f7a19db7c1e10e4f4 SHA512 933cc3bc2904b343bd65253a89fcb81ab56a529e502cb639d3ea662ee83f339d406891c34b3f3b799fb458ebb67551604fc0b0a89c40d0d51896f385498d0c95
+EBUILD kontactinterface-19.08.3.ebuild 697 BLAKE2B 6330f35e477c6f264eecfba4c7d01d13ca1e44ba0dcc344c4a153e01e799ca38ae091f381b270f18f8630eeb64749cf2396dbf5660fd368e7858178a135df1ee SHA512 08c0fc7b1f8a6a7e64f41c97812b377e21cce70fd5ee2a964ffd928dfd594d71c783aad565d2589ea8534953786438ff7d32f21e925c94d5c7f929b70dfa0e7f
+EBUILD kontactinterface-19.12.0.ebuild 731 BLAKE2B a32e9631fc60c5159d6493b76e4c540399c001001047752494d858a9c150ec03ce10dae5ef5817f8b8c2c620c1657e59d5e7e6ff2029297d3cf0eaba250a2d81 SHA512 c7f201ac3c02d40e74632a6ad6c52cae4873ade50b96485bfd9f4017eb61b27913ee6a80a793b86713e1af7dcfa1dc8eb2de201f0c2eeadab8e2920c2f17061b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-19.04.3.ebuild b/kde-apps/kontactinterface/kontactinterface-19.04.3.ebuild
deleted file mode 100644
index 9a2859d49de7..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-19.04.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Library for embedding KParts in a Kontact component"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/kontactinterface/kontactinterface-19.08.3.ebuild b/kde-apps/kontactinterface/kontactinterface-19.08.3.ebuild
index a743fd5932d1..c9f58293d29c 100644
--- a/kde-apps/kontactinterface/kontactinterface-19.08.3.ebuild
+++ b/kde-apps/kontactinterface/kontactinterface-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for embedding KParts in a Kontact component"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontactinterface/kontactinterface-19.12.0.ebuild b/kde-apps/kontactinterface/kontactinterface-19.12.0.ebuild
new file mode 100644
index 000000000000..8fa2fe228643
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-19.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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="
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index a5e6bea2a66f..dd0831107b9f 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,5 +1,5 @@
-DIST kopete-19.04.3.tar.xz 9361392 BLAKE2B def10363b7915b83fa326394275e8901c1509287ae039c12ae488f13d507172ab376fc57003169e61426e6f98b90abcfb8499e39f99b9b607cbc4d007c9e1ae4 SHA512 eeb3aed92512976503abd81454433f3ddcb397ade98dd3b21091eb81dad838c57c07d4d4131e9ce0757d54b51ba5f7d50e553e3d864fc55e0602ab5242b969c2
 DIST kopete-19.08.3.tar.xz 9367624 BLAKE2B c7f33d5666f1e72c978c48482ec5c0d260310cf4a90e6ed913b6f2130537db3d9356761bab4186183bb5b86c61ca63303da27dfbb7a6386328d2b85bece23e40 SHA512 41bc20909ec15d6b3cd7c975363dae7a4822a6c563cc721dc2c7afc3ec6c71bc2b7fa90d08d36dedff63e0c68443c55a794743ef0d65b85306a472babe0f2c12
-EBUILD kopete-19.04.3.ebuild 4494 BLAKE2B b63141893bda97e60e931a359722fca6d1f6aa9d84e70f7a88d9e30de39f431451821b312bed179bdf347b11a6f4769426840a55e60e108ad25f5d4be1f42df7 SHA512 5692c604836f16e8c3678029d581b24bddf8e61eadc3be86649667d408fd47ad4b3d8f5d455be2f7f7d7d0c7da02939a46a69d52978c0a4f1624ab2c123e4810
-EBUILD kopete-19.08.3.ebuild 4720 BLAKE2B c7d52f100307ebad824057d2b3f9db11667d7793a901bbeb2d307a4bfe649fc9d797544c5f0fa343d37b18ffa841be3108ccf232503ed26d4a62f2d7225a3045 SHA512 f26d776becf380e68bc485f3106826208136bca21ffc7b1dac44fa3669a8085ca98cf929d1be59b41a7e0cbdf11bd95892c1600dd69d7b95596b79871a255e28
-MISC metadata.xml 2161 BLAKE2B 84471657b718896fb48148e88a6d42ea8779d0a34a459a1a134b6a2d5ded707ff3348857521e96d5f7643e100b249aff5b2e77bec686991511851f1890a7764a SHA512 e884576673c0739b0a3b2a12e6cb33ac83da1b99b6f2440f78d6cdd7689cef7622ef7db44bcf6246311754246c0f896d3ba4f5d46580ed5feb365ebafbe910a6
+DIST kopete-19.12.0.tar.xz 9386240 BLAKE2B 4e6c439f6554786feed37ab736f86d12bc529c2f78713f987889e180bcb2d1f3e80ad79712bd84c935dc403c556ee50ff322b933ab746dd61c0cb63c34ace373 SHA512 fab1e74fbee8606f5deb3bd75f69ca78c448ed926309d3efff9ed83eae2334aef84dd21d73d0434f0248103ad2ab21274259aaad8b977be361107b6eb38d8c8d
+EBUILD kopete-19.08.3-r1.ebuild 4711 BLAKE2B e5919dcd28d222a80e0e20689c790d2f563ac00e5f9a3314412997a30d4053e9cfe0ce1f290ba2477f4125e6d814651c355fc8b060c3b785a341a12631b16d49 SHA512 70f6b3d91d82f80648c8a1581067f3270081fb819053306cca020f2b95004ce3901b142456c3f60e899df87df1b8cb4ad238a223ad369d8c73f0dcafc16ed327
+EBUILD kopete-19.12.0.ebuild 4714 BLAKE2B 2e3891aa4decc9ee7856424e826e8c62a5c31b45ea800df4e3a916a92911c5029f2e94b0ed24066cf026817ce55c3f2b961bde4a644ff68bc02ef9c88bbc78b5 SHA512 d04a5bb2031aa5715f5a48d4164025680780403fecae29d29860eac42c0014bbbbe837fd6bf227154388da7ca996fd12b3e11919afa9828d4149a125b89277c1
+MISC metadata.xml 2102 BLAKE2B 8d82dc772819389b671c1661ad0be0f97703668a6a940c2e142163f4f6e06c110e6d6146144d12ef04b37fb6eb06c57d0bdb766f2c8155848174529111933f2a SHA512 5ca6a22e974c0cb1a24d0dba5ae3f5ff2a860354d653b800655640679c179b90331f436b4ab62338e22e01e145b7c7df2cb9bba82ad8d02436dbbd044d1bfef8
diff --git a/kde-apps/kopete/kopete-19.04.3.ebuild b/kde-apps/kopete/kopete-19.08.3-r1.ebuild
index d6c4f2254f30..d72c9101bfd9 100644
--- a/kde-apps/kopete/kopete-19.04.3.ebuild
+++ b/kde-apps/kopete/kopete-19.08.3-r1.ebuild
@@ -3,17 +3,23 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/Kopete https://kde.org/applications/internet/kopete"
+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
@@ -40,17 +46,17 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	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 jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+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)
@@ -58,42 +64,34 @@ PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 	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(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -105,13 +103,21 @@ COMMON_DEPEND="
 	xmpp? (
 		app-crypt/qca:2[qt5(+)]
 		net-dns/libidn:0=
-		sys-libs/zlib:=
+		sys-libs/zlib
 	)
 	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
+		>=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? (
 		|| (
@@ -126,8 +132,8 @@ RDEPEND="${COMMON_DEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
 "
+#	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
 RESTRICT+=" test"
@@ -137,11 +143,12 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
 		-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
@@ -161,11 +168,11 @@ src_configure() {
 		mycmakeargs+=( -DWITH_${x/+/}=$(usex ${x/+/}) )
 	done
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	if ! use ssl; then
 		if use xmpp ; then
diff --git a/kde-apps/kopete/kopete-19.08.3.ebuild b/kde-apps/kopete/kopete-19.12.0.ebuild
index b63404fc64ea..6c7ba9683a0f 100644
--- a/kde-apps/kopete/kopete-19.08.3.ebuild
+++ b/kde-apps/kopete/kopete-19.12.0.ebuild
@@ -6,19 +6,20 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
+KFMIN=5.63.0
 QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Multi-protocol IM client based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/Kopete https://kde.org/applications/internet/kopete"
+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
@@ -45,17 +46,17 @@ otr pipes +privacy +statistics +texteffect translator +urlpicpreview webpresence
 #	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
-#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	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 jingle meanwhile oscar testbed winpopup +xmpp zeroconf"
+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)
@@ -63,6 +64,14 @@ PROTOCOLS="gadu groupwise jingle meanwhile oscar testbed winpopup +xmpp zeroconf
 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
@@ -78,27 +87,11 @@ COMMON_DEPEND="
 	>=kde-frameworks/knotifyconfig-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/libkleo-${PVCUT}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	app-crypt/gpgme[cxx,qt5]
-	dev-libs/libpcre
 	media-libs/phonon[qt5(+)]
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2[qt5(+)] )
-	jingle? (
-		dev-libs/expat
-		dev-libs/openssl:0=
-		>=media-libs/mediastreamer-2.3.0
-		media-libs/speex
-		net-libs/libsrtp:=
-		net-libs/ortp:=
-	)
 	meanwhile? ( net-libs/meanwhile )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
@@ -110,13 +103,21 @@ COMMON_DEPEND="
 	xmpp? (
 		app-crypt/qca:2[qt5(+)]
 		net-dns/libidn:0=
-		sys-libs/zlib:=
+		sys-libs/zlib
 	)
 	zeroconf? (
-		>=kde-frameworks/kdnssd-${KFMIN}:5
 		>=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? (
 		|| (
@@ -131,8 +132,8 @@ RDEPEND="${COMMON_DEPEND}
 #	winpopup? ( net-fs/samba )
 DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
-	jingle? ( dev-libs/jsoncpp )
 "
+#	jingle? ( dev-libs/jsoncpp )
 
 # tests hang, last checked for 4.2.96
 RESTRICT+=" test"
@@ -142,11 +143,12 @@ src_configure() {
 	# Handle common stuff
 	local mycmakeargs=(
 		-DWITH_qq=OFF
-		$(cmake-utils_use_find_package jingle LiboRTP)
-		$(cmake-utils_use_find_package jingle Mediastreamer)
-		$(cmake-utils_use_find_package jingle Speex)
 		-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
diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index ff8a38c8d6a7..414ef28fffea 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -12,7 +12,6 @@
 		<flag name="contactnotes">Enables writing personal notes for contacts.</flag>
 		<flag name="highlight">Allows you to specify highlights on specific events.</flag>
 		<flag name="history">Enables saving chat history.</flag>
-		<flag name="jingle">Enable voice calls for jabber</flag>
 		<flag name="latex">Embed latex formatted text into messages.</flag>
 		<flag name="nowlistening">Shows song you currently listen to in your status/etc. Bindings for many players.</flag>
 		<flag name="oscar">Enable Oscar (AIM/ICQ) IM protocol support</flag>
diff --git a/kde-apps/korganizer/Manifest b/kde-apps/korganizer/Manifest
index 0783300dafe8..2a09b7d32129 100644
--- a/kde-apps/korganizer/Manifest
+++ b/kde-apps/korganizer/Manifest
@@ -1,5 +1,5 @@
-DIST korganizer-19.04.3.tar.xz 2223788 BLAKE2B 2090eb113fb29d7d6ed82045b54b4092e9509440c9f08134104261b9316e08784c23c3bfc98b65eb0d23f3dd64843a3788683cbb02adb9af48ae2007365bba41 SHA512 0aad7bec431c181f50c2e86b52cd6bfac969243a4f418adf8362a5b686ca0fc433f4520d7c1eb995fd655b717048831712d9bf38cb42f598f9d2d5847e55e269
 DIST korganizer-19.08.3.tar.xz 2222956 BLAKE2B 04b723d856e87dc710e1a27cbd4f8f7790c8a587d7051fdfcc838ebf798d2576312268ad39090c2afa6c5ad764955229ea9b224eadd9cf93c0cde85d1ebdbab7 SHA512 f51b2c569d68a1450cf1f57ec168e33015ebb45d4ff8f5e936523e154c72ad349af2d9d6e7e6269486557d6fe27ca7e24da0591c603fed13eb93e6443bdf4f62
-EBUILD korganizer-19.04.3.ebuild 2492 BLAKE2B 9ec99a774509eae73a2c2e79bec181cbd17d0bb93cfb2910838c526a1cb79c40530c4a98788d593b4d0acbd21617d2b565ef17c73d352a7406c624e77325f209 SHA512 b1a68a3b998e8ab4a5e79285fc1de6a42fe389f60ff2252aa88ea994ac00fad8d6520b1a355f225374937de04b134aac99ad96d3e39ef846e5eb97d78aefec20
-EBUILD korganizer-19.08.3.ebuild 2813 BLAKE2B 321e49549a607f1f56fa3244e671b3762cebf2ebf798f725f1f4f62ade50edfc481e8dee03978d3a3369c3f3d52121b96719dea67bbc9458373b5975810e37fa SHA512 a13fef4191a56120ad94ca65708682d1ca89d7b113538e819c86f2108fed788288bb28dd3bedd35f36ee615b5936e477cf408feac3d8f52194f7dd766548d55d
+DIST korganizer-19.12.0.tar.xz 2227452 BLAKE2B cf4072d26f2ec23b85de6678d845a517b1b31fdde95b6d3997093dd00a2537e032fa7c144cfbe99032a713d03abcc5302179feb94d45a757ff5ac9baaa3abf50 SHA512 517d6e3f8665344e865d8f62743e694546881c8fc4a5c916f0172bff2397b96bd84e2fcace7c5649fd03ff8cf36cebde146106ec4348fe78e9591033ecaf0d95
+EBUILD korganizer-19.08.3.ebuild 2810 BLAKE2B 457d797d3d89a9673f81e72d6c43ea90bc0494de768216ee755b79af6a7ebaf7c51823de5bb63bf957d0423f0a2f384248f9ef3a87c1105a0302687334187a18 SHA512 3628dd1ecf5efb4a8a51d91d4b062b62eec13f56016f85848d9f66c10aad5b69f4df716466d315f47c0ff8650cf5a423ff8ca10eeba9858a7447b59f31931961
+EBUILD korganizer-19.12.0.ebuild 2815 BLAKE2B 474f6983851dacc8f61bef6ab5eeca37bf9ef006cdfd3c8c5e72b1aa9b722f67a06087120f3d21dc6bfb624476ab34c62c9e89beeaffa0174915af2efda9ed85 SHA512 cf0f1af63f850cc173e350a3be1a77570873a226322929aa672f923432059e146899d93bef37cf111679b5ded6e22d9c075406be79a4056ab3ce6935a3ced3d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-19.04.3.ebuild b/kde-apps/korganizer/korganizer-19.04.3.ebuild
deleted file mode 100644
index 77dc1a1ec08c..000000000000
--- a/kde-apps/korganizer/korganizer-19.04.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
-HOMEPAGE="https://kde.org/applications/office/korganizer/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-BDEPEND="
-	test? ( $(add_kdeapps_dep akonadi 'tools') )
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep eventviews)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kldap)
-	$(add_qt_dep designer)
-	test? ( $(add_kdeapps_dep akonadi 'sqlite') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-# testkodaymatrix is broken, akonadi* tests need DBus, bug #665686
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/korganizer/korganizer-19.08.3.ebuild b/kde-apps/korganizer/korganizer-19.08.3.ebuild
index 7eabd1e6f519..00f2f319dcf1 100644
--- a/kde-apps/korganizer/korganizer-19.08.3.ebuild
+++ b/kde-apps/korganizer/korganizer-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Organizational assistant, providing calendars and other similar fun
 HOMEPAGE="https://kde.org/applications/office/korganizer/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 BDEPEND="
diff --git a/kde-apps/korganizer/korganizer-19.12.0.ebuild b/kde-apps/korganizer/korganizer-19.12.0.ebuild
new file mode 100644
index 000000000000..f468538ccef5
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-19.12.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 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.63.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="X"
+
+BDEPEND="
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
+"
+COMMON_DEPEND="
+	>=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
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kldap-${PVCUT}:5
+	>=dev-qt/designer-${QTMIN}:5
+	test? ( >=kde-apps/akonadi-${PVCUT}:5[sqlite] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	>=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 X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 476bf85d0d2c..17120c6628dd 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,6 +1,5 @@
-AUX kpat-19.04.3-missing-header.patch 1371 BLAKE2B c557139aa81f5d5258a51de0fdceeac125c3649a658b1219fa2e311b5c3491f4c577d3c1aaa13f2d4cbb4cc6d122f26629e98bd79c15dccf22e1ad9bed293259 SHA512 9f52f0f0a079113e7911c877b8b716765abec188759faa4851ca7cbe8a0a3a47cf95d23d48726707e3c839b244809dc36716d9b04a40f18f0873fe684bfaf68c
-DIST kpat-19.04.3.tar.xz 3576096 BLAKE2B f086f7ac962171a9f2faf75f3a44ddf71a6c4ca42277178739596475f6333741b1de14bbbb27c7cb9b3076bf483d9717d041e7d7482f2ac9ca643e10993f58b9 SHA512 67ea63fc76fe95c10093a4d28575aa22c211312627323409f11c7973992f6afe009dc6d31433b42391f44f3f4930f0a6743d8beb59df1558697c2db5f8303eff
 DIST kpat-19.08.3.tar.xz 3578320 BLAKE2B eae35ccd8694d99bcc08b51d9c2671b57b7a200777a10568e81ffa74f1c402cc06ce6bf3540d994542bb3856f991f47d23df1ff3e2a077a2c56d4590d0a9ab1b SHA512 894f97b86a852b5310734f90cffc68970816e4514390797e3a2c43ce102a9c624f2b52ad851e78f1c182f45bedecaf496da6b812e0bd6d7c5c60d79133e1d6a3
-EBUILD kpat-19.04.3.ebuild 909 BLAKE2B 79adad702ef3d4179e0ef026f9721bafc1843058d0f985b709d457c0f671006d71ce8690099f04fd9acd1862e5eb95125ad69184f3c442f2ed50a2364ca602ff SHA512 79cf34949f36b3487e0416766dc13e4a3793356d2d19f1ddda93fc1d9e6820bf6d7f50a9d4542ef1ed19a91d3496c1a9b77010697eee57b16916d4c485462922
-EBUILD kpat-19.08.3.ebuild 1045 BLAKE2B da8673f073e5eed56ab9542f1162012396d40a680c92192fc200cb3cf693f17b0e2afd9a04b27cdfd37259b6f1f64afc156029fb43f9459897418c80a1b3e0b4 SHA512 e820614e56824e7df8da5f181da9e3db300ed087cbada0634ce9e2259e17964dbbf8d620a8d4016a4092e88dcae32ad314668caf9eff960969a5b56363aac7b0
+DIST kpat-19.12.0.tar.xz 3577680 BLAKE2B 443c9610670fb67fff257e64f50a7eaac1ca47a635e214fa91ef0a2025f624b2adabcd7308223def8a200e7fda4cf3a4eb20a635dfed56cc572afa913c81b7e4 SHA512 40a620ed2f3cdde626d816e2c6032d659a02a85a1e2229b0acf139a4842e38d55edb68f40d4a4880ddf7508c2ef744ba6545136d12d688755d1707711ac05e12
+EBUILD kpat-19.08.3.ebuild 1042 BLAKE2B 51f4240bc2dd1f24b6f434012835acb89af6aaf3d588003bf5474014c6f575ac7c6d7867061ebc158f615423279c1df811fa6a6cba771e2696f39b36a2d0b2f8 SHA512 b86324c5829b92e98d1bd9843c47d3d020fa12d63a0adbf700a18af72f5fb5224eab163c38ad2db38239fb2284eaadcfee5bed5b0f0f5f35a1bdd1e49b1893b9
+EBUILD kpat-19.12.0.ebuild 1094 BLAKE2B a6c751b14648fc6417edc45739a8628e28be5daf3a4300c4fe2b6dac41d83068e40635988a90093cd105068aed8fb1297794be71d7458531e8ebafe57c520afc SHA512 9aa6e4c3e0856f5013af1c5f94bde9829d221a5ad3f1aeef1b14c09665c345ad197c7ccaa1cd6d4c9745e7af6682358f7d90ebd548b1037495c720f2354d64e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/files/kpat-19.04.3-missing-header.patch b/kde-apps/kpat/files/kpat-19.04.3-missing-header.patch
deleted file mode 100644
index be272b75f4ca..000000000000
--- a/kde-apps/kpat/files/kpat-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5b68765dcd431bca55582c4996adf73ed0ac0123 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Thu, 18 Jul 2019 23:28:57 +0200
-Subject: Add QMap include to fix build (with Qt 5.13)
-
-It looks it's no longer included transitively.
----
- mainwindow.h | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/mainwindow.h b/mainwindow.h
-index 0d6b2da..ca6ee0f 100644
---- a/mainwindow.h
-+++ b/mainwindow.h
-@@ -23,7 +23,7 @@
-  * -------------------------------------------------------------------------
-  *   This program is free software; you can redistribute it and/or
-  *   modify it under the terms of the GNU General Public License as
-- *   published by the Free Software Foundation; either version 2 of 
-+ *   published by the Free Software Foundation; either version 2 of
-  *   the License, or (at your option) any later version.
-  *
-  *   This program is distributed in the hope that it will be useful,
-@@ -53,6 +53,7 @@ class KRecentFilesAction;
- class KToggleAction;
- class QUrl;
- #include <KXmlGuiWindow>
-+#include <QMap>
- 
- class QLabel;
- 
-@@ -127,7 +128,7 @@ private:
-     QAction * m_upAction;
-     QAction * m_downAction;
-     QAction * m_cancelAction;
--    QAction * m_pickUpSetDownAction;    
-+    QAction * m_pickUpSetDownAction;
- 
-     KRecentFilesAction * m_recentFilesAction;
-     QAction * m_saveAction;
--- 
-cgit v1.1
diff --git a/kde-apps/kpat/kpat-19.04.3.ebuild b/kde-apps/kpat/kpat-19.04.3.ebuild
deleted file mode 100644
index fbe9f755a2f3..000000000000
--- a/kde-apps/kpat/kpat-19.04.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE patience game"
-HOMEPAGE="https://games.kde.org/game.php?game=kpat"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	dev-games/freecell-solver
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
diff --git a/kde-apps/kpat/kpat-19.08.3.ebuild b/kde-apps/kpat/kpat-19.08.3.ebuild
index ad66db73cfb1..87777cdbc133 100644
--- a/kde-apps/kpat/kpat-19.08.3.ebuild
+++ b/kde-apps/kpat/kpat-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE patience game"
 HOMEPAGE="https://games.kde.org/game.php?game=kpat"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpat/kpat-19.12.0.ebuild b/kde-apps/kpat/kpat-19.12.0.ebuild
new file mode 100644
index 000000000000..f7c0bf9f16c0
--- /dev/null
+++ b/kde-apps/kpat/kpat-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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.63.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 963e483371b2..2560dd07cc27 100644
--- a/kde-apps/kpimtextedit/Manifest
+++ b/kde-apps/kpimtextedit/Manifest
@@ -1,5 +1,5 @@
-DIST kpimtextedit-19.04.3.tar.xz 152648 BLAKE2B d9f4d9bbc41468f2acbc43562552c1b5884f05d55a6ce9d53e366e93829870799ebee281c6143cbfba8c9ea85432ba74d07345634ceecfedad4c315c6286bec8 SHA512 b8a48b6b6e45ad3ae9d2b0ea7966884cb28850a295b761db430a84da47b52a26e32dd58b1ea5302948812b5169a96ac31281be04753712b144554cfca4bcdeb1
 DIST kpimtextedit-19.08.3.tar.xz 155000 BLAKE2B 6612226d0c16dff7f0705fec3e0167bfaf6a397cf8bf9c4f11b355a347448190366f5786259f07c086eb73698ac4fce77c9c52e242ad1f529082e09aa29af698 SHA512 a85894133f454e540b3199fefea5db310bc5f4e607979a573c26c9f6e24accbf293fad28b0446f5103c779a37fd2e56578b457f25fcc34790f0ad43ac85ed57c
-EBUILD kpimtextedit-19.04.3.ebuild 991 BLAKE2B d04d4144a2b5d57849ffbb19e324d7ab900d2a17e4711ea5f010440d741d490e1d53c699805bb714c3e3fa2620fdcd4f389bfa54d28d88534593b873d10f655e SHA512 c6c3b83c58518f7ade74185b2537ebe8590f0b1ef222c46a2e8815b0f9a30e057aabeb16c4d107ecf339ab5337d7077ad44449880f98c1ca57901fb83daf7037
-EBUILD kpimtextedit-19.08.3.ebuild 1138 BLAKE2B d960ea2d1289af466868dffff4cd99502af723a66da4645b12e092bd7b25fc6085675482d7b6a91245b0382899ae08f9b00a99742d137ac57d9b4b20ed622b5a SHA512 34fe6ffbe5cc2d69de80db43dc1b394828fd8ba39f47f07fcc8056ffd6a08f75c80f0241ef81508cfbc124c3cbd24939a0c1414be06f88281a1b997f718ecea4
+DIST kpimtextedit-19.12.0.tar.xz 167364 BLAKE2B ed5f4b923527986a65cf1a8149d83208a6d9aed16a8f23e06b3a3257cab856a9c0395d3901368683b910a68897f15b4d19e091e725a9ed5b8bb5fc1cecd14142 SHA512 ddb7ef413ddb17b14b4c44f67304689dca9afbf2aa2002e2267930c5fe7d5eab2b0bef99ca2fea26f6d8c638bbae7b21bc7399dace318a1adba202501470cafd
+EBUILD kpimtextedit-19.08.3.ebuild 1135 BLAKE2B 9c8ea5036ab45fd9684c664ba5ae41fe461981699261a3f6ecbd47ac4fa3a7f31ce76234adc6838cbb6c0010ce7cf6942bbc0c62d263cb67b8cdfb98b0ec35c9 SHA512 cb1ec242a9e0dcf67f046184d3ece1314d5d1ea714f968e3304c08ffa53f076977c3ed821f78b885fdb1995928af336d719749948517cc7a1e42645feb914094
+EBUILD kpimtextedit-19.12.0.ebuild 1099 BLAKE2B d3d67f4f95fca8088f6339ed9f5ecf842721349a1a910128c936b4abb9b07dae5f2f29fbfce09745c9b61de2d86b7a1fffa2df159c73b6aa56c58ce4d37b3d9c SHA512 715fd998d0761fdccaa51708c8c4894108e8fbd1b32689a35757225e12cad801536b92fe56930bab1a7917440de6e9e8f45305d6d26ece2ec4e8e3624af6b8bc
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.04.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.04.3.ebuild
deleted file mode 100644
index a0d348f1d827..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-19.04.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A textedit with PIM-specific features"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtspeech)
-	$(add_qt_dep qtwidgets)
-	dev-libs/grantlee:5
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.08.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.08.3.ebuild
index efe06fcecb00..7a1e415069f8 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-19.08.3.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="A textedit with PIM-specific features"
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.12.0.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.12.0.ebuild
new file mode 100644
index 000000000000..0c6d127d3496
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-19.12.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.63.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=""
+
+COMMON_DEPEND="
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtspeech-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	dev-libs/grantlee:5
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/kpkpass/Manifest b/kde-apps/kpkpass/Manifest
index 736fc567a736..f6b12ec66bb0 100644
--- a/kde-apps/kpkpass/Manifest
+++ b/kde-apps/kpkpass/Manifest
@@ -1,5 +1,5 @@
-DIST kpkpass-19.04.3.tar.xz 23320 BLAKE2B c8f55ffab86915b180a9c0101da21ce51b9568d190d8450ea5e09ef287be0e26c8d1a2c4b3c3e310768065a5c51e49da102dff65ef17364359317f3260075ddf SHA512 ccafb57cb9650c11b41dfcf11ffc3571273248ef7933d6438f893285235fddc54f79bb13c5dbe4d13050695df231e99a188a8da56af3c1c50a9fc18b5adf423e
 DIST kpkpass-19.08.3.tar.xz 23260 BLAKE2B ee8374d5b7ed9224862b8f723bb73bdd05b7817d29196e843e360d2638a8ae7bdb9e52265177b0adbcc3ec21e5cc4cb23e4ddaf43ad427551b02083d176ab779 SHA512 edb3bb7811eaada34e7b9dc6a30099588d0bc43c8a0634f17bf8bc766050098c49e709477dde6a92e860775d0825786c2a2788367dddb0617bda868bdbe54076
-EBUILD kpkpass-19.04.3.ebuild 469 BLAKE2B 81d2b283d854a21159af164a96648dbb345202f44e81bfebc3555c13300396876b8785a8e0c4223f5b40cbeddb94cac689a57cc2f9a742295aca691b0b1fddca SHA512 80ef87836fc3d48f543dc7e2736077cbffa16f6aa7f76d133e67ec709aadd5762fa2194741d169fb842c71cffe3261340d03a9182cb7bbb88081761f68b27f05
-EBUILD kpkpass-19.08.3.ebuild 526 BLAKE2B c98f0831a7e216948637f8d1cc9d2d8dc20dbb23067b23592f246fb255f03c8e6507041c7933a125b18a5254974ae8e9a24f6ca6326a55b1ba7fe01a5ea6e163 SHA512 c1325c1454f4df9bce55446847fd7312a2584d4dfde10dd6bda2917a8c85f32ee4afbcd99bc999d089b0d9c298641d422230f9a7d719d2651862cc2964174b63
+DIST kpkpass-19.12.0.tar.xz 23316 BLAKE2B 39c137720fb1cfbd1cc5df5b452c3da4ab8a977b13a813592b568d5436628ac1ff9926df0ac53d0ba4aa7ff7f1b077b5b7ee6f1cf76827cacead69eed8b289f9 SHA512 726822f55ef4905caa0bde9164483da8599a55189040894a0e5fbd690778ec93cd8a10e09a3b68835a784ed2fc44142876b34a4534fa4b1cfbdebbc4e6a22fe3
+EBUILD kpkpass-19.08.3.ebuild 523 BLAKE2B 23f0546e7f2abab2a76fd06964b3f9560beb9c6ffef29c20929de5247604d66384873d467278ed0cd4e1e4318610f0f442cb7c889e22e2ca723d09f43cbe811c SHA512 aaa1b564eb1325efba2e444463af352ca7822d6f5a6a8b4db49b3ebe2bd7b1b621e209b8b08b653d0d2cee146c8e5690ffd84d4456f3b35e6db3f26ae56fba66
+EBUILD kpkpass-19.12.0.ebuild 526 BLAKE2B 3a87201b72347649f0767b83781adf4931f3fcafc3fdca29a5415abb13891e65e6e6e57f50e54f20e8a80c08804bf719069b29183844fb81f40ce8fa52f1fbeb SHA512 bf8fbd4055b5c871fd9dcdafd5d38aaaf7c488b25bb675e245138a2dab6f2faa209eedd93ba339172f0828a61ec76f3cf6664ee535d8b271e0003d9b5d2f0227
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-19.08.3.ebuild b/kde-apps/kpkpass/kpkpass-19.08.3.ebuild
index 3bfd9336dda0..cde4e9914751 100644
--- a/kde-apps/kpkpass/kpkpass-19.08.3.ebuild
+++ b/kde-apps/kpkpass/kpkpass-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/office/kontact/"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kpkpass/kpkpass-19.04.3.ebuild b/kde-apps/kpkpass/kpkpass-19.12.0.ebuild
index 6048e118eebd..1a84d42cecd6 100644
--- a/kde-apps/kpkpass/kpkpass-19.04.3.ebuild
+++ b/kde-apps/kpkpass/kpkpass-19.12.0.ebuild
@@ -3,20 +3,23 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Library to deal with Apple Wallet pass files"
 HOMEPAGE="https://kde.org/applications/office/kontact/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_qt_dep qtgui)
+	>=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 25f38eeb2775..cae5cf5d3803 100644
--- a/kde-apps/kqtquickcharts/Manifest
+++ b/kde-apps/kqtquickcharts/Manifest
@@ -1,5 +1,5 @@
-DIST kqtquickcharts-19.04.3.tar.xz 25480 BLAKE2B a0f3249ea23948ab467e923e2d5dc82010e1bebd82cbf02ee7a905d01f6e520e9d3f147ef4640234ed459ae9b20c57ec767830c9dac4245cf02df6f35c3f1fd4 SHA512 fff688cba81ae2d1ec11be5b378f632ad39b7c4a38a8b84e79dab65a79d086cc5b2b0025697db741ab0786cf0b76a9d158420ad8d3f2880ee8e2282d93b20b5b
 DIST kqtquickcharts-19.08.3.tar.xz 25632 BLAKE2B bdb654d8ec6c8740982480d7df2088cd85b1d2faae343d0fdf9aa4f57e7e42414dc5abe7f1a5f7e9f12c3d8f2abcef893a4799c8f1fe36d0aed4d062235527fd SHA512 4d3ab33818b1b723f7659350d2a56a493b17a72b826890676806d375ec709376a693e04721faf220203dee483881a9d899b7d9eb8a2b876297306fbbaa8eb59e
-EBUILD kqtquickcharts-19.04.3.ebuild 311 BLAKE2B dcda96a490d3357b80556b2fcf916a347358234499545f92bc045bbfdbc5ee3354d8e42f10b7083b4e9ee1ebc737804bd4b4035074483c3e0c3fb3e10e3a138d SHA512 011b1a6163c24389e196f311b8d68a20c1356928eda4463ea60a09493d0ece37eabbdb88a80f895ae1cc3800abc7bf05edcaa9af8c51478057476d4a3d1b71d1
-EBUILD kqtquickcharts-19.08.3.ebuild 385 BLAKE2B c1c524f9dc7fba64df0ef3d11426e10601c020a8e1ef9afdcae7a3b773eaec254697b89e746d8d3967704573e70ec15c7ab59518886c2ab813e9219c2695e9ed SHA512 0393b9f07bacb36079d2ca051e79828cb7dd6d519a28f6aecc55b0f646a641c4bd1948acf1ce3c18608577940259bba18e3e58754a757e4e26f22315c44294d0
+DIST kqtquickcharts-19.12.0.tar.xz 25648 BLAKE2B ca5b85560420d6f2320ed8e2a3f78066af560c940d94c41f645b79699d983031079e09cf3c42728abf2633926bd105e9c64b74c26c875637a5bfb81e4ba4161a SHA512 fd2147e44c6af594f12306337923fb9fe1b3b6652cec0058dc4652e212100882d51baf0e2e1ec87b8b99c0cf598b72fa4752fa5d9935ae76ade1f8690716aba0
+EBUILD kqtquickcharts-19.08.3.ebuild 382 BLAKE2B 12e7d291bd76f7fe8d0801eca90b8f6ded179b76841e6505118806ca0d254572323bb8b7211f0023193a924c2a0aba99014970ebd9ae97a30a1fce975d114313 SHA512 a6939e782bdd0829e26f912a7408b40daa5a7803be70f15f62c31f1cf5ad55590fdff7c8faaab9f3cfd443a29278b7b71eebd0a984567c3fabfdf7a71da8924f
+EBUILD kqtquickcharts-19.12.0.ebuild 386 BLAKE2B 859cb224aa1a78518ac1831411c12ae67a0f1a8b1c4c8df043b3554acf25310143b378274946ab3f9413b8597b643fac942492daf5f19e37cfcd00aa0d0c3198 SHA512 0c70a8d250cd0c50db87033468187d7bb444d1b425da01ea45796785ac893d329faf08f6acbcea53a721803c3c4c6b83673460b8f9957109968a1bfd4b793021
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-19.08.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-19.08.3.ebuild
index d326ab572f76..c881c48747fb 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-19.08.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-19.08.3.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-19.04.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-19.12.0.ebuild
index f49920157d2d..ac95a6d917b5 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-19.04.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-19.12.0.ebuild
@@ -3,14 +3,18 @@
 
 EAPI=7
 
-inherit kde5
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
-KEYWORDS="amd64 arm64 x86"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
+	>=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 4b7c2334ab89..c52e151e0fc7 100644
--- a/kde-apps/krdc/Manifest
+++ b/kde-apps/krdc/Manifest
@@ -1,5 +1,5 @@
-DIST krdc-19.04.3.tar.xz 1420180 BLAKE2B fd22d5689acfc278edadcb161f7ee46357731275327d0063469cf0f01fe24b42f6b8d70a4112aca3b254ea5b8642c1518e805d36ac67cf79e00dff00f6b87374 SHA512 4a9fc033ea7e5064305624504ce488a404a21f87a56fac582b6fa3f1ca2569fda1af886f1c7f907efe0d7de07432e06c0e19d3a585b285e948a8d80f191bb70d
 DIST krdc-19.08.3.tar.xz 1423272 BLAKE2B a2082f614fd9e305e2bd5d87edcaf2adaa7c29d974b9a00220dc28423a9b17b76704bf9dbe93baa47a6c656bf6a88d4849288cf6544cc0598d657482ebbb959d SHA512 19623548e1ade229cd198361b540c893de8b510099c8819d66034f358b29b13cd7f82a948121187d1a445770f9549a5e59b72394a1f7ace0e0673ed4bca8e1c2
-EBUILD krdc-19.04.3.ebuild 1227 BLAKE2B 82323ba158800dec4eb835b9db165a75b6957118e7d041ab309b0730ea166b7240e9b65ddc147864ea3d559ae0b3059ab628656cd8de1721035d983fe95eca24 SHA512 ed815cc1890736badcc632fde6cbfe5bb89028af6ebb34fa1a25cafd2d8fdc1a4fc162de017336e2efae70cf0ec0f4c32427cf5d0159137eddd0dab9fef80431
-EBUILD krdc-19.08.3.ebuild 1415 BLAKE2B 39bc26b00106f32eb0358b262c9b1bf74f0e8301fbf74dda4aecdc3d50da5a2e38c3f83345f7d8d774770de772c61b4b81884efbae837d14cbdb4a0638730250 SHA512 e37936e951772f0fff801c551b4e7856c0befc59e5add5455fe1ab5bff3f45bb84b7eaa029475052f68f3c684639e16386c32f6c6c6204b566c024e69aea59bc
+DIST krdc-19.12.0.tar.xz 1425400 BLAKE2B 43ad20478a15c9cf1fd3625c7d009bcc7162bd8e1d6460b6cb210f38ca46833500d8fefb78f5e1856564e51aceb45ff5ea9e8e303bc000b299d8f1c841bffd74 SHA512 0e8dcf72b80c8797ae66fa6e7b6d650389218c2fdddba4b3f16869b204aef2141ea3d85c4ed30b256cd276a459b4e2252e4435a9ddcea666ae0270f20e790970
+EBUILD krdc-19.08.3.ebuild 1412 BLAKE2B e1ef82965eeb722743b99efc60880c0f81b08a56c1f0ea3da66d6f29eb5edbbe9a48ca2feef44b647dc1b29f6cd2c4c7c2c383c7a0c27047434b6e025fd8514c SHA512 a1337c565a5e584b23f936206fca800d60a276c66f285750b32a2a8d8bae05f050fdc5e74d7b586b444c856c36e2bc47e4c3074ca59b5c5123768011869f6b55
+EBUILD krdc-19.12.0.ebuild 1417 BLAKE2B c76c3c186615e9b947c480187323fefdffcdf5a01139a1174deba10c1a2c6e35dc2fb170c3087f0d4d756fc48b2a3e05358da1281ed06af8b79f4493727a1fee SHA512 2321f4c1e05a69a2c6201a8e579e5492fdc5f9111a9855ce8404ed82198954168f3a9e3832f49cc2d1d0bdc919c81d289941919256093d195a37ca0359428e1f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-19.04.3.ebuild b/kde-apps/krdc/krdc-19.04.3.ebuild
deleted file mode 100644
index e7ad25e6e815..000000000000
--- a/kde-apps/krdc/krdc-19.04.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Remote desktop connection (RDP and VNC) client"
-HOMEPAGE="https://kde.org/applications/internet/krdc/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+rdp vnc"
-
-#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	vnc? ( >=net-libs/libvncserver-0.9 )
-"
-RDEPEND="${DEPEND}
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package vnc LibVNCServer)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/krdc/krdc-19.08.3.ebuild b/kde-apps/krdc/krdc-19.08.3.ebuild
index 15754f15603a..dfa48267080a 100644
--- a/kde-apps/krdc/krdc-19.08.3.ebuild
+++ b/kde-apps/krdc/krdc-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Remote desktop connection (RDP and VNC) client"
 HOMEPAGE="https://kde.org/applications/internet/krdc/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+rdp vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
diff --git a/kde-apps/krdc/krdc-19.12.0.ebuild b/kde-apps/krdc/krdc-19.12.0.ebuild
new file mode 100644
index 000000000000..a88b6829c582
--- /dev/null
+++ b/kde-apps/krdc/krdc-19.12.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+KFMIN=5.63.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="
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}: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 22cb1716630a..1a8540ef51c4 100644
--- a/kde-apps/kreversi/Manifest
+++ b/kde-apps/kreversi/Manifest
@@ -1,5 +1,5 @@
-DIST kreversi-19.04.3.tar.xz 942540 BLAKE2B c9e0788182ff3eede3c0b1dcc8d107d19ab01e50d81c47b6bc83a7ae53c4723386145b64ab48257af1bdc190a11fc9b430212402a2cae6d41c91de21aa081bdc SHA512 4641446b39a5dca9e17fe7c38137732c04b9ff1f2ebf36636d4778d27a29ac2e221bbb8e861fffd3bbc08a9ee1e13c4b12be3fc8cb5081614bac29fa1ca1174e
 DIST kreversi-19.08.3.tar.xz 945652 BLAKE2B 0560d87775f86400924cb7fae6b3113c8f6e0d25f718f07e22e302e9bd4ab73a02c80588c0a523a51ebbb57bf1c9d197bad679101fda17e25d0414637dac1ca3 SHA512 9f329b95a0765557eb80a25271859c104b7a64ed35517afd51bf5c33d3a2821453dc7c509730241a80713dcae3f5132b54d3d2bed0e7ca0c22e916b4dfdca0c7
-EBUILD kreversi-19.04.3.ebuild 896 BLAKE2B 42c3def35dcb73a1d2a138195822909f675888ca6652d1859ad9636afefe02a0bbbb8d4ce9441db76b659705370c77c93fdeaeffaf4d1dfde069853cf4b5fff6 SHA512 5c5aae87ca706997fad83a8b47e3f6a6750d78a58ce37fe523987f2ebac39aaa800868626863aeb740d3052b551d14c2f2098f5d9a7a2b8b9c71215ea76355ec
-EBUILD kreversi-19.08.3.ebuild 1091 BLAKE2B 4dbde1964eee85d3d1ca318b4ddd8b00d925b3489137a37edab887805084baebe8db79132ab7100c5932b184426f50ba8b83c9cffb03f17ef58ed3e500016434 SHA512 eee0709f8a66c8b177f92e4938e923192ed3ff6b1f910fe0a494ed11cee1d7661656910ed92de8b0054455e444ac707dc470d7e816dfab38994205b130e2d6fb
+DIST kreversi-19.12.0.tar.xz 946104 BLAKE2B 34faf3748de21f57c74cb86080faa1fa6939ba4139574dbc06d35630db028d8771ba179491d14723141f62a6fa5261a04f50cae931d235618bdf56df2e478e34 SHA512 552022e5c844f0929febe51ca6770e843badba9692eb225e5c44c2cd5ba6fd19b6c70583ad570fd0c902b9b182759ea7ef21af89c70708aa3cb250411048a912
+EBUILD kreversi-19.08.3.ebuild 1088 BLAKE2B f987867876886cb0b46582e14948183016dddefa71657a7353a6603c468afb36ae9fd333f70406bcdf80581ce5e03b6ee2757f83e1a05b25c90c649bf7b03a76 SHA512 aa38a929eacf8b5b51be938da6c7b8b7d588b67939e05366a8b45ba85ddeb1c9bde6254b6f8f15bc5c2ee654b789f90d0ba6234abf9a716bc7a1894b2ed46cb4
+EBUILD kreversi-19.12.0.ebuild 1095 BLAKE2B 8b477397c153ba00d6e1fea7386c113b0fc1934e28138b2d7747356d6461d27845512ac9e15a3706f2868937d4123a8a4bc46a5ec47614cae18456c4ccf03021 SHA512 302fdee761ec2844598deaa6ed6384d5363d9d4b88edc7bac13c29b163dfd85b2aeb756fc5b9ec86f78b9561c658accf391ca0bfb674dd978d04acfe2d8a22e1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-19.04.3.ebuild b/kde-apps/kreversi/kreversi-19.04.3.ebuild
deleted file mode 100644
index 025ed7d8b361..000000000000
--- a/kde-apps/kreversi/kreversi-19.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Board game by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/kreversi/
-	https://games.kde.org/game.php?game=kreversi
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kreversi/kreversi-19.08.3.ebuild b/kde-apps/kreversi/kreversi-19.08.3.ebuild
index 6c706f698585..c43c824bf89b 100644
--- a/kde-apps/kreversi/kreversi-19.08.3.ebuild
+++ b/kde-apps/kreversi/kreversi-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kreversi/kreversi-19.12.0.ebuild b/kde-apps/kreversi/kreversi-19.12.0.ebuild
new file mode 100644
index 000000000000..e61acee1f5dc
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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.63.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 83d032bbff29..7faad54182ee 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,7 +1,6 @@
-AUX krfb-19.04.3-missing-header.patch 554 BLAKE2B 77768cba45ca6792f1938f3b245cd8d7cfc6fe0fd807f02b5ea923c1f7c599d3dc06b1d40874efd3575557981bf9ce5f2f0a3123a548dde42a02919e88bc9c33 SHA512 1541b46ab8c006d61e5b31a9e2a9f36621aa15ae9501abdb35f16fbf8b2d95cf4a1120c3afa927c07b5527153b3ee6d501a69850b80752507ac9084c18830b1d
 AUX krfb-19.08.3-portal-support.patch 868 BLAKE2B c1239f4247cb507eae14fe79a6f1e375b438dd23eaeb65eb32f81d81223eb58794524ce753c1aba2304058c202dc72a62bea330d9fe2be5c36f331de2df971f3 SHA512 ee64e02efadd52f4df4a753624790d42bd38aa8e45d984351814a91f3dccb00f1595c7dabffb64287c846d8added370d49580aaeb85f9a97508f8772dab91252
-DIST krfb-19.04.3.tar.xz 1256560 BLAKE2B 81e1ccacf9ec5eddd89caccb9ffa8400ecc8c90a4813fa890fc2d57b80258a1998dd189e00d2e90950dbd3de3235035c5887daf001ec45bf6877e5d57fa6fbbf SHA512 4334c51d4c0471cb0aa2a226626a49d6a1456e0c2ab8d03bbed99228bf6e61efbb41570e0c3f35310c2994831b2444c57caa6ebfa8739c5747b12a2f378917cf
 DIST krfb-19.08.3.tar.xz 1278072 BLAKE2B f4103c255b64a5058eda2d8c580514fc79131590aa33b4b7dfe7e4d42f5cbad88b7a16a2939f33853128cea71769b869ee2a3fa5d78cd738fdef76e45acbeb71 SHA512 4c2012c0fe8363854bc93f7c86918e4d151bc8eb7505327615688ff8631a1c77a2acbdabe23bc56a072b5ccd3df5fe7a864ba0402ecc6171b4862118c814d40c
-EBUILD krfb-19.04.3.ebuild 1019 BLAKE2B 77a02fe40b5fcbdb904c555f551a4d7e3d7a3d9993d28bcaa69f4c706db977cff4fde773fce90fa90c7559440483f628ea7e028b004a207485b718d6c77f5a2f SHA512 f588dee0f6773b3a3388a02d46f281a48559846be63077c149de0749dbc91882b1194391b4fbd360b9f6aeb7a0566d11ac8c5b0479a0a819262d9c54bc7dc171
-EBUILD krfb-19.08.3.ebuild 1454 BLAKE2B a0f756380d71d74c2fc18aa6c24d10185f04465151ed25c8eba77a35173f9b47d1cdc7427f3add06d42db6fd2de6a80c17cee65baa9583836b93696785cd65f6 SHA512 ab4958e5c12a2ef633445eb9331aaa72823a497c3709a48b58e32df5f8d73256e916a57472391ea5b9f1ce603aab1997ac600e09c69f1468904499a429964687
+DIST krfb-19.12.0.tar.xz 1278040 BLAKE2B 18f127fcc2cbdf5ae7126c89125078e22cfe3488a6de1cb9c3cf088084347020e679201bf7dd159f4e2526b840ccc62f1030d6451bebe5bae7a0c853c1f882a4 SHA512 2447cc2967fae38f9885aa6f451ea7f3218d91ef1f88008aad238a526a2d32b468b27ea9ad0252ab18e4926b5bb3b2896a4df903aba13dfea5c45c08fab35b2a
+EBUILD krfb-19.08.3.ebuild 1451 BLAKE2B e651fecf5f3858806ee10c32d2b13a7ddfd413dd70acd491a1e49cb5ec5d1137b721af5d839def8ac30b2c0639bd6b721149f3309097e6901a2b91566f75731c SHA512 b25cc03c91d33b0e5ed0b1355232d5bf68245e71d2fe38991dfc5fcadde2f1ab4e39cb08f7165221eab587fa83070e082c2c779d09a0aa36c851c05b9f43dbe2
+EBUILD krfb-19.12.0.ebuild 1405 BLAKE2B 5d3c4cbdf3d214c0f743bf206690c2047c8dba1c0fe88f2a4e0b00f87baea6e15a5169b350df488b371c0c0ea660776e15034c1bf32bc3c9785ad8cdd34d5d7d SHA512 d3ee03c653bc212779dcf7a02442f108b2cfd46c42d35ebd47d3b9cce58aa1c5c0b33c3f6d671ef9a0144016dc1ae739f415790f836c6d30abe4308abdd52003
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch b/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch
deleted file mode 100644
index fc3220d4f40d..000000000000
--- a/kde-apps/krfb/files/krfb-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9290ba179c5d1e3a0a829666f4cb24177cb49395 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 9 Aug 2019 21:19:23 +0200
-Subject: [PATCH] Add missing QHash
-
-Fixes build with future Frameworks.
----
- krfb/trayicon.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/krfb/trayicon.h b/krfb/trayicon.h
-index 6517e4a..166e97b 100644
---- a/krfb/trayicon.h
-+++ b/krfb/trayicon.h
-@@ -18,6 +18,8 @@
- #ifndef TRAYICON_H
- #define TRAYICON_H
- 
-+#include <QHash>
-+
- #include <KStatusNotifierItem>
- 
- class RfbClient;
--- 
-2.22.0
-
diff --git a/kde-apps/krfb/krfb-19.04.3.ebuild b/kde-apps/krfb/krfb-19.04.3.ebuild
deleted file mode 100644
index 5779798598ea..000000000000
--- a/kde-apps/krfb/krfb-19.04.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://kde.org/applications/system/krfb/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=net-libs/libvncserver-0.9.9
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/krfb/krfb-19.08.3.ebuild b/kde-apps/krfb/krfb-19.08.3.ebuild
index fc89b16763a7..fb0eab568011 100644
--- a/kde-apps/krfb/krfb-19.08.3.ebuild
+++ b/kde-apps/krfb/krfb-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="VNC-compatible server to share Plasma desktops"
 HOMEPAGE="https://kde.org/applications/system/krfb/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="wayland"
 
 DEPEND="
diff --git a/kde-apps/krfb/krfb-19.12.0.ebuild b/kde-apps/krfb/krfb-19.12.0.ebuild
new file mode 100644
index 000000000000..2500ae4ba71e
--- /dev/null
+++ b/kde-apps/krfb/krfb-19.12.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 b9981a410c61..4bebcefa1ec0 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,6 +1,5 @@
-DIST kross-interpreters-19.04.3.tar.xz 150404 BLAKE2B 36e620728e390f6d26887ae6e80324ba5cbeae16d7b6f423abba3cdcf74955320eafe9921cc2fc34fbdf0d95feec87c0eae8883d5a5f767fb29092c19934bdb9 SHA512 3c9810d9870b69af984d416d031ac30cbe26514ea9734feee70a32d915acafea531a621a085adcd95e0d0e67c92f8508de94e749aae89c825520c2adf6a674a3
 DIST kross-interpreters-19.08.3.tar.xz 151832 BLAKE2B d6ec5c4fb21100a1548beab6c16600120a181aea1dc2da4753c36d9466dc485a17bc54ca49aa97fcf5f968c998a70f4d028daa18bf7a81052b86d2589fea9fd7 SHA512 2c8fc01bf004b4d5780eb6ba0462dc98681abcc6437f06ae35505e4ea8052aaee82d1d4d45d7696ea473e85df051fdf80e6e4112122a6fe45727f8f2a7ec050e
-EBUILD kross-interpreters-19.04.3-r1.ebuild 745 BLAKE2B 7739d19773cb05b232e432bae0d736035444b6cb67ae2bb350b5108c506157b2027cd7e1dea7bd51ddcc9d386532a245277d31c740afea45329f9c9237d6d58b SHA512 5b5e7e4660f3f3b153e393b2fa49b0b758e953bf21d3b95b08971c5efe847db96cb922fc74ffd82ebdb2f03a8bfc549a52d113bda42d24d0e274794126347511
-EBUILD kross-interpreters-19.04.3.ebuild 745 BLAKE2B 124f482ddb10eed49a45deccc1332e79b0408a5f8c311586d5b780592b387f52bea23b80e2fd38a7b16b8a9f4221dc984686aec5ff9258ef1f531b64bb0cad62 SHA512 1f7a675e3f45eccc3cbd63af5d1a60e2298fbcd031986dc9130653ac0e8ff10106da932e7bfbe7d57e0bfe077122fa04af187280d2e3b5a26b85b73c98e7c67a
-EBUILD kross-interpreters-19.08.3.ebuild 836 BLAKE2B 8979c737288f66c7b68140794196b2680d8f4a2940f845bcba86bfb2340a2ea789dc8cf8d008ab7de91242eea4eefbf6990fd5dde8a9ab0e66bd1619cfedf6c3 SHA512 e86c2c82accba72336c9fdaf7f60cee87bc68dc2f67d0669986eae65740c68e04d5bf0897e69d0cae4b26dcc375432b2013e5218ab9ef353e40563139763a54a
+DIST kross-interpreters-19.12.0.tar.xz 151652 BLAKE2B 6cbc3bf1d71c0c137c6842e848a2492ba390ecc8e78f6bdf45f985d5f950f215c3da54b96d6e84b41546429ddd91eb62666fcf23baa20052de3cb453e94ca00d SHA512 6b793d7ea37c46f1ea18e703aa07cc58c973b538987e12a32422bedfbc2fc8ee9a893d52d5d319aaec098f160568068c094f4e38bda00b6b3f84b72f4cd6e28e
+EBUILD kross-interpreters-19.08.3.ebuild 833 BLAKE2B 72718f83160e9b6f87f2b573dec9f190ba57a5eec45752333940a0a2f7446ab11a1a5e6b9df52bc2462c5f78450c365d38a3c065dfe3f183816750fd9237deb7 SHA512 de95cc9bf768282752d77854cd95f70276b063d7235ad8113b781b01b11642a13c9a107090b04db90f8526defc2278c26002da35368524411163fbb407f1aa01
+EBUILD kross-interpreters-19.12.0.ebuild 837 BLAKE2B bde994d32be3baba2cd9cd6953a7bb66c09c179415519bfdf65c367e8e3cdbdafa6e58f27bd1ed5689511b116c7faa2e41f3f0a80a741ef6e6117d409d0f41ed SHA512 a549d40af8f658e95a66ea14809ab6cdd60bfbe859985e5c05c2807b3cea49f53cb86440ba65fbc0f41bc0865448be2ec1a4d3a35cc5a7288b6247e034c295ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.04.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.04.3.ebuild
deleted file mode 100644
index 9b60119cb673..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-19.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24"
-inherit kde5 python-single-r1 ruby-single
-
-DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+python ruby"
-
-REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	$(add_frameworks_dep kross)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_python=$(usex python)
-		-DBUILD_ruby=$(usex ruby)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild
index 9595b479bfef..202f4baed895 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+python ruby"
 
 REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.04.3-r1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.12.0.ebuild
index b2cd075da1da..4a104a9af2af 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-19.04.3-r1.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-19.12.0.ebuild
@@ -5,18 +5,23 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 USE_RUBY="ruby25"
-inherit kde5 python-single-r1 ruby-single
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1 ruby-single
 
 DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="amd64 arm64 x86"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+python ruby"
 
 REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
-	$(add_frameworks_dep kross)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )
 "
@@ -24,7 +29,7 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
@@ -33,5 +38,5 @@ src_configure() {
 		-DBUILD_ruby=$(usex ruby)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest
index 637e0f2fb1f2..67ff3c5f71d9 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,6 +1,6 @@
 AUX kruler-19.08.3-qt-5.14.patch 1395 BLAKE2B e46ce5ca3e4540a8776e5df5ef478abfd6a12d22551d3180c7ee6efe29fb3036020ffb6d512d26651c92aa8b7f3667480903ad81d053c005fd4acf665b29f1d0 SHA512 bd88002f2f5d40861cb8b63bed31a1f541fd11c214c116b1b8a4ef2fa93fe997f8be672c5af5718ffcbd0222d449b898ddf64c3523accd186006cffc9a65d9f5
-DIST kruler-19.04.3.tar.xz 249128 BLAKE2B edd73d76e299defb832631fb5052bdfb1a748d09d310ceb1b74fdfc91e1fe02b967cfb3773a4a26c817293bad9805d29a9d4775f1982288ecad7ae431905e0e4 SHA512 fc4d2b621f8e4aafb742848a3a58da77c3fa5a00ea91d347df588cb8f9da69a0c92028133e5f87243b2fa148318a47b213d392f8fe8da5a0ce876e4146502511
 DIST kruler-19.08.3.tar.xz 249500 BLAKE2B 49e857bee9076f6f4abde7c719b9c4e7a55d50d70d9beef76ad6e31826aed44c0f66accd5b4ea80afc9543459e27f793973d82930dd0f400ca507b69f9ed51a3 SHA512 25e146e941f6eaf04e4f93cffad0fae777345800f1b80127e39f3701660d4c0f2839d152a82c15b8e5ebe9351a41974e139223984fd6cd99f49b7de36789d139
-EBUILD kruler-19.04.3.ebuild 843 BLAKE2B 868cedc5939f99946af58058f5406d4c1ce9a29c0b43d0dea91413835562ca8ad2a1572c1c67602f610fc89415006718ceb8913cb5ce92b02e3f1baf1ac925db SHA512 4a87985bce986263d821ae5c0b94f1e0152c18f420501d17d6213d8a7b1de6ab3f9c439405cd6f9018d86c70c605a37b08e696fe96e49e7b21146cd93cc967bb
-EBUILD kruler-19.08.3.ebuild 999 BLAKE2B 8e1080aab6ef1b3f8dbd3dfcc2b70b16ea34cbe25c62889666f08a461497d61629e4a34dbd9fddc85992808bbf36b606368877414d7c9aec4682ea4beab3b26c SHA512 1910220dc29e97e447bf31346b41f1537e35428b8257f68bf1cbc3e1d45aa4f1d08070df50e94868d665a4c249a9ca57c53a4e0420c0c33e41dcb38d9dc1a448
+DIST kruler-19.12.0.tar.xz 250480 BLAKE2B 0a091d06f272d044fc8c9be7c2a697c1d8ce4bf9efaed871e2a4ce5a9da2c85ffa70572982467ed0a99ff1e9b1c686dcf94330ae2d8485e1fb345cca120101d2 SHA512 696019c062c17b3f9e3d152dc0ccc63afd2a0fd9b4f578eed4a8d5f01e4d4d9f23f2fb7e849068ec360f43dba9586be83efc2c4d479c19c561a50d0d8b8dcb59
+EBUILD kruler-19.08.3.ebuild 996 BLAKE2B 61f9f1114acbb7466a72b1d96cc199971e4b3594832313b6404b99afd673a75eec5b3fc8203d7f9137b99aea47218a468f77b6ab48c42cfb6867c5cae23b99aa SHA512 98732a4cacafd535b720874ffee9b5079073b61debc4c5c421897aa50570f37ec1e31588bb11e4fb08f0a51f60fc832a6984be967369c924941c3a232788773b
+EBUILD kruler-19.12.0.ebuild 954 BLAKE2B 0e2c7c0df4e169ca518c88fb6e3421826651c9a996f7f08535daf18e9f983a8deaaf14173e62563f1b40b3bf8bbfe150fa21558afb3b73d9ef34db54f5324b5e SHA512 59bdfeabe4e85e4e519421cd7569d8548b450c5492f4d595452d9b1819e970353acb32ac8b32b800d589133136e59886ec7a790b8f3dc3522b3df8a3dc07bcc4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/kruler-19.04.3.ebuild b/kde-apps/kruler/kruler-19.04.3.ebuild
deleted file mode 100644
index 3b47572626c0..000000000000
--- a/kde-apps/kruler/kruler-19.04.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screen ruler for Plasma"
-HOMEPAGE="https://kde.org/applications/graphics/kruler/"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="X"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kruler/kruler-19.08.3.ebuild b/kde-apps/kruler/kruler-19.08.3.ebuild
index ae9cd336b7d1..3af08979d5f1 100644
--- a/kde-apps/kruler/kruler-19.08.3.ebuild
+++ b/kde-apps/kruler/kruler-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/graphics/kruler/"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kruler/kruler-19.12.0.ebuild b/kde-apps/kruler/kruler-19.12.0.ebuild
new file mode 100644
index 000000000000..2b6cc09da8c6
--- /dev/null
+++ b/kde-apps/kruler/kruler-19.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 326ba4d10539..6d48b63f345f 100644
--- a/kde-apps/kshisen/Manifest
+++ b/kde-apps/kshisen/Manifest
@@ -1,5 +1,5 @@
-DIST kshisen-19.04.3.tar.xz 822640 BLAKE2B 8dede9f8bea588120f804f3ea96fec5fa1e38374f855a1df2302d822d79fe3f76f56812523dea3cdbcf543595ac4aca2829a30db0d95eaa3dff81c4694c5ad9d SHA512 5083c2eff12d0b03b44ec9fc2ab8ea1cbf2bc215cef2839f3406cf4a5601371ccfa49b4d493767c9e038fd18abc6091addfbc7100d7bf02cfaf18ea356519a43
 DIST kshisen-19.08.3.tar.xz 821980 BLAKE2B 6c1411c3841d01afa31d1cb83781ff4c6c68d51e2eb67e93478402110bbc80dccfba6ba00f897d2eb815ffc59591a6725cea70375b36e4bf1a7cc95b93b7e0b0 SHA512 7bbc3507dc1100361b4d2d0dea9dfa969533956675d2b72137654237224152d4406076fadb5b749a348d5cbe70158aa7656bfc83b047b7490c43f6782e79dddd
-EBUILD kshisen-19.04.3.ebuild 777 BLAKE2B 382a3b9bb3ac46ffdfeb8df9ce6d628d7600575baf083586396ad422625abe77163086eb6c9225686fbed6a69ddc3e4178a94f10bfc093384cc813c96efdc14a SHA512 5c1ca2f8d3012c523e2dd1389d6a6e0a1f3e227818619d5dc74c7f991d5d9ad825578fbc660a9b0d524da77ef2283be2b5268636baa0f171b0c7a1e8e9df6ed1
-EBUILD kshisen-19.08.3.ebuild 939 BLAKE2B a3227e57985ea875dc0f566095f9e500ec63ebcca93993ae72235de8644ab3d23484319979e4cb5caeaff199268d782c655f0189e37cef3d7cb0662e9f4f8bad SHA512 aaa15958c92b4c3810d5e77f4017dd1824becbe58f4a860be2ab74639edf6b2ac095315ba2390a38e8eff88e4284cb2df8f506059e57b8ea372586374dfa0174
+DIST kshisen-19.12.0.tar.xz 823312 BLAKE2B fc8527fcf05c62e8d6f596a2e616c18f503f94fffbff69852e8449c40d7422b1e192f24ab69bdfd395486d9ea6c13999c81968a9144d659370e5ee38691cf04f SHA512 6175561cc07d770e7781c303a4f6a04c5fbeb9cb0a5947c0c6d88a8552deef5ba57e71b12021b2ad992202df1a473a498617587bce854d0f6ec4e9a2487e2bd6
+EBUILD kshisen-19.08.3.ebuild 936 BLAKE2B c0a92c67bde623346b6a3c0cb8b3dabd48c8f11b19c5260b3d82e640d711a0cf8bd801dfc7dc6920d2985c2e57a8a3c5679dcc3143bd0a8002d8cd5701fa1384 SHA512 9dd33cbe0fef3115af09bd6eb4df258858aa9a48f3ad47d7fe70f68f96deb190cb4016df617171ec7346f22f849578b08cf914839f374cb7b81e0d1a01e28f1a
+EBUILD kshisen-19.12.0.ebuild 978 BLAKE2B 89c29fbc10eca375376574ca630bcd96d970f7b0b11da15ef2e709fc4140305927882eff69bb207b995f527cfa522d1132029d834a97b61b9adf2550fc46818d SHA512 4862bd30df0af4c933154dc8b20155f9d557cc4cc211b99ebb3971ad3b2c029c8e8d5be0dc5cfa20453e0b286c55d14b8dd21a76e0181e3dd590aa92d6a311fe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-19.04.3.ebuild b/kde-apps/kshisen/kshisen-19.04.3.ebuild
deleted file mode 100644
index 7f5da2cc2f9b..000000000000
--- a/kde-apps/kshisen/kshisen-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="A KDE game similiar to Mahjongg"
-HOMEPAGE="
-	https://kde.org/applications/games/kshisen/
-	https://games.kde.org/game.php?game=kshisen
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_kdeapps_dep libkmahjongg)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kshisen/kshisen-19.08.3.ebuild b/kde-apps/kshisen/kshisen-19.08.3.ebuild
index 896733308102..a9cc883f33ab 100644
--- a/kde-apps/kshisen/kshisen-19.08.3.ebuild
+++ b/kde-apps/kshisen/kshisen-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kshisen/kshisen-19.12.0.ebuild b/kde-apps/kshisen/kshisen-19.12.0.ebuild
new file mode 100644
index 000000000000..6465fcd13888
--- /dev/null
+++ b/kde-apps/kshisen/kshisen-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 6f3e5b2025b4..2f29cb6f4e13 100644
--- a/kde-apps/ksirk/Manifest
+++ b/kde-apps/ksirk/Manifest
@@ -1,5 +1,5 @@
-DIST ksirk-19.04.3.tar.xz 6992524 BLAKE2B 2f0640da9dcc48e0b5b803282a63a2cbf0a1339f010f99f3a7a5f80c5a2ddb1eab8b499601d8a9c4867b5c05d64fc2e76cab1afcd2ae01430488ccff8d920bff SHA512 6cd6da1172ea0d89ebf3ff5bd86d6d4228ee8f43bf8c7577d748be1a1fb47d555bbfdb842647a00a4e57ee7e6c262d83e861b084644b2345a5929984ffc7c3b9
 DIST ksirk-19.08.3.tar.xz 6996284 BLAKE2B 4cd50f208df7ccc6bc1ba5ae0ad45b16df2c1533ec1197aca6fe67979b2dca87474809658bf228356bfea4efc3e97125c3f347105cdaff77c55cbe1e276df275 SHA512 4285cd28d8353d60d64fa6a9abc75f7a580e3b600b947be49d768a3d3f9613eaf5655479f1ee5c2bc8139e6efb3dbbbf878a2ef349b017e76a76a2a6c30b9ef8
-EBUILD ksirk-19.04.3.ebuild 969 BLAKE2B 8c21bf543f08116a551940d519e46a7f1ebe778ac07fe17092c704244c4de2e8d5cf6362bf474e8f417d38717897ddaf960c8e98541837bb79163971b2b5cd80 SHA512 50f80fdb8b4f3725ff122c90dc7a44d12220d03b0a8de01aada00b6c9d26a981fa6f5507d2f088f72ead728c4cde45aac2cfd4e844dc5489304fd8a9962c2ae9
-EBUILD ksirk-19.08.3.ebuild 1170 BLAKE2B 21ee7a20e53d9a6e45fbe84f74c1d4e7bd7d21f108a8fe5f135ce604f4c30cc234d4eea74a74b39850cfa63d512cca1594008e365b9eed360b6b1acc48dc6711 SHA512 d2831f5722eeebb262433b90c9ece8ac47335396e11f48e57c54e047ac59181e732d8ee60593571c3c13e1c2e8031d0464041f5c55b7826f0341f1ea2f840c0b
+DIST ksirk-19.12.0.tar.xz 6997032 BLAKE2B 630322e376080525c3752a7afed23c44b2091a3d81312317aa5b431bfd3a233f0cbcceb125bb632a3e8f3a70d3e33d555141f51a6647c906e3c81d0375d69195 SHA512 1d11c1199c00a35221b5367881a8fcc06f6f8ee64ede47cdae3ada76d9ad9f55d9f42c81c9838cef17d4b6d8d9eaa31593a9409b892b75fd0b4491b3ddfc2337
+EBUILD ksirk-19.08.3.ebuild 1167 BLAKE2B 13d7cac8db91ebdb5cbd067147b2e746e0d745696d1073d101255eb372ea149cb9f7c117f2ff4213aa99fc71eb2f983230b35ba13841416edbe3d35904ab249a SHA512 ddd83c910790d0c3d82ca38db16e2ed804c8e6a18318b01327a1f69e89da21ed478b2126f6929c142f1c2490e4fa66420508dc1a30e6575a6280fed8d3be0ddd
+EBUILD ksirk-19.12.0.ebuild 1174 BLAKE2B ae495d8004b6a36134cf5a68155400a629be5ab66c226d2f1aae9dead24de13e4c7f77ce783474dfa9ba79994b33acbbd45e5c123e956cd39edbbccfa37f1c9c SHA512 cfed3e17710547f2694704c5caef40df014eac85a85e5ec801fc747cfecc1b124130a2a80cb0d45f18c3838cd66871befdfd1627e8e081af8494fc3dbf2a3b8a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-19.04.3.ebuild b/kde-apps/ksirk/ksirk-19.04.3.ebuild
deleted file mode 100644
index 47e3a9d98198..000000000000
--- a/kde-apps/ksirk/ksirk-19.04.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Port of the board game risk"
-HOMEPAGE="
-	https://kde.org/applications/games/ksirk/
-	https://games.kde.org/game.php?game=ksirk
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksirk/ksirk-19.08.3.ebuild b/kde-apps/ksirk/ksirk-19.08.3.ebuild
index a59f875c14e3..2d3d85ccad8b 100644
--- a/kde-apps/ksirk/ksirk-19.08.3.ebuild
+++ b/kde-apps/ksirk/ksirk-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/ksirk-19.12.0.ebuild b/kde-apps/ksirk/ksirk-19.12.0.ebuild
new file mode 100644
index 000000000000..a01536bc141d
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-19.12.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 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.63.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 7052d8b575f5..077293628625 100644
--- a/kde-apps/ksmtp/Manifest
+++ b/kde-apps/ksmtp/Manifest
@@ -1,5 +1,5 @@
-DIST ksmtp-19.04.3.tar.xz 40428 BLAKE2B 968eed061de54b762ab1c7bbaf9c8a59feafcd744e25ae8ac4a471b0d851d10d5ddfb185208b77658ae3a0410d35976c4dfe1107b323c95b941386b0ef8b088b SHA512 08cb69987cf332ec08beaa5bb30a80acd1cf916473dbf90e60b672eac76022a83aeba44da1dcb8a8c8545d90e07c3dde342a01ca7c380032cc6da8d581ee47d5
 DIST ksmtp-19.08.3.tar.xz 40472 BLAKE2B 5409e96a99e594f6eb4efea460f6e172c180dde11a31d25ecded542b24a21707fa851d5e8063b331351d0c68a027e5bb92615ef0bbadc3a8255c41d39d39ecdf SHA512 156b1a8bea14ae90162a5c373f53ff519b271f23029b5fd420020fd454da49d004551daadea395d771622d4af09b0cf4e6e0701084943e2572f5a93ac097823d
-EBUILD ksmtp-19.04.3.ebuild 468 BLAKE2B cae128fb12aac19c0428595615c11aa763519ff9ed6100997f28b338f993ffd77194420c8ef3404b5ae7bf0e6c7d2d5d85a5d4064de9c086a10e6831dc129293 SHA512 f4038e1fd9881a6f00435fb992dc2d6500e21ab4135bed9b28142f5bf2f9c270afa47b9013eb7539a698b95bdc9283bde7ba7909cfacd0863085282ca953d9b9
-EBUILD ksmtp-19.08.3.ebuild 537 BLAKE2B 3323a5257eb71785c00d2267a7046b7f2453502fe1ff0eff24192ee453af5d9b5e7fcecfd66e040da44b44683efa57979551d4a382931e899f07d27f6de1723f SHA512 9b374481f83f75128ea8a079b611110cf09d6a5601f41827bd7f99103c0f227cd1c400005c9bb3ae022ba153974c1d3dd55286ea4cb410c364a2a75a7ed40cc6
+DIST ksmtp-19.12.0.tar.xz 40740 BLAKE2B 90972b150944db3382c23e08f05873457699e06e6b3f6cb331198c5da4829e71a8bb68f368025da74a4cceebc4125ed53998a0ab060e186eaca6aa0dc0cc65e2 SHA512 b72b312a2223648ca68573349b9f8fcd1e545ce112b36dde3f2b6313144ba4be1a170b5cca2c43b5d0cae527260d55208e02593eda0540be80d7bb1c8cde7149
+EBUILD ksmtp-19.08.3.ebuild 534 BLAKE2B 02b2ea5dcc77f3a0a5f19bef549a51c30cc7f4346c496ff4e1f32be72590a1151e9b7c329423d7162f4014ab7f8caab85492e2489bb13166d28cf17b6ca3533b SHA512 fb268def98f4984251ca974d30cad1030935ca1f0002de479d0a10aa6c04e8f91e45656b5273bd39ca5e5d0f783a06ae76f54cdebe4550f2f72dbb169ac93142
+EBUILD ksmtp-19.12.0.ebuild 598 BLAKE2B 3f60a94280e883711d5c84541f14f0d81476a64aea88ebe3160d48ff9f70ef099cf0a349ae653f589e56f219d5d7fb286f1966aee92ae91fef7c2102e6806bc6 SHA512 dd10c81f457b09ccaf66af2d825e46eadf4745a38b2f98648ca9212805a6d87e548be93ef0a188b7487d7fe5f19eb89976c991145e79deaefce9e6cbf0574c01
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-19.04.3.ebuild b/kde-apps/ksmtp/ksmtp-19.04.3.ebuild
deleted file mode 100644
index d1be341be877..000000000000
--- a/kde-apps/ksmtp/ksmtp-19.04.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Job-based library to send email through an SMTP server"
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtnetwork)
-	dev-libs/cyrus-sasl
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 642410
diff --git a/kde-apps/ksmtp/ksmtp-19.08.3.ebuild b/kde-apps/ksmtp/ksmtp-19.08.3.ebuild
index d0570a3bbd03..a8b200dcd7b0 100644
--- a/kde-apps/ksmtp/ksmtp-19.08.3.ebuild
+++ b/kde-apps/ksmtp/ksmtp-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Job-based library to send email through an SMTP server"
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksmtp/ksmtp-19.12.0.ebuild b/kde-apps/ksmtp/ksmtp-19.12.0.ebuild
new file mode 100644
index 000000000000..2bb246e21d5a
--- /dev/null
+++ b/kde-apps/ksmtp/ksmtp-19.12.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.63.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 075267c5abf7..934156b5ed17 100644
--- a/kde-apps/ksnakeduel/Manifest
+++ b/kde-apps/ksnakeduel/Manifest
@@ -1,5 +1,5 @@
-DIST ksnakeduel-19.04.3.tar.xz 604740 BLAKE2B a2841cbb2a47786d811ae4545dc11ad8750983dc3afbf991394d6d1493a4edb01903502adc91a5c5fc39e8fe63e3d08a67d4d096997f6561248b6ccd106ad60c SHA512 b56b8aa7223aff96fbddd016bcd907f28786ca65426a4881c4c2432108b8efeaf8b176a3cf803161a4e351d958e0f00580a2e0190766e51401a8b8850e1e1658
 DIST ksnakeduel-19.08.3.tar.xz 604504 BLAKE2B 1150ad321f24d5a5a0f8d5dac12a8230359694ac8e6c225216c03e50c9dde0d6762ff45b667231dd63794b125544e152943e75b4cce8aa005517dd30b84a2d04 SHA512 2f3b6d038678d2e6dac679e6edef4716bd6b1d9d3b87603423036f5d05a93339a7b39949811eb6f1a544038e529e00b2aa2d3646eb8808c572596292c1ae4b00
-EBUILD ksnakeduel-19.04.3.ebuild 766 BLAKE2B b247206d94a36b81402ab9e8e41445102f836175add50ffa11898e1a320e052b338c2a47f7b8e80280edd0617c83c52beda784eca79f38defbe0cda0f0d34948 SHA512 b489b8accaca9dbc8ad70b63b7a08e4dd21c121bee7023f8af6d1107e636ff2f97b1bc9c124f69ba208d24d4a09a4aa29a6cd530eaf91f6547d1e6b705e5f26f
-EBUILD ksnakeduel-19.08.3.ebuild 943 BLAKE2B 4a657bde08d4f927e4e44aea360427b6ff0d7c25470c2ede5d8f3c0a29ffa52ba1b879a444fd240a8702696c3a14c679ff1d44068899df7744c15c973b9cec12 SHA512 f1757472fddc3cc06c4090c93049aa1090afa134af313f0899f58c641325f380c87f8506951e926fb0e27075a6fd0be388d6ac452f61ccebee4f810825987996
+DIST ksnakeduel-19.12.0.tar.xz 605824 BLAKE2B 0876bc236f367931d3ab9975de70914859b20d3c22887015dbeee55e1c2d004f03957a2982150dac07df47cc5d650e6d16bba106862c4b80c4db72a0ce5ee184 SHA512 5d85b2cb49d4908925f8531b4efc736fe19628dd22b93d7ba3f60f38b025f11b51df64e89eb130b1e8c5a87dbc7b85aed328ddcb6999be3a8b1c179923ee0f62
+EBUILD ksnakeduel-19.08.3.ebuild 940 BLAKE2B fbe8142c82e05e05b0cc7ee09b29f78a8f4a1800aa3c5f3e087dd857825b8326948427b912a381989d551b8d2182bf2bd55199ee428412589151716dd8126cac SHA512 3b88f4b5007fbcc767b60826751fa63a062b1fc05e7997db537189e93a65ee51c3f4d6047bba7d61001322515bfab9e0c65aeae79773e48d854fbf63131f277e
+EBUILD ksnakeduel-19.12.0.ebuild 951 BLAKE2B 6d2d0157e745e7f4fcc06120aabf890b8462dbf406dbda2e2a4030b3845b485a1c7560e5f453ca832b761a5840d85e05b020ead9d7e5278e312e332480d53d69 SHA512 a0e68d1eb732c93c2cf89d0d0b34c547549a103c940b462693e79c031a2ef72ff3cfee3a0aeb5b0a2af675f959b3f80876fa88396cd77ce0a31aa6c05cdc2751
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-19.04.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-19.04.3.ebuild
deleted file mode 100644
index 9122e36cc014..000000000000
--- a/kde-apps/ksnakeduel/ksnakeduel-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="KDE Tron game"
-HOMEPAGE="https://kde.org/applications/games/ksnakeduel/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksnakeduel/ksnakeduel-19.08.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-19.08.3.ebuild
index fc94271df9f6..831082b350cd 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-19.08.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Tron game"
 HOMEPAGE="https://kde.org/applications/games/ksnakeduel/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksnakeduel/ksnakeduel-19.12.0.ebuild b/kde-apps/ksnakeduel/ksnakeduel-19.12.0.ebuild
new file mode 100644
index 000000000000..3dd01f038575
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 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.63.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 2878627fc419..cd0a51919b00 100644
--- a/kde-apps/kspaceduel/Manifest
+++ b/kde-apps/kspaceduel/Manifest
@@ -1,5 +1,5 @@
-DIST kspaceduel-19.04.3.tar.xz 611000 BLAKE2B 59331fe5eff8e33d9432a55b3ce643adfb9408dc0b12a1257cfbb57e2ea9f7562539762d0d11b578467c10e9729fa5cf4d7805ce0c21a8b0e01723e53b1dcc95 SHA512 3531e124f96616d403684e4be14523f85fc927adf23215f6321eb1c3ba4fa4cf547c5575b700717de84937afab38775e16acb8b69f70ff9b9159d666f0f2b748
 DIST kspaceduel-19.08.3.tar.xz 611304 BLAKE2B 67c54a7fcf79f21c11f0c9ca09492017e9d22cbcedd2db33c651eb3ada8ccd2074b809d51fffce0ae4999f301e4cd0f0b8eeacba23dc588199ed7aee85805c79 SHA512 3a3307beab90e87f0a143e57d81fe6e6ac620e79d2417a416b4ca6cbce4dc94be036a7a499359c908df075d1a480d1fe6a00ef15fd74bbe8b36e9fcd6d4d0196
-EBUILD kspaceduel-19.04.3.ebuild 719 BLAKE2B 89ac24dc39f68cf8c43f3a5df2da462ec8896ae74b5d1062a219fb5c5d1ce574b0f15ecedca0cb8d978c2be6f7730bdede491cbe0a7dfd1595f2cedfadce85ff SHA512 021f35d1cdb8410a16452b95c712621eab500d244edc62ec5402ab9853db8611bec584a3fcb3249644f8ac0d3e79f57ae1695c96899cf5eaf74741c716a4ec31
-EBUILD kspaceduel-19.08.3.ebuild 878 BLAKE2B bea3cfc383aac3919f0339dbc8356796086c92ff7c3aee1beae650291257734ec3c1aaa91167d43feff12c83d032006f100b5487b394f76b4d183506b57158ec SHA512 9096268040874d2198f700eeac0913eb4c9af5451eb5fef98f0926f13200ad068a943fb43cbad5f78a0a93c47b15bd26178c30e6143bc892fee90dff35582676
+DIST kspaceduel-19.12.0.tar.xz 612188 BLAKE2B a6fb7dc81afa6907d64c292f3547da85bebe3cf1a55fd07e12d53e1062d5824a03df108239a4eab02ac69512256b5f780b76cd1a88c9553ffe05dedc8e4e9afe SHA512 89aee85fa1ac27824e9cb19cba60182fbb300453033db0b63e0af393674cd5d25342a63eeefab07939b0077b5d92de7d8efb813525292bfadb7c43039cb8a2fe
+EBUILD kspaceduel-19.08.3.ebuild 875 BLAKE2B 1880ce033323fb2e47f44febf2e2949a93df623f3138e4efd4df166327cc4067c93f836df805ccc5fd5b74cc296d3ebaa89cc97434cdaae4f9f373715d7b7e90 SHA512 59a8064353742f1a44d606c5ee9876aaa4e57894a8f7a4b47fd63f4a744e5093752943535cda3fc253d7678190042260420a7e10294ab107d966f043a9d40b52
+EBUILD kspaceduel-19.12.0.ebuild 882 BLAKE2B d105a017945e6cf25a0aa52a078ab51128765bb0466457c13e0683e65313bc250f1b2e72e1a6be7160e0bbf07f6714df0ab77c560cfc5099dcd85732520e2984 SHA512 0f3052b186e60fabdbc54dee75d67c59f8771f21292aa967c92650a704adcf1ac52d380d341c53bc8e072775643c96c230914724b859c3bbe56bf149087a7f60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-19.04.3.ebuild b/kde-apps/kspaceduel/kspaceduel-19.04.3.ebuild
deleted file mode 100644
index 45d5f2d45d51..000000000000
--- a/kde-apps/kspaceduel/kspaceduel-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Space Game by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/kspaceduel/
-	https://games.kde.org/game.php?game=kspaceduel
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kspaceduel/kspaceduel-19.08.3.ebuild b/kde-apps/kspaceduel/kspaceduel-19.08.3.ebuild
index 7dd6cf096c7c..0303a26ae04f 100644
--- a/kde-apps/kspaceduel/kspaceduel-19.08.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/kspaceduel-19.12.0.ebuild b/kde-apps/kspaceduel/kspaceduel-19.12.0.ebuild
new file mode 100644
index 000000000000..e15411592c9e
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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.63.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 eb02a74c72c7..c16d1ba1a2aa 100644
--- a/kde-apps/ksquares/Manifest
+++ b/kde-apps/ksquares/Manifest
@@ -1,5 +1,5 @@
-DIST ksquares-19.04.3.tar.xz 260376 BLAKE2B 9d36c374a58816cb00f27ed4a338761f85a46a54eb376f16cfd84be197776bffae38bd5451b24c9f28b24d0d10a8e7940f31408427fd137c339c1e921a882eeb SHA512 515f6acbf2cefdee3e9855f2c4c3a1ba7d9ad8b197976968de2364e2baef5ba6a376559ddcd94f58fcd1e9a3f69119a9e5402764d12c9d494c4e5c252aeab6e6
 DIST ksquares-19.08.3.tar.xz 260604 BLAKE2B 5c96af1c6fba1fa5abc10c8c12131c032d61be5f1c42b68b9412c8b8ef799b7123abbfc59068757f29f2e450a703989dbd0f95de360752f620fc19455ba91bef SHA512 5c30be80598d509fe168978c30554a05337a8461e318f6bb834a02c118fa4f763e832f9d57c3c47b3923941bfb325750e544bb0a5a428ef73886fbf9076eea1a
-EBUILD ksquares-19.04.3.ebuild 752 BLAKE2B 54cb3c2cf0aa56cb44daca69a8ae65d144c1fd2532c341bf4576632f41c6694a9c79274719acb258e8e86c8e31982958a037275e350153d44b611e42a399e2cc SHA512 da0089a6830b973e064c0da913b5970e45e16dd209de865fa1c6954f2b5702003464a37494273f618823e668c542e487e0417d784ffd7d53b1141f5deb33b198
-EBUILD ksquares-19.08.3.ebuild 917 BLAKE2B f84d4f631ffc82d0a1d042920287b84c2cf243b5e1c7249bf1e2ffbf8a46417e2bf85c8e8187de441406dc85154b89cf972104ff2bb43254b641798ff823b938 SHA512 69efbb1cdd7dd4daa64c8bff9c4354f99706cf01f33073d8b87718683207e5ca2e42764d2a00d2acc6b45cd50a61f8e9d810b6d0912192500d5a6ce16fddc28f
+DIST ksquares-19.12.0.tar.xz 260788 BLAKE2B 219b6940f1ffe1a82754d993d8905b1ae4015479cb1aac97dd25f68fe6debd0338db20d0a4fd4251603e43b6e87dabd8ec755580296e3d6178335cad519e7846 SHA512 3b5a508c6c3f37129281faeb49eee8bd521012bc91529839bd49553dec580207820ba1383b339a7cab878e7d03de59b246d25b4b7821381c3c265234ad259f34
+EBUILD ksquares-19.08.3.ebuild 914 BLAKE2B 85bc132c4e687443a3126e7a7af4e73f743db468f820530953e10c0b5979dd245db9c9f7fa9fa1df87f0ce17852845da6e5d0d850fba52c2db5b054b3ef2019b SHA512 0d4c49437d82f2451972d502257228651bd0959e4cd8ca11ee204b64b8c2d478f860831ee9c3954d596a577aa6d30a8ee1920f3dd956d9ec0d384c5ae36f48f8
+EBUILD ksquares-19.12.0.ebuild 921 BLAKE2B 540cbdb02c3c4967ee53bf3f495f02209f2d87dbe6baa23cb9ae62d4c644851ed4adefa055a396121cbefc48ed3fec5ebca8ca6655d77d9ada234da8ac205add SHA512 75b7ded9f0f25dc06e890f024e28fb2c535190b81d18017ad2c9b7c37422bc0da78f6c31f17a4bcecff84fe31b7c2c5f849d2de03a47352cb07b6a904ea15fca
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-19.04.3.ebuild b/kde-apps/ksquares/ksquares-19.04.3.ebuild
deleted file mode 100644
index 968b2ce7b9be..000000000000
--- a/kde-apps/ksquares/ksquares-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE clone of the game squares"
-HOMEPAGE="
-	https://kde.org/applications/games/ksquares/
-	https://games.kde.org/game.php?game=ksquares
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ksquares/ksquares-19.08.3.ebuild b/kde-apps/ksquares/ksquares-19.08.3.ebuild
index db316cbb1fd2..d00dd11ccd77 100644
--- a/kde-apps/ksquares/ksquares-19.08.3.ebuild
+++ b/kde-apps/ksquares/ksquares-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksquares/ksquares-19.12.0.ebuild b/kde-apps/ksquares/ksquares-19.12.0.ebuild
new file mode 100644
index 000000000000..eb16711fcb78
--- /dev/null
+++ b/kde-apps/ksquares/ksquares-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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.63.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 04d8aba390e4..ab0586795a50 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,5 +1,5 @@
-DIST ksudoku-19.04.3.tar.xz 1647672 BLAKE2B 104b636edd678bfd0d0f5962ddfa31b2674f8bdfd4fe72825c0120f53b5cbc8103cdcffccd21e8593739b01fe7c3320ac120d6fb360402146f7f566d5fac417e SHA512 0bc73b01a46282913d7f4d74fd6495c6e61c5c4b37a1a9a5c1f3fa0869ae60f06a85fc40a6632af31e74efd9f736acf915cf31d5ca75276cceb0d4355369eaa7
 DIST ksudoku-19.08.3.tar.xz 1649140 BLAKE2B afadfed26d2fa79585d9f52941d5a7a8f0c51ee6fa887e8977292aa20c06e2e0c1e6cea06f11ea46daba3381bcc36015dc533da52cf8f55aacc62398a6894242 SHA512 fcb434bf12ca2a553fed928e258d48173e90da682c776638705047441a690c6ce12a20231ec4005424565a4d1c5d961150e4253cf35ab5e7f8efb044652d6dea
-EBUILD ksudoku-19.04.3.ebuild 1101 BLAKE2B 8cf9c43c3a060a26d255e2c920b8ddf5b31c8fc3238fef328f1d185d203e02b2adb7f1b00924665e40b7d7efd1eed8e375577187326b2453bb01bad5ea472c3d SHA512 41f68705cee63b5684bf1d87063776959b2ae31a143eafceb4d9f79d46558d798f26bdf8dcd1f3a61ebaa5c00e8c18298140d1403ab9ac079edef584a46bb273
-EBUILD ksudoku-19.08.3.ebuild 1307 BLAKE2B 17cb958d93cd535d7e1ab32b3f64c377a5e44ef56d10a14b869d72f333fa0cdb01eecafb7b9759b6d6bc34a73003af84023c9ed77f6b56f73e37d128bf6a037e SHA512 0b9d136d57f2b0df9e5b1500fd382e98f87185275bee14e3e03290a1c647fcd8998639911fa0db6387b7fe6a904709f12cfa2bbb62967bee299645daf93ed154
+DIST ksudoku-19.12.0.tar.xz 1650052 BLAKE2B 6dbbc245783b710ddb6a5b639eb83090d6bdbd6a4deff768b622c4f9050ec06d6c2af730ff4a0d6061f446b210712b54696a9d2c4a90991b52dd9f9fac06d5c0 SHA512 2e17aee06f2d0826afef66e9e1ffd8d39e08344f1cad004da883c4f7fe2c34529eca930e6c1d6af765dcf9db5575a6dc1ad4ca3ce055c39272d352f709cf5d59
+EBUILD ksudoku-19.08.3.ebuild 1304 BLAKE2B f4077fb1cc32a2d12a436bc465fd053de2815199c2737368387f436d2e18d41b853442aaf3f96cc540703cf375c7a1cbc4151e14a4c545e44410567733f8afd8 SHA512 a0487a3ffd902ce1e50ce35fd9a4ae1d4a34cbd9e0582e040e5feddb53b26a32db7a0858adceaee853831d8c5945cd4809061ccfdbf896c8185d3aef846c7183
+EBUILD ksudoku-19.12.0.ebuild 1305 BLAKE2B 16ad9d4a40b3beae9cb0e9940e2d2e70ca6539212dd8fac22b0b5564dced7f9bffdb1f670a6bd8f4a332e74cc729e95d2e615cffc34a2895892cd7538de3402b SHA512 7b03a09a14d9591fb8970acbb3c3f4399fd74ec6fd49edfea95726fc3e528b2619f7d18b3411a0a42ffbc1f9931291ab31317a3897e6e45a8be86c539e35f4bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-19.04.3.ebuild b/kde-apps/ksudoku/ksudoku-19.04.3.ebuild
deleted file mode 100644
index 124e1ab7ada5..000000000000
--- a/kde-apps/ksudoku/ksudoku-19.04.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Logic-based symbol placement puzzle by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/ksudoku/
-	https://games.kde.org/game.php?game=ksudoku
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE="opengl"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/glu
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package opengl OpenGL)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ksudoku/ksudoku-19.08.3.ebuild b/kde-apps/ksudoku/ksudoku-19.08.3.ebuild
index b9c0b043f0fd..26df9cdb5167 100644
--- a/kde-apps/ksudoku/ksudoku-19.08.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-19.08.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="opengl"
 
 DEPEND="
diff --git a/kde-apps/ksudoku/ksudoku-19.12.0.ebuild b/kde-apps/ksudoku/ksudoku-19.12.0.ebuild
new file mode 100644
index 000000000000..7e170b62907a
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-19.12.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 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.63.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 6f90b62e4007..1825d6358081 100644
--- a/kde-apps/ksystemlog/Manifest
+++ b/kde-apps/ksystemlog/Manifest
@@ -1,5 +1,5 @@
-DIST ksystemlog-19.04.3.tar.xz 1922176 BLAKE2B b8feba3e3907e974a8690eca92d8959814cc67dcd7d95701ed3ec795499eb2305198ee3636b4cd2768c09fabda73a68448443b98ce4f6fc87228455a9159813a SHA512 13654dfc5844b5aaefe209f1bc96198e7552eb42445b2f34bf97e2804f088076f95ef8ea10fa3784f718803af72b5c6ec7833429d86d79b250f1bb732431b4b3
 DIST ksystemlog-19.08.3.tar.xz 1928428 BLAKE2B 77efcc19726a9af47a009317196d062fd78bf689618f8b9005fbf41b096e7f3ff76fc0451579163d69336fbfc2b3e9e6b9eea409a5933ed24adf82e5cfd29d6a SHA512 bc2f1f73a04b417579d12351d78a0c66a2814590cffaa191c3d5158e3f0819aa7a24bb69603b6883e4ea753944444fdd2986393c9c8ed83dca81408cd56a655d
-EBUILD ksystemlog-19.04.3.ebuild 1582 BLAKE2B 695fe6a4cca0b38fb8427e7ad45a31b10d481d547cc9b247241357db0f8a842d89980063c0ff0585e950e2a6bcac5b49d15a081ef4927df2dc92541c6eed6789 SHA512 be23a4585943f54666770800577dd11929f003ebe592b27affa1fd44c5f43a1fd6ac848a7eafd7266da5600835c0d8402ba148333902a38619efc1d0d94c1ac3
-EBUILD ksystemlog-19.08.3.ebuild 1751 BLAKE2B 7a4b9689205668b7125f6020c644381cc047a8af0e61dae5a4153b5795350d73370f3e57c1e0fe419831bb6857978882b8be0c004d062c109552ddf423054ac8 SHA512 2ec5702a840aa0f74ad714e3453dd918fae3b1e02da41cbaf2c9c8fc829be294d366d00b3e120a7dd63749e6b220866725fa0593ad9901cd357bfca4739df869
+DIST ksystemlog-19.12.0.tar.xz 1927480 BLAKE2B 708e918315bdac7ad9273d23485c641dcfa4df3f249c4680359d2ada5b3f63c65a59f52def26cd58520455cf92f5a04597c97a7d8db843e22074e9ce96a17905 SHA512 6648e1635e6bec0da9e91c5d2dda879fad9c99c0e2f48bd5273f227466669aef7d31d33652cd20ccdef2ea205b9921161c1d46f0c6385f9bd064a6bf20e78557
+EBUILD ksystemlog-19.08.3.ebuild 1748 BLAKE2B c227d0a27161818aafcb4dc5d51ae78149b9c8bf731317e4331ece98913803444e12b5a847e27ece1d552ac4aa0a769493d52c44c9715ca7ec294fa2a0c58b75 SHA512 8640e37870ef4034bfb78fb3d0a527a1e3d420d59fdf2c99bbf22f310af3fc0e8b082632679c2e73957491342b66677df1ea7d1d31bbd973887e65c4e2c8e08e
+EBUILD ksystemlog-19.12.0.ebuild 1753 BLAKE2B 4c2ac9b89efd3eed49bb3d7d2da035a0c9199d8c09eb4c5aab0afe8b9e05e09a562b0d4c093df19698620741bc846697446ebf512bee3d0215757b30e84914e3 SHA512 df64720a269f6cfaab65387a19fbd1da18525f5d9b9c3d92212448820283d3422d36abdd65f1d076087dc6d3f4b952f75c85a5e9bbd07980cf42e5ce26a13dbe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-19.04.3.ebuild b/kde-apps/ksystemlog/ksystemlog-19.04.3.ebuild
deleted file mode 100644
index 4ec83ce775bf..000000000000
--- a/kde-apps/ksystemlog/ksystemlog-19.04.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="System log viewer by KDE"
-HOMEPAGE="https://kde.org/applications/system/ksystemlog/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="systemd"
-
-# bug 378101
-RESTRICT+=" test"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_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-utils_use_find_package systemd Journald)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
index ea0ec1797f1b..eda448fa7d9f 100644
--- a/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="System log viewer by KDE"
 HOMEPAGE="https://kde.org/applications/system/ksystemlog/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="systemd"
 
 # bug 378101
diff --git a/kde-apps/ksystemlog/ksystemlog-19.12.0.ebuild b/kde-apps/ksystemlog/ksystemlog-19.12.0.ebuild
new file mode 100644
index 000000000000..3ecf0122a78f
--- /dev/null
+++ b/kde-apps/ksystemlog/ksystemlog-19.12.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.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 ~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 3e2c041a94ae..47cf8059126f 100644
--- a/kde-apps/kteatime/Manifest
+++ b/kde-apps/kteatime/Manifest
@@ -1,5 +1,5 @@
-DIST kteatime-19.04.3.tar.xz 284864 BLAKE2B bdf67d96ccf84266b34487c1d0278d744b4f356c219981abfd16411d1340ca492417c2f702429453c1c93756017d3ad55d293c84be0dca80935ba7b56d553493 SHA512 17275f87d536f1f9f470a8e2e4fdaae08c41e148e4ecabca1ae8b6becbf588cb40183d9395b2c8c3d5ee8d9b51f735c680e7048c5a9e612ec672cbee3848622c
 DIST kteatime-19.08.3.tar.xz 286792 BLAKE2B f0554fb2260d0474d4add0fc7b7913b35d16d88ff91c080df90e126c02155172a7301cc695b47adc2b2b3924a942e2f5ee71b134c1164425462e3ffcb3227205 SHA512 ad5349955fbff6fefd7fe97e5ff76ef848ecba2c217399ccc5c101b4cc27c7db6ef9d7c93ede6670dbe8482e4707d619f29d640e440cb20f02f70cc955a674b4
-EBUILD kteatime-19.04.3.ebuild 717 BLAKE2B ac2ec8189da2b21098253a03cc54f0d52169028d4376d760a59dcdd93cc02303d03e664b4ba57612251e5b167d6fa50d8cded718fe81957fe585547d28c8622a SHA512 f8c009167f79e06dd430e975f4274c1d3660f0bc4aae91dffa1356f1d9efa50c8a254b1e8c74eb3128ae21afe947b787b7f30ea23dd289a0bab611956822df96
-EBUILD kteatime-19.08.3.ebuild 864 BLAKE2B 92e2cff0684d1b9689971a68e483dc3daacbfc29f0390bdf10eeb599b28d428e67b87c1cb339faeba4b3b18e191168b5fc8629744c586b1aa6414c10e750f5d4 SHA512 cbde1dcd14ffda4d0e5a5d5864c60a3153fc2eed76024d0faf398ac0a30b6c5c620a115c17a9647ab04ba0a3a9055a2de3138ff5de55964d6fe17cfa4001cb41
+DIST kteatime-19.12.0.tar.xz 287156 BLAKE2B d60f4a1aa5059aee9da6983011f0d6a2c57f8306815aac8872b41becdb7c4dbf14860d94620af3af63105cde8552803a8cc5cc0165eb685740772a568873c28f SHA512 9bdedbbd6d161cf3b611b3edb39a0a51f1f23e025bbcee4860a4498f2240c8df594a58a1c586152b139673101714217a48fb61c52cd7cbbefeadd6906e67631d
+EBUILD kteatime-19.08.3.ebuild 861 BLAKE2B 5c578dfba917212a74f6c9772ba24ace72d0c301becb3077b9dd3dc912ea2bd950dcc33da81d5423515d5044a1d31d50b13c540b13c79c388b4367cee0f94f9e SHA512 4741c353281d9a93e1cb90b2459dc49111a804626eae0b1abe5cfe81949a3187257dc5246c74849ddd21d5bfe374e2fc21839ed50352264a45e24c730f7a9c8d
+EBUILD kteatime-19.12.0.ebuild 877 BLAKE2B 3a9ac9c023fcedc4bc1275779d26ad5c7e52925ea193c3c08a25933a5970c0bfce6bcbfe0ddfea81c1720ccd5e3b082c6338291fe0014b16e6c7c067347b2cce SHA512 5cd0b30b7cf0d8cdbe794b438ab4bf580d0ef835be0ef78d0642727985455fe7829c7a4a69f40f4523348ea1058abdf48e457228fa1e034ff4781909e3dc205e
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-19.04.3.ebuild b/kde-apps/kteatime/kteatime-19.04.3.ebuild
deleted file mode 100644
index f11ef8b49635..000000000000
--- a/kde-apps/kteatime/kteatime-19.04.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE timer for making a fine cup of tea"
-HOMEPAGE="https://kde.org/applications/games/kteatime"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kteatime/kteatime-19.08.3.ebuild b/kde-apps/kteatime/kteatime-19.08.3.ebuild
index 0129a048620e..2b12120cff4a 100644
--- a/kde-apps/kteatime/kteatime-19.08.3.ebuild
+++ b/kde-apps/kteatime/kteatime-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE timer for making a fine cup of tea"
 HOMEPAGE="https://kde.org/applications/games/kteatime"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kteatime/kteatime-19.12.0.ebuild b/kde-apps/kteatime/kteatime-19.12.0.ebuild
new file mode 100644
index 000000000000..a8e509df11a5
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 265065ac0436..2c82c3283d92 100644
--- a/kde-apps/ktimer/Manifest
+++ b/kde-apps/ktimer/Manifest
@@ -1,5 +1,5 @@
-DIST ktimer-19.04.3.tar.xz 376784 BLAKE2B e96571bfe44b41e7926eb0e65637aaa4f34750ec93220c1697b609768d7f8f02c46488d90a6cd05f82cdd57e169cbd1816a92454befa3f7d5c3630ea6f00f0a0 SHA512 ad0cbb37d56251a667aa21742219ce1bdbba8e1a7a11f34947e4d3954d11dd10166b891906a13c99c71436ae9ad824a5bb788826a2d935632af40ece438feb8d
 DIST ktimer-19.08.3.tar.xz 376768 BLAKE2B 989a578a40b51d7570e97557f1f010c3302d86dd4ba687e0b1d971007215a9e494e7f29bd9ad0a92155ae09bf82dae67765e9bc1319d12ea116ec6f18ffb83f9 SHA512 8e8eb803cec7ef2b445817584d44f5e0fcf5cb88dc12a65c8a91577fbe7e2462a5d08603198f8ab4c7dfb4ee139ea61f06087cc09c592ace6b759af2d1d487ff
-EBUILD ktimer-19.04.3.ebuild 698 BLAKE2B 27ce9c45198c0ea821b0d9d76b51496ea9d74ea3de249ba65c8561e34983513685dcca98023fe18e2d9ae2916aab6881fcf96d0b698d1698153da7a3074f0d14 SHA512 cf69c316b55b76f1edb466b76078d7b717a6fd43327447b4078f513e81d69dcda6518c5994c490231a133cc5645a7eb87b6327de587bd9524f16a0bf34632822
-EBUILD ktimer-19.08.3.ebuild 833 BLAKE2B fd00770d3e2023dddf1f36d3c5a57b23d4cd00dbb7d2b8f8a991923409905a5000662b1190d5a9cf0fee8e1ea8b5119e231176a8194342b5db20e2782f6987bd SHA512 3c2d67ccf7d4000f7750091145a34b70e70bde71eec12c1904305e839fcd80be2e996262cb620dccd00b576685a80e295c4b1a58b79619b4c4ca3c1f9b39a224
+DIST ktimer-19.12.0.tar.xz 377360 BLAKE2B a89c0e13b3058697c1a436c984cf67bc315ca6c4cb35376cb14ae355ba9bd81ee76d12443475c7d56afe30c8af86e6d6bedbdeb0ed34d9a6af0b267673fa5eb2 SHA512 5861751ed9b344ece5fc9dceef7a3407edd16880518c1445cc3d5138b7155fbe999856fa6a9bf9d8a1a88cc9cf42121c66947a54a0ceedf70b5732859fab64db
+EBUILD ktimer-19.08.3.ebuild 830 BLAKE2B a5dbbefd2e41c9543bcf0c5a248025a4db690b789c6391658707d57559797516e9139f75f8723601e8a3448bd842de8a9efe57019a77c7cd739ec0d3c53db574 SHA512 014c76b40b7511f7b025e6a4f2b2e1de3812b14b75291855545d1e465c53634339f95a35175725bb56abdac510255febe648cb23986a948f4d9a747947919555
+EBUILD ktimer-19.12.0.ebuild 842 BLAKE2B 15fea4b89f0eab8d794fdf57bc172a505b7edee9b6776efd172575ba35de5a8ab7a5400f3bef17440013269b922e0ab498352fc41dfb2af8e6bde335ba6c9878 SHA512 e5a25c2b7b277b35b37be8a2dfb22972376063c4a3099b6ebd2755423d6e23083409c49e26343118449f4f7deff410d087a57f79cd72dc955ed73898d9dc38a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-19.04.3.ebuild b/kde-apps/ktimer/ktimer-19.04.3.ebuild
deleted file mode 100644
index de813b6cb816..000000000000
--- a/kde-apps/ktimer/ktimer-19.04.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Little tool to execute programs after some time"
-HOMEPAGE="https://kde.org/applications/utilities/ktimer
-https://utils.kde.org/projects/ktimer/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktimer/ktimer-19.08.3.ebuild b/kde-apps/ktimer/ktimer-19.08.3.ebuild
index 8a23f51ad4c3..b47aece2d157 100644
--- a/kde-apps/ktimer/ktimer-19.08.3.ebuild
+++ b/kde-apps/ktimer/ktimer-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/utilities/ktimer
 https://utils.kde.org/projects/ktimer/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/ktimer-19.12.0.ebuild b/kde-apps/ktimer/ktimer-19.12.0.ebuild
new file mode 100644
index 000000000000..80903bd60ecf
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-19.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 40d08eedd3fb..e0b9f59b31c7 100644
--- a/kde-apps/ktouch/Manifest
+++ b/kde-apps/ktouch/Manifest
@@ -1,5 +1,5 @@
-DIST ktouch-19.04.3.tar.xz 4947000 BLAKE2B 6148566525f9839dc93fd5365c426007568bda2bc0a76c86639ebdb27d62778d843b5cdfae65880f9f55114389add213077c15e87714e29d0a2644ed353034ca SHA512 499caa202f3e08d85240c0cb2b0099495d37c8c285701d5ac0834fd6a30a78b3988677577c5d21e24bf68a3ee22735b145f340794e5860fdb193c964ded49a34
 DIST ktouch-19.08.3.tar.xz 4937064 BLAKE2B 5098fb24c08e4343320deef501cbd579b575f81797f22bcbce914112d1e4ba1e83e924c8ddb58aa6066aa1a23dbfb8f9b2f451c7a83c960d54335cc950551823 SHA512 934680eb3f43f31ca04058a50b181a1cd6bcc5a9657bc5203c947e05a35706722aa023ce717b6ab4a4b5dd388e91682aee06b2cc1de9ab2030e9437e00ea1176
-EBUILD ktouch-19.04.3.ebuild 1350 BLAKE2B 21eac1d880d87bf0710157c266f305d2a2f6c2058a3fc55c841eff4b904edbf426fe1b3d5815ba7d42dbe705c965d5fc5cc18fb93930c90afced7e60a7d9003e SHA512 b424e35f1bf4d70e56109d3845b7b8b53a3fe3cfcaf71cd1b6fcd0629a62faae800d8122b5a1aa8b55b81d1a21da3f8638800441a3f2101879e9778e59d0f26b
-EBUILD ktouch-19.08.3.ebuild 1663 BLAKE2B 974060cb46c8554ac6cfc72b16fea7d88e437a29be0274bc82d8dcc4c3a63677b3e640a1bd907bf1cf6b1f67dcbc178c9001eb94f7e9c84e6f2120e2d2927906 SHA512 965368e6f6f1f5ca78e83f147432050358329a7d64f34039e9a8741c445214d532f3441b03fba16395b45eaf9c13cc38542bf9748f3fdb0d921753481a2161d5
+DIST ktouch-19.12.0.tar.xz 4935588 BLAKE2B 9cc9cc140347e059f3a217fb43502f68b9028e0ea1829a338db79f76512af3a5441a6a44788ae8e800bc51512c3efcc2e13902fb16e0a88bbdddc05f4c031cfe SHA512 19fcd2987547b8383ddfee4681c57ba402e5e7e5be2d3e97bbfdf7cb2ec5bcd55e2dfee3ba9a2f5602cf9d37f90f970b036db5597bdbe9e5b1b969e3cf2e21e4
+EBUILD ktouch-19.08.3.ebuild 1660 BLAKE2B ce8f4a4d3a38b150a9f36e7cdd39f8149a22f0bcf11a1dc35decdcb1fcd969454bf2322f033daa158be0ec3eba78040ccd5f12b919d80ba29ca0256d0174cf66 SHA512 d65e6b5d335c5a1f17ff9bed709ee8502c9328a2c7c5ec2a41d899a41251cdc4e8fbd60b4d3e2dab3f05b2197a2680d3b53a8f88e003c05320d737afb2a2a7f4
+EBUILD ktouch-19.12.0.ebuild 1659 BLAKE2B 8d1cc0519eb9e14f38e5adf667ecdecf9b01ab3825e356d2f19d25e67268db1e81dec4847a74f0b976a524cef61148afea87ceac485031f93c88d042b22f7b02 SHA512 8c6d36ee03d0acdde7c8e14c3aa388dfa5d8c5ff101a0bfcb4b3f8f5f94fbe6bd6210800c06fef39b8710e8234646f1699dd3addd8bdd63933062bba4aa53f0c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-19.04.3.ebuild b/kde-apps/ktouch/ktouch-19.04.3.ebuild
deleted file mode 100644
index 6fe816fc0ed2..000000000000
--- a/kde-apps/ktouch/ktouch-19.04.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://kde.org/applications/education/ktouch/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-# USE !X is broken, https://bugs.kde.org/show_bug.cgi?id=402902
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kqtquickcharts)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCOMPILE_QML=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/ktouch/ktouch-19.08.3.ebuild b/kde-apps/ktouch/ktouch-19.08.3.ebuild
index a1a0c243f967..3b388fd9ed01 100644
--- a/kde-apps/ktouch/ktouch-19.08.3.ebuild
+++ b/kde-apps/ktouch/ktouch-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Program that helps to learn and practice touch typing"
 HOMEPAGE="https://kde.org/applications/education/ktouch/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktouch/ktouch-19.12.0.ebuild b/kde-apps/ktouch/ktouch-19.12.0.ebuild
new file mode 100644
index 000000000000..ae683a137663
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-19.12.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 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.63.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 45e91dbfb1ad..ef0d7f152504 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,6 @@
-DIST ktp-accounts-kcm-19.04.3.tar.xz 262348 BLAKE2B 2f8227ae00e36b079d0a536d7d5769e0f45d8d2101e09974e59e61e734f1158614b823629bd1963498465728c82f574817e9df0e9cde4c59ac809fa869f1a15c SHA512 4b800d81dc6a61830d2e2da6ee006be2266e1d6862812d6f21b3fc9f85f5ab2ed0f617b8f0889529cd869e836c4dab51c35ce88b3a1c93877ed50949a67ad48a
+AUX ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch 1117 BLAKE2B 3f6d05d10df137aeaaf68890795458314ac43556df7f29493ab129a9046f97aee0775159db57fc7d9c42769f8eef9ce071803828137b75b16206e6d164584408 SHA512 c4509fcb1a3a5051c6175c101dde3e50630c95a922791f92dfefef5db089e3bcd9fb0f9aceacdc0d28558337aed850062b8e641c83cb8dc2acf9d78972a96255
 DIST ktp-accounts-kcm-19.08.3.tar.xz 265200 BLAKE2B 82599ec0c4f9135a2d45f3df1cd53d3018ccb5ef530733fa8fe640f1ab05d9db2f32d15a2292c416455953c58f2eeded94e8ff1400326b37d1c1dc3e28a41684 SHA512 6bccc23631256e91d4962004bdb96949ca79ba0e8f2068a92c763023a2ce71413f559a60c54f84dc5c23fb1facfe7ff08f6c74b68021e6dfbc30d19f3a8c3ba9
-EBUILD ktp-accounts-kcm-19.04.3.ebuild 1573 BLAKE2B fa708f671d3e5f790936a71ac58464e4daff913722ff6a19c0ff56d0142d588a942332a4be9259c1f621df06ffbb30c86148c7418d1304105d519bd0b8ed1949 SHA512 792c3f5f0dbd4d46e6755b79979fd5dc8aadcd9d1e0b61be687865fd6934524c360a606ba1636b0e329a088ceb1f21853a27a30be644cb33f1533da37c30a2d8
-EBUILD ktp-accounts-kcm-19.08.3.ebuild 1739 BLAKE2B 143a0b1caeb6521c4562db7751e37760347a23e8ff52db0043e9133047c53b0c9412a6cb49c92c523284fbc1484c72c92fc665130e4e853cdff3fe089ba77d46 SHA512 a07ab9a1524c731906d836a672763a824e512df9edac9bd0457fc719d033a08a83c7d004eea5146a601bd78cfeaf81887ff0946c9f8b0cf261d0eac889f1e48e
+DIST ktp-accounts-kcm-19.12.0.tar.xz 263776 BLAKE2B b1227202774368332cc0356539f941022c149519a1e49bd81005d7ad4268513feadb09a3cf498902bc321ae56782596be9f3bc41297712d6a26d3f2f3f3a258d SHA512 2ce587b912772de4f62dcb0d925866cd79d8f7447e9ba396e2d73eb4c08af6873734bf7d712aa630b3ba027e0e154db03eafdde22932758ae180c04d7ade2694
+EBUILD ktp-accounts-kcm-19.08.3.ebuild 1793 BLAKE2B ab4f995066ef74f27300759fe3b8e8ebfc1039ccaebe5f00c5334501eb40ff42083a238d2b9673b770a8efc02d1fe48d75c0502121686c49ae98eedce0df4a86 SHA512 21e95d4e790a37739f179e942e0649a89569f0978cbb72d68deebcb5bb91a509983163cbdbf640468a9b8f705ee30535242918c965f33f573a0a201cf575be42
+EBUILD ktp-accounts-kcm-19.12.0.ebuild 1687 BLAKE2B 2266a26c7a13232f1b199771c137677f757065658a91ac4b1a8262ebd3bd5ef45bc124f67863d3c5ead0892718ad7fe9da80749b3cc9a8c791a105248d334c41 SHA512 1c877aa749dcc0c1351a132a8526542c91ff241a403095306f6d07c0168c50d4f5d14827a28f033f33ada522e9c374c6d298c8831b9fdac51fea5a05795f94ae
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch b/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch
new file mode 100644
index 000000000000..fac56a410cc4
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch
@@ -0,0 +1,30 @@
+From fbe5097f4a79f286607b859be9c68de371955117 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 18 Nov 2019 22:13:18 +0100
+Subject: Fix build with telepathy-qt 0.9.8
+
+Use the new TelepathyQt5::Core link target with 0.9.8, otherwise compilation fails with
+/usr/include/telepathy-qt5/TelepathyQt/_gen/types.h:15:10: fatal error: QDBusArgument: No such file or directory
+
+Differential Revision: https://phabricator.kde.org/D25370
+---
+ src/KCMTelepathyAccounts/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/KCMTelepathyAccounts/CMakeLists.txt b/src/KCMTelepathyAccounts/CMakeLists.txt
+index 1fe7c09..18181f9 100644
+--- a/src/KCMTelepathyAccounts/CMakeLists.txt
++++ b/src/KCMTelepathyAccounts/CMakeLists.txt
+@@ -69,6 +69,10 @@ add_library(ktpaccountskcminternal
+             ${libktpaccountskcminternal_SRCS}
+ )
+ 
++if (TARGET TelepathyQt5::Core) # telepathy-qt 0.9.8
++    set (TELEPATHY_QT5_LIBRARIES TelepathyQt5::Core)
++endif()
++
+ target_link_libraries (ktpaccountskcminternal
+                        Qt5::Widgets
+                        Qt5::Core
+-- 
+cgit v1.1
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.04.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.04.3.ebuild
deleted file mode 100644
index c36bfe264fb6..000000000000
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.04.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy account management kcm"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm64 x86"
-IUSE="experimental"
-
-BDEPEND="
-	dev-util/intltool
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	net-libs/accounts-qt
-	net-libs/signond
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kio)
-	net-libs/libaccounts-glib
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kaccounts-providers)
-	net-im/telepathy-connection-managers
-"
-
-src_prepare() {
-	if use experimental; then
-		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || \
-			die "couldn't enable experimental services"
-	fi
-	kde5_src_prepare
-}
-
-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
-	kde5_pkg_postinst
-}
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.3.ebuild
index 4cf442172f67..d2114d3a641b 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.3.ebuild
@@ -13,13 +13,17 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="experimental"
 
 BDEPEND="
 	dev-util/intltool
 "
 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
@@ -30,10 +34,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	net-libs/accounts-qt
 	net-libs/signond
 	net-libs/telepathy-qt[qt5(+)]
@@ -49,6 +49,8 @@ RDEPEND="${COMMON_DEPEND}
 	net-im/telepathy-connection-managers
 "
 
+PATCHES=( "${FILESDIR}/${P}-telepathy-qt-0.9.8.patch" )
+
 src_prepare() {
 	if use experimental; then
 		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || \
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.0.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.0.ebuild
new file mode 100644
index 000000000000..55d5742899db
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.12.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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"
+
+BDEPEND="
+	dev-util/intltool
+"
+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_prepare() {
+	if use experimental; then
+		mv data/kaccounts/disabled/*.in data/kaccounts/ || \
+			die "couldn't enable experimental services"
+	fi
+	ecm_src_prepare
+}
+
+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 1896adaf8dbe..55fd4e974409 100644
--- a/kde-apps/ktp-approver/Manifest
+++ b/kde-apps/ktp-approver/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-approver-19.04.3.tar.xz 37012 BLAKE2B 475a1c2c428117ff29af9cd5eda8141683d9a9a6a4eacb2803806c75089b4aa830c3c90579fe4d0ef5a08f397c8d90b044ad6964bac37e91c71c59d127bc1407 SHA512 36005dec5361f6d7e5a990f55d3550fffe765b05920b28f3119403298988996de16244a30e55fe14b92accdb206df1ed3236b53acce5717e3949aa496e8371fb
 DIST ktp-approver-19.08.3.tar.xz 37296 BLAKE2B 39ba0aebcf3adb04add4f65669d15a370c280b863f56b1b59041017ceeadf09460298c5d68745992b6f49d2a9df1fee2f2c242fd1d1222e15ccca11f7491884d SHA512 82745123bf9b3b97f51aaf72e881fd50586945d333726eaa26afaf11e8acec26098532843cfdd02cfa10df92b2656ca8107a5c34c27c5c3518f38f28b0956913
-EBUILD ktp-approver-19.04.3.ebuild 679 BLAKE2B 7b195b1349a995f5a9267570ae9a189effb9e4e7229923383057cc75f9ba5234a44a302287d69e2ba2aab2f23c6a05808ad8ed54f3ae2683dd001590e1d3f8fd SHA512 bd7e235f2504a3889c2b41db8a17178ccc8f9dfb258aa6e74d91378ecff6120579c503f410a14141b890b8c1fbddb58dd7f136e9d5c3df2486a6b51869edd446
-EBUILD ktp-approver-19.08.3.ebuild 802 BLAKE2B 3fb5b8506641c9eda514381bc2f27160c23022de1aa10ce421494707a540c7baf64da3e8c308e52686b318819b3a534dc468823b1c8b2ece5e52a605e83e04bd SHA512 4155e001d32ce82dd124d47d9f080bfd049c3598380cea12851bf12463e9d788d2fea57d07e9bbdf4afbe2bd4b5dd9b6605b6ee643cc64a65acdbcf99c12eeb0
+DIST ktp-approver-19.12.0.tar.xz 37424 BLAKE2B b72528b5261de1ed865886e9154b30f8b4af39c1ff8efe50c8ed423a33d0b0f7c2f0e9782cbfbc5f122c8aefcc074eab535eb8a78f8190ed6a8db07f7f2eef16 SHA512 f80ba25beaa044141fe44da5c2b3dbbd9e65975cf476448b8dcb0c31a9d9b1f2ec296c29d36068fea4dd978420b76a3f9de8888195693b185d857d12f343914e
+EBUILD ktp-approver-19.08.3.ebuild 799 BLAKE2B 2ca166e39c562ccd81f9d7b2db82e0ad0f949f894edbe394c8da16a370738d77bb82e177a7842d289f528358bb2248afc0bb6123cc5287f918bc8c31f1419aae SHA512 785da11c013230ce14ee43995dc97e4ca92cfebe8a15de18a201f239442297eebf2db3453106ae3b52e72eff745874542e594a084c0735985804b2505407cda5
+EBUILD ktp-approver-19.12.0.ebuild 764 BLAKE2B 6e244cf9a4bab9ebabf3f591bd3c60d84fe149a18970e988fd31627eb056c6b3fae79017d2a3e79313196c25e3adfbd0eaccb304e4a38afc3f51c883a38b5529 SHA512 4debef4dd68190916619e1ffa7a0304bcfa184510d61ae2ae7bff823f8acca5de96a88d3ebece6c518dc083994fe098afe87991a2f2991c6dd70ee69c5800c1e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-19.04.3.ebuild b/kde-apps/ktp-approver/ktp-approver-19.04.3.ebuild
deleted file mode 100644
index f28d641bf40c..000000000000
--- a/kde-apps/ktp-approver/ktp-approver-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy notification handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-"
diff --git a/kde-apps/ktp-approver/ktp-approver-19.08.3.ebuild b/kde-apps/ktp-approver/ktp-approver-19.08.3.ebuild
index 264a52c0de15..95ab42cf0e53 100644
--- a/kde-apps/ktp-approver/ktp-approver-19.08.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-approver/ktp-approver-19.12.0.ebuild b/kde-apps/ktp-approver/ktp-approver-19.12.0.ebuild
new file mode 100644
index 000000000000..1fbff178cbfb
--- /dev/null
+++ b/kde-apps/ktp-approver/ktp-approver-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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="
+	>=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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	net-libs/telepathy-qt[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 720bf514bb0c..02100c64d27d 100644
--- a/kde-apps/ktp-auth-handler/Manifest
+++ b/kde-apps/ktp-auth-handler/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-auth-handler-19.04.3.tar.xz 46016 BLAKE2B e114dbc3cd079043b928e157912244b1886eb84606a1d256129458e4ab18cdfef2208a33318ff1a7e2128bfbaee289100b90ee1a112e01267de8eda6647b615b SHA512 ea83ab820326d65ca39c33a918f893c16b91cd31fb8cc1db82412d530a3ecad8535747872b311fbcc1b7070e9d3fdc30a5b9a253e062563d416ec16dac00232a
 DIST ktp-auth-handler-19.08.3.tar.xz 46416 BLAKE2B 90593f21408e69c13b9f6809d286ed0ea165373675cfdc711b6d6c6941b864dd0d04a469acce3ba40a0df624d7e4cf2fbb15b9658c1ff879c49245a437a1e0c0 SHA512 fc3b835c73b141f6d55392ff0c0af096ec19e234e5229d09eee233036b15faa7796b5776a59970f630c3ca82276dd86cfd60a6f403dd34c0882e3e246851e901
-EBUILD ktp-auth-handler-19.04.3.ebuild 830 BLAKE2B bdfd530f41f96545492cd812ca72dac4a5234884cd144a067299b5d2615b568a2a1f2d835c5c8200151ae171d4de43e0f5d2e9a487d6bc70f6cc013efaaa0a82 SHA512 e705fcc849d9f4ccdbd981ce4c7d85c47ec65eb97184cf4ac8088c357c0bf138ae36f9079cf8e9ee9d120defd03703452da3ebaf6f13868b7d0eedce3d424ca0
-EBUILD ktp-auth-handler-19.08.3.ebuild 962 BLAKE2B e4c3e50a1b52a62b44c2c90576ff17401f7f9471e32b3f651c652d6751e45bdbfb39d44e72fcb04f53eeebfb14b17fbc14221bd4064fc6db407ba7740f8a3006 SHA512 657c81b7e9ab6c36f7f3a6b7dbe4cf33051120b0a3b3abbdf6eaceec49a5a8c84fbbc8d2075ad6b939167523d46176b15acb509a8109aa7538b5c8570af65c2f
+DIST ktp-auth-handler-19.12.0.tar.xz 46420 BLAKE2B 64f80b0c504cdb6a3964f15636a3c81208c53e145b05ad9df1314eccd87555ad0532ad3559524f1ef85edc8e5cccd7dea8d045039c80ef7029581836bd88f920 SHA512 3190e680c41370e267588a0f81d9f1ed5457b8af9527206bb3a7097a03ca338b7263d68ad458052a43284e6e8b1dd512fa856415df2bdbb0899a26bc6ea0c159
+EBUILD ktp-auth-handler-19.08.3.ebuild 959 BLAKE2B 6d21fbc033016ee563c9f44915e823609dd324419e1c1bcffdc74d681b53c1967c6ddeb6ab10a2b11652a5e47c470d9ad952b246f518540cd43d7a1ee3616ce6 SHA512 f6818fa0bd6566f05ffc3b2acddb77553bed9f4b38a126ec1e4a634b6c59c734cee7259dbde8c966f3af1d9c2a81489f1c00b9aa01dc2177a0778bb20ece66c4
+EBUILD ktp-auth-handler-19.12.0.ebuild 924 BLAKE2B 0f120e05d03d91b21afee8d4c731c46318c62923f82a7eb0272876122b43497f5226e30d2947bd31e8fc50e5630f150337cf0528e067816b1d6f6e8277a3d2ad SHA512 2fea79988e80e3a4c4f7bef428bf02135e2540162c52ef79af27c4d3df9350d430756ad2910902b59c8ff05f5b02274c7f239d0dd94f1b80bc9464e17531297b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-19.04.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-19.04.3.ebuild
deleted file mode 100644
index cd5f7794fb83..000000000000
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-19.04.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy authentication handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep kaccounts-integration)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	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-auth-handler/ktp-auth-handler-19.08.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-19.08.3.ebuild
index 3eda70ef4c8e..403a6346b4e0 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-19.08.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-19.12.0.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-19.12.0.ebuild
new file mode 100644
index 000000000000..fc1fabc3b9c5
--- /dev/null
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-19.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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 a6eb4283af84..a2d5724c5d0c 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,6 @@
-DIST ktp-call-ui-19.04.3.tar.xz 95968 BLAKE2B d27f47217af83c18c3feeb507a63e96cb6743f49eee968ae02739894e74feba3f0e916ee5a1cbfc2144f96914863331b08248e024be1d7c3bd146f9718b0b840 SHA512 cd31a06c5c36de20564aba7a083642eff0c6bfc33de115a893220e410164d81e6e6b6d3679022a05e6eff7918a4e92caba85a9f3d10ba844704fe67230c8a5d0
+AUX ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch 987 BLAKE2B afb662023b5a754ff702fad6b6a651c934aa10aad66c4c382fb031d26abe40ddfd61265a8c7939ae6ff68d2c49ba996bdf5020a9b3640f6fee500f63817ccd33 SHA512 1f780d3b301353e82629a56dd78ba9556b3051d091e56eeb290c605797dacf22a2cacc81d6b8e320d51ef9234582f75e29dd1436c8e1b48c8b3c792d936a11f8
 DIST ktp-call-ui-19.08.3.tar.xz 97260 BLAKE2B 9b1f6d5c81fe29c702c63841a7566c0dd670b6347b82ecc015f16ca327ef83304a1606440abf43f499a33cb004d43e7ff1f10867b8238795bbf9756c3e6fe433 SHA512 ea3b4050b163ac1c782fd69797889275a195e277b413de3681ba584afe20bff32e0c882c3370c7efd8989daf180c1444e9233b1b14914e3bc9d054e0c1140717
-EBUILD ktp-call-ui-19.04.3.ebuild 1061 BLAKE2B e3a2da9556e0872e2b30643a17cce21fb13136beb63a19a1c1c327eb4f8c1b2caaae0af90d17439f8d7c24dc64ebc336a996dcb45139340625d2f39ec11ecadb SHA512 133c2f6c650f1d05098533ef0baff71639731044a71924f215e03517317661244d7774af350e3b985734d16c16f243b8e2d300bcbe045f8a0094794d71e75f74
-EBUILD ktp-call-ui-19.08.3.ebuild 1220 BLAKE2B d73b2f437ba73be534d664bd09fc8c310007ddb9b7d54cede857a42ee7eb255fde324b7cec18b56f4c485924835a59552844ccbff3a1d8d7e593ac4e08475f70 SHA512 44e0a9a39513c1f69153059f432821780140b424f2bc4dfc13f2d1fee829873fd3e8a2cb9aaa77ec73a41aa09b9f7d217d3c0b19c3b0bd48621465d9d0386fb5
+DIST ktp-call-ui-19.12.0.tar.xz 97320 BLAKE2B bb867d77dbe65c7073dbb7fc2795f7f6e1740995c768afc1c6786203dc1c4778dff39dd4e67d4d46c64ef9eb35c3f3986d6e9ce136630a5ab5bc7779607ce73b SHA512 2d449b7221d8abd7e8cb2062eabcc14deddc3f626661ba1e621d6dbd67ade8f34451e06382a8a7ffef6a8e58045490812d041e692df9d2bef6010d8692e8fb4f
+EBUILD ktp-call-ui-19.08.3.ebuild 1287 BLAKE2B c11a4d53a096e38cb4403d3d149a5f9caa2c42b554ae1646a3185c76f951564bb1a17b7fd63a17b89b9b4a80bae497a5a02220f38aa70085f3f97896763b5c5c SHA512 a231925787dc4741bd7eed0f17d4c4d6d14c897472154cb8d622c6ac35b8cada54a51976dcf83c6bc58c047ce92f25af1f0dacdc68719483142979d04412b852
+EBUILD ktp-call-ui-19.12.0.ebuild 1182 BLAKE2B 9985c40ba63d2342d269f532420058ef0dbc1424bbbed96e9f5f353b9a03fa92d3a203868b88f96926d2fd3e4e4d07a5c5e67403f2db93b42a1be5b604d15ed0 SHA512 032e083862febb19eaa00ed25a69298845ecb44df4b3f516770ec33599916bff1e0262bf116f3c6fbdaee40258f500498b05b21d4cc969d9a5d5613f4a38dfd2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/files/ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch b/kde-apps/ktp-call-ui/files/ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch
new file mode 100644
index 000000000000..d2be3f480eed
--- /dev/null
+++ b/kde-apps/ktp-call-ui/files/ktp-call-ui-19.08.3-telepathy-qt-0.9.8.patch
@@ -0,0 +1,30 @@
+From 70564e30def5a877bd66e4758a72facf7ff1b09f Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 18 Nov 2019 22:09:24 +0100
+Subject: Fix build with telepathy-qt 0.9.8
+
+Use the new TelepathyQt5::Farstream link target with 0.9.8, otherwise compilation fails with
+/usr/include/telepathy-qt5/TelepathyQt/_gen/types.h:15:10: fatal error: QDBusArgument: No such file or directory
+
+Differential Revision: https://phabricator.kde.org/D25372
+---
+ libqtf/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libqtf/CMakeLists.txt b/libqtf/CMakeLists.txt
+index 3025576..3b7b0fe 100644
+--- a/libqtf/CMakeLists.txt
++++ b/libqtf/CMakeLists.txt
+@@ -20,6 +20,10 @@ add_definitions(
+ 
+ add_library(qtf STATIC qtf.cpp)
+ 
++if (TARGET TelepathyQt5::Farstream) # telepathy-qt 0.9.8
++    set (TELEPATHY_QT5_FARSTREAM_LIBRARIES TelepathyQt5::Farstream)
++endif()
++
+ target_link_libraries(qtf
+     ${QTGSTREAMER_LIBRARIES}
+     ${TP_FARSTREAM_LDFLAGS}
+-- 
+cgit v1.1
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-19.04.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-19.04.3.ebuild
deleted file mode 100644
index 06684d94e6df..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-19.04.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy audio/video conferencing ui"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	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}
-	$(add_frameworks_dep kcmutils)
-"
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-19.08.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-19.08.3.ebuild
index eda2799c8721..f115e0ae21d8 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-19.08.3.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-19.08.3.ebuild
@@ -13,10 +13,15 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+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
@@ -28,11 +33,6 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-apps/ktp-common-internals-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/glib:2
 	media-libs/phonon[qt5(+)]
 	media-libs/qt-gstreamer[qt5(+)]
 	net-libs/farstream:0.2
@@ -43,3 +43,5 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 "
+
+PATCHES=( "${FILESDIR}/${P}-telepathy-qt-0.9.8.patch" ) # bug 701096
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-19.12.0.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-19.12.0.ebuild
new file mode 100644
index 000000000000..fbf38c2c2323
--- /dev/null
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-19.12.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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 6a26675a6359..0af7dbfbae4d 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,6 +1,6 @@
 AUX ktp-common-internals-19.08.3-telepathy-0.9.8.patch 1898 BLAKE2B 72ac4337a881182b0f1d43469f68ec7b11a105f626da42acec134abd9b0e5ebb25a59db57d8656ca5c0e9fcebd88a0ad42549b3d1ec6a9ceaf474d0853ab83b3 SHA512 93c43f7eddc99c22f55308ea1cccf59f7fc5c1d9c57b72d2a8ff7ebdfa00ac3e6319bf33ecaeac8ef53a1f9685b5278f32c2b182184fd64919f97df0825f8563
-DIST ktp-common-internals-19.04.3.tar.xz 442052 BLAKE2B 904e1abe4598599d443aa5fed946c943364e84fe9b85975b7af0c2f3cebae7658d193a6f91a7d34f8f61c73f4091d7a105408dada139193c9124868cee123c4e SHA512 9dea0bbb9c5cb7812e553b26ffd650c2ed3e1b05065d9f256b475d24199c74b1335edf12d4dd6949e5e59065546dd520f18b72f6b6b610873ee142045cd2d141
 DIST ktp-common-internals-19.08.3.tar.xz 445792 BLAKE2B 36ba8abed61b1b45481b1a65d565d6f12e115a9db8bd14b2d8a4f276646387e1c18a27d26cda78bbb5885277de23884329b6d42798abb592e8c8bf555c156ba0 SHA512 255e8e16cf1b374a1106f66f4d69e660a9443d7b28d169730326fd4689a864bdd34bce9a33ff63ba175faf1bf65a1db1484e3dccc229eb3f0918c9fcad965e60
-EBUILD ktp-common-internals-19.04.3.ebuild 1578 BLAKE2B d80b7e6a9979aeb540d128510d3f3b11f06bdf7a77a65e95f1410bf9ab91947ef8f1d4a7ceacdf1ded56ff7a76b5faf31622ea3ce21b462cfe1bedcb709ca608 SHA512 42a2f09d48ec4472d99333a5c7c9c171c6c5677f75930ab37ba4741ccb84101cfe1ab052f5dc9d1f216d8687a46b36ac1acd9e106cb39f1b532abbb29dd6a37e
-EBUILD ktp-common-internals-19.08.3.ebuild 1838 BLAKE2B a4df77b1264e3d5f20c7579739d7340f7dc7a8dc28b833bc0983153d7e3611ddfb8dba85d05681e871033aa047d1e6ae79d702a73a6e89b559b16ff751a44d2a SHA512 2d0e5934a7f7770b205d97497b8c341d4ac992d1ba2ecda7e22098a6f9d31aa4e8ca1b0f9617919ab0ae2e1300a2ed95dba5a0fca40d397cb20bfb45eb4cbd67
+DIST ktp-common-internals-19.12.0.tar.xz 444260 BLAKE2B 9c4029fed97b570dcdd541e38d91854ae1355bbefa644d69165ded9972e1843981beeaa43bf3eabd812db5c142b4c9434aae7b982dea2e574570606b83f12791 SHA512 15c78c91f650d37c5d8547da7b8c0dda71e16cdc24cb80ec0d832b5bb9037d24a2be1181275a6df8d4fa10d7e5379ec88da2add0d2b0a0318f87292f36c98050
+EBUILD ktp-common-internals-19.08.3.ebuild 1835 BLAKE2B e65b986b1f383e1b9b4aebd2fa7e4b36b884bf947545f2d5f3f6e12102c4bed13b44dc325f42030688f05e7d5e73b459620fcbe5aab81da2767612b9d8efeef1 SHA512 ea0ff23168c6291d68560adba6f933789d630284737ef2b5bf5fdf578c238c6dadcf96943713c81b73cd9e730165257c016a5e46fea7eb50bbf59da18af4efb6
+EBUILD ktp-common-internals-19.12.0.ebuild 1722 BLAKE2B 408054bc98d73769e50e866f57deeafc78bffc8e5e5da498eb27253d7ea24d536fb3082a41cdc508a490599ae7c9ba7866c93e6dc85f5d4d5b1e48e620612132 SHA512 24a5cc79d2b2bccec2dae677abd072f9d89c8d37972bf05334bd753e4e857e51e5fc0bde4140d8b7d9b1c7a21c68de83fadb76d7c6b2785aa50094f0fb59eb4c
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.04.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.04.3.ebuild
deleted file mode 100644
index 96cda4d82b15..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.04.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Telepathy common library"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm64 x86"
-IUSE="otr +sso"
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=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? (
-		$(add_kdeapps_dep kaccounts-integration)
-		net-libs/accounts-qt
-		net-libs/telepathy-accounts-signon
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtnetwork)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package sso KAccounts)
-		$(cmake-utils_use_find_package sso AccountsQt5)
-		$(cmake-utils_use_find_package otr Libgcrypt)
-		$(cmake-utils_use_find_package otr LibOTR)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
index 2df7d44da82d..868710153aa8 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="otr +sso"
 
 RDEPEND="
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.12.0.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.0.ebuild
new file mode 100644
index 000000000000..e14496131479
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.12.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 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.63.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 e581c06980e7..bb411cb388ac 100644
--- a/kde-apps/ktp-contact-list/Manifest
+++ b/kde-apps/ktp-contact-list/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-contact-list-19.04.3.tar.xz 145776 BLAKE2B d41148a76c2349018dcb373ce1b9923a6a07fa38fa35d5afc365fd3c6acee1d3b99b18026033d781214412a64a2ea44598887cc7736f5fca5ea8d2aa78cc556b SHA512 8923c5d696a79de88938586146b494ed9ad660a0079fa226c49ac21a63444dfad9b34a1260a968ee76e72d7562d7a1b2d709772b3197efa6976fe6cee7d8c83a
 DIST ktp-contact-list-19.08.3.tar.xz 149412 BLAKE2B 00c0897e152f25b0fb329f143a472372722922559ba224a64531da08336a703c6735df0fa8c3c547f198d5327e18141dfe1f3b4ab78d0ec2ac7318cb1443a869 SHA512 f91e9454fc20015f3f85e4bd1d75f1bb5b7f6bbb06e1bbaafa8799258673b296665f77c4a8f6cfaf668428a9508141b607d7974af6ef21be790f35d94cdc055c
-EBUILD ktp-contact-list-19.04.3.ebuild 1035 BLAKE2B 940e1a7b4aa58bceb6aac21e297f46ee7938cff82a88690b8395fffa605fe971e342c99bfb9c0bf04320669cbb7810a00b9e63da780b265d4a0cb1d0c0985a0b SHA512 d654acf7a650862cc30d3c39d3c07940bf563d67eecf7cdfd54dd6a59979e547d0c9110f4c11935286eb218eb70a8dbcc45a66bf047d2eb5caa8e83a82c69b7e
-EBUILD ktp-contact-list-19.08.3.ebuild 1224 BLAKE2B f548acdfaa2627200a5362e2e50b304c48d41901b6dec1fde8c0260ff96b68f85b07202e2fe76ce96aa0735c847f5163c98b09844625f579e71fa8b1bb570014 SHA512 ef529b0046b82f0f4268878a758b1d8b65229103f9c82b5de770341c25111ba12b58216d69f8e8a6097aa792299086d9c562942088bd1b4a4ec5cbdd0d511789
+DIST ktp-contact-list-19.12.0.tar.xz 149476 BLAKE2B eafefc9e19d5bccd2f5a7af3856e613d46af442eb5ab73598f7a763cf36d7edf0bb882d8b9e81f2eccafcc0dff5c2c6e488b3a5514248a4762078321de71e8e6 SHA512 21db21e5b2e9f231145f84d99114f68bc13cec16d985bcc34ee3121a1f60dfe294b85f4a175b7fc68d9607f030bfd0a965c01dbe763717f6148d971638983dd0
+EBUILD ktp-contact-list-19.08.3.ebuild 1221 BLAKE2B 520dbf9029e757cd9ddbe5f18e832f5994e7dae7b723e047f6be99708c545eace597144e4f33204485beb745971bc9f5c7e036521520d9ef7aa87a527c0448b7 SHA512 7534f7124c25ad5f5952b2fc9c719f749e36cd1dd14a731d6aa0fdc4f44a5baecb7e408efc6be63538c8e91d4d3446e89bc50766bed4b3c80cd6d0d3cdcf2f36
+EBUILD ktp-contact-list-19.12.0.ebuild 1186 BLAKE2B d8c9642fd1d66f39e1f0f593934c7976d5a6b9c4078a7361d0dd23f0bd57ffad2416b6387684c326fec12dc19125031a5198d1e8cbbd8532e5f4d4aa372b4e39 SHA512 27d8e7ab37fad1c503ab085f9f4c539694e41b43538c56c3aafdf4a7b533cd6cd17f038ebff6f75f884ed9dc4f7a320ccde50a7220310b94b72fd9fd5d7afe27
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-19.04.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-19.04.3.ebuild
deleted file mode 100644
index b5a18f191006..000000000000
--- a/kde-apps/ktp-contact-list/ktp-contact-list-19.04.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy contact list"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_qt_dep qtxml)
-"
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-19.08.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-19.08.3.ebuild
index 527f5d2121df..9413140be6bd 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-19.08.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-19.12.0.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-19.12.0.ebuild
new file mode 100644
index 000000000000..9fae7ee8bf34
--- /dev/null
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-19.12.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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 058e83b6ef81..664344f26886 100644
--- a/kde-apps/ktp-contact-runner/Manifest
+++ b/kde-apps/ktp-contact-runner/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-contact-runner-19.04.3.tar.xz 42020 BLAKE2B a5e4a78542a778f8d7b1b2e9e4e07174f49ac98b4b77bd0ceafed999b3135a54e4e610bc44d5224d88758ed1d0eb9e7ed625c4cea9e3d57b0849e3fe44ae6a65 SHA512 bc6de953745b730971e0b5eefa7f182b4e2f0e4f1ff2e6d9fceac85eecbf611ec5168cae0dcbbbecd01087306c31e4701dbceb782304ba71aa2687e551e26e87
 DIST ktp-contact-runner-19.08.3.tar.xz 42896 BLAKE2B 07be9d0b2f17674f7e693f32f0b85267e9ebf6bbbbdde42c0808a3d435b2358a4653439125ef4ee752837b57ce23a7a7b500268b8ec0cf78a3e0d7644c07b0b3 SHA512 7962f81c554094c7ad876d70c718c9c1ee2dc190041ecb845698748f84825b708fce11c4ee4729c5ed9cb6ebf54ae0b8f42aace6f6e94e1f1b71869c1bfd8f89
-EBUILD ktp-contact-runner-19.04.3.ebuild 605 BLAKE2B cf6e193ff0cd23c40d59996eaa7e6dc2929355235710b2efcb42ded59f2f7869b5f7e44f112af6fe35ce147e3f753bd8b2c41c89ea399d930133b3cbf007e2d0 SHA512 c8b00f9c0595206f274b533e47f7d7f63cbc52e343a5e4d5930008c4685a64848b612a67882d9ebf7e7e40184b72c8ecd82d20ad7c07c6b348c9d77243f331b1
-EBUILD ktp-contact-runner-19.08.3.ebuild 716 BLAKE2B 5a187b40580cf5c6557cda8cf2b67bb7bf1cbb5a8ee71464379ea00aa5920658c2dc65bdd0e34a2bc4d92e1b7aa394f559c3ff6edfb6e3ff4659c757b519ef66 SHA512 9ea50f220a92ba39f6e3f8d37aa6b6c7f03afb17f865faf1ebc5a4d58ea050fd4765b1d91816af1563f7c197984a44def77ef1eb2a85ddb470f4580686d88706
+DIST ktp-contact-runner-19.12.0.tar.xz 43136 BLAKE2B 2ee6156c20b30f3ae7d7e8dda93c5f3d82ca388a2014379df64ba1b9a657f17672189e22166bc62ad532e3515466c54d89f28857bc33ec814492a4f2f5c88a34 SHA512 1be58d28465a24a1952a52597144aeed9b3d97ac6bf2eadd1dfd9550ff8399b9fc84ff5efa323e8c9966a29bd5e807cadad4d522e1210e00ae0a2e27e802c724
+EBUILD ktp-contact-runner-19.08.3.ebuild 713 BLAKE2B 63bc7cf0abcb08c4b1b3c739dfd424f4fcd27dfe70bcfc7188532a98b2600085c4d7e5922658740a59dea2d5e6265d3b134bb70e52d4e0aee21f7ccb9dd6631f SHA512 f2dd7f698f6ef67a81f993587f8c6419e5396a8d7e99227fc3f2860155ddd98d21279ca1176e9537d44bc699426ce5cf8fddca957fdf756181010829c710864d
+EBUILD ktp-contact-runner-19.12.0.ebuild 678 BLAKE2B f99bc8a2182e4a3e29bd5ce04a8a9650833c91f3b8cc180f6eb9f3a57fd638d6904f3de7cc18b3b52397c7e473a25051f0e6a2d5108fd94a3f576854367d6db0 SHA512 a09e5a838c316455762667b15a44575d598e1a6e191feb00948d9c415a3afbd9e61867100bfa4aa012d1893fb47c7ad02f950cb8fd6ca9896d729bcfff91a8c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-19.04.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-19.04.3.ebuild
deleted file mode 100644
index 6f05e10feea3..000000000000
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-19.04.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy krunner plugin"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep krunner)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kservice)
-"
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-19.08.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-19.08.3.ebuild
index 4324a7271363..5edd8878a698 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-19.08.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-19.12.0.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-19.12.0.ebuild
new file mode 100644
index 000000000000..858012c44d88
--- /dev/null
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-19.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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 8dd9a9ba4e16..41e70409691e 100644
--- a/kde-apps/ktp-desktop-applets/Manifest
+++ b/kde-apps/ktp-desktop-applets/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-desktop-applets-19.04.3.tar.xz 42836 BLAKE2B 20ed339ae6f0b38b0bde6dd20c8ff35063b51f050f113039987bb37f38271f9222c4a9f91cce0f1f6748300e759c33b601af8f320f8cf4679cdfab20b3ac2ff3 SHA512 81b54785dfb74b5c41f224f637e660422b83a1b2584bfbd67d902e3921ddf670caca1bc4280eda6f54906beaddc2b31da05f68659bc812224854225c629a1aba
 DIST ktp-desktop-applets-19.08.3.tar.xz 43576 BLAKE2B 29ad835fe671cbe514fa52726f28efa450728a53338e95a18dcc26703dbba2c9f20eb46afdc3f1c74eeb8cf2fb27d20964cdc95e8fac110b469b739c9ed7bd11 SHA512 4137547cadc4070a84c3de5ab4b88fbe9a0bf54aec8a35aef9cc328a93af7390452819c47087b2aa2b1b2f4fc5eb4dc4e1426193ff22695a899856ec2871f5fe
-EBUILD ktp-desktop-applets-19.04.3.ebuild 575 BLAKE2B f2d64f57921976d7591a771eaae6dd940ec40ba0a9ab3db202de6d392d1424a2470c3434bcf0dbf3e1d57fc5518a58bcbd5be5eadd1715759cc2ebf011365804 SHA512 4903e6d61a81012ad9d6659f28a1153c57b63370afe719646fcbcc10b10078ee8e47031fd4acea1631c836a1b480ae99060b4ae2679866418b415c1d69e43932
-EBUILD ktp-desktop-applets-19.08.3.ebuild 656 BLAKE2B 649eafe2f17f0f927ace01dfad852ca95441cc257ba9f91e61936aa72238ab8c4daca4c5cd88bb1cccff8e949535830fd444f29430935d95045f1a9ba9080ac8 SHA512 f98c720951d3cd4f4eae46931d3d6524d198d56e267205be56b08b8549b9cfdbe55a9e88a81dadf79b8b8596835c7b06160e9f6485e58339e0c3294b791771e3
+DIST ktp-desktop-applets-19.12.0.tar.xz 43588 BLAKE2B 6e6124f06714dd4187399c9fb786a8cc6802f790e2b7a3cfe75b58e2dddc32bdda84ff59fc255f017111c8c04298771d718d08831d073cde002fce02aa5860a2 SHA512 6f4bd63540d45922d4bc54ebbf6301110ed425eff3b19ba3217ebec3618b2cf0937fd86a5140469abb5e17c237f671c2ad95e8dd1af3348604cf6a78b7049b1d
+EBUILD ktp-desktop-applets-19.08.3.ebuild 653 BLAKE2B 7fda1bf2119d7765a316b9a2421521b1d0fc57b05f89a768797ab2af67b1ccd38647eafdbca45d33425cf4811f1cab6ba00860db22a2ac25946b82d6fe849ec9 SHA512 2e739e8ae297b9d83164411f245ba7c5955e7bfa0130f128c2999f9fdfaeab718000ae396d0bd374e3ca29197c7f079f9aaaae62a48f4453bd7c3b6e3b71f560
+EBUILD ktp-desktop-applets-19.12.0.ebuild 618 BLAKE2B acfd7f7833abe8db263c1c7f690e5f469931c453eb69c8b0880e0455c35f2ccabee6b13efb75faa3079c9da2bb50449192761ea0f8e2350765119ac5b8246e4a SHA512 f9a902956b1720daefe9f9886f254bf22c751d407df1e484919f7b59d4aaaddc39114b251c881a08a8f11497855b02330f452a176d1ab529b09dc0292a7cd8c5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.04.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.04.3.ebuild
deleted file mode 100644
index 84ee4d644c6d..000000000000
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.04.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ki18n)
-"
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.08.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.08.3.ebuild
index 4205a7e0c31e..06332081efd6 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.08.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.12.0.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.12.0.ebuild
new file mode 100644
index 000000000000..a225343bc975
--- /dev/null
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.12.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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 fd4d6937e866..559505db1f0e 100644
--- a/kde-apps/ktp-filetransfer-handler/Manifest
+++ b/kde-apps/ktp-filetransfer-handler/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-filetransfer-handler-19.04.3.tar.xz 45960 BLAKE2B 2729a26b432cddc670eebb5c2a1f4c8e80a873fc4e292d0c8c4d68af237482fb15587daf4f5d382cd0f8f228ea3888242e573f179a0f7497ffc8ac29875309a7 SHA512 71fee23c14c7f3129a7af20a3edd84cabd094e000271c5244d8612ed4350bfa6ccaa6d4c4643944991a919e8bc65596c963e06252a92f67f3de54b1a91f2ac55
 DIST ktp-filetransfer-handler-19.08.3.tar.xz 46320 BLAKE2B 91bb936fb2444da73f6eedd9915220a0e8271853cb179a73d43d26464ffc78ef6a3726e103d41b796fe69e2a6f87d4aa2a2213410173006fbe40f445f3c0977a SHA512 66bfbc690149c4bf1ccb8672112c4bbc8cc64abee8707c223fac51ef7eb5ac8f609385b00451ea5d9ac17f89d60ae6b2b7d35636a3f69bd30856b37f1def9b11
-EBUILD ktp-filetransfer-handler-19.04.3.ebuild 621 BLAKE2B 4a0587ab9494d365af8f8cb184daeee1bf8363c2557a6f56c116b27a9668f892ddc09dd9e9e8408d3aae91bda37be7bb8c225b708be447664dbb0b4a354df443 SHA512 4ae45172014855a03247020e98c5c9659843fd27a1bd76bea52835df26e1568482a23c4a10a8f506fe6e652adbf35f49d609e51770a9e2f70c88d4d82c2b7b56
-EBUILD ktp-filetransfer-handler-19.08.3.ebuild 732 BLAKE2B 18266eeee4870169744df142d3677d9c1f9b8157850f96a4fcdaaaec6ab2de86102c0fd51d2d70605ad8a64f5e07c920613be2519c9c0cf7d9285bb92334d0d3 SHA512 85653223ceaf3d43596bb6e9a36c94506949032c8f2dfbe0c3ea3f83720d2b6425091ba2140251fe9f7f23300e2ab8349c8b947ba8b902f3cd2a40bbd53bd377
+DIST ktp-filetransfer-handler-19.12.0.tar.xz 46260 BLAKE2B 92870e34e1023bf3b2cf483e692da6f2c7dcbe4abca0d075f0de84ce65e09c5784c51ce16c668c0d79733fca2e8b7e665abc5f40747ada8e8645deaf7b703032 SHA512 80e1cd7fc91e37a2be26475bcdcc977af04c872c423ab78aae85d5e9431e9a2a6b0c92a47fddf8b41d7f643d00f315101f1e5adf7270386314a735c70836d4f8
+EBUILD ktp-filetransfer-handler-19.08.3.ebuild 729 BLAKE2B 70f9a2dcf230bac293d89e5673ab6d73079323fe20e01b98cdeedfa8efac2ad7dc39088ee61a5fff1598a7465a2914b92aa6a15d95f472851c5a4f302624359a SHA512 26cbbddcaf3b409976748487d2422d2c467376fe160a2c46e21cbb4fa02af6edab6740cc5d314683992460281a7b23df5f847576470b128e2ed7b7c1da3833a6
+EBUILD ktp-filetransfer-handler-19.12.0.ebuild 694 BLAKE2B 2fee4d226f9f7915f486a3657c340de7e9975c32123914dcb533aab69f97dddcfdfbd712ecf20c52b0920be5cb59830793a9415cd71cae9389e4e9e919b6e61b SHA512 3d3b7d730cfce3329eeb5995aca1d45e0163b347d1bf972df60aeebf80562813c3e67fbe8923e4edda4be24a8148e934ec0bcdab534b0b6202cd0fb5fea6a8bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.04.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.04.3.ebuild
deleted file mode 100644
index f8651a678605..000000000000
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.04.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy file transfer handler"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.08.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.08.3.ebuild
index b4f3b6b4bb07..264da6304e42 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.08.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.12.0.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.12.0.ebuild
new file mode 100644
index 000000000000..746c7f94f19d
--- /dev/null
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.12.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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 526dc6a53f29..49c8852228af 100644
--- a/kde-apps/ktp-kded-module/Manifest
+++ b/kde-apps/ktp-kded-module/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-kded-module-19.04.3.tar.xz 94500 BLAKE2B b1b19471e284778b47cacb6fa5e0debd3d78a420deb070cfabc026e6793ed2430ec9e894ad1f78856b8a31a50587d55709ef872b9ed4a82c6afca6b81fc088de SHA512 b9a0d7fc1f22162ebe4af1f90f66f03c4e2e52e365472acd09477d3f287ac25fa9b32cb4a2beb3a4fe89ee4df19bab027a07559009c0287be7ec0f30ef08917d
 DIST ktp-kded-module-19.08.3.tar.xz 97024 BLAKE2B 32b85c663e65a3bbccec44953e6f7b452a834cb2fb0777edff16fdc7f88fc1e7554672108d946433c132246fc11ec46011262bb4d5e043d1c6323cb92d0bb96e SHA512 362c06f501bae142d227ece722cd9217afd1cbd3485c0e90bb3991e5520bb3cfea75d483c0503bfd2920d8941341da4689267d8075621b3181ee1f20d8d468d2
-EBUILD ktp-kded-module-19.04.3.ebuild 980 BLAKE2B 6d3a53c9e700a9992c6108d5e9248bed137abeaf1268de385b93c9d12e354381225682486611823d90606e1dd580168776711c6873e8ed9cf6e8fc9b3c2e7c05 SHA512 fa09e3948f1345664afb39163433925f5a8c46844d82015dd94a9370e1790bb1e1c7e32575144dde7574ed5e42f219df752731092338be00592dda7dc2693780
-EBUILD ktp-kded-module-19.08.3.ebuild 1148 BLAKE2B 769ec4f29f244b55ab4b9caf6f10c42794570c56ed8f4867a4f12dbfce254f5ce65d7c163c558f98fe830199e872aacabbdd3540f4daee532420be20b69f4771 SHA512 9e4dbb3784ab0e52f60ce3e35375354dbe9f7d1b748f78aa5bafcc03679b390bf43adef4d04537a4e9f00682f21375bbe2c00ae83a7d464b599f80de496f14e3
+DIST ktp-kded-module-19.12.0.tar.xz 97400 BLAKE2B 524da01b573e2231784930a8062cede0cc3ce9dacd1ddfd7035d95a4b7af26df7c92e1986fa4e5ed34f3d45a8ea1ed3e90b08c6921b8dbdb8130d5a740633d45 SHA512 73f18ea8d460812326752f1daee4d8de7512f8d80f9af29ea13a7431139842537335c035c3fa4daa05b99cb6a9656fbf45ee5adeaa9979250d98078dd1005d20
+EBUILD ktp-kded-module-19.08.3.ebuild 1145 BLAKE2B 7506412f9773a32404ad50cd9c0ef47df595a68641d121c379014f33dca0e1380bc4586be662b172f7e1a70d2b4a0e545c97a697ddd45a363f7cb228d0479493 SHA512 01f861e3e6669178ce6349c2f4847945c5876585872158f866b2b48dece256a1f1afc7f0e95314f93ae54eca2ea6bc856cfd4c35a0253c440526a4717a451f3d
+EBUILD ktp-kded-module-19.12.0.ebuild 1110 BLAKE2B c9e541ae1023312d3e3924538238fe241a04306a5ac72b77076752442d8526dcfda81d15251ae329fefcb033ee054c811588801186c0cd78db618abab190025c SHA512 706b66ff88660266c3798b63d714e902667033f9706d71651963d9435e82f9738f3c6e37576b21f329f59c2c7899a005c3e706967dca850147f48b57a9ab5ec9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-19.04.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-19.04.3.ebuild
deleted file mode 100644
index 7b16b9bfcfda..000000000000
--- a/kde-apps/ktp-kded-module/ktp-kded-module-19.04.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy workspace integration"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kwidgetsaddons)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep signon-kwallet-extension)
-"
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-19.08.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-19.08.3.ebuild
index c1a0cfa2b301..b683d7d12aec 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-19.08.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-19.12.0.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-19.12.0.ebuild
new file mode 100644
index 000000000000..9ff191b24d91
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-19.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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 a77a83624ff0..97c702566f75 100644
--- a/kde-apps/ktp-send-file/Manifest
+++ b/kde-apps/ktp-send-file/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-send-file-19.04.3.tar.xz 28608 BLAKE2B a7dd375ebb1260c7e9a9929c15e5b3e6bc65e31891c479675a03f1f4c32d2fb05b9397d8017e9a559e5b99524e5a4921b75ca03fbf4f4f61f4b0ffcecffaaa7f SHA512 56752991344ba351db220ba91b5a11483b6524a502e299d82c1ec265850efd0c99fb862a42926bfb4058eca079c2bebbf47b144270d1111137bae29efad345d5
 DIST ktp-send-file-19.08.3.tar.xz 28896 BLAKE2B d00e22ecf4b50ef3bf99a7598838c8bf0b1f545662f41701bbf3c293b4a1cdbd17ace300df7d2ed6c7919699c5ea9b53991b149755b5d2f5da043b73791c217b SHA512 176d0f08a18e9f1431b18c2d41676a97adb99e87d240f0b526161ceef159fe690131e85a50e5df76281159e6cd36c495b798dd6935a32897eeb8a90c1e63da37
-EBUILD ktp-send-file-19.04.3.ebuild 828 BLAKE2B 26a29d244c9ed75a25307b58007f08e0f724d3574e32c3e55f5f2db12d7187fdc9308ad3fe4f0c52359fd09076c40ef00116fcaf03e28d5e074151da6cf754e6 SHA512 87bd795bff03f65119f6310f9fa1fe1ba56adbf31125961523e88ae33781e618d46d89ed5a7791458c9205fb3f4e57e7347595e20bd3283a5ef20c3c282062d8
-EBUILD ktp-send-file-19.08.3.ebuild 957 BLAKE2B b2021762bd4038c3aa65e6651ab60836f4dc6cc75af5bd24df93bbba6f0f970c90955300903e6fcb7f26066c7ab4a6c2ff99ce9e3686e59392319763916ba46a SHA512 10be93fbbf6fb555f51787a06824e3b4c28e841d9b47cc8ecc8c6fac78e5ae6322070695c7ef395c9de8dc863cd59e9d6244fa453dbe995a722260953a36a85e
+DIST ktp-send-file-19.12.0.tar.xz 29024 BLAKE2B 3e672903b2a582efe20ebe6389e935d643f69c16a6eabbf0d6f0b91e7aeb9a91fbff095d4e4ecd3a2f8498224b7bc6b4575e60d973b660be25f791a4a8a1c0a0 SHA512 ce53231b1be459bce5e75d7affeb44076da48d2d363e807909d0840d3368c9376666c761fe83956e64a2ae9c67f976723cdf1b14ad8c16ac964ea6ce5a44482f
+EBUILD ktp-send-file-19.08.3.ebuild 954 BLAKE2B 2da589669fff32a0f01c3bfb2deb4914c990e7bfb4fa90756fd1e3e783f956f34a65cdd30978b059c75b0761efb5d9341891c9aadf9452aec72df74ada07efe6 SHA512 75ef07abf84fae4d3467deb081e6acc2d2e6e67c02e4fd9fdfefe3a85b036692061bddb98671f93d9f6c4593c2cf561bd25afd151bb67e0b5942e99745387db6
+EBUILD ktp-send-file-19.12.0.ebuild 919 BLAKE2B d6ac181f1f35717dcd5cd19a1c113cb51acc7847f304afc7f0324ee5f3091cbee2f876860de60b7293be201d4b4abd5d28c54997538d4c35e8ba47aac8dd2ca5 SHA512 99860634a0259e099f0d37fd909df7be2b11a4ebab5b72b1fcbc6e9fe69f4e1ddb1cb3a5592b042b2b881ccbdee2f5847fe1217a3f083c88de7d78e867af4fbd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-19.04.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-19.04.3.ebuild
deleted file mode 100644
index 28c63fff962e..000000000000
--- a/kde-apps/ktp-send-file/ktp-send-file-19.04.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	net-libs/telepathy-qt[qt5(+)]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-	$(add_kdeapps_dep ktp-filetransfer-handler)
-"
diff --git a/kde-apps/ktp-send-file/ktp-send-file-19.08.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-19.08.3.ebuild
index 11670c5a82e1..dce0031c5211 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-19.08.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-send-file/ktp-send-file-19.12.0.ebuild b/kde-apps/ktp-send-file/ktp-send-file-19.12.0.ebuild
new file mode 100644
index 000000000000..c251e4958420
--- /dev/null
+++ b/kde-apps/ktp-send-file/ktp-send-file-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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 8f1368ef86dd..b42a509920e8 100644
--- a/kde-apps/ktp-text-ui/Manifest
+++ b/kde-apps/ktp-text-ui/Manifest
@@ -1,5 +1,5 @@
-DIST ktp-text-ui-19.04.3.tar.xz 464932 BLAKE2B 1c4772c8bbd009690f0447358bc650635e9bd0f745fb3ce9418f945f950cf476af8dcdd888cc4f22ac0d9d848e0fbd58a63d259a3605f38b3a3e8424f94040d5 SHA512 ca880a475f0ec1a98701b1fdbb8916f3b97748aa6edf3cbce8b4c7c5f2ac4de714f3b4dca53a5e1cfa8970fac8603791fe011e357c94007481c1bbe56d5783ea
 DIST ktp-text-ui-19.08.3.tar.xz 469764 BLAKE2B 5bd1910f08ef54de06d212805d44ad7596c625023cdab944ad9c4aaa2ae499c3f8a4afb6bc63c8cdfe94e851f122945478a11d8b3c343a1c04c4cd8825f0f4e6 SHA512 a8dae8db2b19ffaa359d8fa6a19e91ca5db416a2d7158b9cf926a268497042397fbe1b2808cf36c2d8e20608b417fb0732d62f67335d0f6564bc546e88ccd733
-EBUILD ktp-text-ui-19.04.3.ebuild 1457 BLAKE2B f9ac9ab59b2310a7580bb4ab6c889da87c1c335e27f200ffecea255e7d8e03e6aea1e7b0f832e313062ee303043359d91a7dc1eeaeb8980089df484550df6b8d SHA512 f77ad24004b9c449f5d6f847e78f088327b5897158a5e7ea15e91badabddd943d348b2609fc9fa8c0676736ad1c8217774deaa6793f166caea59b2610398a0b7
-EBUILD ktp-text-ui-19.08.3.ebuild 1684 BLAKE2B a99ce25ba4d878e4f1e0ebe940953b6b018afe9f66b2c1f98712e9ba8b64ea20a312e286cf09c24488fd2984187cd8297b5bfeb3df0bb7a30bc003e1cc4b4494 SHA512 dd1d406b941270473995f17acb1f653a135cbeec6c129ad68820f274e6dac979c82ee1367b4ff1b2579fb1daa05947b7d41d8672b0869ac5b7de5e4dfeee96d7
+DIST ktp-text-ui-19.12.0.tar.xz 471572 BLAKE2B b3ad1ed67af921c78faa0c107ecc15bd20eebde6de174973eeace6985395ecc7332cd09b94d298684cec7136aa9bf0223380e0fbdba3c073d0c7c4e6da1b286f SHA512 8f4f3560100336bf3641103d8b20e39138d1809bf0480589d37b9006315d76f9a492180c2b83012f106e79696afd26948e467a2fb31fc340c1ac15e1894ab5ed
+EBUILD ktp-text-ui-19.08.3.ebuild 1681 BLAKE2B a3ec867dadc3c1445ecd6880cc69edc0ac88fe5442a5557a638d9eebda6fe789f51f5b7ef9dee1ee2519506a0204eac27bb240f8d1fa60b753698dce1bf565b0 SHA512 734bbd19941a04235b29a4b175bfc8a0adc62152de20ebc24a7f7b367150cd6a650556f75fa9085000828976ab9287248a3cca465c6dc2fa769548f75d86fc12
+EBUILD ktp-text-ui-19.12.0.ebuild 1640 BLAKE2B 7bbf1c95ab005b4381b85cec50193c1dc03b89b85f94698930d9e88e6340ea62110b864e00df6b430a5137cf0d2700cb31a8de62824e284630af5dcc90ede7c5 SHA512 517dba00f0680a15d5c921c88594ad2f219f9e025516d6a7c52c1123cc47d0f1a1c026ac7e5c8f101834d75056bbec30c3568427d5dfd3b58871d9d99bfb0a93
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.04.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.04.3.ebuild
deleted file mode 100644
index 825a4977a374..000000000000
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.04.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Telepathy text chat window"
-HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
-
-LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
-KEYWORDS="amd64 arm64 x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep ktp-common-internals otr)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	net-libs/telepathy-qt[qt5(+)]
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep ktp-contact-list)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
index 3de2a22952c5..12436c5228f8 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.12.0.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.12.0.ebuild
new file mode 100644
index 000000000000..60e81a319cea
--- /dev/null
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.12.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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 f25fdb21ec6b..65a54f616416 100644
--- a/kde-apps/ktuberling/Manifest
+++ b/kde-apps/ktuberling/Manifest
@@ -1,5 +1,5 @@
-DIST ktuberling-19.04.3.tar.xz 32635044 BLAKE2B 81d3d45f36026e092d7e73c2e6d780ddb233fce8cf441522f119253c80db5b382f6b9039cff243facdab0bffae7d81c566ba8a42de37a948f1912784039c0912 SHA512 aaf7df449745545cc7b9e33683b2a40645811d33710e79ece9c98c78f3b562531581bf99205d0d333f1edf4134a7feb41db2b350bd353c9e74a5cf2cd6b890a4
 DIST ktuberling-19.08.3.tar.xz 32640240 BLAKE2B ae355959a955477f9e0a880cf45df077d84a7eee465bf72a4c809c42ae5500b2dd729514efbf75f712dd88867c1807c4ec12f64fb5bdc9d9e01327b2387f0b5d SHA512 dd977d8cf0f52c2236e572c1f342541e8357ab6916924862b56184a1c825d2797d8f147930a9c32e332b909f7360fc1275f5250f1b183fafb3f8b0278c7063ed
-EBUILD ktuberling-19.04.3.ebuild 974 BLAKE2B 009a04957c60e19a23243af100451a70975e4bfdd43199efd571bd59f18ca6e81bc3fb3d9fb26f3a5cc739c99e80a3de3450f2434b9d9c892b5a451efafd0632 SHA512 3e55715bc8e5f49270b29d4e849a29a7a55f4f7e8e404102cac136180749d82b7063c56953818b1b4164c495bae52e885adef1696e750a021f8c31957b5e8462
-EBUILD ktuberling-19.08.3.ebuild 1130 BLAKE2B 03b84e8b3d2ecf69176d1821924b64589d2e2c8dc81b46feab77ff3f5350f738c467f5a18aecdfa8e5f01b2b984d0c871d0ec01fa0ef28363eee248f6b635636 SHA512 1c135f8be9953525114fe45104fc614e9ccf9947fa24bfe49e47a0664b60add595b57be528beed7df7c3ec155bf64eda3d49f2694fdc65844d220906b2757ea5
+DIST ktuberling-19.12.0.tar.xz 70729804 BLAKE2B 11cb68ae91af8186530b0f1ea869dbac415e2c6f12d27fc8b585a7f4d15df7a00cd38d5b3065da7d2fe6446ea79954b68d2755e94ffdc8f335f3f6b1e5fb62a3 SHA512 33dea1157c1e81531592593eb48ce683eecd3dd2801816aa9fc6d0a24f1758392619ae0701ec11d892a028a81bf1bf4562232a2fd7f3a2e4ab5e117b44eaa9fb
+EBUILD ktuberling-19.08.3.ebuild 1127 BLAKE2B 2ec7e1f563388636102d202d009bbec29b8ced3c1a91693e989a38d3dbc99d74b3f767f6d9504220ab865e98101f490da8558bc6cf92b64359674df7cbd57206 SHA512 5f5ec1669a4ee3437b2f587bd1cd3758c9ead8fc7398db10a2b8acc56f705dc2c6f9b57041493f366467885476c021257588679c800bf218463292d45e743f12
+EBUILD ktuberling-19.12.0.ebuild 1134 BLAKE2B e10c4c1c355ae0caa032120f2f75e0644126000b897522df4b5cfacaaa0e1bd65679882f8ccb2f442a563ffb50a4c482abb624569b6f7268680608ce34db5856 SHA512 992f0b92102be6438f17b179791b0556965a609f02a91d5fd9f2b38209262ff4f334ca15e3bf1d3243223f5ba5a1ba4517f43b96e8d8adb3548f305b02fc6891
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-19.04.3.ebuild b/kde-apps/ktuberling/ktuberling-19.04.3.ebuild
deleted file mode 100644
index b31feb6933c9..000000000000
--- a/kde-apps/ktuberling/ktuberling-19.04.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Potato game for kids by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/ktuberling/
-	https://games.kde.org/game.php?game=ktuberling
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/ktuberling/ktuberling-19.08.3.ebuild b/kde-apps/ktuberling/ktuberling-19.08.3.ebuild
index b95453e3e94a..dc4353b8fa4c 100644
--- a/kde-apps/ktuberling/ktuberling-19.08.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktuberling/ktuberling-19.12.0.ebuild b/kde-apps/ktuberling/ktuberling-19.12.0.ebuild
new file mode 100644
index 000000000000..f59a9b81bdbb
--- /dev/null
+++ b/kde-apps/ktuberling/ktuberling-19.12.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 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.63.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 ffa2a2b25c38..5581f21e5ca4 100644
--- a/kde-apps/kturtle/Manifest
+++ b/kde-apps/kturtle/Manifest
@@ -1,5 +1,5 @@
-DIST kturtle-19.04.3.tar.xz 1827296 BLAKE2B b149cc81f8cb1cffc1124a9817519223c63103512c70f6957ec2faa08a1b24986d07fc1d1045a3a8c36a39b42796e25c2833fc36f6d3c4e248505722bb3f7599 SHA512 f5c376175856b2e8a851da51bb7fd49bf6efb17040ff8b6b2cf799156fddc22736f595b3caaf462694264a072b2c7ce93fa68bed286bc61cb6da7ce8a48977fb
 DIST kturtle-19.08.3.tar.xz 1829196 BLAKE2B 6b6fc4c681dc61563eb5f17cdd0b4a69f9458f035875c487723f388d7e154017d026bd1596e31748aed64848b7118347bec047971a84d0edb35270f59308b07a SHA512 2aab0d607b27561f377dd965351706c1fe49eca49f5e57a816f62311ea38ad7bb7c85f00ff71efe6b30edd6bb2798b1e5814e3d3708dffedb0f64c1fe173ec1c
-EBUILD kturtle-19.04.3.ebuild 843 BLAKE2B 4d8b479d814be1ee4b6ff69a8e339475c3472d93f5b4df44946a88b7027c905fb99b91735eb63bc3e66d417bd79fc0dd8a46ccda587f173045309c9ba64fccca SHA512 60c173152c424c4e84dd1312bc38049ca419980baaa0abbd7a0406d5d2b36fca92f9f36596949514a591797989ccf3fb1f83fd9818e1faa23db48789d5d5b022
-EBUILD kturtle-19.08.3.ebuild 1008 BLAKE2B 1fe53069fb9c4250d6566e7c829aaa1f1b6d264626a9fb1bbeefd5d8b2cc84b6eadbcf9155063562dc896406a4420461073c64b0ecf87f3a3a45d50ff103c023 SHA512 406fb6f55375306e57d8782331190b9abb9e47711c5b3980cef98028dcb286a4d029aa07eca4bdcfd07bfe8a76b783da3e04bcd2f81a87255be3363148f6e2ff
+DIST kturtle-19.12.0.tar.xz 1829452 BLAKE2B b454d6156bc3c3cc68fe0f9d20f0ad52db3e9dc3fb47478af9dbcfe47e5c8a61c35b6e45c0745192cda4101d46fc63fd490f5a6d494c6a145c28c202f3c6f401 SHA512 96af2300230e5db7b8221e9323fbebcad43c881b14b2a5426d0aae509518e008fd04dcd8bf8ed55c754bbfd811ef027f9f53939529468559651211ca90ab08db
+EBUILD kturtle-19.08.3.ebuild 1005 BLAKE2B bd3d8b7193206a653593e5dd7f2efc48a7949ee7d9aa5d3dc0d1769571bddc906c393240d3e6833a5d47506fee06f93864fb5efa29e4edff9276bca866e5e3e5 SHA512 0ecbc130802da63f41be25723fbf79cff9dfbd329c7aaafb566a40c353d461197a2090d7dd838f5a8452ba686daa14b0b9d748d6063d4ee29f79c04b3e908cbf
+EBUILD kturtle-19.12.0.ebuild 1017 BLAKE2B c4e850f43bbb8eb1b1302150c5dd235cfb7228dc25b398d16d7fe1d7d5faf7c8e5acbbae8d0aa743e529ba5e4c89346cdedafb505e229725a4f9e01e346e9fac SHA512 bf2e3f5e1a6951da429b9f315441eceaf7f3bd840641379006838a15ca66bdc8978d3981992214cfbacc77d74e7102e706f9f3d1bbecc9b1841f320ea0e7310f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-19.04.3.ebuild b/kde-apps/kturtle/kturtle-19.04.3.ebuild
deleted file mode 100644
index 53de2f053e76..000000000000
--- a/kde-apps/kturtle/kturtle-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Educational programming environment using the Logo programming language"
-HOMEPAGE="https://kde.org/applications/education/kturtle https://edu.kde.org/kturtle/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kturtle/kturtle-19.08.3.ebuild b/kde-apps/kturtle/kturtle-19.08.3.ebuild
index 0f75266ef007..c092a806f31f 100644
--- a/kde-apps/kturtle/kturtle-19.08.3.ebuild
+++ b/kde-apps/kturtle/kturtle-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Educational programming environment using the Logo programming lang
 HOMEPAGE="https://kde.org/applications/education/kturtle https://edu.kde.org/kturtle/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/kturtle-19.12.0.ebuild b/kde-apps/kturtle/kturtle-19.12.0.ebuild
new file mode 100644
index 000000000000..294cf448819d
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 52f62405898c..0e0eff51ab35 100644
--- a/kde-apps/kubrick/Manifest
+++ b/kde-apps/kubrick/Manifest
@@ -1,5 +1,5 @@
-DIST kubrick-19.04.3.tar.xz 313252 BLAKE2B ce7fd10b7ef86ee94cef2663f893c81caacd09ad9262a4c7502a6920d647921c87dec8d836265d048cdf661a02a8fb656dfa04514c8862fb4a64282defcb6638 SHA512 3dc5cf9dbe93198558449941c6b973cc288fe7c4b4cb4b34134176afe417232934eb35588a538aa55224b982f69413837164564682411ffbb6908c7b53ac3811
 DIST kubrick-19.08.3.tar.xz 313384 BLAKE2B b1f76f57b5301b924c2b20878708fe15dcaa0babcc21467de0a1f8ec09e5b9b128eeaf32f2cadbcd1f9bbc8d54d69a07bd87842358f15e57c5f31ee1ece2077c SHA512 158347fd0f5bd20b098b57ca490bc298ad9e5d78beeac36e60539131c7079a6f9cbcb3bd1bea94663e6aeee63bfa8f1ce90c3e12d7217eece2e85c9e5f171d17
-EBUILD kubrick-19.04.3.ebuild 725 BLAKE2B b8d167244b68689f5b67b377218bd32c9d7498c34e0f3ce71ff93dd008178f918e4a28fd2291cfa66f8f022b76b8cdd53238484ecfec9792f7c3b37c3dabf8a6 SHA512 39a187d314ffc42a3d2738bae9d60557cf595024092dd76da062c3eee9fb01e1f9128c1351166ca210099ca57e17bd02635dce1875776aca93c1741b0ba0f2de
-EBUILD kubrick-19.08.3.ebuild 890 BLAKE2B ec341e2534423f8b9e8a525cfcc5e69c15c5244c6f57b2b359f44bb65d2b893dd13e652e066cd9a3397def56a11d2afda58ac741f95d7c57854717ea806aa9a1 SHA512 ae91423497b0f83e0e982ffd9b77cb9fd665b05ee5437fefd01585372e93b40833f4746b995de3ece4964f06dfcc36af047ca4e5fc8a4c704f2697ca84522168
+DIST kubrick-19.12.0.tar.xz 317156 BLAKE2B 5004ee1d5a6479dff4c2a86f234e42e01ba67998a025f526eeb50a48b1e2c3f09df5499096f49cde28c23b58b980c20c02ecdfe952ee573b9070774e260b02f8 SHA512 017e2a9eaffdd380cd84d2cead80fddfcdbd694e0e865322ac46c16855d725e8addc5584a5fb2cadd1c8c6b69ef51dbe67878ff906719a2ad7d49046ff00cc6f
+EBUILD kubrick-19.08.3.ebuild 887 BLAKE2B 34e8e08d2fce4200c7d51198b08cef5d526e9b0d9658bc287e0f4c443f2ebda30cff50a2c45a162aca529b0ffba0350634360d2269496196a5e713f0022a4faa SHA512 12ca2d596496881643b528b857d5517e1f2cbbe9ecdce0687e8cbb717c2277f95abd519cde008bce240473045ed785c598853daf80b289a24056baa92424f253
+EBUILD kubrick-19.12.0.ebuild 898 BLAKE2B e0a5293c6b857c859365deab4b39fa0fcd030406d32522bd0afe359d7d01c3490e87f56680aca0cbc39d696cc9c39f371572617ceb5e44ad3e76ec8b395c57f5 SHA512 307a4338f3dfc4220222f319b0034b68c7d3b4bf1c2902b98c213897db5f85c1c714fb3223125189afab73eb0ea469d3c64d2946b5a302dc0c21367d31e5350d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-19.04.3.ebuild b/kde-apps/kubrick/kubrick-19.04.3.ebuild
deleted file mode 100644
index 9e030eac8112..000000000000
--- a/kde-apps/kubrick/kubrick-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
-HOMEPAGE="https://kde.org/applications/games/kubrick/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	virtual/glu
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kubrick/kubrick-19.08.3.ebuild b/kde-apps/kubrick/kubrick-19.08.3.ebuild
index 37721e3751b4..d7443ba4c22f 100644
--- a/kde-apps/kubrick/kubrick-19.08.3.ebuild
+++ b/kde-apps/kubrick/kubrick-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Game based on the \"Rubik's Cube\" puzzle by KDE"
 HOMEPAGE="https://kde.org/applications/games/kubrick/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kubrick/kubrick-19.12.0.ebuild b/kde-apps/kubrick/kubrick-19.12.0.ebuild
new file mode 100644
index 000000000000..abd34a517975
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-19.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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.63.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 b6e0805c3af1..e90c94f2e2a2 100644
--- a/kde-apps/kwalletmanager/Manifest
+++ b/kde-apps/kwalletmanager/Manifest
@@ -1,5 +1,5 @@
-DIST kwalletmanager-19.04.3.tar.xz 786548 BLAKE2B 2246dcaf2d48a17e9c2cfd13bb70181bda04e5b03db4d6d3bcad87b434471f7e321e0213b339cfd32f8229f9c098a2b7de494ee78da73efb53c42a1c2a3e3446 SHA512 517c69c4a45c0ac9f330670d6b6f2eaf5454ac9f1b2292bafb851d035fe0c85cbe1d7de02254db5f6a1b260a06ad1a95621106c8c07da0b7e35c6d75709e8597
 DIST kwalletmanager-19.08.3.tar.xz 786804 BLAKE2B 120ddd77efb2eb039e1ff65fc55102a63e3f55500bfc5a3b0b5dc888a8d71ac88f3555d51254c5eea700c6821892fa52fccbed3d52ce6641a4bc362083cbf2c2 SHA512 432c281e468f804076f35c7aa40850c95b7aa0848924349971919baf65c03add00ada921aec6a1882b7e933a5429aac7d1fa0a8fe9569ea0af59fd213df906ec
-EBUILD kwalletmanager-19.04.3.ebuild 1197 BLAKE2B 83392e2f32465d601f96dfc6d66b0800bb6a2e3a5686eabd051b42293307d08610d3a731aa5232f7a72f822010ed75f78ac36d1625abb9bb0080eda535ffe6f9 SHA512 21ecf0027f019982bc8a21542b2111f6cd0e15f93f27e98297e86f9eb8ce8c13ca99f528868ca724b024dd35c514112f260c3333eb03c616b9e518761da634f7
-EBUILD kwalletmanager-19.08.3.ebuild 1381 BLAKE2B caefc2c302ddf9baa681a63135938c1e014685417940a6476ac04e978827f7db76e0dca4d8324d1712e44299d5968f258cf58e5c9f83dde9c2a07f508e8a5d2a SHA512 ef44f512c1e6ad7b2b04c12bdd526cd7371cd04ab567215357cf0e27622ec9430e97a13186c528f683a1323e4db3e39674cbd563068cef5b879b1b2b26a31850
+DIST kwalletmanager-19.12.0.tar.xz 788744 BLAKE2B 79bc06dbf179ae77ff89c9efc1d8bed0adb2d788b11e1a9da336ce698f210568772dcbc7b6ee41672a2f1d7b92904afcad5c87afc6b13590015d0b32e82dbb2d SHA512 5a7934dc3a173c1841e47317aa4d84b9cd7640941f0f63128af99a0b84f8f7941a37d49ca8b04f50927efe47c0026d96b1cdd6e918258d63403165ca4849f72e
+EBUILD kwalletmanager-19.08.3.ebuild 1378 BLAKE2B e319b4f783897f60abf18ae62528e1e740abe8a9c1da2fd847d7652b597f0c7bb993b1474f4f89ffe3989bd709cab4d21563d2bf74cdf109a2ab825452cfbb6c SHA512 106034ca4c94680b5f3cd70c13147451a5ed01a17424e80ecd1afeab92cde9fc63d4116bccf029ca7fe8beaa91ea3d4dd9a4fad7cb8837bacfb7b914c069decc
+EBUILD kwalletmanager-19.12.0.ebuild 1425 BLAKE2B 0c2752c570665b0ac1758b4e6c114a7bf7f2f6bbdf3b5645e5856decf267fb1934e1aaf6d4fa3f07730ee2e57d36f8f67e95e1a385c2522c43f2229dc1acbe5d SHA512 a80a06af22735527d1baa7aa622b7727201f006754e0d30a0740e64050cbbe2210fb540b6c774736d4fb05f9406c59b5068e4beddf41bc0a00946341a68aef04
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-19.04.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-19.04.3.ebuild
deleted file mode 100644
index c088518489bb..000000000000
--- a/kde-apps/kwalletmanager/kwalletmanager-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Wallet management tool"
-HOMEAGE="https://kde.org/applications/system/kwalletmanager
-https://utils.kde.org/projects/kwalletmanager"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!<kde-apps/kwalletmanager-15.04.3-r1:4
-"
diff --git a/kde-apps/kwalletmanager/kwalletmanager-19.08.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-19.08.3.ebuild
index 9b9da822342e..e442cd7127bf 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-19.08.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEAGE="https://kde.org/applications/system/kwalletmanager
 https://utils.kde.org/projects/kwalletmanager"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/kwalletmanager-19.12.0.ebuild b/kde-apps/kwalletmanager/kwalletmanager-19.12.0.ebuild
new file mode 100644
index 000000000000..7c3ac57a4840
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-19.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 e65a12620b11..9811c396a96e 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
-DIST kwave-19.04.3.tar.xz 6209860 BLAKE2B 67d25636f857b81bf4586ac7a77cca1837a0267b16c3ee4b239058f26e4b2319e37c873eb42f239d20a0b545178a464bcb996fa1020e9c86905bd2b11395ee55 SHA512 9f3c6a058c652164d610f53ec36f1dd4d1c255b99c71684d8c19357ddf3c74dbc66288d47292866f88ed81ef72aa440f07534f55c7b2d34093f6c2c58a9a86a7
 DIST kwave-19.08.3.tar.xz 6196324 BLAKE2B 33cbc85f3afb4c050f536819c799a7393d5883a7929b73cdbf782f43166990c1adad288e786755f5e9b35cbc7e72b0620d64f731fc6cd481da57aaf692d5084d SHA512 ad332004dbd9ab4b0a0c047a6012c071d44dbe1fe81dface3f68fbd556b52ac7ece5c5da66e704d87dab3db69cfb45a92f5fdecbb638decef7265db9c1945554
-EBUILD kwave-19.04.3.ebuild 1996 BLAKE2B 145d5b1a1d2c2bb8151851ccccdb734e99554855cd2e2c3bfd1be7d6ec000de8b6628abc65bf3ab9acc606cc6ddee3885f998b6af89bb37bdd0bc16f1c126602 SHA512 8bf633796debdbad762e404285cb11162e871cb7c6931fec928c74b341441ef00a4b1fd97382769bd178c4878a8de23c238d47bb76bfc82711e3c99fe713763e
-EBUILD kwave-19.08.3.ebuild 2160 BLAKE2B 655941749c1055087f8dc4dc3d71382b3fde156040d25bd6b3a935f12efbabf505cd1d53f9cdbce9a87be7e252eb8833bbea5f435a4faac88ba3e8bd2fae8ef3 SHA512 a517741681f3439ac542cd673b77aafdcd6fd45d55427488e479fddad954c093846183712bbfc588abfb0641c664bc7cf009c68a4f69ad685362983cfeb1e3dd
+DIST kwave-19.12.0.tar.xz 6188904 BLAKE2B c64e730e8901ee264e6e19c5d2bbf406ebf8e65271fd7ff85d790bbdc8c9fcdb2272dccbdb33afca06fa6c8a328a667dcde2b0d133c6fc9344763b36b4f9a445 SHA512 e0b06b43eb94030e15e3ced8c4aabea324960998657a129d19fc2c6a2da6c2aabde3466d71d3d1129190ce15d1ce36bb12cf774fa95d2c221f2279972e674281
+EBUILD kwave-19.08.3.ebuild 2157 BLAKE2B 204f0e6a500feba79c9471c84bfd08fc9d90645b700cc1bbbf961f17bfa4831679e566a6b82ceec16034441f68fc0c3277c01c0ec84b7523e824c3cfd25766e9 SHA512 bab3b01f5ed6d4cdaed5b4431e9aac65dcd722b40a2180b2c7d56d24a7456dfe786af41e65ff9f3d2b5addbe070c881b9a0e4cfbd8395311d5c824d0e5d6c18e
+EBUILD kwave-19.12.0.ebuild 2135 BLAKE2B 0df37e5211bec3b695d4ea7e6b483f607024b4d1bb9a523e64ed85c392434ddb2ad73af63e95009fff917ba9fb86e81737ab992754c76f650e9452c1028f5c5e SHA512 b2425e0cbbc4fbdf403032cf643b20dec32851b0142d0ecdc8a419e62e79b7a45081a385739023fc04e00be2ddce90d452a322f2fe84066e311d2686018eca12
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-19.08.3.ebuild b/kde-apps/kwave/kwave-19.08.3.ebuild
index e1302c6a1b5a..b5b35fe791a5 100644
--- a/kde-apps/kwave/kwave-19.08.3.ebuild
+++ b/kde-apps/kwave/kwave-19.08.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
 	opus? ( BSD-2 )
 "
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 BDEPEND="
diff --git a/kde-apps/kwave/kwave-19.04.3.ebuild b/kde-apps/kwave/kwave-19.12.0.ebuild
index 6c01bb007425..0afe98ae4201 100644
--- a/kde-apps/kwave/kwave-19.04.3.ebuild
+++ b/kde-apps/kwave/kwave-19.12.0.ebuild
@@ -3,16 +3,18 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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="http://kwave.sourceforge.net/ https://kde.org/applications/multimedia/kwave/"
-LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
-	handbook? ( FDL-1.2 )
-	opus? ( BSD-2 )
-"
-KEYWORDS="amd64 arm64 x86"
+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="
@@ -23,20 +25,20 @@ BDEPEND="
 	) )
 "
 RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=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
@@ -47,7 +49,7 @@ RDEPEND="
 		media-libs/libmad
 		|| ( media-sound/lame media-sound/toolame media-sound/twolame )
 	)
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
 	opus? (
 		media-libs/libogg
 		media-libs/opus
@@ -59,8 +61,8 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	$(add_kdeapps_dep poxml)
-	$(add_qt_dep qtconcurrent)
+	>=kde-apps/poxml-${PVCUT}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
 DOCS=( AUTHORS CHANGES LICENSES README TODO )
@@ -79,5 +81,5 @@ src_configure() {
 		-DWITH_QT_AUDIO=$(usex qtmedia)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/kwordquiz/Manifest b/kde-apps/kwordquiz/Manifest
index 03c9387157aa..086dcbde9ae2 100644
--- a/kde-apps/kwordquiz/Manifest
+++ b/kde-apps/kwordquiz/Manifest
@@ -1,5 +1,5 @@
-DIST kwordquiz-19.04.3.tar.xz 4167304 BLAKE2B de31519763ee5516706803a74d2e203332a6faa3357ca39f9a18fd911f640524c74da07104b01b8cb53a0ef3f3d0e56135fc26207339790281f1e7ebf00a9b57 SHA512 83ae3b4e34de6d0491203f008dab358c23f34301e7d10904f1bb2230a01541102d554c9aa4204160a372ef96e404285dbcb2d9f8a1c25ea7a6ae6fa5007afbc3
 DIST kwordquiz-19.08.3.tar.xz 4174684 BLAKE2B 12c0fce9044be7dea6b06322faaa6974236149c1901ad1d14a46c0bbd5afd32f330a9deaf36a56190b6520a016ac4323b095482bb9e1931ae47dddaaaace9d84 SHA512 2eace5904211f44d6ace73122a52f7b970e16e68e25921087560322989823ef0c518d5e8a0d07c06f59ca87959f92a35a836486ccd20d82d1b5225ca479e5404
-EBUILD kwordquiz-19.04.3.ebuild 1021 BLAKE2B e18848ea0318a589971aab4528653e447af8589256cb871bc433c8888b553d74daa5572de2bf99335f3fe6f85897a78e80385c99eb4ee3383a92851ec2b316fd SHA512 686d142b81515afaa1c5ce8b8444abfe68fa4c15218cb9cbec902e3616d81c7df1fcaded53be4de3e7e128a78e51381b57b43f4b07d2e67db08f369b45e18725
-EBUILD kwordquiz-19.08.3.ebuild 1228 BLAKE2B 6f9c9a2437f246e4d1cecc16ab4bd0e363df944a72d4948dc7b3efe39e452afc4c4d0611228d20273f72251b510b928f074433d7a5e1d54e8dd83a6a8639b513 SHA512 3e6b88b4265d4fd4083b62daedff6148fa961d018702ef4ce386b467b3634598c548d8f638246092dffc22353a4c1510d33eed19bf21407909188bdf77705d21
+DIST kwordquiz-19.12.0.tar.xz 4170736 BLAKE2B c95fcdc3b9835fde7bb0f892f560e3818fbe2beff4b47ed45286bbe87ed0b29ee239a383efa7054905f6253998a36c3b5d343a69918e0ada9828a7e1e288b839 SHA512 55780f68344a0dad9def31d042973601c587292c58b75389ca2d5fafc72eda58cc5668a34dc5069bbb576b19148eae98458ad92b50eba546a9a3c0cfc8f94dd0
+EBUILD kwordquiz-19.08.3.ebuild 1225 BLAKE2B b0947d55e6b6bc80d5e066b066cdb1dc4d24381125307d6e86b4cb2d32c80ed81d0a68a3ca35df35a85cb44a6f21284fef91a05316407b1b2091fce4b72ffd80 SHA512 869789b852d1a18ab10682361bea9b8d2ceffd957dcaf2298ff26bd1da1c097d85406d315dd9091de0ad5b5e7090c595af0d7ad123fa90b8207218ea8d9ca549
+EBUILD kwordquiz-19.12.0.ebuild 1237 BLAKE2B 58b248f57a5230175275a40079b05957eb72082ed5055e682101f56ecf6e0cd073b39a64c7cbefca5f62f07d28ad6701d1b7731e9d84c8194591330ffbd6f702 SHA512 27f24f5272686ea0a41f0d62feec23ce4ee9e9879380b873e1c901857b2154bf7db740de88dd573e0e17b3742954356d4082a2328d18ee09b49e9d740f74904e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-19.04.3.ebuild b/kde-apps/kwordquiz/kwordquiz-19.04.3.ebuild
deleted file mode 100644
index fa440ab84598..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-19.04.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Powerful flashcard and vocabulary learning program"
-HOMEPAGE="https://kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND=${DEPEND}
diff --git a/kde-apps/kwordquiz/kwordquiz-19.08.3.ebuild b/kde-apps/kwordquiz/kwordquiz-19.08.3.ebuild
index 42f2d271ea06..ffa8a7dc3b2e 100644
--- a/kde-apps/kwordquiz/kwordquiz-19.08.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Powerful flashcard and vocabulary learning program"
 HOMEPAGE="https://kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwordquiz/kwordquiz-19.12.0.ebuild b/kde-apps/kwordquiz/kwordquiz-19.12.0.ebuild
new file mode 100644
index 000000000000..aefbdebe77b8
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-19.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 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.63.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 22e9e51ec4b0..89aeddd323f2 100644
--- a/kde-apps/kwrite/Manifest
+++ b/kde-apps/kwrite/Manifest
@@ -1,5 +1,5 @@
-DIST kate-19.04.3.tar.xz 5790932 BLAKE2B a6eb6b73a671cff1c5ba7b4f46e790fbfbabbc7d97322983fa524ddbd8b0d12f528275b9d90210c66332081edea3c10968933f151894a3048d9a815d28c3f82b SHA512 57ea4a527307dd45818b7e3f1b59ac346f5e82090b01fb010d4e3e31d00eda9c1b8e554ab203c3320fa073fbd65e775e27375f254f05f2dee512a32ef09bc218
 DIST kate-19.08.3.tar.xz 5844532 BLAKE2B 34aaceab92783a869de616be9290887f75eba5ef6198e93d90a71d62b441a907a7893916c72ac85c46d6156330322d5297c60c8c9b43cbcd615c05b51cdd0000 SHA512 0a0b33858bd4856bdf29d354603d33541b2c0aab134025db3014aa31cf3231fa2bcc244252872c0b51c28b7cd715556966d9049ce85a8ad614e1f552479c1bc8
-EBUILD kwrite-19.04.3.ebuild 1186 BLAKE2B e0bda0df0a0c1b18f5bb0f6542cd2b0b23ff62ce8423e0d1d7ab478580b521e0a74c20c48185de8d6f429812fb2248c081d28b5c5b494091345dacd08d4f39a2 SHA512 73535bef1bf33a06417b5669932354552f64a15693811b5c3274d4552b23c3e196a4b632234f45d08b7a285f26d3218102cfc28d4ac4440e24496b440c9a0ae2
-EBUILD kwrite-19.08.3.ebuild 1355 BLAKE2B 727080897d82d55a8075eb3e6d6da8713b79577d9db8f4ca6d52a06c6a481d01fb6f8937ec76bd75f060c8a1f1880994dd6250ab021266279538e5253b5a9cdd SHA512 c2119781c821df9e62735b0337eccb68ba78aefa954390cb325d8e5fbca8daeeb2cbf7c74a14c53c87e49667cb14d3d794137d113574b50ac920a2cbd378fa36
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+DIST kate-19.12.0.tar.xz 5695096 BLAKE2B 8b783c86879ccf49d8d028b02eb5ff89e85ff061605e1fd46e0d5952611455a1832a20fba2158eff61617617f95207a158a6e36975602fb4ff0dcd7147928f8a SHA512 37106b3db09c302d69922cb81a425b2a74bc7bac8cc7d767d6efa59d60b5e80b4f1d2e20dc1e87a2cc57b534fdaefd58b40ce463894f58b56d8ec9a229487db8
+EBUILD kwrite-19.08.3.ebuild 1352 BLAKE2B 18fde4c907ef8a39d72f4eade94b7f152d0dc9dc100552709e594512aad73201212b288005b84ea8af93e3429e30dbab8215500caf1950f30de9d93f5a8c30b8 SHA512 927234c2ae520cd640eced082a138595cd80e0c000ec4112e7d6334dfd449ce7179d4cda73d05306eb4e592700990deaa909b17f5f9bb36d8afd2c93f620a818
+EBUILD kwrite-19.12.0.ebuild 1471 BLAKE2B d776bedd64518c9eadc24889cd665bc6c8fbe36a7c215ad2b7196229e718154568b0918d0b40ab223d694817b1442dec62177a22f4af44a50a2a5b91ee058777 SHA512 82058e9e2dfdf1b6287a277a1a2a16367a6851dc1c7ea8710ea4bf86dfe5e6cdf3890ae1822c26007790768db4995092a7756196eb8b744d9e18a7538afd2455
+MISC metadata.xml 372 BLAKE2B 80ff693fe7c7c67aee3a23b6a658a150e33589f9a42df15e7d1956290947555993789ee023345b585fecda3ae828b9d99107aa72b15a6dbaeaa806d0bc2fc2f0 SHA512 3c9a012ef2f6e23889c5c73b3c418e9e60439ea3e3a58995eb8a8b730bfafa5659c7cdb848d0b340f1456828105d92e85c9cdcf55faf22ac676d2d377a004093
diff --git a/kde-apps/kwrite/kwrite-19.04.3.ebuild b/kde-apps/kwrite/kwrite-19.04.3.ebuild
deleted file mode 100644
index 00349a2ac53b..000000000000
--- a/kde-apps/kwrite/kwrite-19.04.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="kate"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="KDE simple text editor"
-HOMEPAGE="https://kde.org/applications/utilities/kwrite"
-KEYWORDS="amd64 arm64 x86"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_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=(
-		-DBUILD_addons=FALSE
-		-DBUILD_kate=FALSE
-	)
-	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kwrite/kwrite-19.08.3.ebuild b/kde-apps/kwrite/kwrite-19.08.3.ebuild
index c622764d1b11..37cfd2789ff4 100644
--- a/kde-apps/kwrite/kwrite-19.08.3.ebuild
+++ b/kde-apps/kwrite/kwrite-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE simple text editor"
 HOMEPAGE="https://kde.org/applications/utilities/kwrite"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 DEPEND="
 	>=kde-frameworks/kactivities-${KFMIN}:5
diff --git a/kde-apps/kwrite/kwrite-19.12.0.ebuild b/kde-apps/kwrite/kwrite-19.12.0.ebuild
new file mode 100644
index 000000000000..0862c397eb87
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-19.12.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="kate"
+ECM_HANDBOOK="optional"
+KFMIN=5.63.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 ~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/kwrite/metadata.xml b/kde-apps/kwrite/metadata.xml
index 2fdbf33d963d..e86df5ddbf6b 100644
--- a/kde-apps/kwrite/metadata.xml
+++ b/kde-apps/kwrite/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="activities">Enable Plasma Activities support via <pkg>kde-frameworks/kactivities</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 1f86279aa47b..6ea0612fe9b4 100644
--- a/kde-apps/libgravatar/Manifest
+++ b/kde-apps/libgravatar/Manifest
@@ -1,5 +1,5 @@
-DIST libgravatar-19.04.3.tar.xz 30920 BLAKE2B 53dbd825d2f8c92f30709a15218d6d06e72703e5290a88bc19a95b45935479b205cac5b1200f705ac1d4543d289664930f2783ff3160f75ad39dd4d8957c6ad5 SHA512 be274c19def96cbadf1d07e1ad04742f6407bd8843e6e2fc88bc6f5b662074af7d39aba25d938d8f6e1216bb8537bc6af621577d5c2bba7894121a52d0fd5de7
 DIST libgravatar-19.08.3.tar.xz 30804 BLAKE2B 6d0e98adce3d3c7cdcafae39b7169d5153af4773cf591ac72a32b3847344072597f92d935e5532aa47c007e9e269877b41f93ad183a537b3f40a633b59f480db SHA512 dea215bc8ea7820b187d0799a1f1e4ed77db0c48247ead770c3e473db03075d8f607e59eb01582c961fa474eea9ead27501f5e6034e58d316d03f1aca3ef7460
-EBUILD libgravatar-19.04.3.ebuild 725 BLAKE2B f19d5e9d15965ab8708e5a33e79ae04d16a3dffce1057e3831d8c9787df1ef6cedbb3fd008edc79d3c3d98a86c5dde875d999408e1eee8f9f908a715db1603af SHA512 af4a75825e956c7f5cd322a41e29367cda30475c52ee655a8b413baa1b73e420a6693a7d3d08b09f09a0a52bc7d8f6a84e96476588661f95bfa61015169302b8
-EBUILD libgravatar-19.08.3.ebuild 841 BLAKE2B afe441c01168d36817ec46ce0f5b6cbb3fe17cab0a0b7f691decf4a835945051086bf3d01ab35a2bc5001f4533fccf63ae018137fee532c618ac783ab8632f48 SHA512 e9892fbc2db2da9058ac94fd795460fee415a415edac97318cce998fbcfced6f1ee4a3700277711fef7a09e041248db38e2ae7a4a572f0d640d0539d4ed81e50
+DIST libgravatar-19.12.0.tar.xz 30932 BLAKE2B e0750e037263f18b1657eec14ae2e03e6d74b5c628d112fa80d7fb2bb915cf1b7145a8538caf65776a6d73a67ddb2b1b8cfa7d139e6e1956914bfbfcfae20eae SHA512 5548676a83af8fb38c970d91921e65c6194c672f59b0e64bb135578de0ee9a0ff9aa4881f780348d504554e08827a5eb00677fdd73b9b1e66856d59f26172962
+EBUILD libgravatar-19.08.3.ebuild 838 BLAKE2B 5113216d7cbca78ee884828f1af3b607ab45046727440c5240e37df27106f235c8b32fe016ee5af105c74b30ccb26c9e6bade6615cddf290b912e34c9bfb4135 SHA512 7b9d055236536f2e85a5b7aea55eeae23fc76856a8b2b3e7a3ca7b5b2e349bbe5037e2a360605dadde29bde10100ea299b893d29ded5bc1e68b31ea76921db72
+EBUILD libgravatar-19.12.0.ebuild 842 BLAKE2B 738c9c5e84a0486e0f2df7d271fbf5a8e3e2f81dd2a973de639ad565e9205bdf22ed11d672c1d7d17ba3e4c4820787bbc83e5262e273a71a4fc6cbd813faeac9 SHA512 8a134a9fb290e4336326ac2af696c65111cea0c91932164142685bdf833ed54ccbee5943e1f5239fc43e4cad1b3367f83535860299e10804c948336fb6a7f07c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-19.04.3.ebuild b/kde-apps/libgravatar/libgravatar-19.04.3.ebuild
deleted file mode 100644
index 502a0104dc52..000000000000
--- a/kde-apps/libgravatar/libgravatar-19.04.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for gravatar integration"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_test() {
-	# bug 624584 - needs internet connection
-	local myctestargs=(
-		-E "(gravatar-gravatarresolvurljobtest)"
-	)
-	kde5_src_test
-}
diff --git a/kde-apps/libgravatar/libgravatar-19.08.3.ebuild b/kde-apps/libgravatar/libgravatar-19.08.3.ebuild
index 625ae3343fe3..1f65e6ded72c 100644
--- a/kde-apps/libgravatar/libgravatar-19.08.3.ebuild
+++ b/kde-apps/libgravatar/libgravatar-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for gravatar integration"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libgravatar/libgravatar-19.12.0.ebuild b/kde-apps/libgravatar/libgravatar-19.12.0.ebuild
new file mode 100644
index 000000000000..e8437f629614
--- /dev/null
+++ b/kde-apps/libgravatar/libgravatar-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=kde-apps/pimcommon-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+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 27c78ce80eb5..a14625fe58fc 100644
--- a/kde-apps/libkcddb/Manifest
+++ b/kde-apps/libkcddb/Manifest
@@ -1,5 +1,5 @@
-DIST libkcddb-19.04.3.tar.xz 423248 BLAKE2B 96dbea92cd22d3a515876679d30dbdeb389dbab35001faa6ace6f4edbbec08a2d469c33df69eaa54831ece11246fccde0f6279286a7cc0c8811a091598984d97 SHA512 5899063f1673415b41a1d0bd60b11f9279a1b98e5eb73d3aca9e30928e87b166d426acb8399372ec0bdab2ffaa140a3eb1514bbf9658be394c6abec262b82577
 DIST libkcddb-19.08.3.tar.xz 424108 BLAKE2B 0306f030709e8c2e30861e047999438a28fc9261a34ccf40ccb3a0a68243430e9e8437baa5beb0c9a2ea8743aeee1c6383b88a120452622e580e219da18d0aa0 SHA512 2d24289bf67c4063fad0e61b2b1e0a062cb2db0e9b5c7e82965e140691d69537c811552871296c9f3e0d8d695596c1386485a7626f8d8d3f79d898827652d659
-EBUILD libkcddb-19.04.3.ebuild 1048 BLAKE2B 7757e54e8daf169aed5d549e5abfa318d4b89c9ff20bd00ef641cb78e9422f15ece3444f9d943b0401100dc84c48dfa487eb1008cd7143371aa7ff24a218b4b7 SHA512 4abe273018bb8efdfd1b732fd9244202895624a8b81547b57d8fe814e3e5b25068ec1c847f99f9048622833cafc1061115a7da1954558638ce3d547f8463dc11
-EBUILD libkcddb-19.08.3.ebuild 1151 BLAKE2B 6b3b9772552b8e91ab6fd13ec396271ba75f7f1e23be7e3cad3031ecb02813259d4c3c14032ab72daa5783e27ce54fb1c59884cbd80f10f6a02c172ba952febf SHA512 1641ced4875de90ccb7034a7d39539cafbf606cadf6c4f866a3b1038409a50160787257ce295edea48562085e654d6ba5ce5b62180195bfb675c2d340b75bd09
+DIST libkcddb-19.12.0.tar.xz 425072 BLAKE2B e3f377d16dbcf05646ef228b7f160a10ffc0c520f8238411099ad6be954480211a4e2c9fbc7da87ed645bf36ace742ef0fe51b3b78fb316157e711b5893f3a93 SHA512 a46d50d35d1f5e000f0c9b43031e5827a46d68a8f8783fc760afbb251200f7491973b571ed809a0975df3d6894213dd0177cf6bf23d95051121dad1e72521059
+EBUILD libkcddb-19.08.3.ebuild 1148 BLAKE2B 752957a768461556448acfd156587ea08c6e5bfb6f23c13d64a08bea2328505b8a0fa2b61e1d3eca973e53c1e28be642223c2101d7112ec3ffec3a09ff0f1cd9 SHA512 cf90a197f995dd5a6eb246da6e0905866a536540b740ac975081e4380b5cda2079080148ffe1a5c336dc2b67ff091e81cd63293a8c17a9956e21a52f1e38d0ff
+EBUILD libkcddb-19.12.0.ebuild 1146 BLAKE2B 009151310c39ce2c7fdb349ef0b31f1eb5de1f9745ecef4e4896737879e5e2e0642230956729e42e59413047f3468760e07b199935e66f96135bbd01187d6da7 SHA512 f52c623e255f1bb0b78df52f42e3d57db56d5c60c083e33f212c3df69dc132b14b9ca335bd71c364e19d0e1b8d67be8399f62e9b1010b41600a5cfa8afe43408
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-19.04.3.ebuild b/kde-apps/libkcddb/libkcddb-19.04.3.ebuild
deleted file mode 100644
index 28d5ea5fb1af..000000000000
--- a/kde-apps/libkcddb/libkcddb-19.04.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library for CDDB"
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="musicbrainz"
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	musicbrainz? ( media-libs/musicbrainz:5 )
-"
-RDEPEND="${DEPEND}"
-
-# tests require network access and compare static data with online data
-# bug 280996
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		pushd kcmcddb > /dev/null
-		cmake_comment_add_subdirectory doc
-		popd > /dev/null
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/libkcddb/libkcddb-19.08.3.ebuild b/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
index da374aa6143a..c12a1395c993 100644
--- a/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE library for CDDB"
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="musicbrainz"
 
 DEPEND="
diff --git a/kde-apps/libkcddb/libkcddb-19.12.0.ebuild b/kde-apps/libkcddb/libkcddb-19.12.0.ebuild
new file mode 100644
index 000000000000..0c1219553b5c
--- /dev/null
+++ b/kde-apps/libkcddb/libkcddb-19.12.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.63.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 25ab96f225ff..ea87cbe74499 100644
--- a/kde-apps/libkcompactdisc/Manifest
+++ b/kde-apps/libkcompactdisc/Manifest
@@ -1,5 +1,5 @@
-DIST libkcompactdisc-19.04.3.tar.xz 89120 BLAKE2B 56cf3ac5465a8c8cb22c8db9f356cd340cb7f0f4e2e7c0575c32a828db3b414d9a226fa5b114830610426d039658119a0ab207d9c9d84a4f50619496334e15eb SHA512 5ed703383ee77fc2404ce81e181a890c3e63598c157087c9728368aca50f91d4e398eac10e98fef0da58e6dcb4d6e33c2ef409df444f0052ce71ecb753dc702d
 DIST libkcompactdisc-19.08.3.tar.xz 88900 BLAKE2B 44bf48787eaae663f21f3552c97601040d426aa8f6d2e0ec7887c59085333091268665657590fb0b8bae9a4b9447176da4e826f2c176116a3609d5f2788b10a4 SHA512 5366a85763ec8fb34038775a2a187b1dc5bad3a7fc7900dc65e3b08ab57f3a73f297ddb47c359baeef7c79af8c797572c724899d1fdf730f728fc65e2dbca6e5
-EBUILD libkcompactdisc-19.04.3.ebuild 553 BLAKE2B 2842d3d2447d64e386caf526eb43d8d2a4d9e10455bfaff8fbd0f72851e33bc9c0336704e437da8f1561d6b3c469ad90169535ec0eb644eaffd5b7ce7d45ed99 SHA512 7bc4d4afb360949fb3c651bd6b09c0e56ea95c8859fc6bbf500a4194b45285eb2d87450dc1f845d072dfad481e9d47d543e9dfad507df790bc94b2e03dcb52db
-EBUILD libkcompactdisc-19.08.3.ebuild 621 BLAKE2B 81054f8aba0b9b3048d287ff60dbb686f6dd38b4e8d749bcdb06b6905703836b3f30ff00ebedd6e852655f220c522d6177dbdd5a0943660f53704d9bd4977fd0 SHA512 58a2edd6892a7fa284eb4e6a314925903aba09b12f4c4981e4c1923b1af79a5ba33a2f9b1ec40609ffd71ca05c5ead6c56344264e6ec9c8d596008aa2b774638
+DIST libkcompactdisc-19.12.0.tar.xz 89284 BLAKE2B 7b99210432a0194e6bc4dfa443a088fd40af27d88fe20ff812e6efc5571c1d3458f522154f406e5356fcf8568c9b707ee2aab6c15c5ed589d5f6fbfae4b661c4 SHA512 e0c8aad613831c88cd2ff26ff99c56589e0bc3b4088c15d971271ce7b6221d826157ba8b20365717b6d652b374136b0afad0d3c8bf641e6c2cfaac2fa4344007
+EBUILD libkcompactdisc-19.08.3.ebuild 618 BLAKE2B cd29253128eafa536d7afefcac3b249e10c7c3bdae4240b12e8ca2ca864cae30a07acf103e4e6f3f45ea3d6f6876a9fe54ae8efeb717ffe030d158bfedcc4344 SHA512 44b334b9b21e6b0914cde9372a8d73b2db413123191faf220d11b78d9891ed47a0fbd0cec80ba45b91e9cb78f00f5e4a7e569b3e50da21466e3d9b5b1339c44d
+EBUILD libkcompactdisc-19.12.0.ebuild 616 BLAKE2B 5b91238e90d8c882505ee3866aa25851a9395aa98ea72f3c858741421f6280b8c6d3b13fe62221ef62872666ce71d2183ad80f2900d243c7c32b597ad803bcf2 SHA512 c66cefe8fd80bf3b67d68dd5a63e73005f9a2cc043dab94cd39020b45a46bfb33f36487d9df55edb102686b2ff5c1772e4f9c9d7f4421ee15702834cbca87da3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
index f1e208366e17..e8dd9b411f00 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for playing & ripping CDs"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="alsa"
 
 DEPEND="
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-19.04.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-19.12.0.ebuild
index 52f79b84831a..5e0aaa85edec 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-19.04.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-19.12.0.ebuild
@@ -3,18 +3,22 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for playing & ripping CDs"
+
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="alsa"
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
+	>=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 )
 "
@@ -22,7 +26,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package alsa ALSA)
+		$(cmake_use_find_package alsa ALSA)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 168c6be0469d..e7fe7c6936dd 100644
--- a/kde-apps/libkdcraw/Manifest
+++ b/kde-apps/libkdcraw/Manifest
@@ -1,5 +1,5 @@
-DIST libkdcraw-19.04.3.tar.xz 42144 BLAKE2B 4678189c7b5a2f1937334f444ead7da3245a86f417e7a53c4ba76bcd10772597c912607852636d67f750c16e2d4d0ea21dd6125ad8859b8cfe1f9527a6afb75a SHA512 354415fd02353f083d699e4bb69a007871bc09d59cb4ad9397c89675dd5a204ec21841b156ab20afb646de3c8c79119bc2867666cafde9f1d3f66847dbaf8b4d
 DIST libkdcraw-19.08.3.tar.xz 42192 BLAKE2B 8ab9615fe8c8ec82398bf20714408667222d53b5b70460c415ebfef236b98428b9d309d4918752a9d5e7d6c67d2b3b5ae04601cc82eab815fce74e654b9f2ef0 SHA512 295e171f174e574c2bd016f597321b2aa04f82bb8fbd4144d1227834cf11b22cbaeb4c07154ce23d917c6fd606f6235680f38e877bb1f769212c7308815dde9d
-EBUILD libkdcraw-19.04.3.ebuild 315 BLAKE2B 674e1a8b3bb0b72bfea74e84f877bd5515e7054bec70e0ec0a17a8aa5083a7286c0565252274bfcd8cfd2455af93e22da17b5ac3b39b8cc4832de9457419325b SHA512 e4d5c5b0f1b1911989c915f13721298087daa1ce40aa53cf3c78ea79f9f5b115ded83d33b7873e7a87832894873141f6ec614ab02eff5efabb6201526548b5d3
-EBUILD libkdcraw-19.08.3.ebuild 353 BLAKE2B d5317dbb87a709d12bc3cf797c500cedb413d9d355c1a52bb9dfecf028d07eecd348b39d96abaaf2153d3505210b4ec1108a86501a0e3b22ce6c2014f4104e1e SHA512 1a1706e518db7df31852479415e0f2ba9ffad5496a46f72da47d27a8cd9facbd51aa65b5670452911033cd16e13daf195ce98c6940c7d2d85a32b4ebcdd217cc
+DIST libkdcraw-19.12.0.tar.xz 42044 BLAKE2B 767e7e132561e7f4d9caa5384d75be1e587364efef8185feaa7b87e230c4043a6aa6e8f11d8d5f0fc251387e5f723c59e4fc56125e23dbc8a4862f8c0964eb01 SHA512 cd8f941568e096ce12a90eedb8b6a7860fbbbdc9ca0d7e6d9374278055a6ef3aca9b6cf7de5289c2fce45764f7714eae856dc35f0f89c0beeb560a39bac884b2
+EBUILD libkdcraw-19.08.3.ebuild 350 BLAKE2B 0c7bc52a5d81c670bacc1ceacd242d34c6965f8c4885755876c39ca78e8751d6802d5bf67d8da70e226e4cfed4a46fd38c7ed1814299f2d0a01573cf9b32cd74 SHA512 7f7728c7f61e5a9a2f7c24e719d32986369a96a6e2456f6a9bab4eb64904e2177aa9d78bf05931ba6d15c573cefcbdd5ee176578100dbe981f1d8fe2269aa672
+EBUILD libkdcraw-19.12.0.ebuild 354 BLAKE2B 7be01c2289749b46588d4a7909b1ceb0205cffeeac4c010f163edbb27da1f34ca9e38426e8299f4c8490776a1aa9694f4db05cef75c3631e1d940e0cf73f4e67 SHA512 d8243e47f089e8cea2479bcd57643a420736be1fb4d34558315f670059b98cf00e584209c21c7d1907c0f8851a800c629f4b5f8a86d8472c0d8c9cb8f892a48d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-19.08.3.ebuild b/kde-apps/libkdcraw/libkdcraw-19.08.3.ebuild
index ff3c078184cb..55c18d22919c 100644
--- a/kde-apps/libkdcraw/libkdcraw-19.08.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-19.08.3.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 DESCRIPTION="Digital camera raw image library wrapper"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/libkdcraw-19.04.3.ebuild b/kde-apps/libkdcraw/libkdcraw-19.12.0.ebuild
index 03eb43eed91f..05a075ffd8b6 100644
--- a/kde-apps/libkdcraw/libkdcraw-19.04.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-19.12.0.ebuild
@@ -3,15 +3,18 @@
 
 EAPI=7
 
-inherit kde5
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Digital camera raw image library wrapper"
+
 LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_qt_dep qtgui)
+	>=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 5f1ab017ed91..f7f0f27012c7 100644
--- a/kde-apps/libkdegames/Manifest
+++ b/kde-apps/libkdegames/Manifest
@@ -1,5 +1,5 @@
-DIST libkdegames-19.04.3.tar.xz 6378128 BLAKE2B cfa3f914554eccf068aaa720cd029c483c6c698befb4b51bf6294ea850a27c41ce03fd6e62d8781c091c359cb8430dbbd4ccf6b8751069242e2b15154a2c73d2 SHA512 3d918f7e3662321fd8422f39099fd2d97bede3531c2943ef0f28628e6319876cf60a06342f98e60ea69ce069cce9a5f35a82f20f44b51793dd09a231c533d00b
 DIST libkdegames-19.08.3.tar.xz 6387676 BLAKE2B 2dabd0b9bf486a6dadb74c4114dcc59f3ebe9536d79b963b56a7be783db0bf89ce0389d5bf65f07ac13afb484376ee87af563f6866bff248ba98efd13bad535a SHA512 15dfc1818d829071acf7c3190a0efd3b81abe21dc570ad2670846fee874262068f3a493337fb472e6014182aa9f57d9d969d4957166513dd02f61c71e7e40c3b
-EBUILD libkdegames-19.04.3.ebuild 1230 BLAKE2B cac5e49d70d4065138c072bb34573f2d3d1a2e876aa5886d2a19dcb162d460950738b29ea3e5407b569a7d3e2f5f674735f385a33325881c37f244fd93110e12 SHA512 44f98b6eaaa9fc7731ef17025c0cab5d8a83618ec8af9b34d12afb37c2b8ae689c0f6c2b45f12fc82fd91f115a0115fbc51a39eeb5310a0f4673cf69396c79b2
-EBUILD libkdegames-19.08.3.ebuild 1482 BLAKE2B 31e82c035b7f47c708fdb6ab12a136a5d4ce503f8d25dbedfe4716595997b11850c0b93426d83b8c021ab71c25500bda8b92ececc18ad04d27add2be3ac5837a SHA512 5198091c7982a32cd71687382cbab5e94b26fe31a8f96af346fa4eb8caf3d2e7a0b5ceee00672f8af0479739e1cebee239e97f9c2991200fdfa5ddf4d8e9e9ec
+DIST libkdegames-19.12.0.tar.xz 6384612 BLAKE2B f024b34e5150534a5fa9ccf389d1dd12f0abaa050814d7562663cded72154b4b9010c9868148efd8f57810c2b4ffaee8b4cf5268e944318446c4b11f9c4cd511 SHA512 7e3fdc24fb7f7e906b1f25ec8ca4181406389af81712f7b3d0881c354ebaf49e8c6234ec227036aa47843d5175a24b7c1a651e3f11ea83872453e0e3feb9d2e7
+EBUILD libkdegames-19.08.3.ebuild 1479 BLAKE2B 32e584f0f1662d75a921d853bb55adab36f366719e21718aa6107c8bb01dd64b1c1d2053c7c079fc32d1c0ba24befa977490fb140527e365e4278be24e690deb SHA512 4f508f03489864836b0d7435ae3ed195736eec06200effadba42bac8b20bf3a652080ee807e5fabad885d78f41d4bb8db0fa5e91eef30b36e0ecd982b43c31d0
+EBUILD libkdegames-19.12.0.ebuild 1483 BLAKE2B e332411eb5f1ff54bb87eed9611cf4ce352b1ce17e01b4e964803a448c14e0baae35f0de1727357aa488d0e625ffc0d80b21dfedc0f18562e23a76951720cbf1 SHA512 8b10d1b38655d1fd921bd3725fc282fe0151ab5db32440451b897fe8943c9a5dcbce90ef22ef4be181eeca269e3ecfe1255a4d94bdfdf6dd12d896974dfd36a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-19.04.3.ebuild b/kde-apps/libkdegames/libkdegames-19.04.3.ebuild
deleted file mode 100644
index 3f571a9ddfc5..000000000000
--- a/kde-apps/libkdegames/libkdegames-19.04.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtxml)
-	media-libs/libsndfile
-	media-libs/openal
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkdegames/libkdegames-19.08.3.ebuild b/kde-apps/libkdegames/libkdegames-19.08.3.ebuild
index 7d503ae81762..eef5b9de0206 100644
--- a/kde-apps/libkdegames/libkdegames-19.08.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Base library common to many KDE games"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/libkdegames-19.12.0.ebuild b/kde-apps/libkdegames/libkdegames-19.12.0.ebuild
new file mode 100644
index 000000000000..c8d09bc57cc1
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-19.12.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional-recursive"
+KFMIN=5.63.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 daa8a3b67ca4..820442a76226 100644
--- a/kde-apps/libkdepim/Manifest
+++ b/kde-apps/libkdepim/Manifest
@@ -1,5 +1,5 @@
-DIST libkdepim-19.04.3.tar.xz 336260 BLAKE2B ab4393fdbbc3b1ba334eca62a2de6f2e04837e004049c50030f6678cebfdb73717bf157798b2784c388a996d97fc108ab9a5361fce891584199b5550e3a57a12 SHA512 04531ff6a151526c6ec63fcd4fb71604b0a8064ea4020672fdfbd4228fd5304b02a2ece19115fcc053478804b6fadb3c03d9f662ff7e34b769dc7360335ad81c
 DIST libkdepim-19.08.3.tar.xz 333408 BLAKE2B 10f4670e0f776f4dd2b4711477a88748c6d1a905b8d067ce86f07115e86f60a3132069768857f0c381380a6e786206986bb2b3e360b5c838d21ce29ce9a6bf02 SHA512 f51973b248c1c6c213dca3da0458e8b8655a46aaae5be780c0fa31e557daba10534c78c8ae327e6f4f4eab55fb654fc720d7e0d71dac2e47a431a9162316f229
-EBUILD libkdepim-19.04.3.ebuild 1068 BLAKE2B 3f9de206d35486320a8942d7b8de77f3300b5a8b1da855c791fc0d0434bb8767cb4eda41aeddd0ce610cc26e1fd27c29c1f5bccad830b263637fa21c59c0ab09 SHA512 2df5b7a3aa46be881529e2c8a467be4269041cc51d2d37500bf60c4d984d095ad2513be27ac2482bc6b94d0184e42e0546ff06adbf6db58ecce345070375c32c
-EBUILD libkdepim-19.08.3.ebuild 1257 BLAKE2B 243e2720bbb75d3d899e3b65a3ccc449a5b51e7840d34d98656a74407da135abef49a9ba99c61781de0f451e80acbeb88f1cd3e7f62b466873e999f4ee6e7cb9 SHA512 3541f2d3ab0211b9528e859411a0f60c5fa61ca259c25eaff8a140ba4e63725e3679d0c7318dff36b57a8131fd09a4a31c1d9f3c2c7c82b8b749ddd181bbc3fa
+DIST libkdepim-19.12.0.tar.xz 333096 BLAKE2B cd5ea6414b5c991acde2bc25dfaf36267fa75021967bc371f7cb8243d2a5ae6629e9fa4c98ae64d08f5060f38df8462a3a42990d6778a81c4a6de3e2d6145405 SHA512 ac07ce71ffb18437305d10d5a60be8ad90f42610b56e7547e9dbf3475b480d58e453ba33a0d431e0ea3957175459c8abda3e099baf3d77498229be53284eba9c
+EBUILD libkdepim-19.08.3.ebuild 1254 BLAKE2B c1d2ce56108670f840d8dda4f951bf64499e629998b025bb0dbd35444a95b97bdc0fc090a72424d8fa8eb163aca9d968c75df4e3d57c5036e0d15ff43abdd2c5 SHA512 4e6b39a3e6ad2a0d0b8df6e42dec2b7956aac7fe3b9f66795a68116f24e6078b79643636604fe3fa008a0308f51fb0bb5d8663944ca69496da6f00d3bf2525f5
+EBUILD libkdepim-19.12.0.ebuild 1217 BLAKE2B 3a99478c7653dcd6fe1b9bef83730a8154a1228a0df3ead328decdab4320dbc1f10c56190ca7cc2e6a5d858a30a3768b0f4bb13be73efbbf5d90fe86af6d2b98 SHA512 6450c7b26b53de37e9eb43c498c560a741d7c624083acdada5fb80ecbf687aab6879f6be9a42930b98e480d1cb009636c60a4ac3272baa7606ee0de23910fb5d
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-19.04.3.ebuild b/kde-apps/libkdepim/libkdepim-19.04.3.ebuild
deleted file mode 100644
index 4e26544c2e69..000000000000
--- a/kde-apps/libkdepim/libkdepim-19.04.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kldap)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkdepim/libkdepim-19.08.3.ebuild b/kde-apps/libkdepim/libkdepim-19.08.3.ebuild
index 9818fc5e9400..35986426f248 100644
--- a/kde-apps/libkdepim/libkdepim-19.08.3.ebuild
+++ b/kde-apps/libkdepim/libkdepim-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/libkdepim-19.12.0.ebuild b/kde-apps/libkdepim/libkdepim-19.12.0.ebuild
new file mode 100644
index 000000000000..7684b33dc0f6
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-19.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/libkeduvocdocument/Manifest b/kde-apps/libkeduvocdocument/Manifest
index 52b0b070c76b..5c36b781b63e 100644
--- a/kde-apps/libkeduvocdocument/Manifest
+++ b/kde-apps/libkeduvocdocument/Manifest
@@ -1,5 +1,5 @@
-DIST libkeduvocdocument-19.04.3.tar.xz 206980 BLAKE2B d3684fe2634a274d2089bfadf717170d538bea00a2e0252cced8ffaf516a5e139d37b57df27707bfb42f642c73655adc06454a2afe38c8abc8ddb96001997fab SHA512 575a673cfcb8aaa73bbe20741f4c9c903df3a194fbab5d9fa98c0ade53c789c3e0926d9b71540d2e812268edb4601a84092baad14d340189e218ca8bd2e008f5
 DIST libkeduvocdocument-19.08.3.tar.xz 211172 BLAKE2B f22e74227b74168946a89b307a58b999978f56e2fe9e35909c6b5f60e574eb6e40c709089c7978b23890d348e802fc5f59c5c234b1a0f460b8cb90b0efa36343 SHA512 a548dd294bd07fd9c14448bc0d69fb5f58ca7a15f513bf56e6402af3678727321fe2f2a6a6345c2dcd220fbf1f4668075d73065b1c00835298da9f8c186828de
-EBUILD libkeduvocdocument-19.04.3.ebuild 609 BLAKE2B eafc1508e43d4e23c0b2bc9bd4514377e5d507252d7f90860e59752a9275c2d89011523ebbac1869d0b559a521ef8866ac7f569083d1a3143235cc5a9d15239c SHA512 a5f200a6bb6a4754fbabf808fa474813f5f05eaacf3f4123868de05cb9b1a8dade20795372ce709f03bac3607572649e9c2a74077033395703e264ae3948fa3d
-EBUILD libkeduvocdocument-19.08.3.ebuild 713 BLAKE2B a722d3da17e786d4b0f455bd08eaefd35cc858795f01d6d2a05d17282426131f2639e49b137f52b0a8b260212398e41dca41363a329f7c93803425fad0b8c1ca SHA512 24bea8f06b1a6d6b31a85d0a96bd2c0ac0abc321dfc907ab6cedaf1a20068bc0f38fe784570b97e3bcdaae0dc2612894977fedbb53ee69c9f17a644db9df0e7b
+DIST libkeduvocdocument-19.12.0.tar.xz 211160 BLAKE2B c67c319a32624c425a7f8097dd63711d2e50e20de91c4446909831db681070d7b3d2969b10ae26b76f5730c0ada5344dbfef7b11b198e94b4f9d07a52239d346 SHA512 5432632fe3752f486428e69522b74adf05115d205ef49d3f0a2b41d7cf899be36d97e1d4f810cd9a7cb0bacb1217eb650d687a28bfabc1829252c4c97aa07e21
+EBUILD libkeduvocdocument-19.08.3.ebuild 710 BLAKE2B 6bba2ecec2ea530c2d986d7c2657423a24ce0c6b547d3943f295e8fc63babf8ae9d116a4a1b5bc65e995870433e7f74b60fbe75654fa5291c53539ea944f4773 SHA512 e8c60ae6147318ccac50ebb867a876edf93da953155683d33477dadc1769555688750d5c4f81e679f2288c7f006c9ddacf18d9aca632e474a194ea4442743b77
+EBUILD libkeduvocdocument-19.12.0.ebuild 714 BLAKE2B 14c2063843974f9c0be73468dedcfaf7619204e4dd49fa081485061140ef31664a7b0a6ce5d9b189a0ff33fc4b849c936782dbfad3232071ce22f33d6ca03cfd SHA512 7d2da788f51aa8769968e4d8c37c05b2480836cc42d7b7a3a7d57d9842fadcf86e0b1b0b85a231816fc9bfa4acc1aa898a2170fb72b1aabff8b1748b94888b04
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-19.08.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-19.08.3.ebuild
index cda42e5c1f1d..c097e8eef723 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-19.08.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for reading/writing KVTML"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-19.04.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-19.12.0.ebuild
index fb343bd4c4e4..f8da2b12bd7a 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-19.04.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-19.12.0.ebuild
@@ -3,24 +3,29 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for reading/writing KVTML"
-KEYWORDS="amd64 arm64 x86"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtxml)
+	>=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(){
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if ! use test; then
 		sed -e "/add_subdirectory(autotests)/ s/^/#DONT/" \
diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest
index 1b58a94f09fb..757812a08947 100644
--- a/kde-apps/libkexiv2/Manifest
+++ b/kde-apps/libkexiv2/Manifest
@@ -1,5 +1,5 @@
-DIST libkexiv2-19.04.3.tar.xz 64144 BLAKE2B d02da0630c062f599f9d467ae3b866126175f0034bac978badbf17849102f36f661ac02060d9037fbe038529c32e62867f44f55d5ca9b8ec12c5eea14a281023 SHA512 9e59a9c4d5975bf1744cf5ee8ec65ff1e81fd60a338025debb4d0e1670bd9c4c2d42043e0ce5497770024ef08a169861d7c2b509a274c5aa8722783b49abf525
 DIST libkexiv2-19.08.3.tar.xz 64520 BLAKE2B 9b37f6a83ba6d141a51e6c1d97e6b93f9495b7c250bff71900831b5c5902654fe50e26c70e6397b88de6b32c66159b09e9ed5d078641b8753e11e993a0be3be9 SHA512 4cdd654de9e658fd145b6004e94c8cbdb39de3787466ef02500cac3f858cf5eda2c0ebee9ad2f4fe129273fecbb61b3c0bf49cddc98209cbe555a63fe8c05549
-EBUILD libkexiv2-19.04.3.ebuild 311 BLAKE2B 3bc9060b47e14179d456f643bfbae1f917a3fffedb88299332ec7e59de4aa82580a187258a4feece07c8228388b6650a1d44408398a7143c4c6b75e7dfc30435 SHA512 3bb8ee26e2a8fd0886e3fa66efce40ba9e9705d30b8451168c098a0732d3fab177398c076eb89842399ffa8053b6f027f8bc6978d6428a214b3b16c5a7b83c63
-EBUILD libkexiv2-19.08.3.ebuild 349 BLAKE2B 9a3b1762a448e529b0832035659fe2f2ac45edd6b56b7e89e011fadd684f09c7e4cc7a381e65c5a3a5a478951cdd846509f53daa41ebb50f0172155549fa3df4 SHA512 682f84aa0f7961412d72ee58f88f3bca60b0a4f6cdd5a0aaf7bb1e8f13ad5844bd7001b173e0f52bfddbfbfb13d6bf6876f4ba5a174edf2f26a8db1d292d9199
+DIST libkexiv2-19.12.0.tar.xz 64004 BLAKE2B fc0d95598a00f6183389895c6b3c53b9a9359f48550de38cb15979b4a7cd4953ca9be56b878d10a491f2d27ba8956fdc1f41ea727306c510bfb62d75476bf8d8 SHA512 5d5b25eadb17e0b10e5d866da4c27beef629c60d68c28b20f59c5bcab0e7d6c1d3f61e2af7d041855034b158592b308b9fc0cc70d6554585fbd132ad13fcf5cb
+EBUILD libkexiv2-19.08.3.ebuild 346 BLAKE2B 79d038fe565dfbfbe0b5930b38ac88358d7974e12ee6d22b720964dacfa7a6acc74461fae05d79d361719f912026084a3cec0486e5b89ee880a53ce12b9a49b0 SHA512 977f5b5402278b7c5611fcaf08d6f9a13d61b40ab8c6986d1a74ad65aa4922d353d47540bf48e8a99ec2c76ef5ac6ab5efcc56c1ac08e78cf084430601b26719
+EBUILD libkexiv2-19.12.0.ebuild 350 BLAKE2B ec45e300df0d0c1b1a996d28ad4a276ace7361e143050b7d3ea5813f75dbf097f0d9f3dc147c4f1f0bee79a0f2e346f02fe115d9f5e8e58365369211498a9cd6 SHA512 d8e568496e73379305ecc3472696c3d7f519c82385b008ca19be390fde71ee24da5599a5028a328beca068deb7e420f1daaefa31ea1319e36a907bdae9a414d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-19.08.3.ebuild b/kde-apps/libkexiv2/libkexiv2-19.08.3.ebuild
index 843b857b7de3..c8d06d908baa 100644
--- a/kde-apps/libkexiv2/libkexiv2-19.08.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-19.08.3.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 DESCRIPTION="Wrapper around exiv2 library"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/libkexiv2-19.04.3.ebuild b/kde-apps/libkexiv2/libkexiv2-19.12.0.ebuild
index 54c8cbe13e0c..3fe8e50e3cac 100644
--- a/kde-apps/libkexiv2/libkexiv2-19.04.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-19.12.0.ebuild
@@ -3,15 +3,18 @@
 
 EAPI=7
 
-inherit kde5
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Wrapper around exiv2 library"
+
 LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+xmp"
 
 DEPEND="
-	$(add_qt_dep qtgui)
+	>=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 cdd4861625b8..1a464be1883b 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,5 +1,5 @@
-DIST libkgapi-19.04.3.tar.xz 224284 BLAKE2B b0f10139d478c8d1bfd8345f777de4a672a586caf7dbc4d32bd30db3c042894e51e82c8539851884fd7dc420cc81f1495dc3fff8b8a8506482e1f32dc9380226 SHA512 2f5d3f1c1b9e0dca8fa331cbbbcda5658526d5dd5d45e452d6b197aa0f3583ff8c38d68a288d3cc5c7f641ce229ca56107f6216c74bb8bafeb196f7c7abf5bfd
 DIST libkgapi-19.08.3.tar.xz 234484 BLAKE2B 1903e85c6e8098111864fc5ab2cb48d61a07c4d70a65849b3ce7a2385d0d73f66d7af119d7733fa55a8462285a62584ce11ffc73edc2496d8bff6400b8120524 SHA512 57e9da2b2357ee05d1ebaeabca758854c5221b081bda86f9ab5b3d6725af2efbaeb045591e222e8966066fde393a10e7195475732aeebfa738a1aeaf6ed3e2b0
-EBUILD libkgapi-19.04.3.ebuild 766 BLAKE2B 52ea9d86a023afd7477b7271a3c4677ebe5d997772521de0440819fc557b1faedf10a059c35e14b0c1a7997d99fd787ec586c3e46592374e0801b90337c2fb9f SHA512 620677a7649990888ffafb4c42a5a2e8c1b21687e822d41dbd9e8db946ae35e6781cad32044020ec851242ace79c0178e794093c5d5c16d6362a69bba9b1c2e0
-EBUILD libkgapi-19.08.3.ebuild 881 BLAKE2B 0bd9ca9420c2cac234a7eacba4c1524b3c53fd734a66638eddf42263483a6659ace9bde36b2acbc53998aa209506fa8cd8a871f593caaf5b278fea20f59d6c35 SHA512 f68b9975cdac78cd723ea9c332bda4dce3e4ab54680f5b199a9c3be1a5998c20abcf4a0ebfd1a5b8d9625310ead1129047e2b8b1a2140cda6836bfc2f9ce2910
+DIST libkgapi-19.12.0.tar.xz 238596 BLAKE2B 0d4fb93718975e78d89ada78faa296c0fb0d238e1b2f9c68e15b082d6422753818267e6c438a2bd474c433152f379185e7088e82f382752a25c5776eff92bd56 SHA512 74c2f03be10d85d2043fdffe9080e1ef3f01863dfef1dbd13c405ef5543ff6887933aa7bddfec519275e8bad7f31d0e651cf8445f84d6d8cf3ec11336ce9dea5
+EBUILD libkgapi-19.08.3.ebuild 878 BLAKE2B 5d1a22464798e12965692b8d79574b0ca10642942ccd6f66c8f86e41340f017a542526b7ba3737e0d118a102e2401821537180eaea060adca0b240d4210f6467 SHA512 a362616943722c6e1b04dbb62577edba16f71d40a58f3182259baa063af9856ac2bf5da23cfe6f9c3fe0bb35221f8c609124646f2c7bff6dc39ddd7b3d5ccc7b
+EBUILD libkgapi-19.12.0.ebuild 899 BLAKE2B 048187be736760644a08a0a64331ef6eb2fc2d6437b519d95c48f11f34a897d2feaf1dc7aa8c80a0a292727c0d3603cb7eb6a0222810c3693a9f9d321f47887d SHA512 15d4bcb0aed5017228a10a200685185f9a476fce628dfc80ffcfd43ac214923984c44cac9b562c5e7f57581355a583adc6655a15c88fd98e539aa05d7c16687f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-19.04.3.ebuild b/kde-apps/libkgapi/libkgapi-19.04.3.ebuild
deleted file mode 100644
index e9921250d3b1..000000000000
--- a/kde-apps/libkgapi/libkgapi-19.04.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="https://cgit.kde.org/libkgapi.git"
-
-LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE="nls"
-
-BDEPEND="
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-DEPEND="
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/cyrus-sasl:2
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!<kde-apps/kdepim-runtime-18.07.80:5
-"
diff --git a/kde-apps/libkgapi/libkgapi-19.08.3.ebuild b/kde-apps/libkgapi/libkgapi-19.08.3.ebuild
index 230e2eef7a1f..2ec5b16d435a 100644
--- a/kde-apps/libkgapi/libkgapi-19.08.3.ebuild
+++ b/kde-apps/libkgapi/libkgapi-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/libkgapi.git"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-apps/libkgapi/libkgapi-19.12.0.ebuild b/kde-apps/libkgapi/libkgapi-19.12.0.ebuild
new file mode 100644
index 000000000000..58609793b00f
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-19.12.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.63.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="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=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
+	dev-libs/cyrus-sasl:2
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!<kde-apps/kdepim-runtime-18.07.80:5
+"
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index 05dcf89724c0..b633f0a6fcf5 100644
--- a/kde-apps/libkgeomap/Manifest
+++ b/kde-apps/libkgeomap/Manifest
@@ -1,5 +1,5 @@
-DIST libkgeomap-19.04.3.tar.xz 150832 BLAKE2B d64c4a38b2afba99b23867e5a969715b65d7b0e03bae90f83c07d3651c167c6f50301fcfd34933db388c8147579efa68b349cabc26423f1af18b35b658d88c40 SHA512 130c8fe69303b275cce708a00a6b51ea4680e48bd504fc8cf6491271fe273a4db768628089f0fa9edf83c383bc6c7afdee5a7853e2ff884133c8854754f0acd6
 DIST libkgeomap-19.08.3.tar.xz 150620 BLAKE2B 96588fe06c447f1ec853ee69e1b33c607964effbb7a697e8792b885b18bb9d2daf1f3c543b7b2f0567ed1b578879aa161156c6ae9870e10d53252e6043534ff3 SHA512 c73089ac399d3516ecf243ad13442e81120e01c3b88d558c607fb5e49273ea76ddc585f3c99ba6a91919fc03d4cbef4bc07830bb44da51568aefaf7c8f510369
-EBUILD libkgeomap-19.04.3.ebuild 803 BLAKE2B de14372182b7112b0b006b6d9f002814a5d19a4955953ee20b6efc9c35dbb3720af932922b1fd9887c92ef2f0e561fbcdd082d53b75df01ced583e4b8559a48c SHA512 106c22e593e88b8736432dbf07804870d5a1d99eebfb3d2191d807f7a4634fa8148fa9fd6fa7a318de1507ce2c4988514113335dfd5a680e2ce5fcd0fbf1a92f
-EBUILD libkgeomap-19.08.3.ebuild 911 BLAKE2B 4cb75b867d73645e554de86ea9c65b93a6ed218fda1351ac9cd14cc5e01fb0d9e0011ab6061d3c140a123b980495db3d234c27dd6d63faf882441b3f2d68160c SHA512 4f4687747cb5fa41d00d94a37152ea61979915e6f7a9df6cff34398a56457697f83671f01e0404f62d9824876751e0523f2b7cd710ba22ec16f0c3383e36d262
+DIST libkgeomap-19.12.0.tar.xz 151052 BLAKE2B 6ecbac6d71681efec7d6e4f207c734d0e8bf91c13c722ffec9245ad69732d4b28f8f06ad824fab34f500e9162f45bef64ba42837572b056355fd84ad9aa2dbb6 SHA512 657efbdb80288ce2d0f59ebdba3f287e3f8389b86aead31accaf0370161b64a8a0c2cc0c3393c27a169250611360e9140a9c322c46283a7f5e81335b57103580
+EBUILD libkgeomap-19.08.3.ebuild 908 BLAKE2B adf4d2653caa820f9d9e0bad445abb99c8780b8b36e4abe6ae4d7fdde70bb16c41fd91d3299ab65c4c52da74e069d958c2ff5a945f3bcb299340dd4556310415 SHA512 3157f91b33ee78b2dcf0493e026ef5089e86f41cf030c91cefa492092ddd4f0d359ef7282cba860bf23a0d9390988bfeed116c0be2e43790094f4b0b782c9e67
+EBUILD libkgeomap-19.12.0.ebuild 911 BLAKE2B 8f0f7df3010b37cde094b6dd8005e48cfc7c018fdb04a4447ad38d24c006fd5008498af1af7021ad2d8ee06a9f8463dbb4779435306878bb318982266b3f597a SHA512 d30d1c225073e3f90cd930b45b0afac0d6dd50d0c226ba26c74edbe0d9839b569b88021e5ec74800d8f793f70f461726d75a25b8f4f8683732726c49843c5e5e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-19.08.3.ebuild b/kde-apps/libkgeomap/libkgeomap-19.08.3.ebuild
index a1b9df57ea59..a80d8f5da8d2 100644
--- a/kde-apps/libkgeomap/libkgeomap-19.08.3.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkgeomap/libkgeomap-19.04.3.ebuild b/kde-apps/libkgeomap/libkgeomap-19.12.0.ebuild
index 75e9ca3760be..060a3a91700b 100644
--- a/kde-apps/libkgeomap/libkgeomap-19.04.3.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-19.12.0.ebuild
@@ -3,33 +3,37 @@
 
 EAPI=7
 
-KDE_TEST="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_kdeapps_dep marble 'kde' '' '5=')
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
+	>=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
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	use test && local mycmakeargs=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5KExiv2=true )
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 928f7426f095..37ce18457d15 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -1,5 +1,5 @@
-DIST libkipi-19.04.3.tar.xz 103364 BLAKE2B 0f4f40b99c245c1a0386c894fb3de271f9211de99443794c1d3450546e6190671e5f7f294cce66c770955e2e2530fea37ba7fb8e82e51721e55de25249ee451b SHA512 a3e9b2d79b6447f40e57524287e03a16a47f95a64388176bb1823a428ec20ac7f640f2f2e9efb181a376b669559cac648c9a114258b190914e92b3248190e18c
 DIST libkipi-19.08.3.tar.xz 103468 BLAKE2B 9583eaa86f72725ae0dd83733f56cf0d846d83caad50723950c282af1d08e4cf21a65645bef6fb8950b22f213c55421107ef40ae33cb40871727fa7761804202 SHA512 6fe9b5e96768c644fc1fc395b0787bf99504fdaed319261f04a0a88be50df5624a5cc3738e609d29da4da50b1db720098986b2da215035752b6c5d0e6b175aa4
-EBUILD libkipi-19.04.3.ebuild 486 BLAKE2B d342cc343ecf7785668276a9c1698c6da83a72cb67320a7906191c6660d93c35e89afaa4dc616e363ee862735abff3e0cf77b0e9c736698ae0426e687d7d3acd SHA512 dbed9a3e38ee104308f16f542428905a24a723b1f0b26d845a5a2f7790dd2f6ffb543665aad6f6c76f26c8cfc134ae14c4e0931783d28ada951cc7dc8da8b730
-EBUILD libkipi-19.08.3.ebuild 564 BLAKE2B cc73fb97283e7340f365dbe2cbabbbef108230d255738f3a8c4e211ad95a72a3257cf856cc1709db8d1a23aa132e7f2244e4dccbf881cf28d9c418e6f9863f63 SHA512 3d1b44b4970ac496955e42a0a395eef0a844c20e9acfa59e0c8e4a1bfa4af5f934f41b252aa8868d381edd0eb8e7d2485a8c13fe387ac45685637bfed0974270
+DIST libkipi-19.12.0.tar.xz 103372 BLAKE2B 3b6018264990df1a64456f5989e65708df2e2fe73b0c05a7c172ac894f4badfc5fec73882fc459c866e7db2b67675a45a1e13f8a142e8a1c15c82f032873752c SHA512 ff798ad355bc309858d6ed4eea01e1076071621e5fff450ddf2ddc7ee97ebc37be7feeb6c91d35bc37c02a67f6ec66aa93dfc6fc223d34be011687d1a962303f
+EBUILD libkipi-19.08.3.ebuild 561 BLAKE2B 190f133dd156fe3f0d0300c440f5008c4db7463218c5aea57541067282e1812d0f6fe4d25bf616c07c82377066ae5d42dcec5f00eb4adad95169b687176932a3 SHA512 f24469235667b5edb71f8c4e7978165e961ac164015424dd453dfc6d193d7c6da46ea4cb542e5252239820914553eb4e1b21bc2856b1a305cc85b510df13f2f9
+EBUILD libkipi-19.12.0.ebuild 565 BLAKE2B a8dbf9131bc8bcd600357825760ae23caf04d078fcfa4a4d8f83197333bacd19697fdba1b075deba5361f6b0304c3d87dbc36ef43b50c028dc4c7ed8a5de52f2 SHA512 13f03b8497482b496ff770ea3d8954f228ad7aa082c4b500d1e8d150cf22dc968ee89100ff196467a2bb8caa8052670936901525b42b1250f93a2d99c1668764
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-19.04.3.ebuild b/kde-apps/libkipi/libkipi-19.04.3.ebuild
deleted file mode 100644
index 8d074c064f18..000000000000
--- a/kde-apps/libkipi/libkipi-19.04.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="A library for image plugins accross KDE applications"
-LICENSE="GPL-2+"
-SLOT="5/32"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkipi/libkipi-19.08.3.ebuild b/kde-apps/libkipi/libkipi-19.08.3.ebuild
index dab87debe2ab..5b984e60cd58 100644
--- a/kde-apps/libkipi/libkipi-19.08.3.ebuild
+++ b/kde-apps/libkipi/libkipi-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="A library for image plugins accross KDE applications"
 LICENSE="GPL-2+"
 SLOT="5/32"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkipi/libkipi-19.12.0.ebuild b/kde-apps/libkipi/libkipi-19.12.0.ebuild
new file mode 100644
index 000000000000..6dc273600fa9
--- /dev/null
+++ b/kde-apps/libkipi/libkipi-19.12.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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 ~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 47ba7de44b94..e76167ddccff 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,5 +1,5 @@
-DIST libkleo-19.04.3.tar.xz 332212 BLAKE2B 08fe120c3bae794889baa7ccf73d0297054c131dd95a5e1c27b33314d88ed58227770e2fe871e06ee14d33f0957c450284f35aacd2bd4fadb5fbdbb46c2f1538 SHA512 06dd54352f8350abb386e573d06f23520f511c2db4c6b6bfc655b5c0ac34f92b8f5b0020a72122c275df139b8b65142b247940812afcfe563a19aee3204ab403
 DIST libkleo-19.08.3.tar.xz 338888 BLAKE2B b0f95c736bd1a8c4b6beca48f486183e46ecb70798451ec92d9d884209ecfd90c4ef74d3c38018b04877c0192436596f5d77c72c432432fc8345521a97858d04 SHA512 b36766d3387e1ca9fda920b50b866c7b736e39037fa65df2c4399bcbee8629b34bd69c08d447273f5368cc14352a58ad32c2ea1ad254d3be1d155eb100ed8883
-EBUILD libkleo-19.04.3.ebuild 902 BLAKE2B 5d178a1fd0813479fe1f83bf2479bc24591a30f209e9a9e72e22efc74ca8a611e377f0dff653de63b73f83394cae4547e7587990b8f96359fc9e5ed3b8e5b8e4 SHA512 8b138ac2e453f0417a5e051ce014c10eebdca83d24fc1dab44c72e5ea36b94591c027721067c21fbf5e398fb594ae23c43ff67bbd2996f6e3833e6cb2c986757
-EBUILD libkleo-19.08.3.ebuild 1032 BLAKE2B 0c8928e9f19cf5bcb225fd72cd4e7a744f9471abfbfb399154da7ca4d752eb2d0fc27e5e92e75ddc7ab6155972bb8108f3d0cc1f8023bafb2ef0179a877ed96f SHA512 ce7d23dfe0c3b204d24672980ff27bef60b74ffc1c8718058d1d935a21edb9b598065fe017f36831726fd98ea1b75d42ab42a8433f973a8dbd286a9b893a5485
+DIST libkleo-19.12.0.tar.xz 344220 BLAKE2B edeb8845ced71a2260e87f56c16b9e64bbbc75edd9591e177eddc4aba1ed7da1b41800df57a5820b71ff04b85f80c09c83ffb5cbd252b64b7d76da48438838a5 SHA512 35df26dccf805b5fc28956e25a9251f7b17e1c62a981ef474c8b34ff45176768c3317f227cb2280d5dc1187d188777e04f85721e7188a3627f4d0970a4b36ba8
+EBUILD libkleo-19.08.3.ebuild 1029 BLAKE2B 329ae96df034dae4c1465fa1cc41669f47658d3d37e517795e7e0720d1c81742a355b949e6faaccbd3eaa367ecb4d77a84dd88480a4bafb2e83bcbb0e7aecf31 SHA512 f989a91606eb4a035c485ab9fd781897d534c1cf2febb0ca812d2edf0187fb5478801114cd4388a304897ada8a9a9ac4454562d9737cec9f2dd45ac2d9d438e4
+EBUILD libkleo-19.12.0.ebuild 1027 BLAKE2B 2227269b532a41d10fa18976aafe16cc8213f1f61d9abb5b329c35ea377c38aaa0a4be93e3edfcdb10d46756f8f550120d4962dac115a43ad31d42d6610da1bc SHA512 dee4ad68cb5eb8687458749ffe59b900118e8df22278b5cb65d9c728fb26aa122dfbf3c59799146663df7e90f793b50c55f39d345f1226a111d3c2801332d997
 MISC metadata.xml 368 BLAKE2B 971372ca098974cb69299f52e0b44e479517a0fb2f70b6c23fe762d93675674d62e46d5d4faea403edba12828ffc0c32fa274d287d1c71ff499df69d2e52a2d3 SHA512 dbef1e7970af1f4cc05ea180f5beecab9288d5502c365d2dcbdc418a67868baa9245bae8ae0c9d637ddcb3f88a03061285fe144a3a117c722654045fd7a4a58d
diff --git a/kde-apps/libkleo/libkleo-19.04.3.ebuild b/kde-apps/libkleo/libkleo-19.04.3.ebuild
deleted file mode 100644
index 460984dd8763..000000000000
--- a/kde-apps/libkleo/libkleo-19.04.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Library for encryption handling"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+fancyviewer"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-	fancyviewer? ( $(add_kdeapps_dep kpimtextedit) )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package fancyviewer KF5PimTextEdit)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/kde-apps/libkleo/libkleo-19.08.3.ebuild b/kde-apps/libkleo/libkleo-19.08.3.ebuild
index 7362069793aa..c0f4714d76d8 100644
--- a/kde-apps/libkleo/libkleo-19.08.3.ebuild
+++ b/kde-apps/libkleo/libkleo-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for encryption handling"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+fancyviewer"
 
 COMMON_DEPEND="
diff --git a/kde-apps/libkleo/libkleo-19.12.0.ebuild b/kde-apps/libkleo/libkleo-19.12.0.ebuild
new file mode 100644
index 000000000000..8d6efd072657
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-19.12.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 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.63.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"
+
+COMMON_DEPEND="
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/gpgme-1.11.1[cxx,qt5]
+	fancyviewer? ( >=kde-apps/kpimtextedit-${PVCUT}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package fancyviewer KF5PimTextEdit)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 3545a5856fcc..d45cddad79fc 100644
--- a/kde-apps/libkmahjongg/Manifest
+++ b/kde-apps/libkmahjongg/Manifest
@@ -1,5 +1,5 @@
-DIST libkmahjongg-19.04.3.tar.xz 1683960 BLAKE2B 729d93cffe031851ee1b988362aa94c8234293b931169f3877960f78effbcf00a77845c8313babf9332132e9dd48202cf19de5b0910d2cf6641bebd7d54d5e68 SHA512 a03c661cc8d219eb990e87002e493b21f647ea0fab867e13e59faa25319fbd03ce2a02473917584492118d582d845787322af4b075ebf4f19abd2c854b1fbf29
 DIST libkmahjongg-19.08.3.tar.xz 1685196 BLAKE2B 1c0a12f31a4c32b08e8139e13b6524f6d6753df59865477e130d7a09f5c9a3cb06934a84f68faee9912a7def8a753efc8e87a96019da95f24dbeb7bfff4d0bb3 SHA512 d9ee93852fa2493c0842b6d0527fe6c617b074aaefbae24b07a3dbba857e6d565de46c76df37dfad7fdc249a238affd4560c5bda98b1ed27688ef10f21cc48c1
-EBUILD libkmahjongg-19.04.3.ebuild 525 BLAKE2B d90dd5be6f91db4ad398b84ca8f2c13447782faab2bada8db19d4ed9b541b690c8409ce84cc5629a9d433c52f70dc3f4e359fb6bebc7c4f0169d0713a7a898f4 SHA512 abcb8aff39b02a7aeabb305e6b4af96f5a86e4f12a9b0e115a068a06ac6361784453be1572f0426826c3a044b286d439274086e5bad905581790a0d5501de63f
-EBUILD libkmahjongg-19.08.3.ebuild 654 BLAKE2B 95f80bb3a3a85364cc07ed35f1b1aabf3bb8a96ec451d68651da68110e40ed5ed26158c81cb6e76ab26b45d3740e63dae2b2bf801fa2987e043d2321f39d2ada SHA512 c8acd3afe065950a4e50a4ab6e551d0d83d89b15bf8983a3fcc46ace371559230963ac802b0d888fff2df3988c831d03d8a328ba4668b3ad240d89dd77a93c10
+DIST libkmahjongg-19.12.0.tar.xz 1685412 BLAKE2B 862821bdd011d124b7f5cb7b271a1bc11154f4883c0d1478d0c25c9d1381a3e2bc1c4848ee583bc80d26d1a7e961c9b5ee66348eed9af38af30d5bb769362e16 SHA512 5aa9f11fba830c42a4d6585000148ec06e62eb7e0c12ab08016db23e2c128289830401082894aabf01ffd04f92ccf0b6b0f49a13b0f251015660be075a56a988
+EBUILD libkmahjongg-19.08.3.ebuild 651 BLAKE2B 4866a4d98f5667aee0deb31e9e2d64b8b62700c9a7c8ff917f7997737b6f1b1a42adeb212aa52b1f180c09791a4669392fdd7ed8a229b48b4ffcfbb0d38810bc SHA512 fe39c6623cf2cdf22f0a9e114485a0a49a90f06e2685b6f83226fa94a5b857229e8634ac3c3e6369c431d794a06cd990bc0879956ac4ee8bd3fa40566ab91b4f
+EBUILD libkmahjongg-19.12.0.ebuild 655 BLAKE2B 49d5ccb7b4d24c4a976919a937576adbd92320f9e3d8531ca5b204a5c051828f08c18d87bb74f26064db0ebd12e9c034fca197fe379464b4751cd26601e9be7a SHA512 23cb0d4aa49138e72aa281a36036e07388fb00cc2550a8f362b1fc1d24f56fc0b6a22e728989b90fe11c9a40c6c596414067c5adabe80f0fe3eb8ec9afa2003b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-19.04.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-19.04.3.ebuild
deleted file mode 100644
index 1a885ea0373d..000000000000
--- a/kde-apps/libkmahjongg/libkmahjongg-19.04.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkmahjongg/libkmahjongg-19.08.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-19.08.3.ebuild
index a7bb317ee76e..5f6cd88f7f83 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-19.08.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-19.12.0.ebuild b/kde-apps/libkmahjongg/libkmahjongg-19.12.0.ebuild
new file mode 100644
index 000000000000..099c197e44cf
--- /dev/null
+++ b/kde-apps/libkmahjongg/libkmahjongg-19.12.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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 fe84f8c6534d..a1a3eb50cc84 100644
--- a/kde-apps/libkomparediff2/Manifest
+++ b/kde-apps/libkomparediff2/Manifest
@@ -1,5 +1,5 @@
-DIST libkomparediff2-19.04.3.tar.xz 173244 BLAKE2B a43d1456878dca65655cd0f8ca7504fea05b7e4e224c842f61dc1fe1f3f850724faecfaad521bc5f5deffb0af3bd87e52b13fa5a01ecaca8d0c6636710b58c15 SHA512 efac763b433956b05d83b20aa33afac19e696fc05ed7a03ab04a112b87516f92e7a750ba8d7b3a274662e05652700f1c8580f96aff7931e444c3cf2e2d49cf41
 DIST libkomparediff2-19.08.3.tar.xz 173512 BLAKE2B 81a9941efa54cb75fd9a06aeb07326c1668c49092a26cb2600d1404f2ec8025e574df1d2d11f9b845720ee251abaeaa05c6fb15cf1d03107c40c73f899a958e1 SHA512 e9b8c06c36dec40475571692b18f3cb67a379c315d90d7c807945248940783c51aaa293776644b3a73ef4f0e2d38dfdd5a4d6dd16fbe7e9aeee3f7cc381cf1e9
-EBUILD libkomparediff2-19.04.3.ebuild 533 BLAKE2B b6d68c50386fabdbce49ec56f937694d0b15323b203504916064b2e8da4c1b18516bb95432325c1c6fb4c45c600045a337534565c40f7903f8e03064c660712f SHA512 4c0bc6a784a5e023da655ae2b22ac97fd08ab9e6142ff0f11e256461aea3074ee940ff4015e628f719a4228c4d8b30ab68f729542574f12ff3914eb8fad348c9
-EBUILD libkomparediff2-19.08.3.ebuild 662 BLAKE2B 9af6235af9e23ad93c16b2684bc13150e26233fb58ab4ea0b00fe36dcd4c7f10bee1d504506620b7782f84e4a615e59a686c71953929284bee2b0aee18b0f10b SHA512 8986b565c2f28ca3a7e4f9b01d03835cfd85ac0289ef98ee3c639575f91b8f57a930d7636685af3850c509400e15283fd56dfa0d543aaa385dc0a5e9f972863b
+DIST libkomparediff2-19.12.0.tar.xz 173592 BLAKE2B 2215fe5ecf7a7f5a95651ca8b5a8c896635edf0da23a695e1bce2a8e0238a4b7989736d3945d3ded00d9b160dc23d6364ce3f580464316f9f9af46eebff3cb54 SHA512 b1707ea17faebf6a49f3e03d1ae3fc4df64fb7e7c3af37e8b4ae2c3a1b8560c93094661022f7b57f3ec1661b0c94c67dd68e4bef9d542767fb0a4208f3bca34b
+EBUILD libkomparediff2-19.08.3.ebuild 659 BLAKE2B 1f3415ba65b934d6f8bb9f5a088400f1a8b81cbe4e50aa282930e66640e3bc631936dd7b530fb342d31b75235dd1d8dbce72f680b323d92d22550a3f8ff40dad SHA512 a37a7f8f224c06dc5253e0eb802de0b569ec90321262215b98fb47267f888c90c30957f2a5a016d47bca918b2417a5e23e61b1891057337d47b86eaac529d895
+EBUILD libkomparediff2-19.12.0.ebuild 663 BLAKE2B 7f36d9ebabcdb828dbd79d805c2ed3c6e07efe162227523daf73b08803f1ffbfb7ae350f4d8d43be34443d24fe28a599caf3c3561312613c0739a40d5412cfb1 SHA512 3f69bf6775d758e4f744148d2fa83f0c0f9a6aaf36fc8c465586372171748d0232a12d0112451cce421632a84f24f218099986f4ba353f9d260f320769819eb9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-19.04.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-19.04.3.ebuild
deleted file mode 100644
index 842b49877add..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-19.04.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkomparediff2/libkomparediff2-19.08.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-19.08.3.ebuild
index 499fea1a5895..4b65fd21b678 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-19.08.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE library to compare files and strings"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/libkomparediff2-19.12.0.ebuild b/kde-apps/libkomparediff2/libkomparediff2-19.12.0.ebuild
new file mode 100644
index 000000000000..f911fb939814
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-19.12.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.63.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 18e40d12c8ff..9a6560c55cc5 100644
--- a/kde-apps/libksane/Manifest
+++ b/kde-apps/libksane/Manifest
@@ -1,5 +1,5 @@
-DIST libksane-19.04.3.tar.xz 137800 BLAKE2B 2094d93ff902b29066987de05909abf96839fb4645fffc719125d0e6aae985b4e2f74d0bd34bd0077204de76f7c335014041939037d6e8860b5d550fc83bfc7a SHA512 c86c12e44c934fdbf9fff530286c0b325dd211110325c8cad23da3c7dc6ad2d06fcbaeacf611c35f3bd39d3cfa992e93ba098ba578b8c0ca246295f49b35b695
 DIST libksane-19.08.3.tar.xz 138820 BLAKE2B 12a235e665e58311a3aaf579e2590646694d2e2a8075914ba1c6041ce37b2335f072ecf356fc62cb566f4047eea848679841d432bac1c2b17955df1d31d14c42 SHA512 66514aa5918124cd9b9837c7e896ecdaf7cdb4d42c753fb8e95851882a3b2cd705e0463b751470b6b3f142983aa912856c838c1241ec158bcfdd89b3f4a3130d
-EBUILD libksane-19.04.3.ebuild 630 BLAKE2B 762b1a30f0f311f396ceb422fa820f97ae8b250199243040b3cb4f5296b3b10ea27e6b9a89c13d5c892223153635680e0ec0c1c96fbf12c76dc61b3b236779aa SHA512 51ead34a83c3f32938714b8ae65674366443ed1b3f12566ca523201fb5dcf5507af0fc4531d8aa2ce53aabd5dd3f9a01d63678fed3c06f10469c67f34b19536a
-EBUILD libksane-19.08.3.ebuild 710 BLAKE2B d540aabb5b4e11e39b678daba3f5ebaf5f7e2b2b20679a7005ead3368674e0b97cb82315e4aafeb6fea80c9bae82aa5d75edf750ddf1b6fcb3b2a77c501f5db3 SHA512 f59089b8bd638cfcc5323626203ad4efdd89148c73674ac7674d5c59a82b657e8e0014e093b3ec2148127a9f68549ffd19c062d07ca2ae2aa252de736b8eb991
+DIST libksane-19.12.0.tar.xz 138940 BLAKE2B 60fe50c2b2f91867ac5765f181ae904c12f66f5979ce8e37d39905626a8f8a075e762c790dec7546de78e559ce2ae1e50f4cd6f4f45a46ee182e101310e79318 SHA512 18733ead017660af4741967941df9ff9188b8ad2bee5d15a29b7f452cbd68a94f09ce20e4cc69e7ef993054689a975342b2739cdb49a5118a2078b7148ed5de8
+EBUILD libksane-19.08.3.ebuild 707 BLAKE2B 218496fc1175548447461fee8a27f20d180e87799a94d1229d03126c365bf9b1b2c3ebb209f226abea420efb17553a2a96e28258e4a75178b6e73be067aa6a24 SHA512 1a3edde3861403d3a8ea9b6c8d1bfeb97fa4b1657e793935bc05224aebe1ba9b69a9ba3294a6eaec65ab3ccf489d8fd74125ed63ceb87a5096679c446b9f4bfe
+EBUILD libksane-19.12.0.ebuild 705 BLAKE2B 6c711564d5f67fec911cff66a87c14312fe680c1dd7a6ae7f715a3c62a052a46c582dacd3d55e1a7e9ce4ee0a6953cc7ff2c7ee8b299a2ff2deace2a4c58dafc SHA512 20d037e8f67ffcf28cfc4f6afab9a0e4e8738c9b9caa3b53baff570638f2d6a543ac8341a762313e1f508287148a50549d4b1694565d69f1c474e51db7ab8563
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-19.04.3.ebuild b/kde-apps/libksane/libksane-19.04.3.ebuild
deleted file mode 100644
index 19894a19e3d3..000000000000
--- a/kde-apps/libksane/libksane-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="SANE Library interface based on KDE Frameworks"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="kwallet"
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	media-gfx/sane-backends
-	kwallet? ( $(add_frameworks_dep kwallet) )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/libksane/libksane-19.08.3.ebuild b/kde-apps/libksane/libksane-19.08.3.ebuild
index 443352904806..a5063c070684 100644
--- a/kde-apps/libksane/libksane-19.08.3.ebuild
+++ b/kde-apps/libksane/libksane-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="SANE Library interface based on KDE Frameworks"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="kwallet"
 
 DEPEND="
diff --git a/kde-apps/libksane/libksane-19.12.0.ebuild b/kde-apps/libksane/libksane-19.12.0.ebuild
new file mode 100644
index 000000000000..735e0e7e8828
--- /dev/null
+++ b/kde-apps/libksane/libksane-19.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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 ~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 f5003f3787f0..fe1555fe3381 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,6 +1,6 @@
 AUX libksieve-19.08.3-qt-5.14.patch 1332 BLAKE2B 128c2abb3814624c38e929ce028611e8bb8c9f5755e5d7396be1c9700cb83b6735d0d993beb5b1a61ebca818534243c89da04f02e9e2edc9a398c793e554c3c9 SHA512 f4d6da6434a50de22062ee64f6fd321a641459ac7a802a157aa7a7c09f570017bf276956d91bdd921404212232f416de3cb09fec73cc6d7934360d8ded4e5b5a
-DIST libksieve-19.04.3.tar.xz 549356 BLAKE2B 364a12f0fce7a8d24b27cf7a732d39248e53fd171cfeb6651aaa1208a5587b6c1dae081d725092103e00951f00ebb0fe705a2d337710421019121db7e02f1857 SHA512 8afa6825eb0a413a6c2e26be9680b02df8126ba1cc8ec26c14b6e4f5900f5e4f07672f0d5ea9c39e4206ec0feba8b47117375a6ebb97f0f1dfb6e922d0e8c10f
 DIST libksieve-19.08.3.tar.xz 549664 BLAKE2B 53c6ce9dd0a30fc8be01003a6610b20ae624e5c481d931cd8a09fa083ba681ee3fc79cfb9d185b12315e69f972e055ae82cd9c829058822f11c6d990b544564c SHA512 f5aee4894b95d48868b08941198ec9370a3855178c2f48330b36473fa2584a43fd7943a9d91f0781a92e79de126d6e78349c8d97b28b96cd2a006126cee3131b
-EBUILD libksieve-19.04.3.ebuild 1459 BLAKE2B de50886b458669ab737a35bb77d710a8dc6143e4f3bdc20e49a0f612305898814ae5558747ac0779c3523a3f01741d359c0464ee7891011c69ff85d94ec4a741 SHA512 5de4c66d029b96dee81b85f78d30f33f84d968d1e3023831746357c3b93e3f2c088947318034475d3b9d537c359440f9b963bab1bfc2d3a3283d8be7fffcabcf
-EBUILD libksieve-19.08.3.ebuild 1765 BLAKE2B 65bfca3bda12a617d049c6db0d730be776a73e20f191580b21b6143c2a1911024816b443bdcc09267d8f1266e6412c6cd527dbcfbf4120b74b5bbe5795396b74 SHA512 37c2c857939ea50f71bd3c83eae155dfe755e2e31f85d0552a3308fa9c0721d77c793dc15c381d0a415d8b7b3e7d2c8c14bfcfdbcf05287d9174928ee7a4785f
+DIST libksieve-19.12.0.tar.xz 553512 BLAKE2B 25a415e1e00790645704c3872fb9149ed5cc89b1de96c4440ead6c7e16068a8efd3888345b997ccc821284888f001ce9061245702d946f5a1749a935e43827b2 SHA512 b5153dc011cb1d9595d1db195c8cf8ba97f3129c2cbf483c3de99bf77f9ca59d5c94fe706099122f0d1521be628fdd44a7c131665b5a36d149b8ce9dfc0081a1
+EBUILD libksieve-19.08.3.ebuild 1762 BLAKE2B 7b1cec8c0bb844cd992c185d90d1c09b462a58bc7dcc07d8d2e11b398c24518303b82e313ab5186994f948ceb7394ed4cbe7f4b08b27eebcca6928cd37ba0e0c SHA512 5546224c35191bd38c84d3f3982f5e282aa99b26cb1cc3519f763e3ca352aadab14121bb8f537faa151d8e818ee547128e063539867d97532804a8752b9b5118
+EBUILD libksieve-19.12.0.ebuild 1636 BLAKE2B b8cd3bbeb89be2a2a6d107945826d97a51a81e35151c26a7e38c07bda3e3f49453fc23b2a65823d56352f85610e41ec48c8687066ad958ec96967f14816b00e4 SHA512 2c863f4bb27c821de463c25fc1b827d1a309dc0ee78259420cd97d2f648a5370ace3e7c3a780eaaa9c01af1b384d3e1538f0bc0ece08d15b16a20f16813767a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/libksieve-19.04.3.ebuild b/kde-apps/libksieve/libksieve-19.04.3.ebuild
deleted file mode 100644
index 0ebd59a9804d..000000000000
--- a/kde-apps/libksieve/libksieve-19.04.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	dev-libs/cyrus-sasl
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kmailtransport)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_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/libksieve/libksieve-19.08.3.ebuild b/kde-apps/libksieve/libksieve-19.08.3.ebuild
index b702cee164be..4e2e59bf36db 100644
--- a/kde-apps/libksieve/libksieve-19.08.3.ebuild
+++ b/kde-apps/libksieve/libksieve-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
diff --git a/kde-apps/libksieve/libksieve-19.12.0.ebuild b/kde-apps/libksieve/libksieve-19.12.0.ebuild
new file mode 100644
index 000000000000..cf1ad91d6f8c
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-19.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 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.63.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
+COMMON_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/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}: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
+	>=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=
+	dev-libs/cyrus-sasl
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+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 81acfa9ad77a..5a2c6ae03685 100644
--- a/kde-apps/libktnef/Manifest
+++ b/kde-apps/libktnef/Manifest
@@ -1,5 +1,5 @@
-DIST ktnef-19.04.3.tar.xz 299676 BLAKE2B a79a2b06a2ac92709793bb08bbcfb669254859c41f3b7af3adb5a7bcb65a07b4561244bbb0743dadb2b6da5e71475ae51764d7eef0bfe234ddc3203212b5a0fa SHA512 067fe58fd555cf2047982bb53978a88fc63b6b5cc122396ec1a501de391af6299571c883e1789b703a4c68c88ba133d09809ac5162d8b6e2c0ea145a2f8e859d
 DIST ktnef-19.08.3.tar.xz 299736 BLAKE2B 7eeead8a6f6bca6e97da8ba10fb1979bff39e8c2df0f68d53816044fa0d1a3d3516e2842b2bfa0b7492e6dd9f2faa124ea5b6a5c018f4320300474c151658d00 SHA512 f8a869116e33962d1c3533bc13abe115412b2764ff033b2b30e2c108dd71d9f30ca3cf8da26de5fd899e50f8324ccd43255e6e5f3cdeaffa3b3e5e3838905baf
-EBUILD libktnef-19.04.3.ebuild 454 BLAKE2B c45e9996202c19dd718adb8537a7493f0f67364f604b9cb199e7d6b93998e25eb87f99d3d2fb56a16d97977174b15db94cbe5e12377276d1559fc2325d8a97db SHA512 1a6248937660e42c6b56ccd4e669d946af03c2bdf4bd0accf1bfcaf1957d9582061a4383b95ee7a4891aebad648747ed647161fa524dc813106d7c12266d353a
-EBUILD libktnef-19.08.3.ebuild 564 BLAKE2B dcd5719804147d1238162e73379ec4a42e44aec9085b891f4e2817cc4380b95783c2df8bc9f22bb791e088d1ff905c54894a1d84f523d6944db2e94a34ec14a8 SHA512 508552f07a072df3eff52ea0573a7a245eb919265d96018a82e55ff39176e83a2197cca805570f327de26702dc0280a0b47766447787791c0694717790122135
+DIST ktnef-19.12.0.tar.xz 299776 BLAKE2B 7271c2995adfe8e9daf54ea08126931df745549e2bdd4081dca586b572f03660d2b2ada8c556c672c273e5b25e695f8309bb993de7314c5175128baa83ff14de SHA512 f9c016a6de4ac3fac048ff107caa81d82eccade5fcd7d3017dcc36aa3599c8ecfc1e986763b27b89d7cb059b7eaf97eee5c88aec1e661c0a5e1d1c0a76c63543
+EBUILD libktnef-19.08.3.ebuild 561 BLAKE2B 45f406a7b8c001e435a5c297bf7c924cf26160a61088dae993201dc27a7c84b51428d921a4bd5303694f4c94af47041a71bfbb59a79a9749990e392aaf86aa9a SHA512 4abc12f35d83846a26cf531f170a27f6d40647e8d9817b261e04663793316d8eda6756a653c1d79cecf878185703f06e3dcf2072ee4b346788d0ef969bb0cd18
+EBUILD libktnef-19.12.0.ebuild 565 BLAKE2B bdfdf399502790a0958f565d805ba924eac7e895fa6d7dd60fdc732e911d7eded015f6bb767008f75a189604443011d0ebda071c8c7a2817d03fc7e12a83415d SHA512 a05f324144bc20eb68be1f1b844572c3631e6ead08cc342b713f9e3567894c59026797c51eaeedf497d3159eb935aa8355287389cda1c6d70af89774876e1c44
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-19.04.3.ebuild b/kde-apps/libktnef/libktnef-19.04.3.ebuild
deleted file mode 100644
index a87072a4bca6..000000000000
--- a/kde-apps/libktnef/libktnef-19.04.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-KMNAME="ktnef"
-inherit kde5
-
-DESCRIPTION="Library for handling TNEF data"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kcontacts)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libktnef/libktnef-19.08.3.ebuild b/kde-apps/libktnef/libktnef-19.08.3.ebuild
index cf690b1a88a7..53e2d6a69ded 100644
--- a/kde-apps/libktnef/libktnef-19.08.3.ebuild
+++ b/kde-apps/libktnef/libktnef-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Library for handling TNEF data"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libktnef/libktnef-19.12.0.ebuild b/kde-apps/libktnef/libktnef-19.12.0.ebuild
new file mode 100644
index 000000000000..06089162e70e
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-19.12.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 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.63.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="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/lokalize/Manifest b/kde-apps/lokalize/Manifest
index dd43fcf62c15..c0a3e1eaaa93 100644
--- a/kde-apps/lokalize/Manifest
+++ b/kde-apps/lokalize/Manifest
@@ -1,5 +1,5 @@
-DIST lokalize-19.04.3.tar.xz 1677308 BLAKE2B 22b4414802dc6ab582720fc38de8f7b27a114d3e1a183b43125d9fc7d244edd3c19cfd62e1e7760fc8588a46be134cc3ab15de8d2921b52f0fcba7a9a0286a56 SHA512 66f4cf4c103ef7888f762e202b2ec53fcb653f2208ff078c9b755038bfb4e1f34b80455ba6dc77c39ac864bacdcfec3f88ad6c9df5d1dfd1fb485cb1395b7207
 DIST lokalize-19.08.3.tar.xz 1694144 BLAKE2B fdf181c98a12ece7b37a4a65ec4aac9dc82c62a423e719f29d5be2b7841b8db6660d9f74cec82aa627adece93004c443457ba16c4b68f08ba3c04d9374a9905c SHA512 866e8900fcee9cd1659b85c2438f1348a0030f94a28068f2e8db659823f5364d51dc6277b0d1bfca47c62bd281667136c250f2c58bd25924080346e4f100c729
-EBUILD lokalize-19.04.3.ebuild 1533 BLAKE2B 26a20cd3183e368560554c460e10459169fbcf420023028e0bc1696e5dde9471c669dfc5479d4205c3c9833c2ff801ac5ea80f06a238dd249c47d4938107926b SHA512 12c1346cb4b5aecc0765072139c5e24339c1ba3d9e0735c5eed743faf3facfdc86a8391665898f3970e920fe577a7ef56f3fbbec8c859cca52d0421cb38e0037
-EBUILD lokalize-19.08.3.ebuild 1734 BLAKE2B 9dcd4f4003f6fa692accb7b079a368953e572da16d9ceecb78bdc55e74bdea3719ad364014ab0c583eaea53370e6b8fb34c87b2f0a41df7e3ef8e207d3487d0d SHA512 8ce0da27cc9cea9ce895c232b350ede31d9c8d52880132b61d055c466ff2219ae671c25f5b3b9d4a1cc25e15a381dbd67452372d6afa6c1205d6046e5196b0e8
+DIST lokalize-19.12.0.tar.xz 1701644 BLAKE2B e51628f71585e0588fb7ed57a7b69f518cb7525cbf1a614af599e2d3c4a302a1ac5aba900fbeccd8d6fef237105d459dfa2f5de0c44acfc1f24ce78cab7ff6cd SHA512 19961a138ad75ee14bb36e8d169e6ac9376fb0eb0b3f7392d3bf9dc0cf9a932055842a13d74f2e5662138bbe1e8cdd90722b827adafd379ec79186a1a4792861
+EBUILD lokalize-19.08.3.ebuild 1731 BLAKE2B 0da9fdb12714f3701f5d9eae14289fc625cc476fbf49c1a37adad397826158a89300f9316b468632e8cfb48c0234a2361c62f42372c77db0a02457297a74b2f7 SHA512 8c19b8813dbaef1783f11170ee67b0cd2befc39a5d2275ace0517d7888d3b47b444d646d8b4060fcff9f92e57a61d5e0a4d1ff748d82d9a80b473d14c99760e4
+EBUILD lokalize-19.12.0.ebuild 1740 BLAKE2B e28ecefdeace60b47528aa741ffb8e133b06519cbc0bf4c8375ad6a1531edd82490a5a00633fe8881b0ff0a07d6363f9a4e35e618c23f8824c9b4a7d001cb2b7 SHA512 f44b602d2ac0a0eabc9ad7a6e0a6cba6976cd6087dcb02d82cc5aff41075bd1cb7281cda447c59c20cc24567f5499e724806a3a878f904f0bf1cb5c5a02f7ccd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-19.04.3.ebuild b/kde-apps/lokalize/lokalize-19.04.3.ebuild
deleted file mode 100644
index 01f4812f7b06..000000000000
--- a/kde-apps/lokalize/lokalize-19.04.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit python-single-r1 kde5
-
-DESCRIPTION="KDE Applications 5 translation tool"
-HOMEPAGE="https://kde.org/applications/development/lokalize
-https://l10n.kde.org/tools/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-text/hunspell-1.2.8:=
-"
-RDEPEND="${DEPEND}
-	dev-python/translate-toolkit[${PYTHON_USEDEP}]
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_install() {
-	kde5_src_install
-	python_fix_shebang "${ED}/usr/share/${PN}"
-}
-
-pkg_postinst() {
-	kde5_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/lokalize/lokalize-19.08.3.ebuild b/kde-apps/lokalize/lokalize-19.08.3.ebuild
index d3e9e514dcce..20cb67f3ba14 100644
--- a/kde-apps/lokalize/lokalize-19.08.3.ebuild
+++ b/kde-apps/lokalize/lokalize-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/development/lokalize
 https://l10n.kde.org/tools/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/lokalize/lokalize-19.12.0.ebuild b/kde-apps/lokalize/lokalize-19.12.0.ebuild
new file mode 100644
index 000000000000..969f13031445
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-19.12.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 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.63.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}
+	dev-python/translate-toolkit[${PYTHON_USEDEP}]
+"
+
+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 c172ab56d30e..ae79e82c85fa 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,7 +1,7 @@
 AUX lskat-19.08.3-qt-5.14-1.patch 2355 BLAKE2B 9860a29c79f0091c0c1fdba5827c2ca9739d9f59643adb1a7cdd6e3b1a888342cc1d7f986eebd1bacdeca3562c4f34d81db883ffb16fc14fd8b87efb7b3e588d SHA512 e7c95fdfe66bddd51bc6ee4f81d05375299384587ab60b6dd5db8bc1781d68c1d5581a01eb3897b44e07dea9fad44b16d9b8ec22950f00f8f6b07cbe4f55f628
 AUX lskat-19.08.3-qt-5.14-2.patch 876 BLAKE2B 07738b892fe135da261a1abff627c546e811ca167c652e662c791889410aa63780b9f172e9855feca1a7c74525047eff3ca9395ba014ce019a58872e3d08df90 SHA512 8ec5088d2a2e2343bfa92d3f7479387714fe2cb0133c9f5400d66cc8e892c7fe4922463a3c3689046423424d68c20b82c14d16d07287c8fd7c8e2abf82dc9d60
-DIST lskat-19.04.3.tar.xz 1217088 BLAKE2B 0782c0b93b590de065eec090d31cfb174cc64e9e8eaa4768570fe9a96a90531934c3849ccdf5206e4d18a0ca2139f550d8826785e8797bb3285c1f6c7a67ed17 SHA512 497729984c2efa01726b54db1c21d868a6f56d01226660b9fc8d4149b259d368596d28c0da88ff8e6056f7ec0bff33456541ce1e0f6bddfdb08d28de42e77ef6
 DIST lskat-19.08.3.tar.xz 1219400 BLAKE2B fd7b2b196a8a7fb279f41c9a42f8e942c52420495babc592ac841056f5fa8a0097d0ee841d9de07595e9cc5ca0c8b474ab2047b29d0cbe379b98304f3280846a SHA512 460bc794627fe612fd2fb7a4949d8c74e4b6ca729db9ec7837a9f988ca1dccb192822814d5c4911cf890dc86ae3314903bbd82263a1a892811dc4fcd2501f6e0
-EBUILD lskat-19.04.3.ebuild 707 BLAKE2B 47b8f99e69e01902138cc74a49a29046a67759aebb6fcf0b21cfefa3820ea1f9fe07b15334152e735782521cc7782c1bbf4d401c7effa87a38ef79c49e42a37a SHA512 06d8ba5d66f2d3ec174888bea6955cf240281ee932b38ce837f40ac14f6b3801b59056f24b29e147a5d52282a379cb3f33d42fa60e3261ee5aafb3b20154ec59
-EBUILD lskat-19.08.3.ebuild 918 BLAKE2B 87aa70ca2bae615dfa0c17637b2cc221a63414b62ef8b13f08ab0a8e4067cd86a83b7a65e9c83ce0780025809d0d20bc6ffae918d10ba676423b6f7d18a5b6f9 SHA512 1ab469aa5b810b8d28f4451f181ec53c39c7c5e13dc60f40d69374ebb48c21b5f7c7adf96fd8cafd22e581c6f7e1467645c31f4ad1a28a45af19c513ff3df60f
+DIST lskat-19.12.0.tar.xz 1219244 BLAKE2B df446cb203c540906ab3464d959f34a12075fb97aa448719958216ccd4500fc9e09364e15342cb4478dfdf652ab6499cd6badbaa2867cd301731a9c17dd9b370 SHA512 5852d00e4f9f3d1a4d67e78da89b55c4bfbc90501707880d37cb4e531cef438470aff4b5c0edeb35eb23135ebf057fd62e21c91668e5a12a9de367454bc842f3
+EBUILD lskat-19.08.3.ebuild 915 BLAKE2B 182083c672114cc1acf2e2377480ad7218a5ed5e85fc00dcc66a69310f3c6bb81bf84eb27ffc98bac55b63eccd79f89125b1b6b10297af8cc031baa03fa4abd0 SHA512 f3aab70280accd2d5ffa519bdc41b5efc0a0250035aecf0b9430df16a8c67977a85130dc78daccd8ff3ae18d18b718bdd217a65c014601f73c4d7921b6a9eb32
+EBUILD lskat-19.12.0.ebuild 870 BLAKE2B 2669681f940b5a98fbc7c05d2e429eefc76a5822f72a3343722aea09f8f84c07c0069215ac27362a5c117f355382fe92b995e3aab15d6cf92b0699b7de1a6372 SHA512 46c5852cbbe1a669abf43d756886849c37240b3366801d7e2ed1c3a4aa8af20ba24bfe759c6b4d4114b531787f0b2d293fbd4e2fa4c1052c1be7581387cdb78a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/lskat-19.04.3.ebuild b/kde-apps/lskat/lskat-19.04.3.ebuild
deleted file mode 100644
index 0113cd07ef06..000000000000
--- a/kde-apps/lskat/lskat-19.04.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5
-
-DESCRIPTION="Skat game by KDE"
-HOMEPAGE="
-	https://kde.org/applications/games/lskat/
-	https://games.kde.org/game.php?game=lskat
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/lskat/lskat-19.08.3.ebuild b/kde-apps/lskat/lskat-19.08.3.ebuild
index edb54ba5df73..fdc464cdd68d 100644
--- a/kde-apps/lskat/lskat-19.08.3.ebuild
+++ b/kde-apps/lskat/lskat-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/lskat/lskat-19.12.0.ebuild b/kde-apps/lskat/lskat-19.12.0.ebuild
new file mode 100644
index 000000000000..ab4049f657aa
--- /dev/null
+++ b/kde-apps/lskat/lskat-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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.63.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 1060f112bc35..652a371cd0ca 100644
--- a/kde-apps/mailcommon/Manifest
+++ b/kde-apps/mailcommon/Manifest
@@ -1,5 +1,5 @@
-DIST mailcommon-19.04.3.tar.xz 691900 BLAKE2B 78f542ec2fbc3e8defe2a182a0bc1ae28490f0806a7ae31d04ab526e842b840e27ba5632a2b50a64b8c6671ee63c31aafb0bf8a16db98bd864976e69da377f26 SHA512 66c6a180f27ab727be38184ac847aba3f0c6fce962b244d8d4dbc7296ffea02e85a3b0ad89213df5d9f97974e06d3331879f0e964726e7db417c8102668527dc
 DIST mailcommon-19.08.3.tar.xz 693672 BLAKE2B 2be6b716903e83a8e9397a24d8f062b65180e39fef1b0d784804a9bb09a1760d66a2099c331da6456c3bac7654d91c238acc3275961fbd4234afdc11c8784470 SHA512 d1bf8aea689f0cb24dc2030c258795465b3a5e5c16bb49a2f35f62b999faf97cb40f0dd3d4e2bd2d6033e48438bc693fddcfa69d34ad799f4fb22d808f9b06ff
-EBUILD mailcommon-19.04.3.ebuild 1413 BLAKE2B 4c9e1df1cae6b2b7b5796b012c11662c1aff80fa378b6b49c0915461002d53074b727e6fe0c7041c05f9d948bf8cd2d4fe5a2338bb843b7c179252b1c857bdee SHA512 b61a6c17a116e6a8d6dfb7113d8f46d69e2491e21fe0258475ce85dc6ce4417136ce577d2dd23304d3db4516ce376afaedf4999ba1388ab05ffe0fecd880fee5
-EBUILD mailcommon-19.08.3.ebuild 1733 BLAKE2B 3eb9d54bc2db295f4165d80d000c45f219ea1fa43a43d6f2589a13721b8daef6963ef6daa6a3aeb85b27fa0485078c16070314f93468fe0b65817da816131a6f SHA512 184fa17627dbaaa77e8e3df4499fd57b6c4f5314083882c2048d33a136c63b124b16893a0030934d6dcf1568059d39348c53d18f7bba8153aecd79ef0e31fd54
+DIST mailcommon-19.12.0.tar.xz 701872 BLAKE2B 72f2a8b0df0da87fd7d711b5471b1d4a9b901b71900d70fdd1bd5c58ee2fc4afc6d01c9aa199af9617499de7a13cd860d8f7218308e33da4d6ec891385785e81 SHA512 6fda0b5c7afcb5b66dbb5730ce2256bae2ca0e775a6b32fec9ecb1dde8f38962b16786b71ec7b31c40d0e9f482f47507fdd59c8b0b0bf31b4fda016a54e4107f
+EBUILD mailcommon-19.08.3.ebuild 1730 BLAKE2B ed7074cdbba5262db93ec5c9279207eb659ace6c61bb2306bf8714cbca14025609bb815d9a508cc7983d15577e0cab4f61630ce5cabd9558da599f65c2bb9053 SHA512 fc0da1daa5b906ea31e4c6017035f6d16e3bd5779e9ea1115d77e7d718156b1629af15d939809a1c2e33de7668b85cf4a77b3b72917a75f6feaba4e99329e683
+EBUILD mailcommon-19.12.0.ebuild 1736 BLAKE2B f870745990bf7ccc5ab4a06e99fdf7f73e9e7669da3bb193662377e34937b226c396e66dc1f5ee1f7bf3975fe7ac9b48862553bfab26045b3ac7a4b00d04bf1f SHA512 09aaf21b6d566378f81936c4f5c2ac40653ce1b2728689650b7aa4d22bf7e3e76f6aea3df12e9f0dd88b2baa05a8ffd86f87854385d3b66cc3a7b6bfc58b92d1
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-19.04.3.ebuild b/kde-apps/mailcommon/mailcommon-19.04.3.ebuild
deleted file mode 100644
index e08367608eaf..000000000000
--- a/kde-apps/mailcommon/mailcommon-19.04.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common mail library"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-libs/libxslt
-"
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailimporter)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-RESTRICT+=" test"
diff --git a/kde-apps/mailcommon/mailcommon-19.08.3.ebuild b/kde-apps/mailcommon/mailcommon-19.08.3.ebuild
index 508ef396813d..a7341dff403b 100644
--- a/kde-apps/mailcommon/mailcommon-19.08.3.ebuild
+++ b/kde-apps/mailcommon/mailcommon-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Common mail library"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
diff --git a/kde-apps/mailcommon/mailcommon-19.12.0.ebuild b/kde-apps/mailcommon/mailcommon-19.12.0.ebuild
new file mode 100644
index 000000000000..bac06c66994a
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-19.12.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=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
+	>=media-libs/phonon-4.10.90
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 05a798db9837..a179c9aa6023 100644
--- a/kde-apps/mailimporter/Manifest
+++ b/kde-apps/mailimporter/Manifest
@@ -1,5 +1,5 @@
-DIST mailimporter-19.04.3.tar.xz 540420 BLAKE2B 79ab6ef86746085f9a13b0610205b94bb822d332438f8aadfeec4e1f16ac3d051abb99edead969ac2c1baa99a67d484bc6bfc86e41ab602c6f8e5f2cee285734 SHA512 5e0033182e32f9b5fa00b9d18b6cd0180f28d10ed236d89b1e461de80db9449a5b4567d5310b8a236bc30f7a8c2447502d8e9bc6c17f600731ba3bb1f83c66c6
 DIST mailimporter-19.08.3.tar.xz 540544 BLAKE2B c6424a27e1ae47b268596b65dea94323bb8fa458618ee9362ec32734acbd09952a6b98543f3f57e86838e28a37cafa7a756fcdf13b1584e30a51d2fecb08bf4c SHA512 f0c924eba0b5dbb262402f3f6ee4f4d883304b0578e61399df366e11c1301a1e00d9e72d7c7e5ee62bd2a1339b69354a4dc2e229e80a4455a7d85923d6c9cf0b
-EBUILD mailimporter-19.04.3.ebuild 655 BLAKE2B 422a810b82ec460d46d210c52ac363796a80f308ef353ae3ec3e38180d27dc91b0d70e8e4c368c451db1d469dc09af0206a18a82aa154d618cf83ec28133f225 SHA512 dd785d28b1a15382bdcfb8b3ba085d398aa180d971eb2fc051cd112adb29b98ae81a103920d3650fcfb996887044fc47cf9128cd9d543114eb51428af070e797
-EBUILD mailimporter-19.08.3.ebuild 775 BLAKE2B c90fe969f72ddb28b52dd6573113647d9c81b07046a02c48935705e43233b44458325e1c8a0c035bf6443bc90423acd41a42c11156163ac482b5add3c59c2ee7 SHA512 792467ecdbb454cba0ec786aa6ad1c69d99b00c49d0d630eba896be86521c3da7c485dffecb560822f8a8fe1dd47d577ee4e25c96b560210d12b65f86fc176fa
+DIST mailimporter-19.12.0.tar.xz 540600 BLAKE2B d9087cc1772b6b3b75aaaf1400a610f449f4bf4dd42b488ac7091e64f9cf0f18dbc6a6298a6fcae52b6d988fc2270852d8069e6bba61e3eedd6ccff512461e9b SHA512 48a27bb75f6cec5b3aa3788a8c04f2bc39f449551343fa26c455bd8b14abdb41b5b699a2243434526f6944a0dab536e705aa2afd052421b8420a3036650dfe97
+EBUILD mailimporter-19.08.3.ebuild 772 BLAKE2B d917b8d21d2ceced977ee534d292b2cf33800cf1668c64d11a707cc7b435d04aa9d37cb95e02eec4754670f385b63f9bf1c174fe75446f5e745a121a692dd69b SHA512 57ea33b78ccb593f5175bcc1fad3cbb3c849dc3fbc5a70ff32620ba2e7cdab37cae30e1b79033ce458227efcf06eb3f280388536acab1f6713108d4257b89697
+EBUILD mailimporter-19.12.0.ebuild 776 BLAKE2B 1511b94d909d2777d451953ae65a3521e4b346c3fa4635ab4cc48f8dedb013f79389e86457b349a49d864854bc1715dfa8dc5eef48f06d36188fc88a3426e6a2 SHA512 df48ceb12affc9a4ab21c56724fbca93ec111f2c975f4286c7c5d0cf35de8206ed44cba32a13b92afd74efb35884a3b900562aaf07b8c60679f6a1e1701d23c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-19.04.3.ebuild b/kde-apps/mailimporter/mailimporter-19.04.3.ebuild
deleted file mode 100644
index 2b9a5eb39506..000000000000
--- a/kde-apps/mailimporter/mailimporter-19.04.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Library to import mail from various sources"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/mailimporter/mailimporter-19.08.3.ebuild b/kde-apps/mailimporter/mailimporter-19.08.3.ebuild
index 8c9ca5eb4bbc..9f12781e7cb5 100644
--- a/kde-apps/mailimporter/mailimporter-19.08.3.ebuild
+++ b/kde-apps/mailimporter/mailimporter-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Library to import mail from various sources"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mailimporter/mailimporter-19.12.0.ebuild b/kde-apps/mailimporter/mailimporter-19.12.0.ebuild
new file mode 100644
index 000000000000..59b5db1899f4
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-19.12.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 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.63.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="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest
index 86c29312b243..93933c78c544 100644
--- a/kde-apps/marble/Manifest
+++ b/kde-apps/marble/Manifest
@@ -1,5 +1,5 @@
-DIST marble-19.04.3.tar.xz 52188608 BLAKE2B 446078cdcff447e6e15b5be62a6169ba1a227fe189d4ff61cccc9b29a6fbf2fe500a57774f117759dd9a5371329e510fe862e68ce110e5c567108af30104d082 SHA512 4839ff6466accc920507ba032e7dea45a4fd22b6b93ca2f8d15526f0c8490f86271af0f109232f6f87dd00e090295b4ff17ec17b4592b90f13f26ce08fb2f4f4
 DIST marble-19.08.3.tar.xz 52406676 BLAKE2B c4836b451d0a13cf5de9f736063c7df9e093fa7f6f949aad35fb8f70f80a23c320d34beca5499f9c3bd2e4d43ab26149d6706b998a02bd20ec6088da4ddd0b56 SHA512 7c17b3015ed16d169f7bc2c2c633527a33818495b4894a571b0880011539f9c73eb787ff9705641ff1e4a58ec28418e6a495d6b216bd4807e407eb345cd4dc46
-EBUILD marble-19.04.3.ebuild 2326 BLAKE2B a80c94ee3d720d4ea6847420428d38ba3da4945d0a3a6fb4ff2de40b4dd2fe0cbcb97fd1c38f43a37e063449f450d42b3f045c5645c60899d11e0752b21af73b SHA512 13e84eaefe0a1e918ceb0c7ed8a7af6f3521d49c655ea6844bd9f5c2685e83f5dc8e5f93dd18985fbf8c9eb8310971d9b1167bb3ac484659959c01b575afd1b9
-EBUILD marble-19.08.3-r1.ebuild 2683 BLAKE2B 1178336b2abd0cd969b20be93b0b7829cd99ba3a7cda81408ff9556cfe5e4f5fe427bca7f46364500f99a9df9ad1a8f9d25a4c2a1709aad8f491cdddf4c040cd SHA512 fb7312a34bb984adc5db3b45bd947d5a8489f0508219a81a0bb1c6134a70548f0ea8904e465c75646c13dc37d01680a02b1cbd8d86c4cd163978d52e5e6b6ad6
+DIST marble-19.12.0.tar.xz 52194536 BLAKE2B f472d9a0708a9cfcf7f494d51d7b2571f0f4f24da119b87f9cf9960098eb00b3b546bf70858b405098facb7cea8b3d24dd15d138b024446119da5815bd4ad5c5 SHA512 755bae04f95cd28b5e0f8eb9f2819cf1a45cab88fce1da1cc190668669d95d786d6c8ec284bcc1f00522822d308db7820b12d1781436536b4179b14d0249f159
+EBUILD marble-19.08.3-r1.ebuild 2680 BLAKE2B ff456d10f0e876e985ad521779850f02e2dae2ca9142d63f69e0d57aba8c79f470135af1cb10abadb52665cba20573d0e6726dded6f4ddf0f68e48cf96933c20 SHA512 0a2963def2e2db2f07e98b6688ea001b53630aa88d0d7f4c601b50f2f4ae7600b0f84215373aa9279485b8cb4ad278c8d4b83d04ac7a09bfc71cb6ee15e43217
+EBUILD marble-19.12.0.ebuild 2659 BLAKE2B cfcf53176fc7dc2bf050e199d3836163354672d6c056d6017cb39cbf7607c4d6203e02bf10cac288787c84353f97d9757a454cd868349dafeb7e2cb5a0a2ddf9 SHA512 5711e06294989f5ee59492b319cf52054d707fdff4d33810ff74687dca80b6c61e2c3b22c5d316d25e08fd961342b49472a871fd133f4a05391d18aca24e7200
 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-19.04.3.ebuild b/kde-apps/marble/marble-19.04.3.ebuild
deleted file mode 100644
index 5701197f67d2..000000000000
--- a/kde-apps/marble/marble-19.04.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-KDE_SUBSLOT="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth"
-HOMEPAGE="https://marble.kde.org/"
-
-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? ( $(add_qt_dep linguist-tools) )
-"
-DEPEND="
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	aprs? ( $(add_qt_dep qtserialport) )
-	dbus? ( $(add_qt_dep qtdbus) )
-	designer? ( $(add_qt_dep designer) )
-	geolocation? ( $(add_qt_dep qtpositioning) )
-	gps? ( sci-geosciences/gpsd )
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kcrash)
-		$(add_frameworks_dep ki18n)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep knewstuff)
-		$(add_frameworks_dep kparts)
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep kservice)
-		$(add_frameworks_dep kwallet)
-	)
-	phonon? ( media-libs/phonon[qt5(+)] )
-	shapefile? ( sci-libs/shapelib:= )
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-RDEPEND="${DEPEND}"
-
-# bug 588320
-RESTRICT+=" test"
-
-src_prepare() {
-	if use kde; then
-		sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \
-			-i src/apps/CMakeLists.txt \
-			|| die "Failed to disable marble-qt"
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package aprs Perl)
-		$(cmake-utils_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-utils_use_find_package webengine Qt5WebEngine)
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		-DWITH_libwlocate=OFF
-		# bug 608890
-		-DKDE_INSTALL_CONFDIR="/etc/xdg"
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/marble/marble-19.08.3-r1.ebuild b/kde-apps/marble/marble-19.08.3-r1.ebuild
index bc9f779ba6e1..4932a8f01b41 100644
--- a/kde-apps/marble/marble-19.08.3-r1.ebuild
+++ b/kde-apps/marble/marble-19.08.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://marble.kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine"
 
 # FIXME (new package): libwlocate, WLAN-based geolocation
diff --git a/kde-apps/marble/marble-19.12.0.ebuild b/kde-apps/marble/marble-19.12.0.ebuild
new file mode 100644
index 000000000000..da6668a7e817
--- /dev/null
+++ b/kde-apps/marble/marble-19.12.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 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.63.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-utils_src_configure
+	fi
+}
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index 903b06cf9c26..a48648597748 100644
--- a/kde-apps/mbox-importer/Manifest
+++ b/kde-apps/mbox-importer/Manifest
@@ -1,5 +1,5 @@
-DIST mbox-importer-19.04.3.tar.xz 33404 BLAKE2B 1d60252cdd2c08da796780db8b98875a05050b392cd006971f6b6781be35ae7b9a6a20c2240975c5d87915eecf86dce1c7b186c33e1143d789ae23774ff8251c SHA512 5788adc0ea7432d612e8ee5f45997b6c466cbccc3f4d79fee09137a56f9f8dda117f1f7c04a3ff68a86b3597e69e34f68d1332d8a5e0d6ee04cfbe311c6dbdb6
 DIST mbox-importer-19.08.3.tar.xz 33320 BLAKE2B 2c555414502951b1071a5af82a2f3ff9ea3618e8ae229a469b9e872208b86567d0f11587f0c63bb995d31f0f82082857d277c1ca7a7c3f3aca4c2f40491cdf65 SHA512 f48cd0e62c5e8820b7c4f764e13be19111d34b7c182283e06afc7a88f4a95c7fe2cf885aa4913aa466db927a6e3bdacd26a9943f68ab8e3da7ab51674733bd8f
-EBUILD mbox-importer-19.04.3.ebuild 828 BLAKE2B 3a55bd22891f03a39346d3582a6b9b9237ccf17478d719c36b2397fc5e5ca79307e1b919dc8d34fe3022532a4c6731baf84675417a65ec3424197db081a60846 SHA512 c6a5bbe54005083cbc7215185b41aa2f90aa670e568587f0daeaef01fbb7551a35a204fa8e547b2940c7879a831541cfb52c89307a115a65da7a06f11b3724fc
-EBUILD mbox-importer-19.08.3.ebuild 960 BLAKE2B 316907637630e340918d37bb130a9ca37dbf7b2e464d6450f47e8344960e9d7dc1bb9d1a844c85399bab71b265bd5d21bda24287a4f38150292a5b0b44d5cfb8 SHA512 1911eece644d3dc21ec07e6127e7e5c611a1b4371b2870a50c67b1439c5c6ef53e1dcac17cbafbcad3dbde099b5e2148f4bd0bba147edf7820a2f5cd98005ef0
+DIST mbox-importer-19.12.0.tar.xz 33344 BLAKE2B bfeff269670860d12ec8fac02594dcf6ed389a4c896c4c401365c9288280dc40f1fe483a6c561ab3bc3612f2daf4fa5a58287cd0e6abbbe8f95549b12174aece SHA512 4375de381759c913d47cf98744df20a6a979e89eb40269ea2fd776a7d3c9b34cdfedca605a3b11b288a377b47ff5b1c122fae079954b7ffa0876f36c7a405a17
+EBUILD mbox-importer-19.08.3.ebuild 957 BLAKE2B 41ed513145775ce3c1f89a7b93608cb960079404afbe38c3de53a56096ad9c388f483a756554e7c0860a1867aba5168e4484554a974c62e4193f7a8a9e14706e SHA512 4e6f383d0942505256ec8648440ea2746a62f6fe7e5d819c386a06346e1ee7dc0a1a8c491c03b7e186f6a32b8780f71ea7d834edac5daef982bc401190307d37
+EBUILD mbox-importer-19.12.0.ebuild 961 BLAKE2B de5c3552d462bb9ca7fcf9deca6c258fb5aeabc518a1beb69341ce605443d5fd80f9f22d93df00baa19a854168e96e2edd52e65c626e5cfff11d6b635e70d653 SHA512 037192401ef1879d6354ac77fccba4725007c7f1ab0ebd4f76d4a0f1f1eca455e68b2749b3548a80879ddcbdb024de694ecb95de7f6d4513a166e5d5e87ad427
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-19.04.3.ebuild b/kde-apps/mbox-importer/mbox-importer-19.04.3.ebuild
deleted file mode 100644
index 58e61fd17813..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-inherit kde5
-
-DESCRIPTION="Import mbox email archives from various sources into Akonadi"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep mailimporter)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
diff --git a/kde-apps/mbox-importer/mbox-importer-19.08.3.ebuild b/kde-apps/mbox-importer/mbox-importer-19.08.3.ebuild
index a70c3a16b47a..368670991504 100644
--- a/kde-apps/mbox-importer/mbox-importer-19.08.3.ebuild
+++ b/kde-apps/mbox-importer/mbox-importer-19.08.3.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/mbox-importer/mbox-importer-19.12.0.ebuild b/kde-apps/mbox-importer/mbox-importer-19.12.0.ebuild
new file mode 100644
index 000000000000..2f08b9a3479b
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/mailcommon-${PVCUT}:5
+	>=kde-apps/mailimporter-${PVCUT}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/messagelib/Manifest b/kde-apps/messagelib/Manifest
index 7cf35fb214d2..547a044ce7c0 100644
--- a/kde-apps/messagelib/Manifest
+++ b/kde-apps/messagelib/Manifest
@@ -1,5 +1,5 @@
-DIST messagelib-19.04.3.tar.xz 10476616 BLAKE2B bf853931d7c4cb352156ce415f0e53f75c7baefb9083fab4f16d908d0b1aa3e4b85f65e0aac8b9a22bc0731080521cf072c7d5eab8bcc9f9130edb189419143b SHA512 ae1c9df358a7eda251b63d2c7b16b230b62e005eb470923d00667402614ae0b199aa1c563f89200379f9f3f746c36104a14a84538508ddcd2d3cea4db820d91b
 DIST messagelib-19.08.3.tar.xz 10401352 BLAKE2B 1aefa35536c65b63a7a8e80f04c603a7d79ed79817b216341e561070de54887c445d00a0bcd214ac2d4381a2f43a9522ac9cbe443ad9da412ab4bf7721739554 SHA512 defcd4534b1e61a6e115aa2106e92c8bd0d3405d7ff3e2f4a0616d4cd418cee513367215da57585a66f47d2208c888ed7fdef8f9bf70758f787551d009f746aa
-EBUILD messagelib-19.04.3.ebuild 1903 BLAKE2B 10326783f1df4d08e2b3c19feda4fba0302b8077be0aaae4696bf8bc871f349e1ff2727e0f24df3e85651414a50a679b3c9932d4092c9d67f7bc4c9bd7f6718b SHA512 1d7d5264fc6e258f0dee9439fe9707086bd556a1755a936c178b27f983a918a6cb08332e8995b3e92ed7f4cb57ff3d2ec7d002ab72da10fa170ad81d6b480a62
-EBUILD messagelib-19.08.3.ebuild 2167 BLAKE2B 7b78ca3b189805e8c0a9e5e1621e4f8e0728ccdfc3876773f26e4e3d36e605ccc46fad0b8f67edd316d5a6ca6c46d1657cef711f7d32d934a0efcf993eaa7c65 SHA512 a982b0587b6ae9bb43ddcdfd21a0539445f7e2d24f6248ab18dbe37262bfcf5300222aa5660bf6ae0905a1d774c3b6c4be73fdb40da60456324382d4d860f90d
+DIST messagelib-19.12.0.tar.xz 10466896 BLAKE2B b0641141e1a8017782a3f325b87cffade42387d021681e66adfeffeb41b060187efffa05403d3f48594d976e12af5b7e04efa51d12ccc911264fcab6d09e93d2 SHA512 c8a367ff32a4a0afdab0b57725c24b3592b6fc95bd8d5f2e4ac8c872054f8c9de9157b4c68fcad87e27f1f34aed6db7a08080b5596e274a707b66dc878f5be2b
+EBUILD messagelib-19.08.3.ebuild 2164 BLAKE2B f3a1b3da5c4c02e85d6fc85065553d08a5d1b5cd76048b10c1be9a2213b3fe545454ab5f5474a4a0a7627a73b31d763f4a2b739040fbb67fdd276df73d2dc441 SHA512 72cd7559d585bbbdddc84678d9e37bd72f2f045d9779fe9f81bf11e20839dc009c9d82abcbf982f3520c14a72895e869b8567ea5555131237eaa98894cbc5075
+EBUILD messagelib-19.12.0.ebuild 2185 BLAKE2B f4ca099abe90ea02eaf0fe4a374f19bacd3ab53f473518bb84e524eff28cbf64687a8634ff014c7840b87d0bcd3395261e44cf4177889a01329671f0896798af SHA512 8f50e152932c580fa49545c5b5707ec16a009c22250513be64c2c3ef2f1efc9d07149e2c29da83138f87d85d94ba2fe568c4e041543d8249f5865986f920b2b4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-19.04.3.ebuild b/kde-apps/messagelib/messagelib-19.04.3.ebuild
deleted file mode 100644
index d2a1f8a26f9b..000000000000
--- a/kde-apps/messagelib/messagelib-19.04.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Libraries for messaging functions"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep syntax-highlighting)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep incidenceeditor)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
-	>=dev-libs/grantlee-5.1.0:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!=kde-apps/kmail-4.4*:4
-"
-
-# bug 579630
-RESTRICT+=" test"
diff --git a/kde-apps/messagelib/messagelib-19.08.3.ebuild b/kde-apps/messagelib/messagelib-19.08.3.ebuild
index 0f21bc7f336c..19bf28a164e7 100644
--- a/kde-apps/messagelib/messagelib-19.08.3.ebuild
+++ b/kde-apps/messagelib/messagelib-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Libraries for messaging functions"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/messagelib/messagelib-19.12.0.ebuild b/kde-apps/messagelib/messagelib-19.12.0.ebuild
new file mode 100644
index 000000000000..c520d61b34b0
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-19.12.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 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.63.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="
+	>=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
+	>=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
+	>=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
+	>=app-crypt/gpgme-1.8.0-r1[cxx,qt5]
+	app-crypt/qca:2
+	>=dev-libs/grantlee-5.1.0:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
+
+# bug 579630
+RESTRICT+=" test"
diff --git a/kde-apps/minuet/Manifest b/kde-apps/minuet/Manifest
index b54aac5ddb71..f0938776be59 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,6 +1,5 @@
-AUX minuet-19.04.3-missing-header.patch 543 BLAKE2B 201445ba134af3aeb136356030118c8c14649d46627c6ff4167826ab87915ee7eda7ff4afccb359e94a756a853db88f029c165288eb3784ac043c76676e01a6f SHA512 bef276f1efa7f353f153620657747487af433d11902c2fb1398e65caecb98e06b1f2b2ab42fdcc413edcd8d255cbad5f9f248d2ecc5f09b4678557dc5f7c2cc6
-DIST minuet-19.04.3.tar.xz 27602392 BLAKE2B 38bc5aab61d7f007b55f6cf171ecfb6bb650978079b958c23a0040e85dff3fda3198a22b7dd81c2dece7478b4c2c5056e934e98b69351ecc2a06757db44f4b64 SHA512 96d6fe8634260de1e9b908c239628aed49eed57e3f0587d94a4c6e18318fc98c0db8219a6d58d68ef1bc06ce13032e0ff438511b868e8acb841713a8be966f8b
 DIST minuet-19.08.3.tar.xz 27593424 BLAKE2B f0aad2bbb9f4e0f0fbe8e9c493876eb482379610fd173f754aea8cdec06ba3baf5944aa9237dc71e12c0e7e4536e770b4f7fa14740be551e91e41b1a7ee9b733 SHA512 0e21f9f7ef97130f217842ecc430ee3742ab9fb1d86d4b24d11d4b8c42ce77516f0c1c258ebfe731296f7b08a699734daafb25c6a2bb1ae42a32b2e2b414be96
-EBUILD minuet-19.04.3.ebuild 611 BLAKE2B 9851635931cd0ad0b844f056b71feaadb5f2325dba8ad0561f5b458d25a216fa2b9791214f78be3c60c199b56aa1445cb54cf5c0aca0eaf94f94ab4c9af89bcb SHA512 194b73fcb3080d00220bae16e8e595bf842827ee094a210a2972b034118896fccdd01473f1802d80293778f51aa9212c9b4c8d9183165fb2e40b555a5ec9bd5a
-EBUILD minuet-19.08.3.ebuild 675 BLAKE2B e467e6dd56ef4f7ca769f9d0d6b0ee2a1c5884d74e3995fdde2ddf9c4eaf5d27bd50d3dde400bb73ec0bf3e47a29f02cc803d60da78816ff209384342de1c432 SHA512 2990028fcabd369f11efb55aa8eb60c106008ba4673a65aacf2c05a77b55d468d20b689fb09235a4e8fd09c92036fc6316aba5495bfe855bf09e2329a91a9bdd
+DIST minuet-19.12.0.tar.xz 27597704 BLAKE2B 2bf680fcb0dd637cdd93bad6334683147969425f5d67e4f7f69ad115d2cae775e4d9a41457642f2640d299a81cb0e3794e5f67056c6d495b3290bd9ec944d0a9 SHA512 94583c09236c4c20643e130118d80ff1143827ac31ea22644a6d76cbb64e8f009f4e2c43c4ff05bc1ab2306e52e3599063cba6d7c0ab3c923aa44e62efab0478
+EBUILD minuet-19.08.3.ebuild 672 BLAKE2B e20170d977b5255d420f5cd5bf35b8f7a94c061a39d401ff15669b3e3f3f201945592e5431b25289af1ee052204c7fa94f738a5fc5a7b71d2377899a41f6db09 SHA512 42df34239cb680769dcc2867a70e11376722db41ad997a168bc18863c91cbd72f095fee7d853e3d33a613449180c2aaf0e9e643d96341fe5341b9514236c5b22
+EBUILD minuet-19.12.0.ebuild 676 BLAKE2B 29a43e3a4e837612ad9223a66b6667ebdf99c78e35e0479e28ffa50b6711c9339b6c6b68db4a5262b4a641f914504d9da3ce6a6e6384b83782581a814e9a3014 SHA512 c8bf29876a7103673f5d7fee1191c9c55804802e2f1ff405e353062a369b9cafa30906e803457da3bb0163298b36cf72caeb2554eae4506abe9d1db073b3b200
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/files/minuet-19.04.3-missing-header.patch b/kde-apps/minuet/files/minuet-19.04.3-missing-header.patch
deleted file mode 100644
index 9524f4f3564f..000000000000
--- a/kde-apps/minuet/files/minuet-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0ed28414428a6e19017ae7c5605ca09aaf0debea Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Wed, 17 Jul 2019 22:56:58 +0200
-Subject: Fix build on CI
-
----
- src/app/plugincontroller.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/app/plugincontroller.h b/src/app/plugincontroller.h
-index 19c6c89..3acd1d4 100644
---- a/src/app/plugincontroller.h
-+++ b/src/app/plugincontroller.h
-@@ -27,6 +27,7 @@
- 
- #ifndef Q_OS_ANDROID
- #include <KPluginMetaData>
-+#include <QVector>
- #endif
- 
- namespace Minuet
--- 
-cgit v1.1
diff --git a/kde-apps/minuet/minuet-19.04.3.ebuild b/kde-apps/minuet/minuet-19.04.3.ebuild
deleted file mode 100644
index 5b8c1fa2e8d5..000000000000
--- a/kde-apps/minuet/minuet-19.04.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Music Education software by KDE"
-HOMEPAGE="https://minuet.kde.org/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtquickcontrols2)
-	media-sound/fluidsynth:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/minuet/minuet-19.08.3.ebuild b/kde-apps/minuet/minuet-19.08.3.ebuild
index f222d681f861..017aeb677337 100644
--- a/kde-apps/minuet/minuet-19.08.3.ebuild
+++ b/kde-apps/minuet/minuet-19.08.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Music Education software by KDE"
 HOMEPAGE="https://minuet.kde.org/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/minuet/minuet-19.12.0.ebuild b/kde-apps/minuet/minuet-19.12.0.ebuild
new file mode 100644
index 000000000000..bc11e064dcd0
--- /dev/null
+++ b/kde-apps/minuet/minuet-19.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 50cef98db0f8..ac8b691a51d0 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,7 @@
 AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e12f63dcdc46955618de6e07ccca72c9e8378f625deabd11ab174fddc5122f68237decd3402cb5b402e5b21fe55e9 SHA512 29d9271e4165fa4f3d1cf02cb00e32be662f5ae39b77fdf9f7d9ccfa24dcded5d38cd7b9fe1a1c6e65021faa77504663dd5030506baffdbc3f449bc67f6b21d8
-DIST okular-19.04.3.tar.xz 7021028 BLAKE2B fba1831390fe113be1b15c862441e1ec6bb456ab909512037cc6b758db2ddca02f5dd17ecaf0f544420cad4cb4af8a38ed953ba31a934a0e533c57f28ab7e2a1 SHA512 c8d2a79fe00b91f58376937ef57cbc20bc7363d9a046cf05fc34597d36f75009011c63589857270755f294adba5fc88ba980bd5affd08c4751bc9e3b908e3946
 DIST okular-19.08.3.tar.xz 7068828 BLAKE2B 8805936e7be73d3eb937fed0fe77d535c0d40fe839c9923466cada7f8cbf0f37253348d608d52eaaa7780c22db5f792ccb9bbbc474d35663e58b5b542b40fd13 SHA512 2fffce8023d9b0d08ec03cc51d21827772ed07c3004fcf8a23589211e7f676b61253dc39c8a41da5d9c4764ac9895c1a0e16c72c7157213b2e79ccaf35db77fa
-EBUILD okular-19.04.3.ebuild 2965 BLAKE2B 246b458a5537e0a8af2bb500639beb124d3897bbcc4c155569c0ed5fd71058ca3ae5b96ac336a9829d716dec7957c9baf9315a7ac1e5da7b1293e5b0d9abfe56 SHA512 b91e2322f0061fc9b81bb16ed9ea799fff31fa739a09ed1f3eb00e5d3a4969ef490cdf7ce7d9480227d44d112031c53e5ff8b6cc52e11387586ba25d0405b1ec
-EBUILD okular-19.08.3.ebuild 3219 BLAKE2B 0f0fca5aec8320a5ed8da49e57141ab5138568a7de764ad9f3d31309042a3b3a419b3b35317003422e7c49f97c6980ee775d0c493dc007ae05483866d6994657 SHA512 e4cd8e74d0412ecf6bad50875f9f04cf4d72c09f311de6bd4b0042a5a2ee162a3a44f12f5bc10c24023541c155b1fcacca652cf23877a1ba22a15319ea3f39f6
+DIST okular-19.12.0.tar.xz 7200656 BLAKE2B eea7be1e36a699de689bdb7bd0c4c96ac417a10cee129dd6d306105c5b2b0c857a5f6a070b833ecb08dd29ad0d0c52aef4167b045cbe57e1e3cd9b49ebd0dd6b SHA512 93fb134f18b00ce84e9b2ce84974562a5d22f956b459e540750d0c67a980f66383ec13fa8f3bb52f196ce7fabe468de4fe63b0fa6678df840d2defb0e22fc30b
+EBUILD okular-19.08.3.ebuild 3216 BLAKE2B d4d3b278dad01cfc4a074b8ef51fbc2326b7665aca2c8b2d1fb8c4e12be7cdfedc6d14869a430cae097f268868cb37e7f6a6c44e51b9ee8384bba404e7100182 SHA512 ba8b5cfdd1e1f60718b4c5d55558ef9a208d6923cd461088a0c1d38843f8e9949f6cd5194935305b9b5daea9bb633ee096e5149b4d369e9cd375e2bfc97e7f61
+EBUILD okular-19.12.0.ebuild 3148 BLAKE2B 48e395ca46f78be8fc757afdd18b98cb7074759ddfa0372812f277a63316bf37e39d2d85b0ca62cf48a1f8f22781a46e6e44cbc68c388939962176c65d12cb6f SHA512 7013f7f9ddcc45e309e36a7c4b35bf8713703ea71b695c37ac520a413b47b721f0dcb27906da57bdc02f08b2b6c2c4034cb8442c3ba97abb86e39d04cf03700d
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-19.04.3.ebuild b/kde-apps/okular/okular-19.04.3.ebuild
deleted file mode 100644
index 5fdb05b96215..000000000000
--- a/kde-apps/okular/okular-19.04.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://kde.org/applications/graphics/okular"
-KEYWORDS="amd64 arm64 x86"
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	media-libs/freetype
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	chm? (
-		$(add_frameworks_dep khtml)
-		dev-libs/chmlib
-	)
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		$(add_kdeapps_dep libkexiv2)
-		$(add_qt_dep qtgui 'gif,jpeg,png')
-	)
-	markdown? ( app-text/discount )
-	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
-	pdf? ( app-text/poppler[qt5] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( $(add_frameworks_dep purpose) )
-	speech? ( $(add_qt_dep qtspeech) )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( $(add_frameworks_dep kimageformats) )
-	mobile? (
-		$(add_frameworks_dep kirigami)
-		$(add_qt_dep qtquickcontrols)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-18.08.0-tests.patch"
-	"${FILESDIR}/${PN}-18.12.0-tests.patch"
-)
-
-src_prepare() {
-	kde5_src_prepare
-	use mobile || cmake_comment_add_subdirectory mobile
-	use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package chm CHM)
-		$(cmake-utils_use_find_package crypt Qca-qt5)
-		$(cmake-utils_use_find_package djvu DjVuLibre)
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package image-backend KF5KExiv2)
-		$(cmake-utils_use_find_package markdown Discount)
-		$(cmake-utils_use_find_package mobi QMobipocket)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package plucker JPEG)
-		$(cmake-utils_use_find_package postscript LibSpectre)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tiff TIFF)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/okular/okular-19.08.3.ebuild b/kde-apps/okular/okular-19.08.3.ebuild
index 458f2be94e27..8856309f0299 100644
--- a/kde-apps/okular/okular-19.08.3.ebuild
+++ b/kde-apps/okular/okular-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Universal document viewer based on KDE Frameworks"
 HOMEPAGE="https://okular.kde.org https://kde.org/applications/graphics/okular"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
diff --git a/kde-apps/okular/okular-19.12.0.ebuild b/kde-apps/okular/okular-19.12.0.ebuild
new file mode 100644
index 000000000000..c4bf77aa9c46
--- /dev/null
+++ b/kde-apps/okular/okular-19.12.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 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.63.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 ~x86"
+IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
+
+DEPEND="
+	>=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
+	>=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
+	media-libs/freetype
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	chm? (
+		>=kde-frameworks/khtml-${KFMIN}:5
+		dev-libs/chmlib
+	)
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+	djvu? ( app-text/djvu )
+	epub? ( app-text/ebook-tools )
+	image-backend? (
+		>=kde-apps/libkexiv2-${PVCUT}:5
+		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+	)
+	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? (
+		>=kde-frameworks/kirigami-${KFMIN}:5
+		>=dev-qt/qtquickcontrols-${QTMIN}:5
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-18.08.0-tests.patch"
+	"${FILESDIR}/${PN}-18.12.0-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 76dfff2604ac..d164a1ed39d7 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,6 +1,5 @@
-AUX palapeli-19.04.3-missing-header.patch 614 BLAKE2B 8b1866cc21544d74c2b189bdd03506577d3a39e2f8ec2ebe51c0c2646f61a7b80f1570aa6ad8e898501a5de44c5d578a15c075e673db2ebd05e4a6c9b0c8b026 SHA512 05fcff5bf4691640d2d9e99c9b8ea5f43e2322673163e167ddd5b3562d9db698ef8f617761bf475aa0741011b65a09b73c8d25b4473bc08f50594eb9c10b72a9
-DIST palapeli-19.04.3.tar.xz 2068716 BLAKE2B f0765e43e4e0490a8166f2c3296977faa7032c7354c2ef1be231a4156af0606cb58fd3c62544edb61f730c8be3f895042e3a658280357ba9c68c9637fc90d96a SHA512 cbf5b6f3a963980795adacb8c1da7c32bc285142a2d4f92d9f0cb34cd69b3c5f9c4d2f51c1f43ef14a088dd86462c86db0676d627bac12182f7d562544554d22
 DIST palapeli-19.08.3.tar.xz 2069352 BLAKE2B 0ba42e64f3d76f84b826e6da4a9d219b47f52d6241da7b999e0d207078756a30dfaef1775816272a78fdc709ad0659bfe570e53af0cb39e765a1bf5d7debcc4b SHA512 1e263e10a3d6d1dfbc2a0951297cbcc381cd789d5c806ec4ad57db4feef9a9e6a525e61991d03d554a02154652cbfe485a135da72822d03d35579de171c91ee0
-EBUILD palapeli-19.04.3.ebuild 926 BLAKE2B 7ae76ed8557588d412365a6ed200db80ff8318e658c37ff7ea2c58d6360798d187927c1517b0c0890169e8f966cf92d4b36e0c5cbedde219cebf26cdad5b9e87 SHA512 f3a222bd6b5eec6f4b27bb3d60cf911f8ecaccbc884d10f9f784bcbd5d0a74a87a848cfc149efb93ae32e1f0c5e9ba43990fab05f4cf65d21e4dec3a82023810
-EBUILD palapeli-19.08.3.ebuild 1074 BLAKE2B 0e03965ab65be745433b37b25ea3eaefe55987cf70adc79c3c5e0b0437838335e89d94f15d2d9bfabbad073e2ca2416cb0a7de6d5524858406f43b6b3009b711 SHA512 99a17745294fa72b8737445d821c8afdee8fcda8c431f3b7613ded10fa9d4fa86c4ba427806c4c8e43ed195f292f064f4317c8455eaa7e2c3515e62c3c0f6c11
+DIST palapeli-19.12.0.tar.xz 2069068 BLAKE2B e05ad0824d59f2d9f784c6238e0f38fa1822125d167309877da71402116244fed07183235fe3f3501e3df1e035c6be3d47106044707f395622e55d7bba880371 SHA512 af4aa35dbd5a1917ba1a135388944fc31eb423c6b69a3ce6040f5b2641cf02c1951b5d7e6026fd12f8f965ee840c3e05ceea05245779a73050b607096fe2152d
+EBUILD palapeli-19.08.3.ebuild 1071 BLAKE2B 08f685c532336e0867bb8b348ce63035bf052403a41b0a8680606dc04213d763e69a4ac5bb7086f6c58ca137e21a8d87a6b5dd0faeb752610d6ed00fd38c25b6 SHA512 49777482d2d68667bdab5c22990ed07b437fe3a9237a25f6e65ff18c1a66e1125a1cc98c7c7ef2e65e6e56d36bfc19589d4cb08e87f3c0dc5f2f53fa55874c73
+EBUILD palapeli-19.12.0.ebuild 1082 BLAKE2B 0073565801ddc85016cade530a67d3b14d0fe2febccdb4311788afa4a6b12edf87fb3ec8fde9a078002fe93ae8192a3752c5ddf2af97b41974e41fec1911567c SHA512 33e9f369bfc3bfb675e26fe84d2f2382523f69e959ccbb6d6a30ac9b8489c3a0f3ea855d416901805f02ee64bd56a1281d12136bbab56454fe2b9d900d360ede
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/files/palapeli-19.04.3-missing-header.patch b/kde-apps/palapeli/files/palapeli-19.04.3-missing-header.patch
deleted file mode 100644
index 23f9b0d73283..000000000000
--- a/kde-apps/palapeli/files/palapeli-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 017a6325de82f3872b36ddb35052e1845fb97ff8 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Fri, 19 Jul 2019 07:31:17 +0200
-Subject: Include QMap header explicitly
-
-Seems no longer included transitively in Qt 5.13.
----
- src/engine/gameplay.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/engine/gameplay.h b/src/engine/gameplay.h
-index a759f8f..af18373 100644
---- a/src/engine/gameplay.h
-+++ b/src/engine/gameplay.h
-@@ -26,6 +26,7 @@ class QStackedWidget;
- 
- #include "../window/mainwindow.h"
- 
-+#include <QMap>
- #include <QTime>	// IDW test.
- 
- namespace Palapeli
--- 
-cgit v1.1
diff --git a/kde-apps/palapeli/palapeli-19.04.3.ebuild b/kde-apps/palapeli/palapeli-19.04.3.ebuild
deleted file mode 100644
index a96a015e4b0d..000000000000
--- a/kde-apps/palapeli/palapeli-19.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Jigsaw puzzle game by KDE"
-HOMEPAGE="https://kde.org/applications/games/palapeli/"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/kde-apps/palapeli/palapeli-19.08.3.ebuild b/kde-apps/palapeli/palapeli-19.08.3.ebuild
index 12b132f3c33b..3dbd3898c0c2 100644
--- a/kde-apps/palapeli/palapeli-19.08.3.ebuild
+++ b/kde-apps/palapeli/palapeli-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Jigsaw puzzle game by KDE"
 HOMEPAGE="https://kde.org/applications/games/palapeli/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/palapeli/palapeli-19.12.0.ebuild b/kde-apps/palapeli/palapeli-19.12.0.ebuild
new file mode 100644
index 000000000000..4121c6917f74
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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.63.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 845b4d114cd7..5b178d0d63c6 100644
--- a/kde-apps/parley/Manifest
+++ b/kde-apps/parley/Manifest
@@ -1,5 +1,5 @@
-DIST parley-19.04.3.tar.xz 8816536 BLAKE2B 7e3ef26f1cf3f1ff4a6367d088a05c4404b4efb2ab6a1662cfa9e5d853c8f3f6e14b3ffc94061b8808eda618fe0d21c7a3ba1e53f71072260b8f2df62aac825c SHA512 cf3a8f86a48d8207b4ff4235edc841bea34cb3588f0b09a6b233f1cb312a8b77907de4dab611d0adfa5eda932dbb64ddba349a3479f7d394237d61aebc401bba
 DIST parley-19.08.3.tar.xz 8827432 BLAKE2B 2657373f0cd855aefd898edf8c82f584d0f6c7fbc85e379336765a5334aa476a0f5f76b28a14e19b4ff797a8e552288d68d566158a41774c96ea9e69d56df4ba SHA512 5a8ede27d2a0612b1db3f0693e9f1749c6c20394bee4ab1cb1dd8fe41aff5d0c1c409f6be8d91dae3f540301aaac941d99c14e6fbfd8ce9e56e85a83c89d344b
-EBUILD parley-19.04.3.ebuild 1254 BLAKE2B 429b7913dc3896344df7b67500387bcfc51a639640291876a0b40f215af5d1c83710ef320a94b52964bbb8967eafb0731aa23dd00ea9a3af022ca526ff00230f SHA512 9b4c48747bbbb94995e4c0ebef12982e26b0d0fe78e2177d46dbcb9e3b5c7f0e00b37e8f7c315230b3340300392b482fe241a95e3a25fcbfa06dc5ed99ef8459
-EBUILD parley-19.08.3.ebuild 1469 BLAKE2B fb93dd02d78628221642f71aa76280f769f0a06336d5238956c8dec6e760d1df6a2628cb8fb71988843a29bddc1bfd0131e0fbb99eb6d6822074629824d015a1 SHA512 9abd8935c745c6f71825e97aff613e61c10b155cd6db1975477af3c297c3fb2ec254df7649fe01ac0c4d7462acd696441c6effa424736b6b6d59e1dbce474298
+DIST parley-19.12.0.tar.xz 8833052 BLAKE2B e5108401c02ff431a7bce8ef086ea5f74e0d5e2c4e67663801a42cddc493fd2235d4f7c08bd2b187373c5e1750aaaa9e5ad3a7810f08c6165baa6b6e76dad5b5 SHA512 36ffeba1f9a51f9cf9ecccfaf0b4565df316ac0c2f860ef401b0fa78d46a8f4e078620fdd12961ff46b5dcad682a3ac6e9c4027eaf155f9eda826e307636afa0
+EBUILD parley-19.08.3.ebuild 1466 BLAKE2B 5da0f24dd8eb29ae4ad67b93066a5e522f73062e6b464893ac9610f92a907567e91e6733b641f139c39f01f3229ff52e1bb199008e2ee18979ea79636459d607 SHA512 68d73d979d9a25eb7eca1b3cfff4279e3a287222e2be61c57ef5ddf90f585ea684982b925ec2b3527c71a46da448bbcfe6326ba8ae636a9def7387023f9c5907
+EBUILD parley-19.12.0.ebuild 1431 BLAKE2B 692999871cbac31112e1ece69a999c9b0f9f5d62dd51d206f04190e9088b0925ce9633f03dceb089b2976865a41425b47ac11cd1a9b796fb6bae588cf59c0022 SHA512 9847634d920486e33931654a98e4fcadb7628817f9ae43af3ac60f93da26b07c26bb5afd7abd9d49da0df1545c1a4a8f85e5d635e1f58b873a7a2b4d1be65252
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-19.04.3.ebuild b/kde-apps/parley/parley-19.04.3.ebuild
deleted file mode 100644
index e7af4bc61657..000000000000
--- a/kde-apps/parley/parley-19.04.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_DOC_DIR="docs"
-inherit kde5
-
-DESCRIPTION="A vocabulary trainer to help you memorize things"
-HOMEPAGE="https://kde.org/applications/education/parley
-https://edu.kde.org/applications/school/parley"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_kdeapps_dep libkeduvocdocument)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtwebengine 'widgets')
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdeedu-data)
-"
diff --git a/kde-apps/parley/parley-19.08.3.ebuild b/kde-apps/parley/parley-19.08.3.ebuild
index 2d94cbb2ae5d..dffc135b86c9 100644
--- a/kde-apps/parley/parley-19.08.3.ebuild
+++ b/kde-apps/parley/parley-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/education/parley
 https://edu.kde.org/applications/school/parley"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/parley/parley-19.12.0.ebuild b/kde-apps/parley/parley-19.12.0.ebuild
new file mode 100644
index 000000000000..afd5b3238997
--- /dev/null
+++ b/kde-apps/parley/parley-19.12.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 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.63.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 01ef049b3ff6..d8ae14e221fb 100644
--- a/kde-apps/picmi/Manifest
+++ b/kde-apps/picmi/Manifest
@@ -1,5 +1,5 @@
-DIST picmi-19.04.3.tar.xz 1358412 BLAKE2B 3c660a7bc90f60579a22d930bca20b4e1d62cfc834159894035b1b55d34dfa362c5f0e09ecc8bc977bfe6babad85e1d4f88f0065f685dcc00f1af5c6e55fb9f5 SHA512 eb1da1740e53ddbc86e36073d5e0ef1bf3c6eac9392de5e00cacb3f8c11e085ba9e1aa170b9cefa90b41abd40bbef6e9ac90d75529442b7b9a27358224a2baa6
 DIST picmi-19.08.3.tar.xz 1358012 BLAKE2B b8567a9e0261854364ef0a5f8c9caf2b87be632529e1621f443f845ffc6725f41690c17d83bcf93a626ddc47cd5a7998390770d0af845c4ad08d6d0b90ad35f8 SHA512 8414ca43b05cbe20a4967d775dc4bb68b70028082bf3d5fd66020b422d6b4b90575ce3c594c4c23706b3ab95618e5e9d5987c86fb6b18cc3b4ba46ab069b74e7
-EBUILD picmi-19.04.3.ebuild 848 BLAKE2B f3ccfa7a7dfb57727caeca8ac11bb287da61b2e724e1aa65040cfa18b3434c3cd4c825bb4f26b17f29c9803b555fbb3827c5ff466ee60546be6ba99b69b5f248 SHA512 099cb7eef707e66b15faec481a65beffefa5221f737fbc329a8c6f5a6e9f5dd0cdc92200a7920ea748dc16709859d17cfdbd005d997b86a9ac3771f6b788e1df
-EBUILD picmi-19.08.3.ebuild 1037 BLAKE2B 41a9951e3ec6c2564afa1a4eae8c7f0c95b358e3f65dab1e837f236b69e73655bc11b71d4673a32e50ac1e71e3b0a79f15711812fc1c5af74538c9bd5df744b5 SHA512 b566c17a750529ba7c7cedce72b81c9fd07c9a607d91a2e3e383ea8af4f1b81284e9c8469cfa09075fa8bbe10cde2672a51a178b4706c3f17de3e7d58476bf59
+DIST picmi-19.12.0.tar.xz 1358488 BLAKE2B c9e7fc3af4400cd856cb681d63f775c5abbfbbffbe93d703aa314bc873b559e71f2a4e75d9396303b51ab3c1b0f16045ad95edfbaff27515456a715e61123d5a SHA512 a7220de92f15a1d5f048dd36659b6355bec30758406dc37ff8adb416034cde5426ab21e9a6fc878961b5510216a2114bcce0941621f0fc35f8c14fde0e38d57a
+EBUILD picmi-19.08.3.ebuild 1034 BLAKE2B f7f8997920500acfbe6cbdba4a3c19625fb53688577a91c19b4f1f604fdc4b7df4625f44506c069a672d2ab9121b8be6c310a39e84e1cf488fc63d348da951fb SHA512 e4085ab1991de90986e96ab9b4776286f0d92da92cd7e3e094d4c65d8f3b4b051afc951a973ce23ff97bd9d2c48ab40b09a10b20a7b1ce148ec28e0fa29800f4
+EBUILD picmi-19.12.0.ebuild 1087 BLAKE2B 455b4a6537bdfc25bb4ababdb068e664df968df523c6ae2559ee4f8856cb3500481e89da9b6ed021844658a5486013b61634a6c77060f0abc8dd4a1c2e1c2bbe SHA512 a055fbd8374e337b914b01ece01fe92772b6f901ca0c08f250725685f038479ea066babec407b9b1de1fb54b4d32521b830caaa7cc7bc1d4893c7e3c2efb17a1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-19.04.3.ebuild b/kde-apps/picmi/picmi-19.04.3.ebuild
deleted file mode 100644
index dcfa1fdb3a94..000000000000
--- a/kde-apps/picmi/picmi-19.04.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Nonogram logic game by KDE"
-HOMEPAGE="https://games.kde.org/game.php?game=picmi"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/picmi/picmi-19.08.3.ebuild b/kde-apps/picmi/picmi-19.08.3.ebuild
index 85625f250674..139dc1aee0ed 100644
--- a/kde-apps/picmi/picmi-19.08.3.ebuild
+++ b/kde-apps/picmi/picmi-19.08.3.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Nonogram logic game by KDE"
 HOMEPAGE="https://games.kde.org/game.php?game=picmi"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/picmi/picmi-19.12.0.ebuild b/kde-apps/picmi/picmi-19.12.0.ebuild
new file mode 100644
index 000000000000..70fa1ddddb1a
--- /dev/null
+++ b/kde-apps/picmi/picmi-19.12.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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.63.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 22ab01a5a53e..bb9ccedd14de 100644
--- a/kde-apps/pim-data-exporter/Manifest
+++ b/kde-apps/pim-data-exporter/Manifest
@@ -1,5 +1,5 @@
-DIST pim-data-exporter-19.04.3.tar.xz 272860 BLAKE2B b1494f33d7a876bb4509283a1fffdb4cf96e72d41212d909b5125085decf5877b5a0006c818a00f4d92e639a52ccf45f4f55b6aee8ea8a6b240e475228c7622d SHA512 a51521f8be993bd6dfcfb21cd82b13e2be1b51c32f17111064fc28b674de9ee1a7165f1e631de1e8c02d7defd02f0c7ed30ce33f549c9ed2c55501d2e3d92c32
 DIST pim-data-exporter-19.08.3.tar.xz 203340 BLAKE2B eca663a60a51c1b5040a374a50da519a39dd01aa3abc87d1daaf27b3de630eff01900086acf82bd58a1a4e6b2b3b29b9559dbf568aa8cffb760ce93b9eea653a SHA512 551251dc0fd260212c0d774ea730d1b863c320595a356dd755dd8ed8bfbe16193cef7967a1114c7cb163ab4bb06e7646992d6ace15c305105dd7f79806348637
-EBUILD pim-data-exporter-19.04.3.ebuild 1362 BLAKE2B 4fca04c4cc64c1aacd9ed07e372b0974014eaff32d3208ea82d6440fd769abbc7d8fc5f940fc67c19e375e5317d8b998ff8d12a744c038e78fbe4746752b2d36 SHA512 1142d3c335d11ef8a081eada76844a0b9723abe6ccab3653b36db387ebc3e261b5f76f8112a67cc92673c72417e1fdf5da4e6b3f2ed67f4ceb8b02398af7ba98
-EBUILD pim-data-exporter-19.08.3.ebuild 1398 BLAKE2B cf9727e75f5daaab7db0b3fd9b05a5422dee01065f3cf46af83e0728f67ee727afcce25151b0c978618066130a6f78690fa74b9b6f60a78f54be7499b651e1c2 SHA512 14db0f43c5ceaea154250d68fbbb86f567c3336f9e7a36e56feacfdf29010ef85603d49869a82ee11bf5274dea8976ed12a02f369da9825074f297af6ac0196d
+DIST pim-data-exporter-19.12.0.tar.xz 205292 BLAKE2B 1355b59d8b659037320f791aeccfc3f6168a9ee4563fef1efe6ba170317db94ee48830160a2b659d6550d39e0d322fb4a099a0b0199b7bd482646af5e5977f62 SHA512 45f620fedb50090d70852968c5f3b58ab2e0076ca4db9ad4965b602b84653c15a47f4786b00c55bbbf621b596e8d3ad1ffbd3496b6e97ece405d69a5e184c901
+EBUILD pim-data-exporter-19.08.3.ebuild 1395 BLAKE2B 5b7605258c10ffa8658c8e32db4d8cc78a8ed5b2a0fa012bc4b3c6cdaf2a4a12a1948e95bb7dbc977cf6a3046f66a034b66cda1f2e62e54dd4e058d1fd78021b SHA512 f62b82f74bd8ea20c30f616b9c16c2e5cd646f91c108782575777f378e466d7ae1cd96a4df426c34021f37b07c3c441446fd7c4410e0ff15c2fe9298b5275b21
+EBUILD pim-data-exporter-19.12.0.ebuild 1399 BLAKE2B 7fd55f119668b56e52fb2a787261ab4c84c3ffbf97cf9a9ec1d58bace7b3c1b79ba133676b75cb354f9e515ec5bb03fc8e9c11cc86291879dfd02d509a2d9157 SHA512 619c71538ad8337945d261723e998ad14bfe5531caf72d1c0a6437dea830fdd34d260b7b013d0fdee1e634d691c7ab2f0e687ebaa360a1995ee2ecc12ebb7ebd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.04.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.04.3.ebuild
deleted file mode 100644
index f615dd775f7f..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-19.04.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-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+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kmail:4
-"
-
-src_test() {
-	# selectiontypetreewidgettest is broken, bug #665690
-	local myctestargs=(
-		-E "(selectiontypetreewidgettest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.3.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.3.ebuild
index ba182658f891..1ef4e29299df 100644
--- a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.3.ebuild
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.3.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.12.0.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.0.ebuild
new file mode 100644
index 000000000000..46a7df3652d5
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.12.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 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.63.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=""
+
+DEPEND="
+	>=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
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kmail:4
+"
diff --git a/kde-apps/pim-sieve-editor/Manifest b/kde-apps/pim-sieve-editor/Manifest
index fac083d5cc64..24b0c9823891 100644
--- a/kde-apps/pim-sieve-editor/Manifest
+++ b/kde-apps/pim-sieve-editor/Manifest
@@ -1,5 +1,5 @@
-DIST pim-sieve-editor-19.04.3.tar.xz 450400 BLAKE2B 3d7c6576e3602fdf74f1ec7f9839d8dea85eb1624d0dd32e33e46e5306e4070e31e05d66b5f8ef7c1cf5c1569af419f11863fe6fe992f7d366999e8038b21eac SHA512 361884c96f97fa357f9417aa94fc741c1f3fc16cbadfd333b0e54a0969b8443c036c59e09b41a76d4637f7be97e2150be6904b2489ae7760c6b631775eaf8cb2
 DIST pim-sieve-editor-19.08.3.tar.xz 451160 BLAKE2B 948a25da795132fbe50548d00a417f27e2350adb2936d424cf6982b309d923badb8ab6cf857be541ce085e5a0d40d4470c69c6049149bc1f3c3b9ddba6d2b734 SHA512 297d22b0cd8f2423812fe5e5a041c3e1ec66334a92ca024b569b1251c01733ad381ab9774b6d3d10788ededdefb4c1b8adf84ac8087b4db9df630a9c4dbb7579
-EBUILD pim-sieve-editor-19.04.3.ebuild 1150 BLAKE2B ea940df29e1bdcd0950e8c8744e35ad536b696adece00051c4263f04d31e0f83f24effe74186bd60867dcfa0aa51900f64def0fe22d91c1043ad7580d93bc168 SHA512 1c5b1a45dd50ac8b1a8b5e473af5bf09c78bedfef6648f0bbadbc31384d83c04e15d5002c10d420a49aaa625a642feae33a548fe580fef8edcaf2879aedba85f
-EBUILD pim-sieve-editor-19.08.3.ebuild 1344 BLAKE2B 6632a9bc20d7fa49bafcef928b618c4f38d8a5e2647c2aa7bd7f85debb93a46ceef7e2e4beed7d28932c5d68f1f64f405e55fd785d6c1b6df1fc3711fcf1beb2 SHA512 327c826735e673c90c0edda3f50c802ecc645d43ecff3422def610b9ce78a463b4c3443393c38f56994ae8f422fc3f53208e50b9da0cab1b423a5c9316e444f9
+DIST pim-sieve-editor-19.12.0.tar.xz 451060 BLAKE2B 603cad66290953113eb2a82d1005e0efe615a90dc83a66757f1113e3b215119434194d281d04250c59b5757c22420c17c67a38f84522a9b502344193162380a0 SHA512 de21561d5af02bdef036f3c517a186094ca2cfc00d05851e246c532c92a63fa54dd8a23864a6314e004571a55068c1c2ebf0c5be0a147297bf43315e2eee2270
+EBUILD pim-sieve-editor-19.08.3.ebuild 1341 BLAKE2B c158b0dc6338d176dd0b87812fea11c0e45f8c7b8588fe85684f514973133683ceeb49330afebd0af77468a26ff786fe27dc517d54ed4bf16ff042ad395c9c0a SHA512 8620247435d24e7fdbe92bb1a1b7e16ac72c31a18f73313084411ce9ed1e61ad40ae8b751d386a73e584af6f8faf7c73b09fe5d43a58e41cbb609756c1720c98
+EBUILD pim-sieve-editor-19.12.0.ebuild 1345 BLAKE2B f1b9f2f9d76917b292649ba5989c3112f204ddd3f0f757ba982a4a461a4525d3b98c79c023b6a0d8f6f2b6f4ae82af49ba63b6ee3c5a3085fa057ebd3cd933e9 SHA512 093d3cc982e2bfa6912e47ca40e54959b47b97be4c26cce14ac7f9f136d4db6ce9d648db424f8845b14e1b96033a510d40213109786c833b92727da644972825
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.04.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.04.3.ebuild
deleted file mode 100644
index 2e23ee354a17..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.04.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Assistant for editing IMAP Sieve filters"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep calendarsupport)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.3.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.3.ebuild
index 4363a4d87b91..2c071f123f89 100644
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.3.ebuild
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Assistant for editing IMAP Sieve filters"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.0.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.0.ebuild
new file mode 100644
index 000000000000..e7e407dc32a3
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.12.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 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.63.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=""
+
+DEPEND="
+	>=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
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
diff --git a/kde-apps/pimcommon/Manifest b/kde-apps/pimcommon/Manifest
index 6e5e1a4c031d..16bd439e0dea 100644
--- a/kde-apps/pimcommon/Manifest
+++ b/kde-apps/pimcommon/Manifest
@@ -1,5 +1,5 @@
-DIST pimcommon-19.04.3.tar.xz 294420 BLAKE2B 87d67b7dd975b0d989b5ca408e478cfed68918b1451f5faf16538d5fdd5033c00b1b98b07c8b75183ee83b21fa929aed94473a2935075886ff78db85c1589881 SHA512 862d240de0b551035eddf03cbbfe381c7a11c0715e4a0159447197525e5f68cf62ddc716726e1229f5be9e99c6c5129db8ed87aa8e8d0b713a23698a81884f27
 DIST pimcommon-19.08.3.tar.xz 293596 BLAKE2B 31326e8df1cce64849f4cd4672aac2df94709416347ad1cd616db2132ff8537f34034574e015ec54b08917dcccd128f2af8fc2d08a54cad8bf1ba0d9e6f7fafe SHA512 844d36c8ed63ec4de7d5feafd637e1d6b87725e77910839365e9a1e8cfdfd2f46e6e64b42a1ca3837a95b2f7a194fde46d5068b0609d5806fea9295b94c1a2b1
-EBUILD pimcommon-19.04.3.ebuild 1683 BLAKE2B 95ca53683134265ae03facf46c16a7b7e393b259de79eb083cdf5e9c64ca0265b37773ad243c841a7b3e2f8cbd01cb56e3d9787892863d0817c4e0df605903ff SHA512 e2a76e1b69e959cffe709d8407977d10329bdfaf09ccc6c437504058bdcfaa0bac7ff5ff07e6d67b0f14931ce46f4e7d6d595c18694e4857b0c515a6ba637fff
-EBUILD pimcommon-19.08.3.ebuild 1759 BLAKE2B 5e1444fe8da55bbad06044232b641bbbf5d01d14b453ee69ec8fd8a2bebd61676f7c0502a57100df04b8bfd452e707ee941fae7597e609816a52e251e6681cb3 SHA512 7197ae264c760405592471e4b59eac456afc6ef7a26debe31d049729a3a1998933e314ce1b0ca97c2b5030c451452f7cc61466d868356cc72c7696b861184bd2
-MISC metadata.xml 440 BLAKE2B c55b83f7b60d3baaddaabe967f26ebd46bc02e8c299bb6a08bd2b2dc637aeb9014d1151401dd5818fa638e35a52af07b4f4a1c26f11acaafb12af39395987b8a SHA512 270a30b21908e27b18090298815c52c80c90a6411f16692bb725449217411932627cc3ac530c2838b539e1692ac00972461bd6b016d92e7299588e71913a304a
+DIST pimcommon-19.12.0.tar.xz 294760 BLAKE2B 47025b188d3c602d1dfb1fe47b80086255501b794af22d6ffd071fe8d3183ba7e9e95e306dd0ef500c417d84af5fe977a041ca5739708326b0c5e8fcaa04b878 SHA512 e3f23d63777c33986385f3def720d145029ef61ef1df5e3b6ee733a2610b1f4b6f034307622e88a5b6be602431e001cc17f8613ae7da7ce940009b7e66849f0c
+EBUILD pimcommon-19.08.3.ebuild 1756 BLAKE2B 150eae8c00287aec35e3d5d15d52f4713eff0ad9899ac703d1f49424ccbd01ff3a3a7a24b07f9d7919abe12096c44765deb1f24d803b1377bc2af7341ff6ace1 SHA512 3964b70a09c4623fd7f436e23462cf31829792e80e810bed7fb99f8effa8f0fe09eabd2848088306ab6068a4800fb0e6c21916332aa85aa182484a94cb7823de
+EBUILD pimcommon-19.12.0.ebuild 1719 BLAKE2B ca233bb7b50821ba82c20eb6391dd351519f60441e9f8315c571293f906d7102fca044b3f152e0aee497c4cec76e1596f6e7ae22250b8a7fe91f87e69d914ad0 SHA512 19b8556bcc7375530c24126f7cb179b2ea2c3023355f309c99f371e541e4f332ad4ea7739bb348c04200e4a81feff70638cb0edb89acd6b49b53ccc1758b5ca5
+MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/pimcommon/metadata.xml b/kde-apps/pimcommon/metadata.xml
index 7ade8e3d0b3e..a50ada50ef0e 100644
--- a/kde-apps/pimcommon/metadata.xml
+++ b/kde-apps/pimcommon/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<use>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/pimcommon/pimcommon-19.04.3.ebuild b/kde-apps/pimcommon/pimcommon-19.04.3.ebuild
deleted file mode 100644
index c8f6d051c345..000000000000
--- a/kde-apps/pimcommon/pimcommon-19.04.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="amd64 arm64 x86"
-IUSE="share"
-
-BDEPEND="
-	dev-libs/libxslt
-"
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kimap)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	share? ( $(add_frameworks_dep purpose) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	test? ( $(add_kdeapps_dep kmime) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KF5Purpose)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bugs 641730, 661330
-	local myctestargs=(
-		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-apps/pimcommon/pimcommon-19.08.3.ebuild b/kde-apps/pimcommon/pimcommon-19.08.3.ebuild
index 9a4f406c48e2..4f8bb05b93a6 100644
--- a/kde-apps/pimcommon/pimcommon-19.08.3.ebuild
+++ b/kde-apps/pimcommon/pimcommon-19.08.3.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-apps/pimcommon/pimcommon-19.12.0.ebuild b/kde-apps/pimcommon/pimcommon-19.12.0.ebuild
new file mode 100644
index 000000000000..ec0b275ef7a1
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-19.12.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 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.63.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
+"
+COMMON_DEPEND="
+	>=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/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/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/purpose-${KFMIN}: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
+	>=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
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( >=kde-apps/kmime-${PVCUT}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+"
+
+src_test() {
+	# bugs 641730, 661330
+	local myctestargs=(
+		-E "(autocorrectiontest|pimcommon-translator-translatortest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/plasma-telepathy-meta/Manifest b/kde-apps/plasma-telepathy-meta/Manifest
index ef444b65d5a1..b6089e89d3a1 100644
--- a/kde-apps/plasma-telepathy-meta/Manifest
+++ b/kde-apps/plasma-telepathy-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD plasma-telepathy-meta-19.04.3.ebuild 981 BLAKE2B c49cc1627e8ae8869e4cfbeb6ebe1f448f8a32643bf05ac6efb7ee4b4531bd9f3f382f3cb6a28067106a81936dec9304b50167c61c905f8a6b1920abcd5cece3 SHA512 e6a78add28bdf7f264c59979dfd0ef6803a85af1bb155b43d9b97920e9cd0d0181958aea8469bee2b96b3ca38f1345f110a09374a90c59f9fb8d6787ba476e1f
-EBUILD plasma-telepathy-meta-19.08.3.ebuild 984 BLAKE2B fe8ce110dfec685d6008f1cd4e77308b451ee75a4d14fc75a1779c92c4255e8a7ec5a4a79f53a800a5ea4a7b0f782da2b517fea572b8abef782ba410b9a471d7 SHA512 e8cd7a4de0dfd9163a18878c3e069e194fff64b87aefbeabfbdfcacf8943e779a2a11c77f311b1784367cf260ebb29b8735a163df487e28915e2021424dad125
+EBUILD plasma-telepathy-meta-19.08.3.ebuild 981 BLAKE2B c49cc1627e8ae8869e4cfbeb6ebe1f448f8a32643bf05ac6efb7ee4b4531bd9f3f382f3cb6a28067106a81936dec9304b50167c61c905f8a6b1920abcd5cece3 SHA512 e6a78add28bdf7f264c59979dfd0ef6803a85af1bb155b43d9b97920e9cd0d0181958aea8469bee2b96b3ca38f1345f110a09374a90c59f9fb8d6787ba476e1f
+EBUILD plasma-telepathy-meta-19.12.0.ebuild 984 BLAKE2B fe8ce110dfec685d6008f1cd4e77308b451ee75a4d14fc75a1779c92c4255e8a7ec5a4a79f53a800a5ea4a7b0f782da2b517fea572b8abef782ba410b9a471d7 SHA512 e8cd7a4de0dfd9163a18878c3e069e194fff64b87aefbeabfbdfcacf8943e779a2a11c77f311b1784367cf260ebb29b8735a163df487e28915e2021424dad125
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.08.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.08.3.ebuild
index a68369603cd9..b45fd4c99c6d 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.08.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.08.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="gstreamer"
 
 RDEPEND="
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.04.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.12.0.ebuild
index b45fd4c99c6d..a68369603cd9 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.04.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.12.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://community.kde.org/KTp"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="gstreamer"
 
 RDEPEND="
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 2df3f388e90a..cb94183e13db 100644
--- a/kde-apps/poxml/Manifest
+++ b/kde-apps/poxml/Manifest
@@ -1,5 +1,5 @@
-DIST poxml-19.04.3.tar.xz 43336 BLAKE2B 5a1d1a452bd1117fc02904b9a57110982a913a4d8d248d9b96cc87a4ee81ac6c3f6ccc9a1bf313f268d60ed2abcc73666eb5e9daa21cc8c7cb67a8d0df61b803 SHA512 08317130a7e5c189823892ca11f85e19cd5bcf88fd7e86cf4f0643a031dadb4ac26b580c3bd1f7114776cd304d733d1453ad973205afe3aec6a182127be7ccf9
 DIST poxml-19.08.3.tar.xz 43192 BLAKE2B 5105dd1552d94404f41b400ed6ae85ffb17f6b8df62457cb40987b344ae91d0d8bb5707472fb3212c4147b8fe202f7dff91bb5f7bc9d6857d1b945e68dbab89a SHA512 34cc4323def1c62f0d7e088ff664a9001cb9b0b594bc9f47cb5c6546ab43555cffc5c6c0d2d695a81611fd0fa1bc6b7c2693f2b938645721368adc1da1f836f9
-EBUILD poxml-19.04.3.ebuild 343 BLAKE2B e41cb9234de8f93bbb76571ea3b296aa7659edc01becb6e25f5287c02496cb64a218a704ef74fdc687f6d6e67d8f1a2f8eeb5539ced2813e240d9c8cb8b3a012 SHA512 718cb50c63a6285928fd81db8aa454af1d6f1dd34fedc4182212f0574850ab514f5de26fad39fe9a6a4d35526976250ca81e91cd1f5c295286e7a370f49759a0
-EBUILD poxml-19.08.3.ebuild 411 BLAKE2B 9da7bf270b4c79fc04399cff13cc43848049478313c3a5fafa3f0bf9df30ea6701574f0c4866f2eb47bb398969521351b71300c610f14f3733cb78d63331fef0 SHA512 759fe6e8d614f7d05c607ceb966848a7065af371c1ee6cff19b782497fcb71d8835172a0127166d17a364808c539904ae606d62cf4153fc02eaa216c928af357
+DIST poxml-19.12.0.tar.xz 43240 BLAKE2B 656a986f6457b3aa35c2397f478b56249300c682876a4c63d143542dc562952c063b462212cbb7a0271ac3901820f9c9c584b23711b17aadca6a85c9becd8fd8 SHA512 27431a25984ded5a3ec7898bdb66e2187622fdaa3a542a5fb7ff19a14e1d3e63accb3416388fa23cd054bca302117674464c854a8bd334b2cf4b8a83c3ab947c
+EBUILD poxml-19.08.3.ebuild 408 BLAKE2B fe25b5b50848cadf63158800471aaf880a87de1ff2aa97584525489cedcb21139e52e382c18f2cd89df03ca7a1685ecac214fd3234a7f7be8ca502e38929f5b0 SHA512 92ff60b04c3aaab8f576d6d7a6a0ef9320630bb19da30bd6837b7178849cbf4e62122043b02fcd35aea303393084d0d962e7ccb3f7be2ebe42a9ca12305493ce
+EBUILD poxml-19.12.0.ebuild 412 BLAKE2B 64544866342058ca1a79b97cea77c07b9515657171f57467859bc6c2e33f4f3e564ed03b0c8cc13d3b3506b9feb11f9801b2ca2cd8b3253facbe07278d0e3041 SHA512 b4c8434881b106711fbff937ebd25d486006453a3ca3bb2e74aa3903c5b3335d14f7b808a49393401650558a3296dcd84182af150b9810ce9b8921fb88471efa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-19.08.3.ebuild b/kde-apps/poxml/poxml-19.08.3.ebuild
index 034af592f7f2..946f7cf206e5 100644
--- a/kde-apps/poxml/poxml-19.08.3.ebuild
+++ b/kde-apps/poxml/poxml-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/poxml/poxml-19.04.3.ebuild b/kde-apps/poxml/poxml-19.12.0.ebuild
index f33e75cc3e69..2d2831be4b82 100644
--- a/kde-apps/poxml/poxml-19.04.3.ebuild
+++ b/kde-apps/poxml/poxml-19.12.0.ebuild
@@ -3,15 +3,19 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS="amd64 arm64 x86"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_qt_dep qtxml)
+	>=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 b3a914e8b95f..549cee124ef5 100644
--- a/kde-apps/print-manager/Manifest
+++ b/kde-apps/print-manager/Manifest
@@ -1,5 +1,5 @@
-DIST print-manager-19.04.3.tar.xz 240784 BLAKE2B 8f638c84e59bec4897a84f335adbf285df2b5c5d8284f4d7045902aea1a7e099d8d9e4b8ba5f2c398ac2ca18b8cc8a9f4f7c8420a8c349ccc897823d928d6cd6 SHA512 d0e4972c5b2553a1118731c3c0042c907e71feac64b43135463fc909d729bff5b9479804f7793fbc629dffd487123ad9a8a7cadb64a2a3ce1086d9be177a3701
 DIST print-manager-19.08.3.tar.xz 245476 BLAKE2B 218c2d0676ecc5fbb2fbb8ad60cafdc85ccb388db3577f19867fe2e8a266617d010e67878f34d7c02c1e161923db24d817d7b624c1d6472f343d8bd9c025d66f SHA512 b68d9f28a2e387ee11c5756c18a08e60dfb31561721e97b7d55749c60b65b887c217e096ec8bc27004f7da22700500c767b894b84e16a6d571a4cc8e112ffcb8
-EBUILD print-manager-19.04.3.ebuild 1482 BLAKE2B 42151413f0d6c93eaaf1ad24b2517879d3966d89b8df654dbec16a623c6a8bba3298ee9896c75e5f861ac406104e5541a734fe602bc8c05c4fa211151ebccaaa SHA512 6a7307fdcc7e947e6447a43863887ba36a22f7ec711a9c3834a519ac67cd310d04968e363c31b28839c35aff46eaf9681b5514b055f8f2881273faa5bd1a52d9
-EBUILD print-manager-19.08.3.ebuild 1701 BLAKE2B 3456704cc79cefafa19d527726eefa44caca5bcbc3df1c69d37c533fb5609c41d52d061fc3f0c1b7494b3ac7b75045467bcb11929aca23fb172a5ec5582cadac SHA512 1375922a8214aa1ad235bdc6c6a646bc97ba83b8d57d50c7bdd2324faf623585d462df0716e2cbfa938ef32b02d45d9922b4b562d1418d5fae36848f3a24a71b
+DIST print-manager-19.12.0.tar.xz 250916 BLAKE2B 332a2516c730b5637b441d777e197fe836feccb87457106c16a2f5840ce4d0700da51b72712dff0d5afdfe66308b70c811b099ffb0c6658f52b9d7d46c006e00 SHA512 88c30d81521de51da98c04a2c3a2584975376f14771169a95df9f9f1635a39a19eaef3c94e44bca44857af8b7de11b6e2ef159562cadb4cbc57ec7cce7914f48
+EBUILD print-manager-19.08.3.ebuild 1698 BLAKE2B cce96648f0a741a461a7721c9b99db6670f332a5ef6e7476eae9bc4d3725df7c48b15e095f47d2686a1763a207b54343f7f30c9c8341683bc45f205828c2c756 SHA512 7f7e435a291710ae8d4344bf1a21f13a2ca44d382d1064206f499ad734a279cb4c8cdc64b9d554c84bcd4393d663614f6796e1f7a4298559a1e7fa685bc9e0e1
+EBUILD print-manager-19.12.0.ebuild 1702 BLAKE2B c5da94420a6c375fb65439eb3879d30e86a62f54171386af0055c281e301357050875c7356017a8292f61d3f46a916ba908d8d0752b51ea17c7db12f7185b8f6 SHA512 f1ec6fc9a83c12760518cc439472c38b3c6b6fea16c789709bfa1d8f16b0acbd2bbef2325dfd6ff53c652039101c1b1776d0c2bb279b1c549510f20922ef96ef
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-19.04.3.ebuild b/kde-apps/print-manager/print-manager-19.04.3.ebuild
deleted file mode 100644
index b9fb8b4ff4ea..000000000000
--- a/kde-apps/print-manager/print-manager-19.04.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Manage print jobs and printers in Plasma"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+gtk"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	net-print/cups
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	gtk? ( app-admin/system-config-printer )
-"
-
-pkg_postinst(){
-	kde5_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/print-manager/print-manager-19.08.3.ebuild b/kde-apps/print-manager/print-manager-19.08.3.ebuild
index 0b87778f9c26..b50f5f48fe25 100644
--- a/kde-apps/print-manager/print-manager-19.08.3.ebuild
+++ b/kde-apps/print-manager/print-manager-19.08.3.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Manage print jobs and printers in Plasma"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-apps/print-manager/print-manager-19.12.0.ebuild b/kde-apps/print-manager/print-manager-19.12.0.ebuild
new file mode 100644
index 000000000000..b490480fc950
--- /dev/null
+++ b/kde-apps/print-manager/print-manager-19.12.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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 ~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 1c9a61c37cdd..14a462f9f285 100644
--- a/kde-apps/rocs/Manifest
+++ b/kde-apps/rocs/Manifest
@@ -1,5 +1,5 @@
-DIST rocs-19.04.3.tar.xz 1515844 BLAKE2B f554f5b918f43cfbd35483d90a2fcedbdda46888a9deb3d310eb88761607322ec18fefc14afa5f95bd464803a4fcc3b4f1a3b5069cb3b92e945d3123abca075e SHA512 8686047f654604312e2228bae7558483fce908f23e980f66c3ef2559f29684d056db20a37207ad05c52badde5debc626f2de7224357a93d78dc84e84737bfe14
 DIST rocs-19.08.3.tar.xz 1518032 BLAKE2B 15806d0585d001d71c9fec815fe3411f518da642d059b3fea4e2a1b67b6ae0db71ca3225a9a8e2e2e2da0317bfd2022b0f1b08e0c118325e4d69f041c7a43c04 SHA512 be33c38d698ee71ca3fd629c96dabd60cf47ac684021a6b8a60ded856476093c0cb09a7b75252b17457abe5430439cf19d81ef108f7d18ae4782e0d6c0c20d7b
-EBUILD rocs-19.04.3.ebuild 1175 BLAKE2B dee79cf99fdcd9b09bc29c803d1c6b627ed395750faf1432231b0d067b8635e8248b345b261374d6ee8d76a1f6fda7cccb6293a70287aae61eab6e7dc0681e83 SHA512 749bbdb6e7b6eb7df5daf14307f1d40bb22be94f7ad862e17a9acaa7d4e630179510ba432b83945a2dc7c6be340186b7ad167985245db7a15d89fb782697da58
-EBUILD rocs-19.08.3.ebuild 1374 BLAKE2B 129847da71a1e7af2d5594c66b22d021d8c360f33db9185733a3685cbdf10a20a84757ff614d1a75d2386f8438535525bc81e88ec67b38908ffe87b81e37b141 SHA512 96135cd0652dde8d9b22980a7635922eb78ad4d96fbd987cdba4fbc19e0f8b5d4b47d992531148af1eeab5478d357c45916b2b530262c1da566fe79a8c2d759e
+DIST rocs-19.12.0.tar.xz 1523364 BLAKE2B 55c1ebc2b61482fba73b85a563bd68b2d8f0126445add8e2e7966f9f6a9a007855d8a32a9fc1a40acd7eb13dfadbbad4d25cb32d1081cfd5266204984e468673 SHA512 11d9c6a0e6234c86752e07b5037ddd066673459c9f2bc1a779bfe54a06bce796af01b79af811c056f59ffcc85233ab357502a3597eeb21b5112d0f681cb51c6a
+EBUILD rocs-19.08.3.ebuild 1371 BLAKE2B 728449dab498ee953da86bacf16d802f79208c730557fe96296612603d625a36c87abb79102a036967d394ede8a17b382004c0dc2a48a1646f3dc33893879239 SHA512 69eb49eea2b3e236b9c4bb9fc517bf05bff6377c51ab80302099b9f8013eacbbacaa452ffca96ae4b600d1e66d10cdde773af12395a2a971687f0fd2f2e19cf3
+EBUILD rocs-19.12.0.ebuild 1333 BLAKE2B 62598badc51dcec3ffbca6abaa04d7e51f60cbd32e6b52de0aa00012fa68ccb10a3a01a73d9acea9dc1bc8b9feeaad3ed00ffcd330e74269a51b0214931fd7cc SHA512 2f7785d2d1c06f4fda1fe5b1dac1f3b8c5db6b9333a0c163390a210055a79418cd73f5ef868134bab9f51f8f17faf34cd07ed727077bb309b8673a99c068a81a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-19.04.3.ebuild b/kde-apps/rocs/rocs-19.04.3.ebuild
deleted file mode 100644
index b1ef6a321117..000000000000
--- a/kde-apps/rocs/rocs-19.04.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Interface to work with Graph Theory"
-HOMEPAGE="https://kde.org/applications/education/rocs
-https://edu.kde.org/applications/mathematics/rocs"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript 'scripttools')
-	$(add_qt_dep qtsvg)
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	dev-libs/grantlee:5
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.49
-"
-
-RESTRICT+=" test"	# 1/10 tests currently fails
diff --git a/kde-apps/rocs/rocs-19.08.3.ebuild b/kde-apps/rocs/rocs-19.08.3.ebuild
index 38ad411761e6..1b70317af6aa 100644
--- a/kde-apps/rocs/rocs-19.08.3.ebuild
+++ b/kde-apps/rocs/rocs-19.08.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/applications/education/rocs
 https://edu.kde.org/applications/mathematics/rocs"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/rocs/rocs-19.12.0.ebuild b/kde-apps/rocs/rocs-19.12.0.ebuild
new file mode 100644
index 000000000000..4a75ab24d625
--- /dev/null
+++ b/kde-apps/rocs/rocs-19.12.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.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="
+	>=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
+	>=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/qtwebkit-5.212.0_pre20180120:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	dev-libs/grantlee: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 497ac8f63f6c..0ed65f040979 100644
--- a/kde-apps/signon-kwallet-extension/Manifest
+++ b/kde-apps/signon-kwallet-extension/Manifest
@@ -1,5 +1,5 @@
-DIST signon-kwallet-extension-19.04.3.tar.xz 10624 BLAKE2B 711389e25a713dddb93200d91b611ecce3214840d22346064dd27db689d5885995dcfcbeadb19d16beec587b7146980c5b146e46ddc10bf5f34efa9cd4e7f72e SHA512 489bf544078cf2939d9a0f75a5b35984e104c21be212922bd65be5bd685a65a54435e92d71ac8c5394c54d3e299870db59f584c91d8ec7028131f12d42e4aea9
 DIST signon-kwallet-extension-19.08.3.tar.xz 10616 BLAKE2B 1e38b87883ec6aa86f2e626575ac4bf8aeece3cafff766ee7e6ff808f5e004f72ab89a7e3c9a876d738c963e906a3f9eb8c06fbd23a2e306bc19955eaeaf9aaf SHA512 c7fc80dde77d1eda25b00deb7c6125e94e714c167b60f27dabaaa24d59975bf3e6ae404753ee1fbb7c416dbdd3366a53105532c5e18c4ca472c16894293d3391
-EBUILD signon-kwallet-extension-19.04.3.ebuild 328 BLAKE2B d2de9fad64063fae0884781b9e1b5b030dd0db9bc312a758b1f3f6c43ca0847884821753c102b02596b055f98936d0e45187b740a216403fc75f2aedf941e443 SHA512 a76771bec97e060090887d8dbe7c51519d0e1d79e0390a55b393864596bfed696deaf05af1f7d1629ac0fe10b721c97eed3d1c1cf80e4daa0d3d1f8a623a1829
-EBUILD signon-kwallet-extension-19.08.3.ebuild 366 BLAKE2B 40da899b106afa86a6e0e7302f874bd19a99e6dd2ecf7101bf823820edbe5dc8d230e898cd778bc9f9923a95aff39227e08ca3c27e6a90232eced231db979f4d SHA512 b99ff4868add82ba2984806b1c3913e0c29a41d5c516ef3fd0a8c36e511fba2d048a6c8dd70080d1dd179406920f5ba38c88d20ca8b364f6f7fd77e725ad4563
+DIST signon-kwallet-extension-19.12.0.tar.xz 10604 BLAKE2B 40f849fcf32137f865ea1231cf657039d5ec7a1fc98c0e7bb8ad8e09ec16f6196ceacbc96e6df5d4053d51c00af4005dc6d7afb637a7b2f2e5c693b2a9b73f4b SHA512 ff35d46c6a3db9063ad19a3016392e703293afccba1591942f92315d2177c6cae5dbe4c8a1baca5325fb43d3f4c7981b06450f3d0e101a85b5fe8b4c0acde75a
+EBUILD signon-kwallet-extension-19.08.3.ebuild 363 BLAKE2B 9d35be13531fb5339c96e8c7c0f0e545fbe778aae2e4651281cf03838c8aa1ebc207eace9e88af7801d446f421316d83bdab99ac47ce8298e3c24d67086e364d SHA512 a60cadbb4ada67bcc66de291a53073f490b38ef6cc023adf5230e74c3fe6c04e71048b92260db0a1e93f599a88f9114234ad328c583b4368af97ba4018664f03
+EBUILD signon-kwallet-extension-19.12.0.ebuild 367 BLAKE2B f7a93df7a61d9c47dc86857ad970e41bbeae6364f6a02ed4c068616b6837c7917d1f55f53a1959feb5b4e1f70502115e64d5701570f6c90d938f73381df89e55 SHA512 e159d1d4f4fb5d390253686dac12694478ef7874b0eb34b23ea5e84202a1299f47395a35d835b69ee7fa4bf9e3d303b0fd7a157a91beec3cee7b3b25b52ec1b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.08.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.08.3.ebuild
index 0b2289f3213d..aec8361d4c58 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.08.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.08.3.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 DESCRIPTION="KWallet extension for signond"
 HOMEPAGE="https://01.org/gsso/"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 LICENSE="GPL-2+"
 
 DEPEND="
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.04.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.12.0.ebuild
index ce9961865688..9060f051ee1e 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.04.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.12.0.ebuild
@@ -3,15 +3,18 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.63.0
+inherit ecm kde.org
 
 DESCRIPTION="KWallet extension for signond"
 HOMEPAGE="https://01.org/gsso/"
-KEYWORDS="amd64 arm64 x86"
+
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 LICENSE="GPL-2+"
 
 DEPEND="
-	$(add_frameworks_dep kwallet)
+	>=kde-frameworks/kwallet-${KFMIN}:5
 	net-libs/signond
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest
index 9b044a4c444c..2298374c5be9 100644
--- a/kde-apps/spectacle/Manifest
+++ b/kde-apps/spectacle/Manifest
@@ -1,5 +1,5 @@
-DIST spectacle-19.04.3.tar.xz 958272 BLAKE2B 1bf11d7281b4fe4c22dca25752f037f5134966775f162e2e06865a1ea6fbd74a5b33bf17f75e51e48bf762dfecc8e830be071d08f0cc7c580cf85c58f5cb18ee SHA512 e26b73e8523d65956f6e744ffeb15ed1f63fec2cf2f1352ff5ab0f9c208d30efeb43665592a215dcfc65e0cae201675f5a14a86c23e516b3fcb30902ef71143e
 DIST spectacle-19.08.3.tar.xz 966512 BLAKE2B e200150e886e5d0aeba39608b2e62b718cc30bf9443fc59b4cfa425ccf716c1d0e0fd3c81ad447b154ad50392708e8067d945587752a21ed72ce26039cbcbedd SHA512 36a023b1c32c71ff60ba3613800abf16b877f8069937b7feca9d57faab9fdd8fb9db259bec33f96caded688b85e81ad89a6725fa9fb65369f97ad2133273668f
-EBUILD spectacle-19.04.3.ebuild 1342 BLAKE2B b28979b8c97d4cc1b21adc8f536ce391cc9a348d367f9cb10ccf85eb783dbb62dd870b150e45866a9d93455704faf91471b4df2fe92d05dc685ef02fe911a239 SHA512 e98168becd28342f5711d321730af871cbacc15f7ea17b2e31cc59fb29d582f8d8c3bfd505f8c5471f227cbb0aff4b764b566f02f58d095a3db5e78956996d1e
-EBUILD spectacle-19.08.3.ebuild 1519 BLAKE2B 00f89d9109d7ec6ec700433d6e7a28c742ef99bf96a3ea455e25682896f47e5007f2e6b0408dab791322ca41fd59f63184995c5cb56f041c7d228c6d97293a1e SHA512 496f83f56311631fd8ae8b332156f2ebaad06ffd0a98441bbf936ff9dd76f0f0cff9e29642d0f465cb64f45ba5ec114f97614fc3e779947a5fbfb88f4f12ab3c
+DIST spectacle-19.12.0.tar.xz 651208 BLAKE2B 6b8569e7234cc7bce5d26d5f84cee586be569e0627f4e116c420d5aaec48f6014110a653a85484d3b5761bf1ffc976d6aaf6cff0e46aca6d000e85ed047bb38f SHA512 b1ae329943876d4f634d3112304ab4f21a6fa24526ad15d19e2a058506c41a40c872c62ce58ed988c416334d08219c4d93fc57adcb8292ad32cc260b9ffee6c7
+EBUILD spectacle-19.08.3.ebuild 1516 BLAKE2B 23d0bb56942a79a7a3c24007a3c8bcee2008b848da48db84850c078f358607c53b6b2b835fccbbf832a6e287447a913b8893f200d7dca89336473f325d53b0ab SHA512 4289573fb9db85f4061afd7bf49689a2ecc62fe2bb01b07792ba436830e68bd80566513368a8c53311d70953def824af68dafc251f720c2d018fc2a6da63bbd2
+EBUILD spectacle-19.12.0.ebuild 1576 BLAKE2B f7dc118e2eaace191480a715ca5845e12864f1cd17f9f9e69eac728fc501330f883222e8aad54870a5d22734130ec47026ff13cbf5910988c040a888719dc6f9 SHA512 9415285d90ccae580f1d8ebe7dbf5385c54bad09b31b8a54d355c2341e85ad89d9ff7e5ae238fb2e16897275ee03a109486a67f1751457d333f50b7f44099277
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-19.04.3.ebuild b/kde-apps/spectacle/spectacle-19.04.3.ebuild
deleted file mode 100644
index d3cd140b5782..000000000000
--- a/kde-apps/spectacle/spectacle-19.04.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Screenshot capture utility"
-LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
-KEYWORDS="amd64 arm64 x86"
-IUSE="kipi share"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	x11-libs/xcb-util
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	share? ( $(add_frameworks_dep purpose) )
-"
-RDEPEND="${DEPEND}
-	kipi? ( kde-apps/kipi-plugins:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KDEExperimentalPurpose)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/spectacle/spectacle-19.08.3.ebuild b/kde-apps/spectacle/spectacle-19.08.3.ebuild
index a2747989c551..4124e27822eb 100644
--- a/kde-apps/spectacle/spectacle-19.08.3.ebuild
+++ b/kde-apps/spectacle/spectacle-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Screenshot capture utility"
 LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="kipi share"
 
 DEPEND="
diff --git a/kde-apps/spectacle/spectacle-19.12.0.ebuild b/kde-apps/spectacle/spectacle-19.12.0.ebuild
new file mode 100644
index 000000000000..d625a8158edb
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-19.12.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 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.63.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 ~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/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 1e87c05107f6..4f2bca093ff3 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -1,5 +1,5 @@
-DIST step-19.04.3.tar.xz 862920 BLAKE2B 63fad0cb0d22c60220d046773c6f717f954eeaa5a4e2cd8fe6e40e34d361dd3ff7bc9de690cdb7ffd9094c9eff295fbb424ab8a97cae043e54b35809ac2db162 SHA512 d67df9dcd8c84c1358ef0b531808e3515749c255f6fae38a54b5656256bb10ac0b508836ca758baff2b4b3d3f47c736122de29f4f50a7fee72e91e17e08aeca1
 DIST step-19.08.3.tar.xz 869880 BLAKE2B 29efdd4b38df7e171a02102459124b33b4c3e6fc7bf2d07db35f76e298226a7417922d10c459fcaf6b07c42166afa0c216067ce711667ebee4460bc5ebf4579c SHA512 685529b065d46cd6b1fa0fc29c71177763c8dadbbe541795766820d6797a0902b0b51c5bda58ad23338c573368e2edf440da4596fb877d175c06f3ca362fae74
-EBUILD step-19.04.3.ebuild 1419 BLAKE2B d777ac10559edee96a4da72fd4f709a0a82a931a9a4d9c6be83de65b15d14e7dcabef991262d7aadb734993226150e420ae2168b60fbf4f0245aed9ea5fcdf42 SHA512 1ddc66649dcd0d039b096dac9a0bbee6b3d3c96b0e9a1e9eef560b4a4f3fba56888c7038c87d184b4fbb38d62bf64b7693b731061f7133022ba38e42d0411586
-EBUILD step-19.08.3.ebuild 1618 BLAKE2B 642eee7a6597815d6b76b307153528e302a1429f0824eee4bee830b1f0e1c4f2ac9237359d54a6a2cfc80eed6609d215d06d3ca247dc0202a6b1f81705d68d5e SHA512 d0a63019da69027b6f843444772b55eabb736e305a6a2def7531872796f6e5f8027198bc5d3c1a02adffa162f96c4d6f4b3477d2cc4ae9fa0a4df6b7978d642e
+DIST step-19.12.0.tar.xz 905528 BLAKE2B b0756fde3f260a2aa0edbdbc9012d05d24750c65d1cef3535e1a6e8594f3c7452688fe45c4388253581f46b11786ded981ba3b3c01561eb32a38e2e00e431290 SHA512 9242677992acb1410bf4b06a8afce17e7b024acebaa8787bef0e0d1984405bcac30c7c532e255d6c2bf597179b9e286869a5a359c12e9a6fd3f980ceb8cc1f17
+EBUILD step-19.08.3.ebuild 1615 BLAKE2B a3ad5b655a5f9515c28ea8ab77f4983b6a794a29f7cfec07b72799ba0fc15c1b2a1e3cda5144c2ba07549b5db5022b6abc1cde7089231aa7a6cded7486ba16f2 SHA512 206de0b635fd1d9e48f9cd25a66f1f32ce20d78d48ecd2a8f964297bf8413762a54f396d7b14d818d56847b30191305d24b504ca06ab4dc75e03b8cbdaea881b
+EBUILD step-19.12.0.ebuild 1624 BLAKE2B e42d70338bc95758b66da572858f3ecffe0b1cbd2b726df777b1695b7fb8bb3646e69596592eff3ca59acaf80ea5ddf755c3790c5447b604ee4ac41b5cbe9b02 SHA512 da99452d1e17444ecc74bfb163adae42e5a27e0a26763e0c70523aa91ee0855aab8e55360cfa820817e0ff781df53fabdb7d93de3b2922b436e03659640d3c64
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-19.04.3.ebuild b/kde-apps/step/step-19.04.3.ebuild
deleted file mode 100644
index 511e6e745efb..000000000000
--- a/kde-apps/step/step-19.04.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Interactive physics simulator"
-HOMEPAGE="https://edu.kde.org/step/"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+gsl nls +qalculate"
-
-BDEPEND="
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtopengl)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=dev-cpp/eigen-3.2:3
-	sci-libs/cln
-	gsl? ( sci-libs/gsl:= )
-	qalculate? ( >=sci-libs/libqalculate-0.9.5:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: Drop duplicate upstream
-	sed -e '/find_package.*Xml Test/ s/^/#/' \
-		-i stepcore/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/step/step-19.08.3.ebuild b/kde-apps/step/step-19.08.3.ebuild
index 3864e7b04a04..b2e34d926751 100644
--- a/kde-apps/step/step-19.08.3.ebuild
+++ b/kde-apps/step/step-19.08.3.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Interactive physics simulator"
 HOMEPAGE="https://edu.kde.org/step/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+gsl nls +qalculate"
 
 BDEPEND="
diff --git a/kde-apps/step/step-19.12.0.ebuild b/kde-apps/step/step-19.12.0.ebuild
new file mode 100644
index 000000000000..72b0da08fe48
--- /dev/null
+++ b/kde-apps/step/step-19.12.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.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 ab0070568c77..d993d2b5e01b 100644
--- a/kde-apps/svgpart/Manifest
+++ b/kde-apps/svgpart/Manifest
@@ -1,5 +1,5 @@
-DIST svgpart-19.04.3.tar.xz 20824 BLAKE2B 42ec7889e9601c63db693af3442a5d48aafc15f4b77c13e63a8de3c9b01a49ce470f7878bc8ba5e6cc6a98c0735f6941c0ecfb5a2bcb93f974b0ff148b8f952b SHA512 b6dc2c02753f3a57401ef0ab7549c1b44c7079719a70e6318b4b3cf5386dba0a30889fb0f74eec2397d4cea76da9cc14a4f606fcdfae937d5d5265e44f630235
 DIST svgpart-19.08.3.tar.xz 21264 BLAKE2B bc38e3b50620610f24a34f2dbe87d046cfb830dec2e5486a99299cffd1737515d5580f8b4d63ea9455a9704d4e90d40b37ddfc67e5ce7aee39294d9cd6eaeac1 SHA512 681e3423059bbfb42158fe12569399874f6cfec97aaa39af77476f2ac009eed8bdeabf9c746cfc273564f25ed68d88bdaf2fdfeb39088f3f261e76de007711fa
-EBUILD svgpart-19.04.3.ebuild 478 BLAKE2B 07f8e70edab69e0d6e497cd770489a7f98edcc9b5a198c8de03274c35721c69f02ae0e163a2f06d641c16785e238592e540fc475689029d80b169ea38b794375 SHA512 133a665d349bc85c4cd064c7a125ff934ee229c7f40c4ecc0bdfe42d4d3f08e10149faf83d6d48951402d8ffc448459d0e17191fc4484def188b20c804543f8e
-EBUILD svgpart-19.08.3.ebuild 571 BLAKE2B 6d05d1393c8bd819feb105273c15942309f2ebb0f096b833428d98f63968194f9365442941edf17261fc122ef9ace2ac92198d0fe7c8da4fa1a113a7fdfb7811 SHA512 9eaf756c194c542850807a3403a2618e5879be0e84c30eae910d4616e699f923b99a18866b7af3554cb26ec41951eae0c804e1c382b4bb0ce11670d009f0d42b
+DIST svgpart-19.12.0.tar.xz 21256 BLAKE2B 20483f2f6b05662bcf660d2300c789877212fa87d0be8013d96a5e58d7ce9fae0e7f05ae4264dd5aa61715ad96fda46bc7105cf3e94712e2d126104c0ec849b5 SHA512 dcf87237c25220153f06f0118ebda08e5126e44de8a4d8c8bc606273eb068e6ea1fb387dff494e9e5f43ec24056090f25ff021ded491b1943f1a5c4b6fab30eb
+EBUILD svgpart-19.08.3.ebuild 568 BLAKE2B d3592c1dc1c98b46ccac575869797a5e50a480112267bbe458e46844304486cf7b206179aa52476d3606a090ed7a902f048516bf8f922b4219e3e507b922b574 SHA512 67a796d045505f30a6bd0643de39cc7e9e08a57ee4897f6160deb9da47166f6fee21d04785c4c5073be42e06b36f00b9417411aa2f64f8ffcc0d59a2112b39b0
+EBUILD svgpart-19.12.0.ebuild 572 BLAKE2B 92fb20e09f30341974ea0e7cd6c9361786743648b86c6cab1b932165713af14087349fd57eebd35541cb5de0211738d8713ca9a5e05fccd788f9bbac7747fc3e SHA512 2a545d9519be82914a5ffcfb2808905cc1dfff07946b0c3f986bacfe702338b0f0dc8fc5481c07fb5176fc724a9831dd9330c4d49b7cbe29bd5dc2c31506c22a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-19.04.3.ebuild b/kde-apps/svgpart/svgpart-19.04.3.ebuild
deleted file mode 100644
index 0d9d149c2b11..000000000000
--- a/kde-apps/svgpart/svgpart-19.04.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Kpart for viewing SVGs"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/svgpart/svgpart-19.08.3.ebuild b/kde-apps/svgpart/svgpart-19.08.3.ebuild
index 014290bbf231..282669dd01dc 100644
--- a/kde-apps/svgpart/svgpart-19.08.3.ebuild
+++ b/kde-apps/svgpart/svgpart-19.08.3.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="Kpart for viewing SVGs"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/svgpart/svgpart-19.12.0.ebuild b/kde-apps/svgpart/svgpart-19.12.0.ebuild
new file mode 100644
index 000000000000..284190326ee6
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-19.12.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Kpart for viewing SVGs"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~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 f50c8d92017e..e42ae903468f 100644
--- a/kde-apps/sweeper/Manifest
+++ b/kde-apps/sweeper/Manifest
@@ -1,5 +1,5 @@
-DIST sweeper-19.04.3.tar.xz 368208 BLAKE2B 5d498a6a96942db09a6bc67c3fd32ac175a6f1445c15a4856eba37632008e45d9071b8c42c2e2b510ed034a8554aee6455430999077d3626f1a941a5fa55dd32 SHA512 f4ffd154a0d77407652f6d4e8fef0ec29263247aacf6c1de0e4261a5be84387aabf98a47664791bc6cb9333c84ae05c4f83c25f6d2df41884d1236a18354eade
 DIST sweeper-19.08.3.tar.xz 368332 BLAKE2B 2fd839ebad7907960fb7481415e01fb5fd4aa9203e6aad422496f7be7dde1814a6dff270b86cac15d4b463f1a26efa44da430dd6000b21737214724cd8a34436 SHA512 acdd7ba323c9763eba762c919489bdc5bc81a877616e13167bde9c5ae8cd9f09fd11c68c200b76f1c79c53b67c41fa56b012f422767a1662320b5aef0731f393
-EBUILD sweeper-19.04.3.ebuild 858 BLAKE2B 8ebccc9f81f538e762ef6387b6aa51cf088268bbb793142235157fa9d57028b9f21159c19251b58b5753e511a0cec8696cff27a01d6b1ed7fb886a86945739db SHA512 5b5dcb87d0ade486ca5b5fc63b05262c37c6862c5cffa471ff339852a684d106c503039f1b13ae736b351a61ff13ce2856d26a2e43a5e7f8560ece8352e2194f
-EBUILD sweeper-19.08.3.ebuild 1023 BLAKE2B e61e5252baf738b5995a84159730ac649012aa21b584128fbaf41bb057df1a28cb5da33c83781d4a6258b6732e793539bf755067e0509cecbc4e67744079bb0a SHA512 f3dd49f2da60f2a015c5c4f601566d8f38dc2e24cae495b964be7191c595cf43c46164989505b3b2c0339d83af8e11a39147bd6172838b27cb0fcb15c1836730
+DIST sweeper-19.12.0.tar.xz 368636 BLAKE2B f9bb79a9a47e16320a3da743e62ed64de93ad0fe923eec6df1ead1edeeb5883d021d85343a9ed7e41e2eebdae143b1ff562d715ee0c11f7a65a64cc198703277 SHA512 4e00b366ae69c7b806f303abe3f15a4d94868145235954bd7587843c45677eb6f284d717fd0244e6e37356b047a6ef46e4f6ee41759c99b04403f9b7e39a4db7
+EBUILD sweeper-19.08.3.ebuild 1020 BLAKE2B 070056c1dc93c1fe4df7b78c5eb17293710e8fa5975645bacf76d418c1cd09121ee3c87875a3b3aa10eef4d28155408ea954f1bd26815c3bf59eb0278b73d5a3 SHA512 2ebc64fcd67662f13208cafc908aac80719b0673b78e1fb83885cda7b506d0770df91c7fd619f6c16a6a31be15a55b01d1a04cd3b5f67f61f2db310089f02530
+EBUILD sweeper-19.12.0.ebuild 1031 BLAKE2B c7c0676cca83b733e01a07836bc756956244758668f48e011d2f811bc5869ed7d5c844d7fbc6272c002c7a821cf6430fcbcfe830a45eeb8e6adc63728f1b52d7 SHA512 56bce34cc357a984599952d48596840cca1648027120597276d0f502db88ba81f2afaeb6edba487f26605ed23e0b2a18dea76f3a5aa14c9a3eca9cfdc523836c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-19.04.3.ebuild b/kde-apps/sweeper/sweeper-19.04.3.ebuild
deleted file mode 100644
index 4715aca1e24f..000000000000
--- a/kde-apps/sweeper/sweeper-19.04.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Privacy settings widget to clean unwanted traces on the system"
-HOMEPAGE="https://kde.org/applications/utilities/sweeper
-https://utils.kde.org/projects/sweeper/"
-
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/sweeper/sweeper-19.08.3.ebuild b/kde-apps/sweeper/sweeper-19.08.3.ebuild
index 0dc69327eded..61a1460b4944 100644
--- a/kde-apps/sweeper/sweeper-19.08.3.ebuild
+++ b/kde-apps/sweeper/sweeper-19.08.3.ebuild
@@ -14,7 +14,7 @@ https://utils.kde.org/projects/sweeper/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/sweeper/sweeper-19.12.0.ebuild b/kde-apps/sweeper/sweeper-19.12.0.ebuild
new file mode 100644
index 000000000000..2e677696fb92
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.63.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 ~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 4be145a20cba..7cdd47c2ba3a 100644
--- a/kde-apps/thumbnailers/Manifest
+++ b/kde-apps/thumbnailers/Manifest
@@ -1,5 +1,5 @@
-DIST kdegraphics-thumbnailers-19.04.3.tar.xz 42992 BLAKE2B 485f3e08c6995dac03bd52dd0cb4b07749129a4250156dd5a6dc4c7564201678e02aacbeac90bc0d07d8938f5d0ffaaf9e68210b1c30923259588123853b91e0 SHA512 c2b4168b2f5e24ca1d2dc9bdb32bd04d04340d735efb4b6e7ce60cf31fb0eb58aba5aa192eddb76546527aab1fc9b1d28efc568c0b9fbfbc838a07428a7baacd
 DIST kdegraphics-thumbnailers-19.08.3.tar.xz 43564 BLAKE2B 823310ac379467405b555a9e111ea717d87ed4f25c2fbbc415c94e7496263e1254d28e8ee1f2a7ad6ff491a32ca803260b88d85ca0fe719bd0bf2e02bdf6659f SHA512 0ad62b71fef59868ef7c4a0486c99495d769bc8e0b364410f4b7cbd0f84bf4c2e24c13a3d398eb210fde0e226a44c1939a4d8aaea2090686bd83d4582bc0df65
-EBUILD thumbnailers-19.04.3.ebuild 623 BLAKE2B b524f40352154ec6cdd750a6ac1194165a9e4138fac38aa7903d7ada94ff67ee91d700b36200618a11050b0c95c25607983cb56bc853b4e4cc75b7f5bfbbb237 SHA512 e1c10d9ea5dbf9cf7c71cda92c872d358e1ea1a7307dc41a3b676136e7d746232221b6695c6af1ba96c1f65a17fbce97142861e5dfbf74503c91cf8df55ebe3e
-EBUILD thumbnailers-19.08.3.ebuild 718 BLAKE2B 06d29de34d20516e9179aa9ec083afd97b769cf835f34e1a76e1f04be5e26f14e52eee1391013410fed0bd784df0149e7daf950b480aede2998182bd3ccf04b5 SHA512 8c69b0195f9c7f2aa1eeb3107677303a9e067088b25c2751a0160b8039fea4ecc2a84884314f50ec4d61776195f750d5bc4da9189dc8c3981e944497e2ce672c
+DIST kdegraphics-thumbnailers-19.12.0.tar.xz 46188 BLAKE2B c5380f5c840365cf67232c15c9bf995d8ac9e1ac94d6b5febc700e38bd8c33e62bfe3a772eb0dda4439950bd40b9a354a0e8bc0d41a1c7ee3b0a238c886b770f SHA512 bf8e8f91ee345ce2a5282de392bd441d5043394ad308b042fe9624585904faaca501e96f35b6d90dd9d93e9fbc0ee1d39593217eefa291b84c5d758fb912e293
+EBUILD thumbnailers-19.08.3.ebuild 715 BLAKE2B 963256d0559a38dbdd3fb521ad7ec1a5579e8aa3f28e9b734420139320b14f40148a421970c1ef3950c1b8e655c7633c7529e7804a5cce0b8dcd292552e55dcd SHA512 34ee2ac50062bb54078c8ad2fb6cf79fe0a1203f5b027f7d2756978d90ae65bae1a3d1f47e5e602a3a01a29cbdba7dcb77a6b76bf60ae0e7b9efe906400ec477
+EBUILD thumbnailers-19.12.0.ebuild 707 BLAKE2B d89f7d560a1b2976769cd35c01b8c84a7edcf8842e886907752ea9d2fca86f67480984429c7e9b4a8b615e57cb76015dabcad544f92b66ca5834151f411fd2dc SHA512 59d610adc2fbc9224f70b53feef5ff89df93e6b090c0ea8199d970d68dd4c098543c2357b890d1a8705f279499f61398bc8bca9edccb7e1c8e316514a35b5b5e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-19.04.3.ebuild b/kde-apps/thumbnailers/thumbnailers-19.04.3.ebuild
deleted file mode 100644
index 17ea29642d06..000000000000
--- a/kde-apps/thumbnailers/thumbnailers-19.04.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KMNAME="kdegraphics-thumbnailers"
-inherit kde5
-
-DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 arm64 x86"
-IUSE="raw"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
-	raw? (
-		$(add_kdeapps_dep libkdcraw)
-		$(add_kdeapps_dep libkexiv2)
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package raw KF5KExiv2)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild b/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
index 9214a476dec9..db2d077bf3c0 100644
--- a/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="raw"
 
 DEPEND="
diff --git a/kde-apps/thumbnailers/thumbnailers-19.12.0.ebuild b/kde-apps/thumbnailers/thumbnailers-19.12.0.ebuild
new file mode 100644
index 000000000000..580410f92a48
--- /dev/null
+++ b/kde-apps/thumbnailers/thumbnailers-19.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 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.63.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 ~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 d1e7b74647b0..84e5b2fb57ba 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,5 @@
-DIST umbrello-19.04.3.tar.xz 3689040 BLAKE2B f5225082dd67340fdb17fd8b04504cb5fa299dfd21c7d79d46c3c120d55b7a4a92855e981428bb8be30ea1cad9032365e9f330b0db4e5a5116951a2596d4a766 SHA512 85add6795409f3ea2ce5b835edc9878ee3bb9f17b52d0dbb56b3230c4ef3b3fd9f4533238112390efd6cfbf33fd084ac8abb759992124926080fb1da64f34b68
 DIST umbrello-19.08.3.tar.xz 3703784 BLAKE2B e992ef076f96da5599fe4315c4b6d8dc948485bf0bd2b14878e481c49fa4fe76087606f58268503dc401e817047d60ee52c27fa90749e28767bf7c4af70b4565 SHA512 1db25788a60e2a639c649a4d01809751b85a122426bdaedbebf6e6cce539b2b0f37893a8a61675df81517d7fe3e57a59377e49fd11e7ceebea5980372e284c9a
-EBUILD umbrello-19.04.3.ebuild 1317 BLAKE2B e94d02b3f52ad2ba733bc0f7e8d27de7bb092cb398e5038e0dbba5360caa2ab44df22634d92091b7eb38f08b526d9572df86ab19621c9b4fd16e91cd18c3485b SHA512 a47766afb2685fe374167c79a3c3d3404aef964a06fadcda1b2a320a6f478e0737c62644a778c9f5d7437ede0fee4f6481d30e1bee7cd0d27487a4b5195f0463
-EBUILD umbrello-19.08.3.ebuild 1517 BLAKE2B 022980cac4f45b1a2bbd39f7fcb5ca6e22bb26035701fa8635095d7f26cfacb8610166ae4a2b0e7b459db0443cc8200d1a58ded6dc388aa7df00a9452da023ed SHA512 c22d5f274f0778f0caf7b5ffa84da05fdda9c11bfeb29b2b60d5d160c0e36c83c1d75b8f6936fe0187091b88da04918b7b884aa113a43cf8a90252ab8cff7422
+DIST umbrello-19.12.0.tar.xz 3797988 BLAKE2B d0d6665eb4ef4df2a4e2f3065fa7ee1a3e492a16125514f5fadcb1e3792f40c6a33a391558a84e8057ff8e3eb1a8beae6a3ebb1a6f65bf10ad766fe7cbd42d21 SHA512 b85a1f099cebe207b65b0f69f6f4c3c7d76c72e7d09e2c025661ad5a8c1ccc6394b6686a59fa1c997d3b29cfaaa67fc4f98d269abd1a5fdae423de8fdf2ab232
+EBUILD umbrello-19.08.3.ebuild 1514 BLAKE2B a5eea2db0fe2cde1895fa17a43dd1af3c246e10b429bf32efc2be1e6fbb721f9438bfc7992bdb3a7bf3584e7dba6abac8009ba7b5981644522b60f1b2d864d82 SHA512 72074ce2dc5f92ea7108f2518882a131c29c400f8c799cef577cc956fea01933d39ac0c16594b7fb069cb8fabe222f1b0db38fe9ed8c854df16ef5f9057c4139
+EBUILD umbrello-19.12.0.ebuild 1522 BLAKE2B 87e21e3d1c570e970d21c3a824e6ec31b9bf97070e0e6d59721ed52c178909ee4d0c1d8d53b2f2cc3a5281acf34009cfb040b63d880afa9a0bc8f2856bbf0cbe SHA512 a99da26f928c152bf2912254e6b8001603984da1865be9bb618f088b383cd29bd7a7cc6499ecf379ef745597816b23cffa201cae57a63328ee1d9ba45fd40d21
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-19.04.3.ebuild b/kde-apps/umbrello/umbrello-19.04.3.ebuild
deleted file mode 100644
index ac2307bc5f3c..000000000000
--- a/kde-apps/umbrello/umbrello-19.04.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="
-	https://kde.org/applications/development/umbrello
-	https://umbrello.kde.org
-"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdelibs4support)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_KF5=ON
-		-DBUILD_unittests=$(usex test)
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
-
-	kde5_src_configure
-}
diff --git a/kde-apps/umbrello/umbrello-19.08.3.ebuild b/kde-apps/umbrello/umbrello-19.08.3.ebuild
index f50839f024d2..33d549509b94 100644
--- a/kde-apps/umbrello/umbrello-19.08.3.ebuild
+++ b/kde-apps/umbrello/umbrello-19.08.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 "
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/umbrello/umbrello-19.12.0.ebuild b/kde-apps/umbrello/umbrello-19.12.0.ebuild
new file mode 100644
index 000000000000..7bde8766473a
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-19.12.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.63.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=""
+
+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/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
+	>=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-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_KF5=ON
+		-DBUILD_unittests=$(usex test)
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LLVM=ON )
+
+	ecm_src_configure
+}
diff --git a/kde-apps/yakuake/Manifest b/kde-apps/yakuake/Manifest
index a41303b4fc9c..460c8d479522 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,6 +1,5 @@
 DIST yakuake-19.08.3.tar.xz 371420 BLAKE2B c75ef829bee62a5e3e441ca3c5c26778171bf9f4455e7259cdecb21a625af30906a50dcfcc5e93d83f3648ed100018e3cc039b6525f9e4658b02c693feecd330 SHA512 6326d1923b9bb3c8923ce0b8238d3668c2911346519a5a2c5c9b3a693829d271a83a2ddc061d079d0f4b414814460b39e674e4cb78bf5d069f883fecf5db37f9
-DIST yakuake-3.0.5-patches.tar.xz 4996 BLAKE2B 0ffef1bf066b962c73ef6a28251d9abf3df66b28cf324bcd2d4f49c7038ba64dd3554490534cb0b001a589c42309253a0cf77683b4f97661d0fbfc17c96e5be0 SHA512 6c66043e22e98d65230de566e4594f4c1bfdcccc229ab8b66d604bf6fa666964f8b05746eb914f65d1e52fa850010aa5016a26b629f8eec09b67548dd2b00251
-DIST yakuake-3.0.5.tar.xz 347412 BLAKE2B 964b5abdbc377b2ff3c1c37ebf4cb2537dde00d8c4178bc7db1785701dee82c600cd775a38896d8ad8976cbe14427df094c4db0c425355b0330d2e8b4fbe23cd SHA512 17640590bb87b7c27e1e336cb82141b986103af95cfae2da129b69537d89a78eb0e21a6f5fb9ab26ed9e572f9edad055264f642afee6012e1a5a5c55d9dc2d22
-EBUILD yakuake-19.08.3.ebuild 1573 BLAKE2B 4b97192bd98cbab8af162ca94e7a3527dcf7cf4dafc31a27ef533e9b6f8b212b584db0f8c250ebb9d47fd5635abd4215f938d39dcbc074c6426650b147835856 SHA512 721917e1a96786cea26af50509a958ecca96d36994e1735f660c296618815e769372232039d5c32f061dacadf09c7ba846ad1cd24ab1dedd7c86cd2de45f7a90
-EBUILD yakuake-3.0.5-r1.ebuild 1541 BLAKE2B ee193f05532f1ff554577cd10a610e148b48a682b7dc33c074eb65db4c4f16bd3a7b9ee08e1aba83db3ea32ca3e45aeccb4211713445ecbbb7788c99b3de9229 SHA512 6ffd18d724193374cb66da852b22a23161fdebf728f53a7d4ea75fdcee0859ad09e4c33b186b29cd16c7556cbe85b3422d5e5651ee8e4fe84312ff50d5415d89
+DIST yakuake-19.12.0.tar.xz 372548 BLAKE2B f07bb473258150926a99049756d2a3d8f8488c14cf966afe22c959730a586ea80a7eaff0dacc95b564e6fda39a89b1b64a237c083ee0131bc4b384cd87603266 SHA512 cd01f7e3ea4f5d68bdb7892c21ed6aba4f7f81b4f28c5e2e36d5c7b77e858749960bb4a6194af89edc3a2eea1abfeb2bacfdad9dffdd175458a9082182234fd7
+EBUILD yakuake-19.08.3.ebuild 1570 BLAKE2B 7f8e84fa2b7ecf68f3c78bb2e9a0a1e2c25e76598f6f65855b8cf11db9aee24ba1602f8d46b3544c7a15792973c9c99a18fafdedb92455c406393db65bc68d2e SHA512 301a2bf0b4b91fb59eb0110ab71d9aabddd08ffc89c07b98f201f333d5cc032e6c3d62591fe1000083d3aaaf582dcbdb09204a7f28ef2f68ea8fff648498844e
+EBUILD yakuake-19.12.0.ebuild 1561 BLAKE2B 5688b7fe6d8b801a6f2dcf6b860900f2c0e082760ed42333e461e5205c1b66036a029feaa1662d3718671ac039f71d5521febe778260d7f0ee5fb5faea68710f SHA512 37a309ee109d0cdd4f9a022dced6e5144c869a6eb8d8e1da17de4e8f3bbea988c0bacbb7b0e19a18631c93c85a488159ef2f23a3dcc54061779d04b22e1bf558
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/yakuake-19.08.3.ebuild b/kde-apps/yakuake/yakuake-19.08.3.ebuild
index 5a9f3cfcafe2..46e4d915997b 100644
--- a/kde-apps/yakuake/yakuake-19.08.3.ebuild
+++ b/kde-apps/yakuake/yakuake-19.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="absolute-position X"
 
 DEPEND="
diff --git a/kde-apps/yakuake/yakuake-19.12.0.ebuild b/kde-apps/yakuake/yakuake-19.12.0.ebuild
new file mode 100644
index 000000000000..b3195f489afa
--- /dev/null
+++ b/kde-apps/yakuake/yakuake-19.12.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.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 ~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/yakuake/yakuake-3.0.5-r1.ebuild b/kde-apps/yakuake/yakuake-3.0.5-r1.ebuild
deleted file mode 100644
index fddb44535f00..000000000000
--- a/kde-apps/yakuake/yakuake-3.0.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://yakuake.kde.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-IUSE="absolute-position X"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep konsole)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	absolute-position? ( $(add_frameworks_dep kwayland) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/yakuake:4
-"
-
-PATCHES=( "${WORKDIR}/${P}-patches" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package absolute-position KF5Wayland)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index c4ea4b77e09c..96cfbf91df51 100644
--- a/kde-apps/zeroconf-ioslave/Manifest
+++ b/kde-apps/zeroconf-ioslave/Manifest
@@ -1,5 +1,5 @@
-DIST zeroconf-ioslave-19.04.3.tar.xz 38576 BLAKE2B 8ba38ba321c392ae5c7a92bc74fecd5231fb63d06f44a2e25149b28345c4e6e8d90a6359b1b4da957a44007c2d9836f45a224edcd091ce21c20d59250684e9ca SHA512 ef2e0ee73df27e4bebdc7b4a08839bf6cfc6b173696a7572568e46c58eb0152fedfbdf09ccdc8ec4746173419851bbee1e1d2819d911f82faaed62e02021466f
 DIST zeroconf-ioslave-19.08.3.tar.xz 39100 BLAKE2B e1255d5b5ca3346c3b708e246dceb630ac5e7c3218032cab82bc327e28f8af2ea114ddc180d991afb3d4c92ddc2afe97492811909d6ed158750da86e8fba187a SHA512 24b7e3f581b99a6305b2fe688c9ace69a7b2ecfc4c7226875b23d2e91b03af1f3dde648c731a25b1bdc091ebadf780a3a06c8cafa051be2579e7a4a65d7d8f43
-EBUILD zeroconf-ioslave-19.04.3.ebuild 461 BLAKE2B 0fe888ca0bbbf69ea98c713cb3ddf49911ecf241aab5a5cc86cb12a388521b5454be33355c22e4c14ffd985310ad8f74415cb4a7e01b4480c3a5a7b1296af054 SHA512 b65c4b895aa4c6738e2a02e630c22b37d7cab94a07fd497d728b9cfa087eebbc82461d1027d6057aba03469d4f6f55e6f87841effe0649ff8e33d57e1c6786d1
-EBUILD zeroconf-ioslave-19.08.3.ebuild 572 BLAKE2B 727b394f31373eca37cba7c4bc12b93df74250cad7b518f7118e2a0bef76ee0f81f085f60c1df987b046cfa2b844a1f470afa141f1aacc6be6a59405d571aea4 SHA512 7b29afd6ebaae1c4ec6cd5b5493da2910adab35d2294fba2b1a4b9b790c905429eb99a8a10c8599ab5ff9a8c6144ccb0727101a09df4d80fe5218fd9f22f88b3
+DIST zeroconf-ioslave-19.12.0.tar.xz 41840 BLAKE2B 85670e42c320d2f3a2cf2e17c3e448d2962067afae856cfb3ed8721ba8fb5c774dae61f19df07ab07b2a6b77176351f78703ddc92516961c2a91fa58f821dc58 SHA512 04d40b0a79323ac138379698db29b3f674533325e965dc22c20891d1519bc25d8acd8baff29553d584fe5563d11cb109f0a9ffe133666175eecca9a85359c9c7
+EBUILD zeroconf-ioslave-19.08.3.ebuild 569 BLAKE2B 63db46925503ed4b25881bab9deeeed83e2630e96b977021071aefe2f34f23e6d099f1b6cdf05ce696a1d7ea04e1d07c7e25fe51d6d42b84cea9dbed6dbe2859 SHA512 20925c6b46281a64ed76a9c96228119060f9f2d71baf360f08e0648177b77a6c5fcfa79627105f86db21c7cbd67a9e2176f480e7c2d2f3e2edbe85c13ee35dbc
+EBUILD zeroconf-ioslave-19.12.0.ebuild 573 BLAKE2B 858f0001ea61d46fb612512c74fc069a7b8c6020958143e8b636afe74ce563ec8e51674f27cd3d11d55f736ba36e3c8b3ed747329a191676420a7807d4415d32 SHA512 e886ff181da13bed453c22d1563aeea45402ff339dc9f3bc63cb6928e1fda37b5fff5157f6db62d49cdcbc2fa0b8fdfdc80186cb321f02dad5d8ffbbc2e89f99
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.04.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.04.3.ebuild
deleted file mode 100644
index 0f5897595a14..000000000000
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.04.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdnssd)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdbus)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.08.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.08.3.ebuild
index 7e28abc605ab..20c5da2b3102 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.08.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.08.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.12.0.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.12.0.ebuild
new file mode 100644
index 000000000000..fbae2adb2270
--- /dev/null
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.12.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.63.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	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /kde-apps
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)