gentoo resync : 18.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
commit: b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree: 16fe44748708acacd909d4e2e160a09a7f6d936a /kde-apps
parent: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)
653 files changed, 9808 insertions, 8089 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 15267a81fde3..2897ca062691 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 0b564289143e..9cf0dfd9ea18 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.2.tar.xz 332664 BLAKE2B d31dc5a814e0c08378f8da44adebd3ef0e5891eb7782b8eec915bc11c9f5cde5f1e753af742135a6fc88f41e768021a859c54c326a1e15ba8a8f8ba33b9138f4 SHA512 387b9c8cebce8f4480e18888f55c183021a9d84d356074b17e4b1def5e6f1a7bd8deae1a54441bad19c47fa16d40d476119ed621ab8414ff42e669584bb972be
+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.2.ebuild 1108 BLAKE2B 83de3d8253a8ac3f6847049901d62b6174156e16426131259a8e952af6c247db3ff0577957193990e335679ea31dbd4921333cb549180bd17cada3622eb2ddef SHA512 def1a3957e8bdb05815b1a621e1651c657293608fdaabc07775d37e38bf08b832578cb4d10b7b4cd6c3d2f6196f8010d2b8ae3d4612b16efd0af82c4433a25f8
+EBUILD akonadi-calendar-19.08.3.ebuild 1288 BLAKE2B b82bc49817feabe9a351243a630f40550f996c2ff97d21d7eae4c395f311dd2bc019dce0559c35adfea395033b53fc4c9ff926c24625fd5765701a7418e8fc5b SHA512 0795fa6eb76deae138c559023de19f7478ffae80f02748527e3ca03ce0b951472041ae1b46fd7edac15f2be32140ca115ff4d6bc515cbb8144470d0e16dbeb05
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.2.ebuild
deleted file mode 100644
index 8f217b7e15b2..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-19.08.2.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="true"
-inherit kde5
-
-DESCRIPTION="Library for akonadi calendar integration"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcalendarcore)
-	$(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 kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kcalutils)
-	$(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
new file mode 100644
index 000000000000..488e99343f4c
--- /dev/null
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-19.08.3.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.60.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 e569a6535d8b..c638fee934d2 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.2.tar.xz 384864 BLAKE2B ef9823fd00909734b3652b266de6412141b8ea4de55698f56d17881abbc6230876e6281124f4750c08f16da8d4269f32b49d94f3115d443c96df529da5d22684 SHA512 9311068388b4a5f4be047849e93e5de82febd2fe7ee25c518ece41058ed71797200217d7ee2668d42a743e95f5fe1df5a60c7a83c5376adb3fb345e36333e232
+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.2.ebuild 1070 BLAKE2B 450b7fd8c81190b5d1c9f92d93dacb890ac0f98ca7a2ee9eb2f08378c2522e954606509254f11845d03acca022277371779a20d2163be1763aed1b75fb40786b SHA512 add34a726449e52a02122297d6f030e8ac7a1e76b4e978e112a70b3a216a2249f78fcfff96592fca9dc428daa0abcb8609de05077fac9195c6b4aa74c2d6a667
+EBUILD akonadi-contacts-19.08.3.ebuild 1247 BLAKE2B a32b662224a8adb52f3c652d231f28e81275bb5cb4c9767d5eb17d2649a5a4500782c0b3139d470df476fe3773944940b4b791f971996712f8011395663e6e1c SHA512 0fad58bcc02206609d1ccb5c8c7e164111f9f22850436807110de0730e263427c31bfd303c3f3f84457cdbd3e5fe019aae0793e45a285adae706013a6513a6a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.2.ebuild
deleted file mode 100644
index f3cc30af0eaf..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-19.08.2.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 kcontacts)
-	$(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 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
new file mode 100644
index 000000000000..4f6d6855f53d
--- /dev/null
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-19.08.3.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="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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 f54cd4fbca06..c12837cce6b9 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 438220 BLAKE2B 268611983e85cf632bb3e02dc446b5cc160c9b8260a55f23b1f5114bbbd7cc793cda34b5f25bb30a5c5db56450550b9b8fe7cfb5a9c8cec229c2f97e0b049e1c SHA512 9f9645912a1e3767779637f58c9e9f5925bc7023aef3d3a9ed6c56b6f338d0e271d5920a784b95f9fe389b17b7adfa18b7ee38332fd3eaf18c9538beaa6897e4
+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.2.ebuild 1101 BLAKE2B 3675f984fb6dcdfdbd65ea147c0760a9b31ba359933f711f992d4962e8d3ca8dc5aec073e3d82ccd39edf68a8fbd5e7bcfc862a4f7ed1fccbd24e631169b6a6c SHA512 cb65502a03f351b1c52669ffd3586e5e111b71f89983925e8d52ecbc90a63cb19c4827aaa72ac6d625f9edf3f023ac47cb1186e427b1fd14fb4727da5550f747
+EBUILD akonadi-import-wizard-19.08.3.ebuild 1266 BLAKE2B 38b139a777146a7bfe4d1a7d368d5842e75c9b8efe7d7581806e94c40549870bd921910c8c37899b006765fd7b7194a826780d604f212b2bd727485866c0206d SHA512 67195c4be6472484e331eda52ac759dbb6a624cb4406854e5c5c36450ea3190750460ef78195d16b735bdeb25fcaad6a2e27f2d3d50a783a91de8a6ffe68371f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.2.ebuild
deleted file mode 100644
index cf8224231c25..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.2.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="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 kcontacts)
-	$(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 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
-"
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
new file mode 100644
index 000000000000..878ef07ac770
--- /dev/null
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index b25998c1ba91..692f245c6245 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.2.tar.xz 132580 BLAKE2B 17a549491495e6df67614f7ad53ed79e5bef21f5434599d5f3c08c9e72d9ad676d78d963de922947b5b8265779b8773df3a26a56c2182fc772ff417fef3d4b84 SHA512 44f8462c41b3ea6537def599add41f9f250265851e00ac29028e6ea45a74050a5679bc15979b8bb4d791708a54e2db0c62d73e4726c1352c10cdac54436dc73d
+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.2.ebuild 869 BLAKE2B a3099595296e87f4484a8ff523872507b1069c49fec99da1d16540b1bed3412b52bf5d7e0d21c30a8ca80ed835df476dcfb1323ecd75a0729c3eb0abcb4310eb SHA512 aa3d46402ccc096592c0e1a11fe55a85dc173f19373daa7253e22e9bea5db20aea28eda16f17939e3d6b5b3f4684c3e8e195fa2d3c0c56a0e98d1b14cfcc80d4
+EBUILD akonadi-mime-19.08.3.ebuild 1004 BLAKE2B 30b15da6f53e5b59403d4f10ddc39bfdeb5c814de8c50f1f006ac0d68ad57ad02ab50c9a23219664844a6498b493cd44b313abd19e30ba619079e51e969697b0 SHA512 436fa4706084cbc21069669b0c3fc8904a161f1eb6071656a19d71adc8a3f192c7afac2e8792cd4fa4f33f737b39b194b54a7a1874b256557be54ed48a4e0bed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-mime/akonadi-mime-19.08.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-19.08.2.ebuild
deleted file mode 100644
index ff73b34b6837..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-19.08.2.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
new file mode 100644
index 000000000000..b597bca87af3
--- /dev/null
+++ b/kde-apps/akonadi-mime/akonadi-mime-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Library for akonadi mime types"
+SLOT="5"
+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="
+	>=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 26db55bcd212..7574d392d4a8 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.2.tar.xz 24432 BLAKE2B 594ca4173e7a635241c741cd6e20299e0930fbff1defae52fe81d7001f89be3805ea2ad824283a01b31bd084f1f7212feff1e95de50a2e71ee8adc239a4c8aec SHA512 76185971e43ccf318a2bd958ae042c34bc2ef3915047525d5bcbe498d1ef7933a859606efd1429489a42c735a07d9bc883d836a15c2292f2937d1ec2f94c74dd
+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.2.ebuild 403 BLAKE2B 80f1164d35accac72fb41156b3966ef95000fef119dec6354709cc0423ef7185627a0b42342e2eee5dd244d90ee1bd32116df6fa8af5696b425b3110673c0312 SHA512 f76b2b0ea1d2ba55d54f4e3ec0d9e15fe0a11787710213b256ab232f27764496124334dcd24653f1aad4f877793679b3d86fd79a8eb3c11dca82a49446bea55d
+EBUILD akonadi-notes-19.08.3.ebuild 487 BLAKE2B f89db3f1e90fd5c7d28c084109b33a5825c8404ac173b06db0378b70ee35a0a878fad4932057300546bf715dc5e8b7c48524e97553ba7248cad09ba19c4d2503 SHA512 4fa38dfcb43727bcf7a5c3a0584c4905b1f9ae74310cbf7eae8b3d16f399241d40742afa7baa5176f60e7126f3f811adecbdeb060995277d65db5904b33f55f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-notes/akonadi-notes-19.08.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-19.08.3.ebuild
index 57eba45ffbfa..9c3f45fa6033 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-19.08.2.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-19.08.3.ebuild
@@ -3,19 +3,23 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for akonadi notes integration"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 LICENSE="GPL-2+"
 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 31ff0d576f86..5e4690422c60 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.2.tar.xz 82744 BLAKE2B c48924ac94524fbadb432c97013ef90d2afa99d6533d9664a1d9aa77865a6dd67e6de82bfae55f4cdcd57b41f81e3e51a5ad5c2e75c16548ae3ff3d80039f76c SHA512 bf7d3006d03d1fda9ace33eeeb93e24263006fd6829f3e94f2932e0afa20f1cdbd859fe68227fb5602b007aab3c386803cdd458bb911774703a873975072ccad
+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.2.ebuild 1145 BLAKE2B 929982ebe114b42ff0ba025ecb09651543385549344483af4ba0c1c254788061825a7c34d5c0bbd0ce1858f161321ddb53a5685a9c7df46b89fd0cdfb14f85f0 SHA512 2fc60070146a6118eff20622461c7bf802452cacfcb60f0c5ea20e400307e60f942b03bfa0b33601bc6cc6c2de2a2edaf89912ffa791c5635ffe39ec23a7e3cb
+EBUILD akonadi-search-19.08.3.ebuild 1305 BLAKE2B e2b149400a0f53a0d951d219e8c5e311dbc6f97c79bcd4481f7ce96c2ed23cc94f791df861b6d00485428b366c99bbeec9d840ba4f51a8e7d97f4d30d26c67d9 SHA512 739493c5a4ad58ecc96c63ccb54e37b8e98dbfcc4503163c6bf3c3b8d09bfe5aa8bae956a457426018c22521425f6730d1e1acb83352058aac86a7277a351d8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadi-search/akonadi-search-19.08.2.ebuild b/kde-apps/akonadi-search/akonadi-search-19.08.2.ebuild
deleted file mode 100644
index 3d75506dce1d..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 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
new file mode 100644
index 000000000000..367c64b8dc8c
--- /dev/null
+++ b/kde-apps/akonadi-search/akonadi-search-19.08.3.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="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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 857f32f5f981..dfe86bcc2862 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,7 +1,7 @@
 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.2.tar.xz 1578452 BLAKE2B 87946dd8847064c353ab57d926ff767a292d20d44e50e7abc8defe5c1ccf3c82f5cc429176714c0c2f5c77ddb8a63a1da0b7c9367a55bd493e44d13f0173968a SHA512 80dc550a7502bde7edaf59c7fd765992569204ae5b56b9026e29c1b6103240b379ebe72c1b9804336d679aa0db3a3c2231140516d492d760497bdd59cff9b354
+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.2.ebuild 3491 BLAKE2B 99c3f70e574d0c1bffdf76d8ac3e29ed58fe718247a00f1954ba703de0b33338879ab6e753181966e250411e47992a0d5ddbe2d5f307041154c1c0787f52abc4 SHA512 711d7271a471026a552bc9e6612c6841c5183e71aff278bc2815f34d4c6ca12a540d2d734624627027138ad38c6145b6266d262fac4721126c371cd4023dc204
+EBUILD akonadi-19.08.3.ebuild 3646 BLAKE2B 0dfe9f6d15fbda8515f7950e83f6094658de32bc498eea187c4b78f2f72e1603f6ab8d7dd0a1f62ca2df6fe2271cb9dd3b4d7db5ad5843a22b87f7821bd4c820 SHA512 837e21b1def7e896ba032e0e737c0e5e3cc49590d8a29dbc578fe52226f2b3d71195422637ddca41922251ef3df8e0182782fc575ccb52543c41fc51a9dff7ee
 MISC metadata.xml 410 BLAKE2B 259694dd8c348fbd80f1ef1dd2b2c6e5aa876cfcd2d4b781dd51f3882b22f8899bea347c6c993be3912c5acc3d996bdf88b63f8455bb822490f3d33cc45ce8bd SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa
diff --git a/kde-apps/akonadi/akonadi-19.08.2.ebuild b/kde-apps/akonadi/akonadi-19.08.3.ebuild
index 60a1a49252df..29ed0f40384d 100644
--- a/kde-apps/akonadi/akonadi-19.08.2.ebuild
+++ b/kde-apps/akonadi/akonadi-19.08.3.ebuild
@@ -4,14 +4,17 @@
 EAPI=7
 
 KDE_DESIGNERPLUGIN="true"
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
 HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
 
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 LICENSE="LGPL-2.1+"
 IUSE="+mysql postgres sqlite tools xml"
@@ -19,28 +22,28 @@ IUSE="+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)
+	>=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
+	>=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
 	sqlite? (
-		$(add_qt_dep qtsql 'sqlite' '' '5=')
+		>=dev-qt/qtsql-${QTMIN}:5=[sqlite]
 		dev-db/sqlite:3
 	)
 	xml? ( dev-libs/libxml2 )
@@ -88,7 +91,7 @@ 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() {
@@ -98,7 +101,7 @@ src_configure() {
 		$(cmake-utils_use_find_package xml LibXml2)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
@@ -110,11 +113,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/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 6321b12c5110..05925861ce1a 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.2.tar.xz 193672 BLAKE2B 3e7b1ceef6cbe6972560a78464e758e67d9907ac33958ab6398e1e72d0814f6ac4e6c959ed39a78789e55d7f18637c2b874c7390fcb3a97131d2cc5637dad1de SHA512 88b86fad2244d34256de4ff15ae7eba3cea6e130256b16e610e6391464856353c7c601460dd45bd29f4bc91e7d05cd38fe52c8a6d4bc4d47d688796774e197c3
+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.2.ebuild 1237 BLAKE2B 9b499d7cb86996cdbec819189416cce00f170b47229c57c54a211c07973f62c81860f9efde3d83e9fe7998ce494f66e171e71e519a6ea18c76952a9f91ca7b32 SHA512 0e431cc8ee5b2da03526fe98174ed1a408f20e4b0594b4a25250f3ea931ea5b7efb85e39fa3b95db75aefd4a3aa20c09521f0dc3a6dc01c05153d4ae2975ffbb
+EBUILD akonadiconsole-19.08.3.ebuild 1435 BLAKE2B 8ff0b4c6deb5fca1cf88d8fda94705f2b15cfbeb71236acdf95e50fd50a336fc04c388c4bdcf68d25a6f9f3d8861e52adb1a12492b8c44d6afba8498c9993cf7 SHA512 00476efddaf7bcb241e0807f09faa3d5e33377269660b1cffee35fe30749d4f60900e4a565081f6d1c8ffa1dcbe69d003dcab6584ef4ec4a50478888c39f5e5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akonadiconsole/akonadiconsole-19.08.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-19.08.2.ebuild
deleted file mode 100644
index 371f59ea065a..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 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
new file mode 100644
index 000000000000..f94b5dc9e9c9
--- /dev/null
+++ b/kde-apps/akonadiconsole/akonadiconsole-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/calendarsupport-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/messagelib-${PVCUT}:5
+	>=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 5332a4e14350..1b260b7dba64 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.2.tar.xz 2193612 BLAKE2B f31c73ae7a243959b7eda7d6a31fe5f28c9f9f1482c98e32f910dbb41c19acd77fc93a452d229213518b24d269de6e245bcb4d6505711102699d53ed51873f7f SHA512 75cc826ae54bc34d4941fada5f8b48e5db3133b65b0dc121bfd59bf1e49c67f28b63fa1a1dbb4e945f660f9f1f0c9cdb87e0df2c61a695bb7cc6d2bff357a998
+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.2.ebuild 1443 BLAKE2B 2a00d5693a5de27a591ea53025dadde86f39df7aaa71f121c3a9ed10bcb3dcf48a0b0aa1bca3d54890ccce4edd95f4ff04e02ad2185ec9141d058f1379636f5e SHA512 277164d12bf3b15f4b60c79c3df4a8110402b5999525fcfa64da63891e9296ba5da33690a9632d18b1fee6cc4353add584f4283482170a460e1a03f3d4106ece
+EBUILD akregator-19.08.3.ebuild 1674 BLAKE2B 05aa3f218bc5e17bf7d417bfd6fea3f5d0126fb170275fc5284ec7ac360f11ecff6704b37bd23c41cc9e1006dbd1d901d7be0f3540378754deb5732f26e349a2 SHA512 3f7c5afef06cea166828b174f9963c876f90af56fe8df1f03bad3496272d12980c6b193bfe08b388150a5198865297a376b8dff1f50d86ffc3ad6ef62ed34389
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-19.08.2.ebuild b/kde-apps/akregator/akregator-19.08.2.ebuild
deleted file mode 100644
index 98b42a70345b..000000000000
--- a/kde-apps/akregator/akregator-19.08.2.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
new file mode 100644
index 000000000000..c1719482816d
--- /dev/null
+++ b/kde-apps/akregator/akregator-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="News feed aggregator"
+HOMEPAGE="https://kde.org/applications/internet/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 cb00db31d96a..704c6d15d3a4 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.2.tar.xz 333044 BLAKE2B 7fcc314b660ac2c7ec8b86bfd327306b0bb735ac6b247a67f59f91ea67c5dc90b31c02b428fa5c5bb1462176edf18ed9a1cdce6f5c7efbbb30c725660363daa2 SHA512 cab6796e0b2e6223ad59b9754add045277834c6b4ae2ed4a498d116d9daec158543a8d1276db65a5f34c41064094ee4534f7fd87d3dc991825731f87a151eb87
+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.2.ebuild 828 BLAKE2B 00acd40a3e4c246bcab37dc0d8cce6136b05bf693d328f571a8d2e661ca7a4c64ae01d52f6bda44aff94733e382b7f3c7f4f8fbde4b24bc818b63bf4bdea04e6 SHA512 78bfcf0a033aac9da096ecc117eee3d0345b33d4c8a57846564e4ed824be3895d04db34005a871306df3f7717a2f57717a0464b3147d6c79f693c21998f40060
+EBUILD analitza-19.08.3.ebuild 926 BLAKE2B aa9a39971bdae6cfeaa7e353ef3926b69bb0af3e3991b98012bae6f37afaefd4a937f56df712aee43238f7c776391c8bda8ac2e1840c3e8e163dc0e2d25db119 SHA512 8f19206682d1a78475e5ffd2b89d106644e3c9d8a00c707a31070d45d251b652664aada7633e9a34867bf67862a684f646d7a6ed36b9d520805c08f3fa81cf7a
 MISC metadata.xml 355 BLAKE2B 1a43036ef3857c12c1f687c3764b29723e20e3816fb4c123ee395f1fbea257233394bb02d9fe35ca9c0a2f3eb0dc78ffabb2c928b2d52f0fecfbdad78d00956e SHA512 cc71d58d08997c2baf094b7ff2dbe5af9cfb5da7fd4ea295315149154d9980d6841bf23b61e72fcd92ecba8533b56e2548aa66577a5fa841451fd1a65d2f84f7
diff --git a/kde-apps/analitza/analitza-19.08.2.ebuild b/kde-apps/analitza/analitza-19.08.3.ebuild
index 92e71547cf6f..c8e62e6caf2b 100644
--- a/kde-apps/analitza/analitza-19.08.2.ebuild
+++ b/kde-apps/analitza/analitza-19.08.3.ebuild
@@ -3,30 +3,33 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional-recursive"
+ECM_TEST="forceoptional-recursive"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE library for mathematical features"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="eigen nls"
 
 BDEPEND="
-	nls? ( $(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 \
@@ -40,5 +43,5 @@ src_configure() {
 		$(cmake-utils_use_find_package eigen Eigen3)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 7d6c9cac4bc5..42f47e3962eb 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 2584864 BLAKE2B eb234a882a1249be3665754925d9041d59760d05803beb87bf497bc90912b0101ec2247b9b1f773bd99691b2df875dd9b551ff8db8711d30224dc7f89153b314 SHA512 c4ae42a68a9f00238de4dcfef066c3e20f9a896fe00473b4db4ca4aadc8db1f63c876a98833799c533962283fe3f64be36e563e5624e0dae1978452438392788
+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.2.ebuild 2056 BLAKE2B 92f61a8188e5b799170c4f90d7510b4773d8cbe49ad8593261a55ba8fff0b032065cd7c6dd34ff74da692f06982ae1fc552e9358556244ce79e3928f0db0b55a SHA512 00af0a51d5dc2f4f702667e0ab8ba207381c61d7c6a151b282ff31fd9b734b3178c5c830362df70207f5f6c14461ce07ec39a87ca67c9c8959a8498e13d6c299
+EBUILD ark-19.08.3.ebuild 2252 BLAKE2B 768e7e5d365dd72f0b823ce2e5af066205d816f8e1de26579dc42de88397693ed982ec0772a00ce84e5cf69be41ed1926d37670c1173234ac07db9c2ccc07581 SHA512 2ece7258b5e9b4f7758866c5d184174a6d0ea3758b7c10b66dc9a3319e8d0e3bc2c389f8b09cf3330e87966297848c52089310e563c9dfde22ccf6db84b9e924
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-19.08.2.ebuild b/kde-apps/ark/ark-19.08.3.ebuild
index bba063801ed4..5de4f8e9843e 100644
--- a/kde-apps/ark/ark-19.08.2.ebuild
+++ b/kde-apps/ark/ark-19.08.3.ebuild
@@ -3,14 +3,18 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Archiving tool"
 HOMEPAGE="https://kde.org/applications/utilities/ark
 https://utils.kde.org/projects/ark/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="bzip2 lzma zip"
 
@@ -18,32 +22,32 @@ 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)
+	>=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}
-	$(add_qt_dep qtconcurrent)
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
 # bug #560548, last checked with 16.04.1
@@ -56,11 +60,11 @@ src_configure() {
 		$(cmake-utils_use_find_package zip LibZip)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		if ! has_version app-arch/rar; then
diff --git a/kde-apps/artikulate/Manifest b/kde-apps/artikulate/Manifest
index 87d11ef0e7da..8afe546fd6d5 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.2.tar.xz 3996424 BLAKE2B b90c77599c2ccce8effd25a83474b36412d2e60de3c3384bec5e464dd4dc09f0519407d924f2ea25c953f41feae132f03ab0d8e95db32dd19894d5761eda4bb7 SHA512 72e4d0bfaa88b4133964f07fe2e20d9f2cc0bee718388fe56f1f1518f75acf31b4068fa87e652c370e18e6b53addce3414430ee43c9118782925c55bb2536dc6
+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.2.ebuild 1127 BLAKE2B 256efe8395a4845ea404a308860c85601d975613ee0031780f143b8bee3af4b56260ce3beeb6506f5988c8cc7eff75781fc5aeaa31800380dde63f62c2d891f8 SHA512 daf271f27ff05505cb44b8b31d6185a7aa18f6f59d3e270156c4a0e578685234ad731275859abcc4e4d166b05842456a33a4ffb1be7d4d209cf177891a89d865
+EBUILD artikulate-19.08.3.ebuild 1294 BLAKE2B 7b732dd7a0d018cf81493b5e9d7b79057e9a3e1589730f9cf471fa954afb53aa691a645be99b0a3b2045f143872f4c41ff0fb83493eb1c0877cae4664aa93689 SHA512 f2a9dabf101132cbd27267dce43585d0da83e6bb9786ba25403a290d81f4301e43916a9ea80bbef8ac6e4c035471f4098a7a9406d2901351538c74917940f43a
 MISC metadata.xml 328 BLAKE2B b873dc7a695e90caaffc9b5f3a8e50813d0cd33d651f0e04ff1fe463ebf335d834cc7e62640d172c5df73e5fac828a5c36a92d77c0738d7807b16cc86e17ce88 SHA512 f00a5a83877d21d15842052479a08ca06ea387656644416d7af400c4b9dabd9e928137afcb3f7551817f94a5aae28422842a80c641cd481374ca92e305b59962
diff --git a/kde-apps/artikulate/artikulate-19.08.2.ebuild b/kde-apps/artikulate/artikulate-19.08.2.ebuild
deleted file mode 100644
index 28f387134eee..000000000000
--- a/kde-apps/artikulate/artikulate-19.08.2.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
new file mode 100644
index 000000000000..3eda6c9272af
--- /dev/null
+++ b/kde-apps/artikulate/artikulate-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Language learning application that helps improving pronunciation skills"
+HOMEPAGE="https://edu.kde.org/applications/language/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
+	>=kde-frameworks/kxmlgui-${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 70ea1a5b7065..3eb375e16f3f 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.2.tar.xz 356008 BLAKE2B 123a9e76328311a8916cc222ad743818f42c3eaf8b2c621c419dc1c7772da7111e6f6269c30717c38194fa60e3abb4798c09823509a373c3e8b2f03f2cbee77f SHA512 092804445af964c4b5199683421988f473706379a164e95b435a7493a14f2b5a12d3e990d3ec34d3a62ebd483372c1f46db764b0b7278ebff0df484113228c15
+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.2.ebuild 973 BLAKE2B ed4714be15bc6401f6a9497d9f43c49fe97b91bd8e7966a294d65563f9ba2aeddd01458d537b4b336b86a1d6ac8c31db6d79908f1a98b49cae85307d467939dc SHA512 c05cd721a718b4f7109d5feb26ce8ac1ed18a4e186b5b8f783027ae3123f7d67a3ca8aa8290b892828ad9da0a84be607e0795999a55517fb627318ebd20f3f02
+EBUILD audiocd-kio-19.08.3.ebuild 1089 BLAKE2B 66fb5d54c6c6af1fc6848677330534fd4ed85ef9a4523c1a5c39a7f8a8f3fe977b4213136abc05bcf9084be13bed75ca21aab8ca8a758d17dd68352ee0cfc4f4 SHA512 56555473bb19743ae299635883eb4c4f6ed26666a36bc059b2fe67ff8e15f11baadc92933f7dd187201b84e8b1350189eaea41766d55e83999a878e76d411ff8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/audiocd-kio/audiocd-kio-19.08.2.ebuild b/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
index 6b95c236c794..f4626e3b19e1 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-19.08.2.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
@@ -3,25 +3,29 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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="
-	$(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)
+	>=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? (
@@ -39,5 +43,5 @@ src_configure() {
 		$(cmake-utils_use_find_package vorbis OggVorbis)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/baloo-widgets/Manifest b/kde-apps/baloo-widgets/Manifest
index 8978bd42663f..eb5f2f57820b 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.2.tar.xz 261392 BLAKE2B 4767c53a29d95fc8b212e12c26cd60141d06757716161c1a2cd471e4499d7194a3b3a3266f92bf73812f9cc3704d154c3592fa59804e7780c3e29ead35428811 SHA512 08cd7e6ed8655fed179d6ff0f7b9981c386baa914e9b5d0f48ced74eee95fd41cc7b339e831310eba0bb563bed636b0869f4f121a5f413f1d525f2f05aa8f513
+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.2.ebuild 603 BLAKE2B d94726488ff35647840ac0f29f80789dc2ed6ff0fc566b5eef96adcf0f3f98b14a66ed9e1de133725354a2b52cafa754104d0a68c767ff6e5585abb4601b4421 SHA512 72356eb722599b1c7fb17434822fe927f60777e00872877bf4dc724351e556cdd3fc501cb73c9b25613b23dcce690d0987dc8a29df6f09a06fcc49b069b82cce
+EBUILD baloo-widgets-19.08.3.ebuild 699 BLAKE2B ee8743d63b93675c176104fb4080a633a33b85bd2e283677e7caed7c9a4593b7b1032aec06532228aecbc26d505cf66d1c72d274f7363ffdd0f343884c6ccb4b SHA512 c17a644326a5c67ab0ca62cd026c5f44c4c85f0857a6c8e56ae69a76c1a5d66e5b2feede9589a43c4cf439f9ceedd77a02b95c887d6741acc4414e135f0c7a38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/baloo-widgets/baloo-widgets-19.08.2.ebuild b/kde-apps/baloo-widgets/baloo-widgets-19.08.2.ebuild
deleted file mode 100644
index 45feacde63b5..000000000000
--- a/kde-apps/baloo-widgets/baloo-widgets-19.08.2.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
new file mode 100644
index 000000000000..2efe12582630
--- /dev/null
+++ b/kde-apps/baloo-widgets/baloo-widgets-19.08.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.60.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 44f2e6c5d7d8..356e7e53a835 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.2.tar.xz 2820068 BLAKE2B 6b60ec809f6abf1dc08378c0cefaf5729940b499dc9f3a2c4315e1aed5cbbad40782cdb4d346ac6002de61b1dd4253597fc7858543e3ca0c9901d2b6ca4ae085 SHA512 5a78e8677aa0f2796b6177e60b387bdb0af580f4a1231f89c90c8e58b224c7d7162c6f2d0830005fb6059cdb2a5463cb51a8c7162e1bb54c2d52dcd81e22850a
+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.2.ebuild 783 BLAKE2B ff3a0e35890764fa52ffd3058de1d0473b66731352e9531f694fa3d0cd1c631d3bac9383e01a983815dd73a32a772dab23c7f8d6e78c26074d3e1cc54a8a4b2a SHA512 db384d50d40f6f9bf08a2fbeed8bb87ac0c9022c1acd34617814ea4cc60a886466ecc0396260f330cb34b334ed2ed260f1b342c0e427b01c069295cc5648c6b9
+EBUILD blinken-19.08.3.ebuild 914 BLAKE2B 0220c2daa7689fa0a5b8bfbcaebc2b50a7167394f94e9257b01042290a6551da85fad7cb55675ca5e712232fd2f360e54e774b2485efc045ce0ff65c3d2c52a7 SHA512 42b4966da816ab3da65c24f0d0accae26aa42c20a74bae7c0c9c49c407e1e255ca3ec3c3920357067e8ee6535ed2525541e47fa18dc6649c9ab6ae8f991c5259
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/blinken/blinken-19.08.2.ebuild b/kde-apps/blinken/blinken-19.08.2.ebuild
deleted file mode 100644
index 57ced0cab866..000000000000
--- a/kde-apps/blinken/blinken-19.08.2.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
new file mode 100644
index 000000000000..ee87dc1f6629
--- /dev/null
+++ b/kde-apps/blinken/blinken-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Memory enhancement game based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/education/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 35c517f6bc6d..4552797bb976 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.2.tar.xz 821136 BLAKE2B 4bdb3f163c2d47070ccbe60d3cf9297df826435d9a997b9c35ef0d8870c396ef5263b241b067183bac262aad2e3544104366f13f4a541428feaba8680983a83d SHA512 242b4f7485f023bbb73dbfcd1077393d623f584f7c0d33af77f55fda36d59fbed3f74f9ef5c7883a7c86fb409f65794742dd002200f9a7ddbf2400595b5037c5
+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.2.ebuild 697 BLAKE2B 36d4e1324cc4098d0e4e4bc1ed3f5687172a8c4e929d24513407ad47e7a4533eb2629b67caedf357664b30cc4a06992fa9cbb129d1bf145c4b344a4faa01f12e SHA512 399cdd2870314cb6aef0b290cc0762ab25090e6bf51d7b95e7abff2c0ce432a2289145ed4d50e630ce19b104867267f703016aebc1716d849681e4325b3240ed
+EBUILD bomber-19.08.3.ebuild 853 BLAKE2B e9e4c2bab41bab38cca30eed92497f056295f587580f07ee5e929b052cc570075f53434d79b8e25664aebd98da970ac7725b758caceff3e56c93fa6a32aeb789 SHA512 c7df4e4ed829149847286f79226caf9043550e10413db5d0e7420bec10c482f89cf4bf178737f9ab143402ef576b62ee28a92613f60deb7ee8b079409d0fe48b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bomber/bomber-19.08.2.ebuild b/kde-apps/bomber/bomber-19.08.2.ebuild
deleted file mode 100644
index 52a4ba574f21..000000000000
--- a/kde-apps/bomber/bomber-19.08.2.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
new file mode 100644
index 000000000000..e9a04ed652c6
--- /dev/null
+++ b/kde-apps/bomber/bomber-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Single player arcade bombing game"
+HOMEPAGE="https://kde.org/applications/games/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 78cfff66f2ca..59a77fc68fad 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.2.tar.xz 200400 BLAKE2B 332db919a3cd75e06b21e463c354e0b0e3e6d618c1cbda47f83f943e7c4f89e1a35742cdc9e15495391cdc663155129f67e06b905cf6fad40749a4e5472f5716 SHA512 c6072b2a86135bb6eac6e654e3af82cf783a602bb9b9e45ac8aea9de6479e5ba0958ecff42172ab9c356f5d7ea8a7b4805e3a11094b3cafb887d947347216529
+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.2.ebuild 704 BLAKE2B 4ffc5784ae8b680aabf3c7c2bc21689f19f9a2d03c4d2e5b263015b87a2ff00cdce4a435dec436e57f52184540732d62e1d66fac1dcc595bff2f9d2938292cdc SHA512 7ccfdf3c25dbb8698133a7266773d54b5d769246752da95a565734ac89b894e61ccbea38ce272ab64eb3490045f5698ee589bde4be2d1aad1278f09b61834053
+EBUILD bovo-19.08.3.ebuild 866 BLAKE2B 1eedf05325681fb09bd4f76bda83e981b201a30ed63aecacb2999e2c7ff50c11d386225c483098808b9ba724fb7eb7216440bb4fe71d8eb1ce1bb5b7bf38bdd5 SHA512 9275aac587384c7380d65947f51898024adc066b74b2972f82da23105e0d6f1ae763168527cc9c0e668f2b01cb65415417d95add4cef4ff59085a704b2a856b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/bovo/bovo-19.08.2.ebuild b/kde-apps/bovo/bovo-19.08.2.ebuild
deleted file mode 100644
index 6979114e16db..000000000000
--- a/kde-apps/bovo/bovo-19.08.2.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
new file mode 100644
index 000000000000..a2c6bfdc4ac6
--- /dev/null
+++ b/kde-apps/bovo/bovo-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 def2e5ea4d5d..43debb6b8498 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.2.tar.xz 224508 BLAKE2B 05dcffb5eb960f4bda16075e8f729089390e76b32f0ca6e6ed9a380a69c380ec6796a2a801a04a49a00213cc2891ce3dd01dcb39419f0e13d80bc2b6f0ca0809 SHA512 ff57af694d8fdd6c3bf08c0bdfb58d5cf2e54cccc74fcef1a74321fd1109b2fc0f4a902597fd2461fe91e6e17dd457db50f6b1d22b468afd391175cea0822627
+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.2.ebuild 1004 BLAKE2B 5902e92cbc7f710f0a9bcd19b5e7bd935aae1cce9b8485469bd2fd950bedc631b31d86d792ea40ce52443a180cad32fd570de286fde0159734208c9be5d56522 SHA512 a21499d6ba0b23d500f688cce39998c22bb51510a76974c93529aeea9c77424e079a1a29693ec741732a7a7d45dbeee8e7779e6553a98cbc4efbd1a3f484d70f
+EBUILD calendarjanitor-19.08.3.ebuild 1105 BLAKE2B 496b4046d8c00af53290009d2f5c4b64af43c789e2d60b4675e03319237aa4931f7abaa6bf9b85518400c0cedc9553c9f45ccf822cc8cbbcc21fb454ebb6f25b SHA512 29e0afbfd74dc6194ae9859fd647930517c130ac357ebca8a3f56ebc1c1cdee3c469173b8c032a249e3f1fdd9cc3870404fd2bdcbf2c6f36d2de37d3997d1c88
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarjanitor/calendarjanitor-19.08.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-19.08.3.ebuild
index bd5802bd3642..dd2eef2f4368 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-19.08.2.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcalendarcore)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-calendar)
-	$(add_kdeapps_dep calendarsupport)
-	$(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 85403786616c..abe0d5717d18 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.2.tar.xz 646644 BLAKE2B 22e887e08430c30a2af04e579e1f2cf13220084b7433061d7f8e705e6aaa531d727e5ef994dfa62cc94177145674a060e060d820e68c954ecc9c284ae8a50af3 SHA512 122151188d8f0d7db0739ea63daf74ef429c3b7dfef7f6379e2336c23d4c3ecf42dfea9f549ebe53e37e06fbe187dd7d080a7b5d051ae538e28e95c737075f1e
+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.2.ebuild 1113 BLAKE2B cdeb23aa4df95e5371e572fe7e1fc319c0a18921779ab65454279cae9847d8f1e95caaf39165e1a78821fed6d82adb0b1c5dbe16bc6514ec1190315d83bba4a4 SHA512 ea245abd69b230b56f923b4897452a335e1acb104d36c270b7498576b3da31512b6c51b275cec5a822a591306e4adc3a2c6aabdb20224d13b02c600ca105cf21
+EBUILD calendarsupport-19.08.3.ebuild 1299 BLAKE2B 6eba664023132e4a373cc5e6054d7691b96cbf982897658567a071f3bca6bb045f8a27a69ffc4b4b4e10be9c8ad86a09352405fd8238e299a3537e99ff7ac983 SHA512 71d0123cafe0e86f51f7d56ea77c9fe85b1a88d9a84dc3a2259d9f3c784649815b3d3d55be435e79ed8140beb25a7f86837eeb8a7992280910dfb041e7b48452
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/calendarsupport/calendarsupport-19.08.2.ebuild b/kde-apps/calendarsupport/calendarsupport-19.08.2.ebuild
deleted file mode 100644
index f5d530f27b6c..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-19.08.2.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 kcalendarcore)
-	$(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 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
new file mode 100644
index 000000000000..2d9ee1ae9882
--- /dev/null
+++ b/kde-apps/calendarsupport/calendarsupport-19.08.3.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.60.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/kiconthemes-${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 65083c555571..bbdffa2a4a5f 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 2541240 BLAKE2B 1823aee42d3311c24b7f4addf6b369a6165da05f56f81ca1ceec24fe9dd127c6454e95baab23c33c68a08fbf49079bc58751cc064d7c53c2e62eb355314f0e59 SHA512 f9a089297c288bd4013da68b9388407f990aa20f508b759bd1839a85a714728fe2322daa198c522869285b64c02b84a587f605b4f1e8cc22b9c0aafc3138fd35
+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.2.ebuild 3098 BLAKE2B 215bdb75c7d5700d7f678e10190fdd0c947a5236185815d29894c15b2b78d4dd70b9792c8be1d06a9cd55c693ed4ea170834ed32292a3296834098fa685e5bd1 SHA512 43dab3d04ce55b485ecdb66aec8e67d8d9081d1042901cef22f1c367c036368e0d0221405fdf49505516b0f47235eaa83ca9caa4d785fb8f3508fbd4075a520b
+EBUILD cantor-19.08.3.ebuild 3335 BLAKE2B dfb86f4287ae1be7ddde92961e903c14d8e14ecee98e8f9e50210005909fa493526ad0a5e9cb74ce13b9f6ef224ae03b4bd141486d9be92c532c1281f70f6a0f SHA512 35cb996029b9ea6caef2cdc1cd64eb3b925bd77645ae0344069a163ab8cd4ebb9a91fa73dd76f304eb749471bf63095df9e22bd0bf8aea4071429a758e111a1e
 MISC metadata.xml 669 BLAKE2B b2997169dbbde96b40d605ceb183dc26d39e0697fec17a1da77e71fae8ed46f294b2a77d012473be6bceaa03789f3d22fba2080c003f049fd40e3601afb543c0 SHA512 debcad5f8ba8492699b7b32d179b85c69e03ff2524251a4a710ad2e1d361fc91215e461d976ccae2c7423824839058f2bb075e02e2632ef0b887d91f2b39606c
diff --git a/kde-apps/cantor/cantor-19.08.2.ebuild b/kde-apps/cantor/cantor-19.08.3.ebuild
index 060865172386..777069dfce34 100644
--- a/kde-apps/cantor/cantor-19.08.2.ebuild
+++ b/kde-apps/cantor/cantor-19.08.3.ebuild
@@ -3,13 +3,18 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
 PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-single-r1
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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/cantor https://edu.kde.org/cantor/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+analitza julia lua markdown postscript python qalculate R"
 
@@ -17,30 +22,30 @@ 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) )
+	>=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
+	>=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
+	analitza? ( >=kde-apps/analitza-${PVCUT}:5 )
 	julia? ( dev-lang/julia )
 	lua? ( dev-lang/luajit:2 )
 	markdown? ( >=app-text/discount-2.2.2 )
@@ -51,7 +56,7 @@ DEPEND="
 	postscript? ( app-text/libspectre )
 	python? (
 		${PYTHON_DEPS}
-		$(add_qt_dep qtdbus)
+		>=dev-qt/qtdbus-${QTMIN}:5
 	)
 	R? ( dev-lang/R )
 "
@@ -60,7 +65,7 @@ RDEPEND="${DEPEND}"
 RESTRICT+=" test"
 
 pkg_pretend() {
-	kde5_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
@@ -83,7 +88,7 @@ pkg_pretend() {
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
@@ -100,5 +105,5 @@ src_configure() {
 		$(cmake-utils_use_find_package qalculate Qalculate)
 		$(cmake-utils_use_find_package R R)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/cervisia/Manifest b/kde-apps/cervisia/Manifest
index 9b17f2ae5bdd..5e33f05489d5 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.2.tar.xz 1894912 BLAKE2B aa0c005f97f9dd12361ec3f64b0a98e012abb6a08739197c5285dc123236d9f8286bca233a710435aa12501e535a5c371c5e747028615c2649795dbbc162562d SHA512 0c7b1bcc03d969bb43476a1a42d8638f520a4952025a0c6e197cc700aab1779eb38db43aa7e39a3b498d0abcecde15b965029fae5a82d762a5daed65cdb1a6ba
+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.2.ebuild 901 BLAKE2B 8e15142fa2ddbc569bcfa909bda72935ac63af5288487c60aa432932c7d6496cd661557ee592a7028c401d1c9a13a4f6c1f9edfa8be17d59c086deea5df42e78 SHA512 fac73a08b538df8b0429a7b09774d6493c78a99b77e01e891ff9e926f7e74d634fd31577fdddb303b5b80cd5a816e6a7fcdc9ddf8a97459e0724d605c7c284a1
+EBUILD cervisia-19.08.3.ebuild 1081 BLAKE2B f9622cae9ae1ac5b336f5a607661c53bd3a2deaf669e2dd6a8d7c7235216472fd96286f704136bc76b14c8b3cf8c95b5ae68fef17dd24b13f64b7dd016f8a619 SHA512 84d24f6099f87180d133c7536f04cd2576661a18a06dac114fadd1438c2a6efb028977df1344ca63cec0d82a5982778d503757a19413d23c19752a0de800939a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/cervisia/cervisia-19.08.2.ebuild b/kde-apps/cervisia/cervisia-19.08.2.ebuild
deleted file mode 100644
index c9d1054f0db4..000000000000
--- a/kde-apps/cervisia/cervisia-19.08.2.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
new file mode 100644
index 000000000000..16c993674ce2
--- /dev/null
+++ b/kde-apps/cervisia/cervisia-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="CVS frontend by KDE"
+HOMEPAGE="https://kde.org/applications/development/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 e733124b25f3..77b762007a7c 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.2.tar.xz 193652 BLAKE2B 8626ab3375615991d7260fee46ffc725bb5fe739e8c5ba0f8556f2171475a2d4d2751d491f2fa235091a26c3caf5b680b0749ef7c63336a60e0cbb48a0cf3494 SHA512 9d84ccdd313bdbf8c944c887321d8459b6bcd2289e48fee3191e30b5c9ea1a0a0c37923f8382f160dfd99f08cabacf32a123674278a0d80bdbb52a5e12685af0
+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.2.ebuild 1042 BLAKE2B 4b3bd46a5e8b0a96bb2b0795bc82c8cbd0afe6af85a5564f764c67257a5ab4c7d8e5351837eb32538b1b2849bd78561d0f8712a2086469cc357b049cd85fcc67 SHA512 f32ee5e5e8fe53766b2c652d7984cb32c9232b140dd29d07f2e2b8419f53d85c019ba101d7838a8f0265b52e2971a39ebb1e4e4889212b55d113aef67f9e1d70
+EBUILD dolphin-plugins-bazaar-19.08.3.ebuild 1186 BLAKE2B d1bbaf57c4422ff5f4363fed19e572f9007806509d613af775de5ee8c49b9d58ee20769f7b210abaf7751c5305bae779ecb73a9182cec5aa44a7b8acc32f7944 SHA512 6790d6a2b26571e087eaa4c1afc30e64ceada303e01c1f8dd547db8bb3ff31bd35c739a7464fe1e9c1210d2b97aa0c5647031b4fe260ffe034e0281b6dbe5bb6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.2.ebuild b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.3.ebuild
index a8f94fbbd4e3..12274e094623 100644
--- a/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.2.ebuild
+++ b/kde-apps/dolphin-plugins-bazaar/dolphin-plugins-bazaar-19.08.3.ebuild
@@ -3,23 +3,28 @@
 
 EAPI=7
 
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
+KDE_ORG_NAME="dolphin-plugins"
+ECM_HANDBOOK="false"
 MY_PLUGIN_NAME="bazaar"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Bazaar integration"
+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)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=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
@@ -27,10 +32,10 @@ RDEPEND="${DEPEND}
 "
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	punt_bogus_dep KF5 XmlGui
+	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
@@ -45,5 +50,5 @@ src_configure() {
 		-DBUILD_hg=OFF
 		-DBUILD_svn=OFF
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/dolphin-plugins-dropbox/Manifest b/kde-apps/dolphin-plugins-dropbox/Manifest
index dc7d22200bdc..1ca7e96dcca3 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.2.tar.xz 193652 BLAKE2B 8626ab3375615991d7260fee46ffc725bb5fe739e8c5ba0f8556f2171475a2d4d2751d491f2fa235091a26c3caf5b680b0749ef7c63336a60e0cbb48a0cf3494 SHA512 9d84ccdd313bdbf8c944c887321d8459b6bcd2289e48fee3191e30b5c9ea1a0a0c37923f8382f160dfd99f08cabacf32a123674278a0d80bdbb52a5e12685af0
+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.2.ebuild 1007 BLAKE2B 1590edbfad026de3ede65cd63a19ad1e7c0ecc2be94069b0631d0de571d28beb0cdd6350c6f5dd56d1a961cd7b869a95c32bc6fcbb1333f828c3895b4c722bee SHA512 16bcd9fbef004bb1e35dcb93fbb0a261ea3e50a165debcee7d7b0c7d79541cc2fdde1cbf92e79f323092a746b0fac5436a5deda7728e488244a5756f491666c8
+EBUILD dolphin-plugins-dropbox-19.08.3.ebuild 1155 BLAKE2B b2949642081852198a0497b6cfcbab02efcc32037e067a1f3eeb4371a4ce17865db3df25b285f0b6810b6f01b5a91bed18ab19450b27f2855144f18e906fa488 SHA512 9f7a298136435161df4587a962d30268d10b22073a1560b9dfc9ddcdf3cb3f93e91482429e4a7e7a8dd26eb61fd8feb907ab2f67891e54184fc75c6ea39540b7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.2.ebuild b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
index a9451d744149..91c272ea7d84 100644
--- a/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.2.ebuild
+++ b/kde-apps/dolphin-plugins-dropbox/dolphin-plugins-dropbox-19.08.3.ebuild
@@ -3,25 +3,30 @@
 
 EAPI=7
 
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
+KDE_ORG_NAME="dolphin-plugins"
+ECM_HANDBOOK="false"
 MY_PLUGIN_NAME="dropbox"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Dropbox service integration"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 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)
+	>=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
@@ -29,7 +34,7 @@ RDEPEND="${DEPEND}
 "
 
 src_prepare() {
-	kde5_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
@@ -44,5 +49,5 @@ src_configure() {
 		-DBUILD_hg=OFF
 		-DBUILD_svn=OFF
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/dolphin-plugins-git/Manifest b/kde-apps/dolphin-plugins-git/Manifest
index a32688f2063c..fad8d6d22508 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.2.tar.xz 193652 BLAKE2B 8626ab3375615991d7260fee46ffc725bb5fe739e8c5ba0f8556f2171475a2d4d2751d491f2fa235091a26c3caf5b680b0749ef7c63336a60e0cbb48a0cf3494 SHA512 9d84ccdd313bdbf8c944c887321d8459b6bcd2289e48fee3191e30b5c9ea1a0a0c37923f8382f160dfd99f08cabacf32a123674278a0d80bdbb52a5e12685af0
+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.2.ebuild 1105 BLAKE2B 43bcecd00bc1b09a28e5670b2c551b055ba6e4ad3130f07984d0a1e3b74a5154c271b7939f934c0acc6b24d71c782bdc915b25c4e7c0726fa59d6b43098cf6b2 SHA512 412341129a5125b9e3b1ffa0956036a904176c7a9c66462de105fbf55618dc529ae4d6461c291f5f9aa2639f31b4e8410fdf9617bdeef5898048b8d1cb863424
+EBUILD dolphin-plugins-git-19.08.3.ebuild 1261 BLAKE2B be59a518ef2842c62661685305277bab40ebe4890fad3ee8d9229b024cb4dbb8a18f2978f364e5bcbd0b688367000d109d8cfb44dec0b3099c076c2cb8c223bb SHA512 67737ff04018c829a053f57933db7dd541732637ada235f8d348ecfc523cea059328273bb477bb55395a0ead60225bec405704ceece2c71222f94b5f80804974
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.2.ebuild b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.3.ebuild
index 1c11cb316cb2..c93351db8f09 100644
--- a/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.2.ebuild
+++ b/kde-apps/dolphin-plugins-git/dolphin-plugins-git-19.08.3.ebuild
@@ -3,25 +3,30 @@
 
 EAPI=7
 
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
+KDE_ORG_NAME="dolphin-plugins"
+ECM_HANDBOOK="false"
 MY_PLUGIN_NAME="git"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Git integration"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 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)
+	>=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
@@ -29,10 +34,10 @@ RDEPEND="${DEPEND}
 "
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	punt_bogus_dep KF5 XmlGui
+	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
@@ -47,5 +52,5 @@ src_configure() {
 		-DBUILD_hg=OFF
 		-DBUILD_svn=OFF
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/dolphin-plugins-mercurial/Manifest b/kde-apps/dolphin-plugins-mercurial/Manifest
index 583c6cdea970..35054dde958b 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.2.tar.xz 193652 BLAKE2B 8626ab3375615991d7260fee46ffc725bb5fe739e8c5ba0f8556f2171475a2d4d2751d491f2fa235091a26c3caf5b680b0749ef7c63336a60e0cbb48a0cf3494 SHA512 9d84ccdd313bdbf8c944c887321d8459b6bcd2289e48fee3191e30b5c9ea1a0a0c37923f8382f160dfd99f08cabacf32a123674278a0d80bdbb52a5e12685af0
+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.2.ebuild 1222 BLAKE2B f654687cf12fb564f752c758a84d0f4e2c938a6fc5f54643277809547850c106fad1795f66218ce30a53794b85e71d96aa417f1ead8280f59e43ca1ea1ce1af3 SHA512 16762f0c79ae1bc177adf5b67750320de04734e8dfe118aec1c611dbfc69249c6da2bdcecfca39e00140421eab57bba07c36e740eaa2153d0353519ceb758798
+EBUILD dolphin-plugins-mercurial-19.08.3.ebuild 1396 BLAKE2B 2f54f84a66b094568682289a4c6f3f72ac6b10ae6c5e7d45f20a751e58c1f6b05e7cd22a37cdea7259730f636aaa4d6b4cf4f6061d7ceabb042f647c381e532f SHA512 58c772607240f040aedca8c77d39f114921674264fd4f2c1f160c26d9a4930261a2f4170615b149e34a1fe22bc18fa2cc0d99cdfea315ac2e5341ae292faae4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.2.ebuild b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild
index c03af6b1783c..7b2e926413e4 100644
--- a/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.2.ebuild
+++ b/kde-apps/dolphin-plugins-mercurial/dolphin-plugins-mercurial-19.08.3.ebuild
@@ -3,28 +3,33 @@
 
 EAPI=7
 
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
+KDE_ORG_NAME="dolphin-plugins"
+ECM_HANDBOOK="false"
 MY_PLUGIN_NAME="hg"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Mercurial integration"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 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)
+	>=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
@@ -32,10 +37,10 @@ RDEPEND="${DEPEND}
 "
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	punt_bogus_dep KF5 XmlGui
+	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
@@ -50,5 +55,5 @@ src_configure() {
 		-DBUILD_git=OFF
 		-DBUILD_svn=OFF
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/dolphin-plugins-subversion/Manifest b/kde-apps/dolphin-plugins-subversion/Manifest
index 0016b4f3ddb2..59b3a0a0e78f 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.2.tar.xz 193652 BLAKE2B 8626ab3375615991d7260fee46ffc725bb5fe739e8c5ba0f8556f2171475a2d4d2751d491f2fa235091a26c3caf5b680b0749ef7c63336a60e0cbb48a0cf3494 SHA512 9d84ccdd313bdbf8c944c887321d8459b6bcd2289e48fee3191e30b5c9ea1a0a0c37923f8382f160dfd99f08cabacf32a123674278a0d80bdbb52a5e12685af0
+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.2.ebuild 1081 BLAKE2B cd86410e424ed8b1aee26d0809c1476578b1cb04011d248a250147ee85a3cb29e97cc9d631cc713a86c9436e33f0acfb137734f635f7f5e28e1ea65d4315d684 SHA512 107acadea4badf176f54b687eebdb467ec5598064277d556ce3f09c964cc372f7790936896921fbfd17f59fc3a4ff67d516a4541602519504f0a3ec1c442ad9b
+EBUILD dolphin-plugins-subversion-19.08.3.ebuild 1228 BLAKE2B 4c2b2db5f915a5c94e215e48b58f60eafaee30a4e35e121b692afb11bb69d71e20d9ddb5894fef9d652e0d4f2b724d9ba485093509accea53f7d80360e018fde SHA512 2d3940ca9ab44daf3b9f48eca6dd6225b1a13d7aea9c2f752c859445071a5303e1b06a891b04889e95de47e435fe6a1483c4ef5cdc2ebb34d92dc6eef0cf6910
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.2.ebuild b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.3.ebuild
index e049e102c89a..c3c8e455fbfd 100644
--- a/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.2.ebuild
+++ b/kde-apps/dolphin-plugins-subversion/dolphin-plugins-subversion-19.08.3.ebuild
@@ -3,35 +3,40 @@
 
 EAPI=7
 
-KMNAME="dolphin-plugins"
-KDE_HANDBOOK="false"
+KDE_ORG_NAME="dolphin-plugins"
+ECM_HANDBOOK="false"
 MY_PLUGIN_NAME="svn"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for Subversion integration"
+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)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_kdeapps_dep dolphin)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=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
-	$(add_kdeapps_dep kompare)
+	>=kde-apps/kompare-${PVCUT}:5
 	dev-vcs/subversion
 "
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 	# kxmlgui, qtnetwork only required by dropbox
-	punt_bogus_dep Qt5 Network
-	punt_bogus_dep KF5 XmlGui
+	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
@@ -46,5 +51,5 @@ src_configure() {
 		-DBUILD_git=OFF
 		-DBUILD_hg=OFF
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 40265b54afd1..af5999419392 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.2.tar.xz 5267556 BLAKE2B 1c52517f21701535627271aac527bdd7db2187c0a5d0b04e18c8f395fad2cacdc41143b9cfd86bba1a6e4a9005d110ecf86685114b52b749148e2e347fa1678a SHA512 97ba07fc6e5f7295297149b8377620c0fb9dedec33833671f29e39f8cb4fb78051bd21d7d63b1dfc48126b03195b3eecc831c3882346a86fbb6ff1122996cbbc
+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.2.ebuild 2633 BLAKE2B 6af50a215fe4a3e848e92d30f7516c2ce1d7d423cbc544603645342c15ed5e59732c0f7823ffc103019e7926240d0d4e23dccd784ba2a2f388d1b008587c0793 SHA512 08432e888e894af4ce943bccd1612f398f54a62d25ab4831286e04e8902065a7a850f1ab915ef3698f990105344f1d5c14121e0c362d4966a80d2785775798f3
+EBUILD dolphin-19.08.3.ebuild 2922 BLAKE2B c4cb251f906c55ff85695019047f3e8fd329e165ed8911ed2a49073644cc9ba561a08abff57fa7428f26b0aa147051f2e12ee47d3bcf556e32cf6d8082984f7e SHA512 3ce832ed6edb3aefe25ec0622d24ef1b813be023bf84417e8828b10c865bcf5b8abc7091adc5120aaaf6038e5d66043cc26b10423d98354fa96684a8b8641d44
 MISC metadata.xml 422 BLAKE2B bacaf060f870e305255375a8902e9d64332b4b19d7ee428f28a09b3d0d47ebe9131968c8aa2c9e940a632f2b742a4fc349154c6070604bc27dc8ac7b184a6bef SHA512 99e4db3ad705d867fad873bb8f58c02bc3716a0903fe59d4781e127994b00f40e2f9b205ad561f531da049ce7ba566c2300e9fc630220cbfbb9721ea045fd24b
diff --git a/kde-apps/dolphin/dolphin-19.08.2.ebuild b/kde-apps/dolphin/dolphin-19.08.2.ebuild
deleted file mode 100644
index 158e8af0b6d2..000000000000
--- a/kde-apps/dolphin/dolphin-19.08.2.ebuild
+++ /dev/null
@@ -1,90 +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="activities semantic-desktop"
-
-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 kwindowsystem)
-	$(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(+)]
-	activities? ( $(add_frameworks_dep kactivities) )
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
-		$(add_kdeapps_dep baloo-widgets)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kio-extras)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(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-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/dolphin-19.08.3.ebuild b/kde-apps/dolphin/dolphin-19.08.3.ebuild
new file mode 100644
index 000000000000..8ad734c376f7
--- /dev/null
+++ b/kde-apps/dolphin/dolphin-19.08.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		has_version "kde-apps/ark:${SLOT}" || \
+			elog "For compress/extract and other actions install kde-apps/ark:${SLOT}"
+
+		has_version "kde-apps/kleopatra:${SLOT}" || \
+			elog "For crypto actions install kde-apps/kleopatra:${SLOT}"
+
+		has_version "kde-apps/ffmpegthumbs:${SLOT}" || \
+			elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}"
+
+		has_version "kde-apps/thumbnailers:${SLOT}" || \
+			elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}"
+
+		has_version "kde-frameworks/purpose:${SLOT}" || \
+			elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}"
+	fi
+}
diff --git a/kde-apps/dragon/Manifest b/kde-apps/dragon/Manifest
index 3fc700d9a170..5e5222210cc6 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.2.tar.xz 1351332 BLAKE2B eb091ed0cb2a85c5e48c54a441870a17e9a781d19acf6153c0a3de4b80d9c1c7838fdeb2ffd32abe04d3c5e6ed225d835cb684b78da81e4922a659cfc2b0bcf6 SHA512 d40019da9e6d4bcad52bcac5e7adaaacca140276e9fd8e4e24bff3a22d12fb00e259b7d3e88fda0620a6b46bcccb648a680631c053a253a1d71df99b85695c3d
+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.2.ebuild 1006 BLAKE2B 08fe3daaf3d6e0a4aa399d4ac1ab310b28b35f8df214054a6281ed44d312620462a921a11cc316a658472ba4d30308a98de87c364b15ce7c6c4cd6da3e0ab05a SHA512 b77a4b8acb26e97be37391266f65c232978d15b231d40e9156ec5ebf6db868b269834ff693bac1f2ed915d925de2740ea2a065b4f74310b9a763037fb6f99514
+EBUILD dragon-19.08.3.ebuild 1156 BLAKE2B dd0cc6f64f931148ed8c1843cdc39e7d79305a1f602e476c040f7eb812563ca79883786ab69c24341fdff7090117d0a8ec7d6bb88e24ccb6fd03268f2b0f9b45 SHA512 bc80a2ad5e261cba09cd3eee1d28932e6da7bade8558c658345ff36164cad2c4d5679b2fdb1909d7ca6d091c4b9009141fea8d61cd4d0480d806b6884aa839de
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/dragon/dragon-19.08.2.ebuild b/kde-apps/dragon/dragon-19.08.2.ebuild
deleted file mode 100644
index 79fc9e3c81d8..000000000000
--- a/kde-apps/dragon/dragon-19.08.2.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
new file mode 100644
index 000000000000..aaf3863e5769
--- /dev/null
+++ b/kde-apps/dragon/dragon-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="A simple video player"
+HOMEPAGE="https://kde.org/applications/multimedia/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 6551cd0193e1..b231feae9113 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.2.tar.xz 443016 BLAKE2B 711af722eb04b00c9bd89cea38957e9b9a959184230f85da06fb0c540b70d8ac4b7ad5b7fb35c6466f50e3f0cb04d92b7a65b241a2266896052fda7b39a9eb80 SHA512 093bd8acf912226f5963cd74e600b46170d5f7bc78a3f91f197b159e424dc65ab14b7f00cbb5fd97dd5cd8fdcdbae5658f3a6e359e012188a9d5e9c407f75251
+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.2.ebuild 1112 BLAKE2B 58fb43757052b3ac83ae3c975d8469c601041df25335450c5208030a1fa64d789f7458e858b4b5ed405f26798943f52e07e3c98fdde890e635c2873d7517ab19 SHA512 7988a16c3e84c62d60838c6ea4c03d58b99c89b381a268137c0d6558a63bfa5b159505b57cc63e128dc9d11247f75fadbe87a2f27184a4afbf474f1e0efc04a8
+EBUILD eventviews-19.08.3.ebuild 1279 BLAKE2B 4055958049cdd89102e3562709c07f71d8d910d08bf078f2638ceab7f4e2122f005ab4dfb1d7dfd0ab1db9aba92ec7adeb79c1419c2b3c5b651a56abf0e2b24a SHA512 f4fa28c55ecffdc082cfbaf52aafe7c60dfbc9fde39082ce3a920f97d5ebebc70da0afb487af9e17bdf918868addf0e52e4a65dd3001e0d3c49d85c20f393c34
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/eventviews/eventviews-19.08.2.ebuild b/kde-apps/eventviews/eventviews-19.08.2.ebuild
deleted file mode 100644
index 92b8d7c80da6..000000000000
--- a/kde-apps/eventviews/eventviews-19.08.2.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_TEST="true"
-inherit kde5
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-DEPEND="
-	$(add_frameworks_dep kcalendarcore)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 kcalutils)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep libkdepim)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui '' '' '5=')
-	$(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
new file mode 100644
index 000000000000..4ef87d252720
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-19.08.3.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.60.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 9658fecb821c..6d5ae3f9d5e7 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.2.tar.xz 24920 BLAKE2B 625fde994067f641f996ffe46938c02460b75bd8812a15628b5b71633e34d7ac25e709f9ec92216be5fb70b6ce0ee5b651fee684d73319c75fab54d8cc548776 SHA512 b708034ac4b8541f84ce6b806f8e914f656fde260c24b5a4e1d957fe01ec145e62a41545e535821122b1b26e590caba74bd192b309fe295fb0b7fb423f3550b9
+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.2.ebuild 513 BLAKE2B 15afc1a43c495d6406a3ff0035eab9fcc6352330c26b386b7cee95c2e7cb25fb4634078697a4ef742d54838da7969b99d7db22cd7e2b2960d8563cc663f7e2a1 SHA512 a30fb3c3b0ba76b5326349aec6a323c4f568850bdb112cd5cc1cd2eacfdb9cc43af28871d9d4941b7f0fc1635245fa64933d0d309f7bd08d66a58d7d8fb2c823
+EBUILD ffmpegthumbs-19.08.3.ebuild 585 BLAKE2B d8e35aa1974190e3945a3c7d8e77b9d55606e7d1c4d4302ae13a90177be78fbc9f5b709e8148d4898770b57f8ead6b0131a43a2e64e56c5d08d866ea53dc8f79 SHA512 92fb9e65841df38f1f25030a9a0a91b84e44aeae09a952c860fcbdbf0bab210c2b568e88feee1c66b5ba4a6def38896851eabe3bbe6687c21296bdbd9c6862cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.2.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.3.ebuild
index f50e87594e08..8e0e9a920b9c 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.2.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-19.08.3.ebuild
@@ -3,10 +3,13 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="FFmpeg based thumbnail generator for video files"
 LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="libav"
 
@@ -14,11 +17,11 @@ 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 f8016b95314b..97ad8c68ced2 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.2.tar.xz 660172 BLAKE2B 81b5a8d71d8faa5de1b50296b68118e2d0cf9a9237dbf113c90760f158b66c0642e7e647caa4aa85ec25649932c8b94f84ee27853c5cedbcdd7f22ee250a090b SHA512 eaa105f5bb9e15c8bfbe1852ec97758fba66e1c8948c95723cc169e21c471ec74987d28f7c1fe9b4ab4828ce390dc676fc8d2b5a9f64ae5134ba5841dc27644e
+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.2.ebuild 703 BLAKE2B 8f4787ff01fdf7a1a7beadd2ea8145bc0f56764da3f585db437bcd61632d6f0bc3ec0cf01e5382c07081b9dbf2e1761aa64b907a15f1aeb454864af386d45f15 SHA512 d5fcc7fe105914a03810a329c2acf43f6a4feabd7d8101207e793a4eabde695b12cc3558da293b9796d5802c53809c860d130df260ef7490ff54ca5edad85b06
+EBUILD filelight-19.08.3.ebuild 841 BLAKE2B 2fde540ff2e6d30b8ea75a59158c5e39c05ae421e36652c3df5b27211c26af43d7a071bc6672d3546f48e3f50b88584382966dc63e83b6e8e7734b1b70563863 SHA512 d792a8cca3915b471fa12d541133106fc1c53743b99e92530e45f84a5c93e4cb70d2123ef2c12d554cdf65e94a593d0039ac76a5026b9e0a43f754e6be2d1c82
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/filelight/filelight-19.08.2.ebuild b/kde-apps/filelight/filelight-19.08.2.ebuild
deleted file mode 100644
index 992fdf7c9603..000000000000
--- a/kde-apps/filelight/filelight-19.08.2.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
new file mode 100644
index 000000000000..403614f46308
--- /dev/null
+++ b/kde-apps/filelight/filelight-19.08.3.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="optional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
+HOMEPAGE="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 62a4c01dd6a1..dc539ac52001 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.2.tar.xz 1944368 BLAKE2B 5c99efd40f106cc8b7c95c862cd6d8ea9cdbf18cb3eab10373d9e573b4d8ad7a2a6cb7fe718a9087b2d94247753cb2def1c25fbd193296fc5bbb241597470c2e SHA512 20e7b88ffc6e326f4c0000d7b6a9992141f7c2f2236d235e96aea513be257ec29873d7156da4a12b52bef0d49dd54cd9a07942b6463fcb38273e40640aadd6b7
+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.2.ebuild 736 BLAKE2B 39dad563616afb036018d1369c113895e09c9a2601d5e5541a1f7058a99467500dacd4c29e2dac8b9ee0cd76f871a2b7acc8e1c5c6890169e1c4f3525c8ed4fb SHA512 7bb0411d4c841fd5ccb053aec216497b9b52d0ffa76126c3eb47578c5f62b4b1fbc996c31afffc938979fe862f8ea129901e7c13bf3bfc1623d17e73ecdaa160
+EBUILD granatier-19.08.3.ebuild 910 BLAKE2B a347833eaa494d401a7bb572d2e48b2f12a929f509a51f6dacf4d1bf0363decd7881390c67b381022f5f787a3ee1cb24959b0810e2b75381d2e6c565539dd882 SHA512 2131f3526fd88d8646cd0e9f7d20af1735ec2e1ecdcec57484400616d1cde4331e898f311ac23fe75b034ec106b95841e110382cfc1d142b6c90d7aa994c8109
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/granatier/granatier-19.08.2.ebuild b/kde-apps/granatier/granatier-19.08.2.ebuild
deleted file mode 100644
index 1fb29bc02d33..000000000000
--- a/kde-apps/granatier/granatier-19.08.2.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
new file mode 100644
index 000000000000..1a40aa3e99ff
--- /dev/null
+++ b/kde-apps/granatier/granatier-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Bomberman game"
+HOMEPAGE="https://kde.org/applications/games/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 afcbc4ff095b..254fc3c51a02 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.2.tar.xz 111056 BLAKE2B 2b446570ff3c2c82333ed1a2940824863023560e37bd78e9fa818aca461ec97638ce34e5cea760353600fcda1afe2c6e3bbff69bc3389797296ccb1421747b22 SHA512 daef90190bc50c8f6484dd14f4865c81f08191fd9e39d7888f3f02a0279a912a10f5f2e9bf4ace1b3e9f4668251a21341f9f470594af13ac52d70f5d8ddfabe7
+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.2.ebuild 1175 BLAKE2B 825e631171c735acaa6ca7e162847d7433b881285bd8be904a203237e30c684a8562589f51e1e8ea449aa10def0d9f0b30f3ab4a56dbcd6de821272b6eddf91a SHA512 542400a2099ef12016bfa01b2514d0d13e8f9df758a5748928951fae37273b3ef8721267a5ea6a2a5ce51510494e990a210eecf0118911b109ab0ceee3725a3d
+EBUILD grantlee-editor-19.08.3.ebuild 1360 BLAKE2B 8a45a979ba6b5a3e3cfff8dc17121c24124db2788fb212269a60b076009e8f5df8868af0dccf28644d9360f7aa818135d613000bd9dfda246f44a5970f6cfbff SHA512 a9dfe540ba180580288de0915557185da991a49c85b9b173c780fa1846b25b7e0e36aaf086dc265256a7f48b0700d5fcff53366e11cc3d2c998493ebf61eced8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantlee-editor/grantlee-editor-19.08.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-19.08.2.ebuild
deleted file mode 100644
index 8fd07bba2d16..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-19.08.2.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 kcontacts)
-	$(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 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
new file mode 100644
index 000000000000..c8cf5c0a806c
--- /dev/null
+++ b/kde-apps/grantlee-editor/grantlee-editor-19.08.3.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.60.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 875860e51b52..3b0ec9550f4e 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.2.tar.xz 52400 BLAKE2B 640f14f51b1b79d1d5f8ac5e7263f6f9a93ad61fdb30ecc9727db6609d30c4b16964686957daf88d6fe07d1238e3eed2f326d32310aa69a693128e6ccd06504c SHA512 acc9bd53323943abb801908c5d1f148c52ed6bfd0ba3a93f3da05aa4e09aa2cf19f278626c546efefd695f4353de0c8b6e2e8327d92174dfaf4d91205eb442b5
+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.2.ebuild 741 BLAKE2B 5ae05a5fcde70ec9343d70621babc5b35b322be1c9be305229f1c5ffb919e5064f501732de10437a45d629ea0f97dfad9e12e9ba2c3021d6e31d12fac4056759 SHA512 79fed7b0de98969b48de28c81ad2a3ef797c2e6e577ddeb10dc87450127abac7131de78cf941ea407d8e99ec4dd0ab42b932b9316f450fb98ea7838795df8a5e
+EBUILD grantleetheme-19.08.3.ebuild 843 BLAKE2B 387bbf2482aa5a427fac316928f9bfbf2a2aa1c94d702437fa0c142291fb7bb3887e57c5002bf32de4eb56d6b659b6f6ec09138ae71e04be3a94c833f24c12fa SHA512 823e9c06dca431da9ace3f62fc8a69b4111e4f704150158bf513588122d9845083e9d70acb2693fdaca851af7ace7ef19ee1b2ff80b1de0f68a8892fe8153501
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/grantleetheme/grantleetheme-19.08.2.ebuild b/kde-apps/grantleetheme/grantleetheme-19.08.2.ebuild
deleted file mode 100644
index 86d3074a9311..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-19.08.2.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
new file mode 100644
index 000000000000..47f33a7cc5ba
--- /dev/null
+++ b/kde-apps/grantleetheme/grantleetheme-19.08.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.60.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/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 fa207cd85427..d5b13a16b5e1 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.2.tar.xz 5724040 BLAKE2B 14d16f5492aa17040fe57fd17ac8df069c55cea9f623591f2192f33825096c948a08874fab6c5884b34bc6a48839682a8cbe06ecb2ae4252a727d19fd8df2fed SHA512 089bb97a79b2f6853710805d19084334972c86f8c89ddb2e80c7bf30d5a82c8edd5a0be5b68a7ad9e63c1a2b86d75dbd20dccfefe2859a660cd60cfbcbb5d843
+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.2.ebuild 2760 BLAKE2B ac1a6c17dc5635136f4ae3a422908414bbb4ca9b2aef1d82e7357da1f2d5c907daca4744dd3b79d28ed16c7c9fa96de4337d974836c73769947d2b682cdc68ba SHA512 763e075c328124851236b159ab446503b77659c640afb0feca11300dca051d3c897bde7a6886184e7334e0bfe65bfd1b4561abbb9d4dda2ca0fb6cf2d9e30e61
+EBUILD gwenview-19.08.3.ebuild 3005 BLAKE2B 096d3f84eea25b34ec40ab46acd1d422952dbbc4b5aad36775e7588e483ad9d90e26795407f1cf0301dea3f48b01176da7d535211cf8b63251eb250246f80cca SHA512 bff6b038b2bbd02c09109cfc25969f58d0434add155af091bf41039134dfec774ebbe40e563931bbac77e1b75cb5691418fb1a3726ad6ee901d10715f96a6013
 MISC metadata.xml 708 BLAKE2B cde335a32954748c28475a1620aac2e6733490fd8e6126f8963c6b5b0b6e8e87065dbab17e1723945e8f5646815acdf9fdfbf89c4dc57639663567fdcab0b5c9 SHA512 b8fffc87db328df9c5dafb6d72b954ce052678810375278adb390c832bec11f419000fcdd08bd73b9dbcc3e475b7e7b927663c9886b6eb92b7caca7e311015e6
diff --git a/kde-apps/gwenview/gwenview-19.08.2.ebuild b/kde-apps/gwenview/gwenview-19.08.3.ebuild
index ea2389376623..4398c866bcbd 100644
--- a/kde-apps/gwenview/gwenview-19.08.2.ebuild
+++ b/kde-apps/gwenview/gwenview-19.08.3.ebuild
@@ -3,9 +3,12 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Image viewer by KDE"
 HOMEPAGE="
@@ -14,6 +17,7 @@ HOMEPAGE="
 "
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
@@ -21,59 +25,59 @@ IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 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)
+	>=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? ( $(add_frameworks_dep kactivities) )
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	fits? ( sci-libs/cfitsio )
-	kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
-	mpris? ( $(add_qt_dep qtdbus) )
-	raw? ( $(add_kdeapps_dep libkdcraw) )
+	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
+	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
+	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
 	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-		$(add_frameworks_dep kfilemetadata)
+		>=kde-frameworks/baloo-${KFMIN}:5
+		>=kde-frameworks/kfilemetadata-${KFMIN}:5
 	)
-	share? ( $(add_frameworks_dep purpose) )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	X? (
-		$(add_qt_dep qtx11extras)
+		>=dev-qt/qtx11extras-${QTMIN}:5
 		x11-libs/libX11
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtconcurrent)
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kimageformats)
-	$(add_qt_dep qtimageformats)
-	kipi? ( $(add_kdeapps_dep kipi-plugins) )
+	>=kde-frameworks/kimageformats-${KFMIN}:5
+	>=dev-qt/qtimageformats-${QTMIN}:5
+	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
 src_prepare() {
-	kde5_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
@@ -96,11 +100,11 @@ src_configure() {
 		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
 	fi
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_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}"
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index fa9932fc9c62..fe4e54d16f4f 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.2.tar.xz 549804 BLAKE2B 619d6e0dcc475632159a9423de1e9114139c5523a96eae5ba520df2539eeb7ed0ceaeac1ebbd8d9e7225b8bcaf7b56939fe23e5ce6f05c75493e2a3d23416dd9 SHA512 aebf5c6f6cdb2bd12eced072f88535db370ce6435e895b4d6f0d314c024873f4f119ba4de2c3f1a188ca7d3eac016bf18b305547c9734b1032c819d7d449f12b
+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.2.ebuild 1410 BLAKE2B ff06cd5ab96d39a8ac92684149f91708c90f2da7af02c01b0c5b46f1ce2f32ebf142d10f324fd487dc40ffa2219381d8adb39f8f7abb824cd96b6b9dacfe115e SHA512 023741c874ea18a0bceb53fe4c526ef73a9fa1fb0cd4229048d7cfcc9624b3f99eaaf6bf453eab35d5424e3d472a0984703d31fe3b99b6e79b315bbdb0e96375
+EBUILD incidenceeditor-19.08.3.ebuild 1626 BLAKE2B 913db423aed23c1705be9744835def625fba0e9a5640d01f471d820eb9ddf893f8331792b479060891cbbc38099dd46cd2da4ac287919170ff6919a66373fee9 SHA512 2e9081e7abefde80e1821baac1674df23228028e5a1f8b14b66c6f097672cd6a759535b5a1af9d71d9a0b0aa29caaa70aae3bdff672822292953f572091eb834
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/incidenceeditor/incidenceeditor-19.08.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-19.08.2.ebuild
deleted file mode 100644
index 52c5320872a1..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 kcalutils)
-	$(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
new file mode 100644
index 000000000000..2a238686537c
--- /dev/null
+++ b/kde-apps/incidenceeditor/incidenceeditor-19.08.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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 d632c9ed3f73..d59e8a14c69f 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.2.tar.xz 1866212 BLAKE2B 29680b690470b3688a6187326dccc42185c3e0ecab6c6e5aaa1d6f215257bdb43fc4f747e9c51274fbe6c6ef83625fbab4da1d96c52f63fcc15ca0e839984703 SHA512 1de7d1840eb41e47e29001e1031ad9f31942b0663ba76e83ece84534ca88a22ad03b5482276aa40259a72282e73241b872ff27ef81c1f777e31265564635592b
+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.2.ebuild 1084 BLAKE2B db2cb242a405d69b4896467850d0bd3b8ef9e2077cd0fdf2c36bd5ce55b959fa0a7295e6451104b931ac86d35aa7a7862e8e25fabd398bcf94ac25517642dae9 SHA512 d92104547ee732d069acb669db9a4477dc03ee8d9f4736e2925575f70044a429f9cee797841024c76c2e046ad0b55296e1fe4fb1b9ed9279f673006d564385ee
+EBUILD juk-19.08.3.ebuild 1288 BLAKE2B 9ff3e04258ade44c0a1686ae37338104b811f424c1c0dbc8ed4d7c26585a3735b7955e3a233c6d5964a15094c228702892e5face8fb82d08a31af47f1e5a85a9 SHA512 a88ae90dc2a189eedb5b78cd7a27df003afbee005b403d072bf8b49ec31e8bffa20359d76c665480b7b7caf7a71581d93a15c85f531ce34fb27f18a0ae24873c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/juk/juk-19.08.2.ebuild b/kde-apps/juk/juk-19.08.2.ebuild
deleted file mode 100644
index 510ac48592e8..000000000000
--- a/kde-apps/juk/juk-19.08.2.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
new file mode 100644
index 000000000000..72e67b79e250
--- /dev/null
+++ b/kde-apps/juk/juk-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Jukebox and music manager by KDE"
+HOMEPAGE="https://kde.org/applications/multimedia/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 fcb42b8d6cac..a075c3f24c36 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.2.tar.xz 10505676 BLAKE2B 601b60eea2ea2cbe7eb30e947f922c17c9debfc1d2b14dd2604f5783b268d4b60dbfaf0b32f3e5bc0c6d7bb05d3c6cf0ff275eec90ae255eed52c17eafc8bce8 SHA512 e1ff3b9678e6f90764b60560e132f4c969d3f11d38b5233d48c628901509807682de06fb91c9bf653672df62b57afb8e2dcedf6a754b71af31c83e53a385caee
+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.2.ebuild 3359 BLAKE2B c4b84f6fbc417c0ce044313d7c75fd4203a401745f270bc21f515cc03dd421b770447f2d33ecccd67dcedd705c142ba4150bd812893118078996a1a91ff01801 SHA512 99faeffaa7afdef2cc8652736b028827dca8651d14f10e1d6fbc8db35e86ee3316cfb25cabfdf11d62c7048c7fd8737f7b5e4d3af2fe6de0828d5341d38b041c
+EBUILD k3b-19.08.3.ebuild 3566 BLAKE2B 8c103ecd616c635fc55776a117df5555566cd271cd900ab699a5a49683b3211c471285e5bf011c60098ac06f81977744e642cc37f9601d0c5434ab2042c22eeb SHA512 f95426bde10182b32886768eda6bfdd66186b4f33531b4859c20879104068cc5f33830dd689b0a33972f192a832058a7226d4ace1e7dff5fb318de3283fe5b6c
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-19.08.2.ebuild b/kde-apps/k3b/k3b-19.08.3.ebuild
index 4d5866b606bd..3f2f8b8ba15c 100644
--- a/kde-apps/k3b/k3b-19.08.2.ebuild
+++ b/kde-apps/k3b/k3b-19.08.3.ebuild
@@ -3,14 +3,18 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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"
 
 LICENSE="GPL-2 FDL-1.2"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
@@ -21,31 +25,31 @@ 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:= )
 	ffmpeg? (
@@ -102,11 +106,11 @@ src_configure() {
 		$(cmake-utils_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 179451c245c5..78d25b8edfe2 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.2.tar.xz 71768 BLAKE2B e966bb598d4a87991a98bcd1feb287716f8e7a1925b9df36c1aff733f45f35db29e523c248cee2fa4ec2f03c10d8953f0c548dd918c3c352721fa1d934d62045 SHA512 cdc8601c59a17b8fe197a69c7117e55d7307c8e6fc6ea886d064f8b6d963c2919d7984e5b54c1c59405da18f8e6d2a5a5eb37bb39aece3de8f1c839297f13175
+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.2.ebuild 977 BLAKE2B b3b375ca208ff4ff2f26c43e3c07cc6835e74367799900c103761a4b28075e17734e1ab2451db27912ee7321738bc63e8c8acec9d5aa1903fdc058b3d0ed6ea2 SHA512 e2639701a41d6ef937ed0ca6eaab096d0de3dbfdda60859f9fcfb3e7f3432068996af69feca80c9272a22aea794a8cbb60e9b6c37b10cd7157dd88238e40c11f
+EBUILD kaccounts-integration-19.08.3.ebuild 1122 BLAKE2B d01aa612e88e70ab36666bc6b416583706d65f920c40c3a9a228817d3a7ad2cf3f92e97336aa4d3250bde9f52cbb514cbace5e33f61a4e936c91f219d8ea3485 SHA512 50f3a5428ec80f091bafd43d773b67325e2e6629c1d08eff11d1ba75cc1b40d504c6531c5a614ab5eca50679a911d79d917075ca87645ce90c4d4d246b28a772
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-19.08.2.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
index 616d18489bd8..37b62f17e3b3 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-19.08.2.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-19.08.3.ebuild
@@ -3,14 +3,18 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALDBUS_TEST="true"
-inherit kde5
+KFMIN=5.60.0
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+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=""
 
@@ -18,23 +22,23 @@ 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)
+	>=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}
-	$(add_frameworks_dep kcmutils)
-	$(add_plasma_dep kde-cli-tools)
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
 "
 RDEPEND="${COMMON_DEPEND}
 	dev-util/intltool
diff --git a/kde-apps/kaccounts-providers/Manifest b/kde-apps/kaccounts-providers/Manifest
index 7d2bdf47b095..324d13ede7f9 100644
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 32104 BLAKE2B 9315f1ee849ae9524f29df6a014d8d47c467092b1b19bebe80f4d8588606eff6c5ac26025362f9df78235b3e6eab2a97a415d89fe3fb8750553ab0481213724b SHA512 d2a68fb763bb5fe8e98c801e0dab4f84ca79f0169617fc59bb5e45741561eedbc7121ef08c0c8d7b89454ec13fae3b00cecaede97384c3075cb52e23d8ac7785
+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.2.ebuild 643 BLAKE2B d71f6c43b507af233ecbe3b93f9a085e2903e37ad7179d019debe8e16b51f19163b43acd2d359e8fbe3c374cfdc1343990886a7f6aba9862eb3204682d604818 SHA512 6b200514ddb9e64499e29490815a23866833565923a3b70a702e12f56e1bca34e011c847aad3b77444fc169ed8af81e3d3589f887d07188e0b73a87fb5207871
+EBUILD kaccounts-providers-19.08.3.ebuild 757 BLAKE2B 9012afb9c856f7dfbe002689089bc2b251103aef2a3257adc08099c052be5aeae45ba8f757ed3311f3eda564b7e609580814ac8e623ca695c4fb0036a6cb9d70 SHA512 d7c0f679ea51fd9537807b485b61f2c06dac2be308ed68d3ced524f37e5f79e18ed474081aa8860e28819582dd5b5ec2dfae1024d4854a8bbd37196875db4697
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.08.2.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.08.2.ebuild
deleted file mode 100644
index 9e14c3d00762..000000000000
--- a/kde-apps/kaccounts-providers/kaccounts-providers-19.08.2.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
-
-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
-"
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.ebuild
new file mode 100644
index 000000000000..c1a57e6b012c
--- /dev/null
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-19.08.3.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.60.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 00af15179e81..820c6fddb64a 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.2.tar.xz 475268 BLAKE2B d89d75e84a327b4153eaf622453c9818d0995b6d1ab592a800d3881bba4d7136a5fdb6c05271236eccafb78527b9ac26eafc573995794471a2e5d9b3ca560820 SHA512 7afc6eccf6dc8d16c21f9616ec6a8d0f198f10c27564eae423199ef09738e8bd7f2123fe954ab665187c8519693a8c193c16a72fe192666ca31da800f50a91fc
+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.2.ebuild 1819 BLAKE2B fbccc35b894ddf62e5f15d1490e360a6f167d35fb68a2deb2ca15c282fe9e591ece5b21af8d797db1a3c6896addba966338ec3cd2a9c8bc40e38693254b21095 SHA512 5b76ae2d6727added757d03e07f214e467218b12ea6ac4b6b23a54192cb366e80b4b58717ebadd81a1935c434699b38bd6b3b8b1286b9c86e7fb2cce6a09f972
+EBUILD kaddressbook-19.08.3.ebuild 2046 BLAKE2B e8e350386a36884f1c59573f9cabe37b36ee2571f44af50db07876888c5f078539e2034d09ef1c44b12c0bcdea5e55fd98bf365b3d93005d4a0bc7d863a29644 SHA512 b35b127f6d7dd8a23d51977e2744130ac33b58ae8d0df9295755e76c33e960a7be1c20429b22c49847de99acc01276ae2c9393246f4297c8baa68bb0be9835db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kaddressbook/kaddressbook-19.08.2.ebuild b/kde-apps/kaddressbook/kaddressbook-19.08.2.ebuild
deleted file mode 100644
index db1c8f139c98..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-19.08.2.ebuild
+++ /dev/null
@@ -1,66 +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 kcontacts)
-	$(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 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.11.1[cxx,qt5]
-	dev-libs/grantlee:5
-"
-RDEPEND="${DEPEND}
-	!kde-apps/kdepim-l10n
-	$(add_kdeapps_dep kdepim-runtime)
-"
-
-pkg_postinst() {
-	kde5_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/kaddressbook/kaddressbook-19.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-19.08.3.ebuild
new file mode 100644
index 000000000000..0a9d58ea406c
--- /dev/null
+++ b/kde-apps/kaddressbook/kaddressbook-19.08.3.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" # FIXME: Check back for doc in release
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Address book application based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/office/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/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/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 db702b67438e..1e6bcf2b99fc 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.2.tar.xz 4465548 BLAKE2B 64f5563495d6e077d90dd582b38f76176651dd19275e194024a507f6307021626424239ae0e07a633a41898011805c95af9ea0f2009d4059c3bb1a13c65b735e SHA512 d8a58e2c9625fdc5b1064598405f300f8655d8e2312a154ac32c2169b91be3e9283b3962814c92e907d0b853f158329a58b05b11952f0570495c53809ee0bad6
+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.2.ebuild 1228 BLAKE2B 701110e866726814baf1dc3a9f47e346e054231ab49aae9f1f8780e5653066183270c9c9f758383c1cea24dc6863ea9fc009dca31eedca3b955743bc05a21c5e SHA512 698b980c475fdb5d01da1750301fa077f15f24e772c57abbfd0989801e57e42f471e719ce7bd10da1ac679a9e662af6960f666bdf464b15b3d9aa81d51593ac0
+EBUILD kajongg-19.08.3.ebuild 1268 BLAKE2B 8ef06e579f51a76426bcf978ce575c516684f2b76e816d7c7cd802120688db77d21bd872bf968a677589b584539ad8059cc3fe07dd88d50bfc8c3941fec1f3d7 SHA512 5cf84881aa336aca396cb22cf6a6c043e36aa2c14aa61f33cc6ae370a85cc33cf9a2b17ae8fbd6bfc293713c09e43b64356297818e0001566388a8433050fbb8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kajongg/kajongg-19.08.2.ebuild b/kde-apps/kajongg/kajongg-19.08.3.ebuild
index 7b8fbcf0bfd9..4486345c5207 100644
--- a/kde-apps/kajongg/kajongg-19.08.2.ebuild
+++ b/kde-apps/kajongg/kajongg-19.08.3.ebuild
@@ -3,48 +3,50 @@
 
 EAPI=7
 
-KDE_AUTODEPS="false"
-KDE_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoptional"
 PYTHON_COMPAT=( python3_{6,7} )
-inherit python-single-r1 kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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/"
+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/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 790e1edda422..8075b1e59f15 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.2.tar.xz 1824632 BLAKE2B a8e6805e86dd3b2fd108ff16d28fed5f74ae431c96c46543b70fa831bcbd7b784d1279571fae4aa3c637e68bb8a80df1dea3b39976c8c67a8d9c8ff6d0a3cf82 SHA512 c5063053e3845297315f316476d79f86bc517260f4778e9d6986032a686f9c7d8a33cd56eff8a4ab18900892c47ee3cda1d32a11e42bb736a60ec24577c3092d
+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.2.ebuild 2157 BLAKE2B 42edf53e3694c23191d467d9589bbdb274cb5e7f1051e5c785514fb3dc279ebcf3d3456bed5988569bff4ceafc7d458599057ac6eb7538ac7486a98b58d405a8 SHA512 d11636f98cd3f55173a8cd089e01776bfffee1deca4a053cb5a00d63b5060b3e1b7110afa9f80f7c6e2f7abe263e362b6478c23bdcb33bb4422c5a6c8f1c3159
+EBUILD kalarm-19.08.3.ebuild 2450 BLAKE2B 35863edb671cda046f37cecac5ef73d7850367d00e7a926656b9141a0930a61516cef0900d9e129af6b26542eeadcacbd562e24aad60ef0ad7c592bdf71b227d SHA512 53463e0a1cc86848f942002bb3baa084543c5d3622438a1212b707e9126ba068ae79c57e68a48876734a6c3affc2144d89f1f953b5e8003b7d6e313fb2ec0c36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarm/kalarm-19.08.2.ebuild b/kde-apps/kalarm/kalarm-19.08.2.ebuild
deleted file mode 100644
index a67a4fdd695e..000000000000
--- a/kde-apps/kalarm/kalarm-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 kcalutils)
-	$(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
new file mode 100644
index 000000000000..917871df0446
--- /dev/null
+++ b/kde-apps/kalarm/kalarm-19.08.3.ebuild
@@ -0,0 +1,85 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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+ )"
+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/kdelibs4support-${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-utils_use_find_package X Qt5X11Extras)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index c1d01cab3f49..860c65073e7f 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.2.tar.xz 573868 BLAKE2B a40f7d80356f2fb24ac81219451a037656b64f43d0f36681f83a0e4a5c7c82483c94b1bdceb2109713cdaaca3f7c66b7fec4a7c6ecbd575acb79acdb65e9969f SHA512 e3906b58a56d74880a2c2430fc5f12143ce930172a2fb6dd2ca3645464b573541429a19c8234c2b32c71fa515aa090e92c44bf51c0cd57901b6237e3705a5264
+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.2.ebuild 750 BLAKE2B 8d584b2ebb5609b21ac848f614f3ea8157f2d12da4e8a3c20607fe34900279be935ca87f9d4abab97abce0acb673bb24f1354b9079d0f220a9fffa54985a59c0 SHA512 223a30f3259b78ddcb8e0a0c12085ad7755b2ea9d56552816e5b4ea27ef9ab9ba3cfa1576c5a8c097865daea3b50fae1dd373eb438f545238749ccd8e55fe8c0
+EBUILD kalarmcal-19.08.3.ebuild 857 BLAKE2B 21eb56720b8f6f53cab1c5126fc62c1dec3ccadd48b9673a8f24c1b561e982668ce21b32c0e19b04ec5d3db0c0a38ad9b5c3d31945a9f46f4be078179d5e505c SHA512 275293f6edcc437e3aa5ba55352a163389c76855db5f2f6aadd60055e55267860434e3ef4e9e2b60f213e5008ff22035f931030dd46060bb75285ef365a55059
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalarmcal/kalarmcal-19.08.2.ebuild b/kde-apps/kalarmcal/kalarmcal-19.08.2.ebuild
deleted file mode 100644
index c2b93c3b6cb5..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep akonadi)
-	$(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
new file mode 100644
index 000000000000..d9bd2cad8814
--- /dev/null
+++ b/kde-apps/kalarmcal/kalarmcal-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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 6e01dc8fb650..e8a736c7c9f7 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.2.tar.xz 1157584 BLAKE2B 509e7104ddd24d3795408204a9c692cfd6ba125067b48e3f2c903e3f955e9fb4cf5c5e00443a3ab8d251dfcc5aea601d58813d7d8ed58c1d41e74b8d5c6073c1 SHA512 4cb1013dd20b806a7fcd629328662a8b1c6efa81c685d4bd6b1940a8142dd6fd7ac5ad46636743e26d17b37c283fa51f94203878ae1f255720da71a2e8810654
+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.2.ebuild 997 BLAKE2B 8d3e0e8d11e362bc520feb857f1aa7772f6b6b598992115d6dd951010b8b5a2eac58f3ac710580730071d6ff0912c65381bf94018e22951aeffe8caf4f55e03b SHA512 c9843dbc22b247406e92baddb7720dc3f3edc9c5943b1a021b819e56375aa4eae63aa3dc14f9fd392cf3b6b242c891bb5525d301e665750b18869cc59a0ccd54
+EBUILD kalgebra-19.08.3.ebuild 1175 BLAKE2B ad3fb064702ec684f8db0e63a076907b33fb920c4c78daaea74aa464135f534cc079a0d4dbd309393831dfd6f7736914f9074e0b050e6e9f65a5e35ac90e04db SHA512 b9ecf2efa0a31f85562bfadb8e3487e366a8449b656b0ed3d20e706637657940f9227fb962cca4efa5f23110f2d6259982b0f69b484c0d6e2f160e4fdb3b909a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kalgebra/kalgebra-19.08.2.ebuild b/kde-apps/kalgebra/kalgebra-19.08.2.ebuild
deleted file mode 100644
index af5f830c44b4..000000000000
--- a/kde-apps/kalgebra/kalgebra-19.08.2.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
new file mode 100644
index 000000000000..9b74d28d7969
--- /dev/null
+++ b/kde-apps/kalgebra/kalgebra-19.08.3.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="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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/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-utils_use_find_package readline Readline)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index ec24b3ecf69b..e425ab4823c1 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.2.tar.xz 26411676 BLAKE2B a5b45363234ef179b004de2cd8896dcd14d31563aafd7807feab875a3af0c0971a8b47b09e72c32d0fd50e6ea092af850eff49acdc269b385ba4234fc8e7282d SHA512 f6956b846345e986f2c5c939e3996effd524804f166edaedaf3c21fe35f529815cdec5674f67bd52bd30fcacd03409262bf592fa6240a2bcafb3bb695830965f
+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.2.ebuild 1556 BLAKE2B b03e335dbafbef98ce4ddbff7dddb3e2ace5ef81d46c2c00fb0fc6d0b242531c786896148ad255ee294eecbce2e2be54bca304824f3eb73458a3c03a3b2d3b69 SHA512 94e68b01bdd0da0294c3a717d66e0f6c37e599036787469cb6dc34d27ea3e73ae4e911926e1505ca9e5593d473e1800d3e981727b590a8ec4837da2cebf32a17
+EBUILD kalzium-19.08.3.ebuild 1747 BLAKE2B 69e53f3464a602d4a5bbbbfd4060bcb4e4cba691b96b9a58f9f8768cccb624e84929c80cf58ab8cf3449c6d14838807e1b517f785a1b1b09120db3a0f6b10e67 SHA512 79d086a2da9f0d565b943767666d65e791f8fdbe262b53e920e4fa99228aee09f4163bddf7d021c196dbb3de1e5d098dadda8d325c54fb8fb70a2f5c29786042
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/kalzium-19.08.2.ebuild b/kde-apps/kalzium/kalzium-19.08.3.ebuild
index db1dcf41c0be..465797cbdba2 100644
--- a/kde-apps/kalzium/kalzium-19.08.2.ebuild
+++ b/kde-apps/kalzium/kalzium-19.08.3.ebuild
@@ -3,36 +3,40 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5 flag-o-matic
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org flag-o-matic
 
 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"
 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)
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/khtml-${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? (
-		$(add_frameworks_dep knewstuff)
-		$(add_qt_dep qtopengl)
+		>=kde-frameworks/knewstuff-${KFMIN}:5
+		>=dev-qt/qtopengl-${QTMIN}:5
 		dev-cpp/eigen:3
 		sci-chemistry/openbabel
 		sci-libs/avogadrolibs[qt5]
@@ -55,5 +59,5 @@ src_configure(){
 		$(cmake-utils_use_find_package solver Libfacile)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/kamera/Manifest b/kde-apps/kamera/Manifest
index 3e00d2fbf570..fc6b81f078e8 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.2.tar.xz 100056 BLAKE2B 49970805797b282e6ed020d91700ec9a94e50a68683d17af97586a1cd49f8f141007000e2ca546af04b8f061ee59befadc747914609eedb2e39e1e5690225c1e SHA512 3876f8e1b275e1f117a73da26897485e949800c4b223e0bd2865d7d657f8f933d27ffe84271ee8077c337222253947ed54f785a210833c4c283119951ac2bd31
+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.2.ebuild 649 BLAKE2B c6176e607d243d36b366c42e58bb39bd36c76bb8be3b26190a0f621f4d604793dfd38cb147302cb254c73575a1fb59f12e9551cd5359647248d314394e7ee1cf SHA512 70473a59630e1e72b2cbf9cd8953b5a8fdb8b63144dd99546c0892c6522da468dcf772e1958b29569459375f134ddd7531a3f48bf59f8d21e7fff29df14873b9
+EBUILD kamera-19.08.3.ebuild 745 BLAKE2B 913a96e31a2ca03f5f9593eed1b137b90f077685f0096040faa29d998f669d168d7d690cf8a42263cb8957d155a61c7dd57f14533988692337d339c7ffb80513 SHA512 836dd9060411cafa9f0ff29a91a4844455ea7eacc3d7ac7e0805d9f79b2e83e50b8bbb7d0c1364bc4a09809cbf5b8de2d75309fb54c38966cf033e8fb6b7b4dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamera/kamera-19.08.2.ebuild b/kde-apps/kamera/kamera-19.08.2.ebuild
deleted file mode 100644
index 3d4742faf8ce..000000000000
--- a/kde-apps/kamera/kamera-19.08.2.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
new file mode 100644
index 000000000000..5c9aafcbbb81
--- /dev/null
+++ b/kde-apps/kamera/kamera-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma integration for gphoto2 cameras"
+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 620864d0fc88..27548e142b4f 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.2.tar.xz 201724 BLAKE2B 5a872a67f7bbdb783e948c804d006f3a1e7add87899cd814d0564f7f83056c983db8d142314868a5a166f9d343d532350a51e798f9c39e4cfd33dbdca8fef67f SHA512 1e7aedc44fc6f3a39b864bf1e12a7bd305755373f2e2148d75de69c86d5505a4a27b73f859104348fa4453ccf6713d33e1144d4460ca19967f21cf216a187c2c
+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.2.ebuild 949 BLAKE2B 991570b90a4c7d9c5c68a6456bd5a1ae197574079bde556b41629b43876171a455313052c83a9cdbac7571ff76cd38148d90c8be8cb73fbb1a37f2748bdb6b81 SHA512 ee5b83c98ef7b99af05db9a795a7796549a95c42e1bdf30c387bdd5b67013717484486955dcec0d10d6f5f61112484a816e61b6d67684facbed3f96d88fb8001
+EBUILD kamoso-19.08.3.ebuild 1057 BLAKE2B da6ed1cd415a5087665b6b8c4f8af2225971a6371d0e0eb5dd7250225954c178970e4b9f3e17ccf44bd6af058fa784b1caf3b7c919fe41cb5cf6678dbfaa7d51 SHA512 36a2fde285070ab092fe8775ac7992a50f8fbf19033c30fda7f15a8c0a6c75db056e27f732b2c091359ead5e9ea039f520f8795331042a31600e24360d986447
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kamoso/kamoso-19.08.2.ebuild b/kde-apps/kamoso/kamoso-19.08.3.ebuild
index 597fbb025691..03aeafc74f39 100644
--- a/kde-apps/kamoso/kamoso-19.08.2.ebuild
+++ b/kde-apps/kamoso/kamoso-19.08.3.ebuild
@@ -3,34 +3,37 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Application to take pictures and videos from your webcam by KDE"
 HOMEPAGE="https://userbase.kde.org/Kamoso"
 
 LICENSE="GPL-2+"
+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_frameworks_dep kitemviews)
-	$(add_frameworks_dep purpose)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=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}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols2)
+	>=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]
diff --git a/kde-apps/kanagram/Manifest b/kde-apps/kanagram/Manifest
index 45d9de49cec1..23a2b09f2473 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.2.tar.xz 8030192 BLAKE2B 30335667168bb603ab14cb2786a34c3fe22e94985939bafc0f3ba4b80d80da4482e7d03c59b387a6748ff22b7b4ab56acae2c2c9ee8967f07375ec938a536733 SHA512 963f15391452bd78c16360f3f8616143a83e9c3123fa6b74449724bcaaca7bbd2ea113f9a6b17c88904de1b95963571bb6baec39646838e1024f7b3f3e972a09
+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.2.ebuild 1096 BLAKE2B bd33f46755fa5d7a904f2a3cd9f18547a250149ff6301179ff46ff3403a50028b93b442f92bbca059a36a99aa919198b475d5ee363a2146b141b91b714901c38 SHA512 3978da2e1167ea97f1cf7e3e8d936a042617dfad182dca5cb5cfdd3fc9f2284415f678a88308629bc2220bd19e090dba5d710837d85300e1fd6f98b4194d1dfe
+EBUILD kanagram-19.08.3.ebuild 1289 BLAKE2B 2bb79f35fb9f138536b5868b80fdf32c16cb95b280b6baa06408ecb2cc7bc32929145bb1c0296afa5dc1edcb494a76dfd4db57ea043e95eb811d4fa1b10e3693 SHA512 cc05819e83bdb25af2410d9fc69cd93a2919cc32facc5cde82a0cfe09a11c3077d2c3b879cbd7aef8c8f4fca4e248153a6176ace4499437c3a0f2a50323cc8c6
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-apps/kanagram/kanagram-19.08.2.ebuild b/kde-apps/kanagram/kanagram-19.08.2.ebuild
deleted file mode 100644
index 5ca2c5f786e2..000000000000
--- a/kde-apps/kanagram/kanagram-19.08.2.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
new file mode 100644
index 000000000000..39bf95d6fb53
--- /dev/null
+++ b/kde-apps/kanagram/kanagram-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kapman/Manifest b/kde-apps/kapman/Manifest
index ad3bd367c5f7..30826bcb4572 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.2.tar.xz 2526212 BLAKE2B 08e73090cb153342892b0294053f912ede861c1b78f2980c8a8934d913253b5a15ee97cdaa02ea9329d255ad459f94273d777b66aae16108a37a22dfcee48d41 SHA512 0ecad2073517849449017e6b816a90fc0fc696126d9c736f8b69d64a98f751274f1e25ed5f8edeecd12bb35e2019a460a08dad2e7842a33043ac020d34333fbe
+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.2.ebuild 702 BLAKE2B fa11b0fdf84464ab65881e0ab8571c30bfb583145029291b0a70cd4295cd59d415d0f45df0157e89e9e5f42afdeca3b5be0a62b7dc2d2a33c019d1d7ecb71de4 SHA512 861c6acd2a104b97d12dd2b6a441c750f5e5936939e9428ce2e643eaeb1a648c64e6dc1d046426884a4d9b9347c89fb68cbc6770586259f05162caaf2739bfb4
+EBUILD kapman-19.08.3.ebuild 870 BLAKE2B 7f77a2a2843da0a753e2a4381bddb9c6c920f2558ec25fed75d129df1b9fb27d3070ff14b4bea4615dcbf5e24c053245ff7199324e2dbe101a6a97b2a477b2b4 SHA512 2e0683e4db0c1c036de36723fe2bccf257e9230b8b6b76101f2e1966cca5fd17beab38d6d125954d3fbfa43aa275498d3f703fda51e83646292c98c80329f42e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapman/kapman-19.08.2.ebuild b/kde-apps/kapman/kapman-19.08.2.ebuild
deleted file mode 100644
index 0839b93b7a05..000000000000
--- a/kde-apps/kapman/kapman-19.08.2.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
new file mode 100644
index 000000000000..77e4778e56dd
--- /dev/null
+++ b/kde-apps/kapman/kapman-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Pac-Man clone by KDE"
+HOMEPAGE="https://kde.org/applications/games/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 b199a72f3361..19a819db9a4c 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.2.tar.xz 316568 BLAKE2B dff34b981016be927efe29c34daba32d0c3ad775b539cb950b714d67d670b220969c9655b19be2ab605f3c22c68149efc55ccc9a42666c44544574b0431fe860 SHA512 21d7557a42ee8743fa773f7c40cec28d4677219ac79a6d130930e97bb459505f8077e663aff8db8fcf06976ccb0a4da84e23814c0ba9efdae8c9c7a6ae7c9e47
+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.2.ebuild 716 BLAKE2B ea4eee86102bf16538cd874c248431c9d03c9fb0c71ab79aba7d1e0062b94ad4b119348ed35633bf2b6904b2846da4f88d09f29f024cc7e418268349aea7054e SHA512 a6ccc2d241edc72f72f554f720dab0d3b547e414e04fed704b9e0723f92b29c294a52304c90a874fd786c640e0decc1acbc90d10fffec07cd32acce676afc936
+EBUILD kapptemplate-19.08.3.ebuild 848 BLAKE2B 716c24c5fd4e114a23389f7cef46f9030b8e066dc9a6c3f5606e7ab6ee980cb501c12628510c00d044992c2b897d633ff4771075ba5785c80818961589ed73d4 SHA512 38cdbd8a74b6f65bbb9305e63036418446ce7ee8a9c7ebaf489cedec77064753d40468b8066e87ebecc95c589fd465a8633e1773c823576240b0ca2f58177baa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kapptemplate/kapptemplate-19.08.2.ebuild b/kde-apps/kapptemplate/kapptemplate-19.08.2.ebuild
deleted file mode 100644
index c6618ba3513b..000000000000
--- a/kde-apps/kapptemplate/kapptemplate-19.08.2.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
new file mode 100644
index 000000000000..b0edd2a0e615
--- /dev/null
+++ b/kde-apps/kapptemplate/kapptemplate-19.08.3.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"
+ECM_TEST="forceoptional"
+KFMIN=5.60.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/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 5a2a58d42043..18174f309af6 100644
--- a/kde-apps/kate/Manifest
+++ b/kde-apps/kate/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 5846748 BLAKE2B 74e15971a8d5b80be1f4831238074559b8b22142516d2487d5814bdbd20c27069337cf4eee4d709e7f6e55551ca3d964a52b9640ae1d228cff3eaf4d474268b6 SHA512 3e1608843a749af75f12011e929bec0cd18e28b73e6b531b885855b07aec343007deb3def2de1215ff134f84052ecf956d834029267d790cc99ddd76d36a212a
+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.2.ebuild 2312 BLAKE2B f97907722fbc0e267e51eb7c36b992a80842d8cfbb22cebf85c88f0b00c7301d35e90da4246e49f6c0658007e5fe836a35fec6d68744673e7c07b15d3afb3720 SHA512 0f19ac4bdc0022c1e0261b287fb4fa791dc71285445706bbad0bd2d4f4c9d66df7d60a5dd2ce40dfafb8b7220f8a23423df320a3213567ffc78823b8f8eb258c
+EBUILD kate-19.08.3.ebuild 2572 BLAKE2B 96654bd2480fd4a44227561b71fff162bf351a62848aa8a6c058caf7227e8ea18ae5844caadf825ef0cdfccc972ac4653ed33595304b6b50b6a400f7559108c6 SHA512 746844e5753f530bd27556a2125d9b2738000723086724b207b567456142eade759e0ad48f79802d2a00a79ddac39600d5a2c91df82969da5deb07fda4a9e15b
 MISC metadata.xml 438 BLAKE2B 73e26b12116384010c313f77322143b111d10f1f90b8c4762edbf4e12de9d864b626de3c60781f00c098053ce4a71243c034352cd3178c5c77be78a0c5e2bf88 SHA512 a6e3518490973483bbf1a04394601c0d0b68a0869f3026f2aa96e31e74356effeeb53f0eb1d29ea914a614a52807ad04cdf6ba28ce4bc35553af4b6dee4f30c2
diff --git a/kde-apps/kate/kate-19.08.2.ebuild b/kde-apps/kate/kate-19.08.2.ebuild
deleted file mode 100644
index dbed47d30d72..000000000000
--- a/kde-apps/kate/kate-19.08.2.ebuild
+++ /dev/null
@@ -1,93 +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="Multi-document editor with network transparency, Plasma integration and more"
-HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities +addons"
-
-DEPEND="
-	$(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)
-	activities? ( $(add_frameworks_dep kactivities) )
-	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
-"
-
-src_prepare() {
-	kde5_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-utils_use_find_package activities KF5Activities)
-		-DBUILD_addons=$(usex addons)
-		-DBUILD_kwrite=FALSE
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# tests hang
-	local myctestargs=(
-		-E "(session_manager_test|sessions_action_test)"
-	)
-
-	kde5_src_test
-}
-
-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
new file mode 100644
index 000000000000..35b405cb6c81
--- /dev/null
+++ b/kde-apps/kate/kate-19.08.3.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="optional"
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Multi-document editor with network transparency, Plasma integration and more"
+HOMEPAGE="https://kde.org/applications/utilities/kate https://kate-editor.org/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="activities +addons"
+
+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/kitemmodels-${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 )
+	addons? (
+		>=kde-frameworks/kbookmarks-${KFMIN}:5
+		>=kde-frameworks/knewstuff-${KFMIN}:5
+		>=kde-frameworks/kwallet-${KFMIN}:5
+		>=kde-frameworks/plasma-${KFMIN}:5
+		>=kde-frameworks/threadweaver-${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-utils_use_find_package activities KF5Activities)
+		-DBUILD_addons=$(usex addons)
+		-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}" ]] && 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/katomic/Manifest b/kde-apps/katomic/Manifest
index a43a72eeaf7b..6bbbbc965fae 100644
--- a/kde-apps/katomic/Manifest
+++ b/kde-apps/katomic/Manifest
@@ -1,5 +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.2.tar.xz 1422816 BLAKE2B b6565b13150edfaf50c10494f9573a44ef08c83b458b3970139c1a499c6d54d8f7e9f015eeffa2924b8a87a8c9a2388695fa151879c1e85b3d57132ce42db6a1 SHA512 75b4c1d2a3ca709c639d2cb1aad61ef145c6fbc00141c26ad0ddd3db4dd7d9a07b705b9875b5b84e8c95b28cbad62b7fbcd304abe07bfdc22af82d15f9251fdd
+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.2.ebuild 740 BLAKE2B ed50f7f1dd7614f805bd70a5342f204d94f52f486bc93006348f8328176fac0496d187a50b28ae3690669cb079ae2774a83846cb216be98281966cb382351830 SHA512 95ba4db18e2cb2bf99010b09434599cf3080f65b596be1d933c6f1f96a744585c27dd8b0119e2cdac44350c98e605b906ab62f22575e372883774999fbbbd56c
+EBUILD katomic-19.08.3.ebuild 948 BLAKE2B a560ff56ca273715db613e0c16ee500157187704f3c9d08dff7fc407b4f5b537c58ce503510cb1df0cfd61e5fefc0c109215659d25d58c35ab523e851c67e8ed SHA512 6a2a8045c050ca10f2bbc00924da2f63f5326f77467ab055e89da472390dc0813e4d9bc2ed06f398b45edfb221f867f587d69348d09c972ecda87362a0daa6f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch
new file mode 100644
index 000000000000..6dc49d2e100b
--- /dev/null
+++ b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,55 @@
+From 8e1a20b26d60976afdc068f7203cf35147b94a85 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 19 Sep 2019 07:16:58 +0200
+Subject: Make it compile without deprecated method
+
+---
+ levelset.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/levelset.cpp b/levelset.cpp
+index 5e001c1..98e4b6d 100644
+--- a/levelset.cpp
++++ b/levelset.cpp
+@@ -176,13 +176,12 @@ const LevelData* LevelSet::levelData(int levelNum) const
+ const LevelData* LevelSet::readLevel(int levelNum) const
+ {
+     KConfigGroup config = m_levelsFile->group(QStringLiteral("Level")+QString::number(levelNum));
+-    QString key;
+ 
+     QList<LevelData::Element> elements;
+ 
+     for (int j = 0; j < FIELD_SIZE; j++)
+     {
+-        key.sprintf("feld_%02d", j);
++        const QString key = QString::asprintf("feld_%02d", j);
+         QString line = config.readEntry(key,QString());
+ 
+         for (int i = 0; i < FIELD_SIZE; i++)
+@@ -227,14 +226,13 @@ const Molecule* LevelSet::readLevelMolecule(int levelNum) const
+     Molecule* mol = new Molecule();
+     KConfigGroup config = m_levelsFile->group(QStringLiteral("Level")+QString::number(levelNum));
+ 
+-    QString key;
+ 
+     atom current;
+ 
+     int atom_index = 1;
+     QString value;
+     while (true) {
+-        key.sprintf("atom_%c", int2atom(atom_index));
++        const QString key = QString::asprintf("atom_%c", int2atom(atom_index));
+         value = config.readEntry(key,QString());
+         if (value.isEmpty())
+             break;
+@@ -259,7 +257,7 @@ const Molecule* LevelSet::readLevelMolecule(int levelNum) const
+     int max_i = -1;
+     for (int j = 0; j < MOLECULE_SIZE; j++) {
+ 
+-        key.sprintf("mole_%d", j);
++        const QString key = QString::asprintf("mole_%d", j);
+         line = config.readEntry(key,QString());
+ 
+         int max_non_null_i = -1;
+-- 
+cgit v1.1
diff --git a/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch
new file mode 100644
index 000000000000..42bc21731226
--- /dev/null
+++ b/kde-apps/katomic/files/katomic-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,24 @@
+From d8cf83cf8554914ea357920473ff4c722cf794bf Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Thu, 31 Oct 2019 13:30:42 +0100
+Subject: Make it compile against 5.15. This enum was unused
+
+---
+ gamewidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gamewidget.cpp b/gamewidget.cpp
+index d70213b..3639847 100644
+--- a/gamewidget.cpp
++++ b/gamewidget.cpp
+@@ -58,7 +58,7 @@ GameWidget::GameWidget ( const QString& levelSet, QWidget *parent )
+     // TODO uncomment DontSavePainterState optimization back after this bug in Qt 4.6 preview will be
+     // fixed (darktears promised it will get fixed in 4.6.0 release). Bug is about wrong coordinates
+     // for QPainter passed to QGS::drawForeground() function
+-    m_view->setOptimizationFlags( QGraphicsView::DontClipPainter |
++    m_view->setOptimizationFlags( 
+             //QGraphicsView::DontSavePainterState |
+             QGraphicsView::DontAdjustForAntialiasing );
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/katomic/katomic-19.08.2.ebuild b/kde-apps/katomic/katomic-19.08.2.ebuild
deleted file mode 100644
index dfef31246f87..000000000000
--- a/kde-apps/katomic/katomic-19.08.2.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
new file mode 100644
index 000000000000..1038eacef7a2
--- /dev/null
+++ b/kde-apps/katomic/katomic-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Atomic Entertainment Game"
+HOMEPAGE="
+	https://kde.org/applications/games/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}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
diff --git a/kde-apps/kbackup/Manifest b/kde-apps/kbackup/Manifest
index 20f26ec27fee..68272f03e0e3 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.2.tar.xz 358196 BLAKE2B 5c7eb7ccad953606c187c2f0a2c77715d51eec67878295e6354be52806a04e3e7990f3f274facccfd57d757ed668f87d7cc98f419e203059f6b4f875349ce197 SHA512 49fdfe52b9953a908ced828364c5ced2b7219be181e415cccc8504e0a7949dbba0ee768b0bb0fad4f16f42e3c2f3eebfc52aee1b4cb10b9ec5d3dbaee2fb23c6
+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.2.ebuild 758 BLAKE2B efe8f3d0432f25dcacdeb39b5773a2d4c65cf63eac02902b5f10f146b4f8311d74c54dcb83f1c79aaf76579bd4eddc2118627190059a401faa1120296afaf021 SHA512 8558e2633451d24f7eae9cb9067d403c80788302dd269eb7ac0bbab860a10ab97da24176285bf06b256acf4074e4c45dc736ff63eb9fe22daf22f0d348131bb0
+EBUILD kbackup-19.08.3.ebuild 884 BLAKE2B f812198ec9fcc8addd9f12549d3de2ac3236363da3a9c896299aadefd8b41251f9b437a5355b638dc526ec2709701aa2260d49f62006d3f0cdd52f77d66983b7 SHA512 1ff61021c68e06b3928823678a2f33cf6812bff77d9aa001c7dc4ff278d32ec4c2b86cc9a33d933282f3c41d9a163655580d5ee87b5cb2ecfe7bc92c4135d708
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbackup/kbackup-19.08.2.ebuild b/kde-apps/kbackup/kbackup-19.08.2.ebuild
deleted file mode 100644
index fc0ebfc0bd3b..000000000000
--- a/kde-apps/kbackup/kbackup-19.08.2.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
new file mode 100644
index 000000000000..0f63cef5852e
--- /dev/null
+++ b/kde-apps/kbackup/kbackup-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Program that lets you back up any directories or files"
+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 2d1eaaa15387..105dfea91ba5 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.2.tar.xz 446988 BLAKE2B 313fb149246149bf875454ee5a621c22ffb5ed6d9cd55aad2b92d80f5c41cc5cc9fefc081387dc682a49b7be7186070498570e7084e50af52bb6fb479eb86d2d SHA512 ddaba772eb57a8f3fe1d585d997ba6ea50d7a3af1933ee6afd972edda9530001665210e2436bd8a8f6f2887c58e20a2d486ba11ac057d33f0e3710cd2815f86b
+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.2.ebuild 770 BLAKE2B 0958acdabe03ba41acb45447bceb6bf6c772794e481468833378ff8068957a14d4242641b9bb25778790a24054dc70a876755270606325c7ed920d27dc63f72e SHA512 b754e911d555a5e991bb2c9dae38218b6096b5f4f76d4f1fb2ecf1fafd527128f91a406abb2b4422bcf8ac4cd7519820f2901fbbb9c47675fe015e5baab3d876
+EBUILD kblackbox-19.08.3.ebuild 950 BLAKE2B 4a748b4cf04b59251f4299931e3aaa7a46c021a1114beb6bf0932efddbc7c27411e3a66cceae40d1dc51b7bc7f1d3c08f36deead666a6e584b517005142fad72 SHA512 edd3009710f3c35d3c397ff0517218c38b9139f8f856614ea0c3a8d517d7b3686942433f265fc694a1988e3b432a063bee4b5349facef5a8d862bffff7f73afc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblackbox/kblackbox-19.08.2.ebuild b/kde-apps/kblackbox/kblackbox-19.08.2.ebuild
deleted file mode 100644
index 49561429c738..000000000000
--- a/kde-apps/kblackbox/kblackbox-19.08.2.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
new file mode 100644
index 000000000000..169c47b04762
--- /dev/null
+++ b/kde-apps/kblackbox/kblackbox-19.08.3.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.60.0
+QTMIN=5.12.3
+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"
+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 7c4bab51e35a..3f18924d9d52 100644
--- a/kde-apps/kblocks/Manifest
+++ b/kde-apps/kblocks/Manifest
@@ -1,5 +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.2.tar.xz 1908852 BLAKE2B d0c2d1aed3978466b9d312cdf2b9520702b019f8bc572627ba18592c14a69fbc020e5a47e4ddb9e505f327a1f0cd02985b7e96bb4657f9b0b4050fc0e9120340 SHA512 369d447665908bbdf47e7363d47312cd916bfcd89cb0354be6c15e9a749632d229bce3d8084a2b497cc7dcdd49e4b35cc313a3c8dabd82d93a994e43612e4cf2
+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.2.ebuild 686 BLAKE2B e6eb7da9aa9d0c98377be5ea1ec57f32e47ee424f5fe25c7f3a60b942910c81417160d515095f524b568829c035c0d46faa0d4d910c2f03286ec720347cc839a SHA512 e51622f874dcd3c9fb1bc1619e8d5c9738752d64ebf2158d0753a2a7db6e94db645a9739765f6ee1562d07af4446ca33343dbb91b5b10536124615889e5edbc2
+EBUILD kblocks-19.08.3.ebuild 894 BLAKE2B cca3d4871ab128402383fc4204cfa104c54952deba06bc9af661ae00470467f784fdbaf87dad3a5dc2e1cc281aba0ff0db9a1ab7687d14837d85a2e2bfa674a8 SHA512 ef5fc232fc4a562c50b63e0e1a62aa3731db2f373eda43038e218c7de4453ef66d254708267e9662a190e9dd46324dfbf5bc2d759364655899b584765e31d9fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblocks/files/kblocks-19.08.3-qt-5.14.patch b/kde-apps/kblocks/files/kblocks-19.08.3-qt-5.14.patch
new file mode 100644
index 000000000000..b4c67d8a7e40
--- /dev/null
+++ b/kde-apps/kblocks/files/kblocks-19.08.3-qt-5.14.patch
@@ -0,0 +1,24 @@
+From 2f2d2f28fae9fb779fb5f8ae139c6ca28ccc83d0 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 30 Oct 2019 13:34:23 +0100
+Subject: Make it compile against qt5.15, This enum is unused
+
+---
+ KBlocksView.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/KBlocksView.cpp b/KBlocksView.cpp
+index a16d672..2ad0686 100644
+--- a/KBlocksView.cpp
++++ b/KBlocksView.cpp
+@@ -21,7 +21,7 @@ KBlocksView::KBlocksView(KBlocksScene *scene, QWidget *parent): QGraphicsView(sc
+     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+     setFrameStyle(QFrame::NoFrame);
+ 
+-    setOptimizationFlags(QGraphicsView::DontClipPainter |
++    setOptimizationFlags(
+                          QGraphicsView::DontSavePainterState /*|
+                           QGraphicsView::DontAdjustForAntialiasing*/);
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/kblocks/kblocks-19.08.2.ebuild b/kde-apps/kblocks/kblocks-19.08.2.ebuild
deleted file mode 100644
index 6ffa35e36306..000000000000
--- a/kde-apps/kblocks/kblocks-19.08.2.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
new file mode 100644
index 000000000000..495a2a812802
--- /dev/null
+++ b/kde-apps/kblocks/kblocks-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest
index 1f1931aebd2f..40c679c045a8 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.2.tar.xz 73068 BLAKE2B b43bb8df73222374780b1487b579589729093af7a6df5d5cf9ab6b4eb924a88db0cc46f948a477906b4fa430dc88d841f2300d8b7fb548b6767f62af1dab907d SHA512 72e1cb514a2f518cfd9f5815bc0b196ee4af2a46f7969bd71b5251cee8ba5355a4d8f60a70c35db1870c8feda9166eb09c131a4f0fee0afe83367080ce06b05d
+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.2.ebuild 547 BLAKE2B 7a8c53df6a465657781511cccdc963bcaae756633d81f081b6e27f1d48c8001b0af3fbb492aaef3a4d5e0568f814c9f1cf46aa4adf5535e0892b822191532332 SHA512 655d92fce9c66bc75c3e2ffc2a13a5c82e66c5e399f2aa75d9a320325540a28af89b76b49fa3bab276d51f90d06b5b976975df14d9bbdd224db1c39bf986dece
+EBUILD kblog-19.08.3.ebuild 612 BLAKE2B 465b610a8cb759b1e6a49ed3690acf4e932bba3117e724cbc37aaccf8ff23a374ed18fc4a1fa81db3b3ac48254b21abfa067809aca8cf74975d8594a92d472dc SHA512 18b60be1ba6edbb828c4d3b9cb82d0338401874a68debd0dbd369990faca9958f683ecb738acdf6c2b81c7898a902a0f59977ba09982caca57cb17b2a05e5ae0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kblog/kblog-19.08.2.ebuild b/kde-apps/kblog/kblog-19.08.3.ebuild
index 9ae023a19eaa..1dc1d62c10cd 100644
--- a/kde-apps/kblog/kblog-19.08.2.ebuild
+++ b/kde-apps/kblog/kblog-19.08.3.ebuild
@@ -3,21 +3,23 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.60.0
+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"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcalendarcore)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_frameworks_dep syndication)
+	>=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 b0c1bbe4bccc..a79d3d0cd553 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.2.tar.xz 3466600 BLAKE2B 88e337399d519f9bf0ea253ac9b0968368374fb00d6281676bcbdbef46d43bd3d6e55ee4e5e1d1eafd7c94ae91432570764da7dc21fa4d91fce33e43b0c8b975 SHA512 745836150ecca4937cac66ff69da813c1b06bc92ae8a20198857362abeb156ceb809fd2a83429c9f8f4bbdba23261751ebdf921a768d3c0be27493e0a423167f
+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.2.ebuild 819 BLAKE2B ae551d0ee4b991fcf1c5d3a1b34df700fb10d1351782f41c20b88f201ed05ed2f27031ed878cffa71189a96b0732915d1860f95f14cd791c657f46dc8ebdb59e SHA512 e7636c72be8f252f19bc3e4a7a750a3465d3b811dc09fa474b7683641ed096f0878e867859e7a5c8432ebb03a14e21597df71ee0b36db7603a59cf4cf2c56106
+EBUILD kbounce-19.08.3.ebuild 993 BLAKE2B c5f81def13cea02e3b680c96627f9e9be0b5ef3c88b086e75f6329d10e350267b412c994412e7648b6231ab7cfd51ba1b50c18e7654a406490a7ed3ec4d10bc3 SHA512 3143bb0936db194c16a2288e74f0fe8bc48613a30ea4161fb1ffaaa3018cc64000abf20955addc7737a01feb4b34fe00b52f482fb778c749e6107d14fe12127c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbounce/kbounce-19.08.2.ebuild b/kde-apps/kbounce/kbounce-19.08.2.ebuild
deleted file mode 100644
index ce3ed74406ea..000000000000
--- a/kde-apps/kbounce/kbounce-19.08.2.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
new file mode 100644
index 000000000000..f49c763a3dbc
--- /dev/null
+++ b/kde-apps/kbounce/kbounce-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Bounce Ball Game"
+HOMEPAGE="
+	https://kde.org/applications/games/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 947cc2c326f6..e52c80ec6323 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.2.tar.xz 2277680 BLAKE2B 703fb082c3294d0b2d34180969be8a67486270f13fa7181185bd5de04c0d633d99d5d6243aaa65b418559228be713bcb14123bfa919c0d5e8a3386486823a0d7 SHA512 c1d05077716c02a6741bad3e482808e285498139d5abe615fcdfdb048dcfd55b156c7c229b0019359a05f339202e6acdc18f3d3441041299ac4bf52cc2025387
+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.2.ebuild 768 BLAKE2B fa517cd7dbc1449c61fef3012e28e55f024dc02b5aa26ec7fee18ebc0a2cf5c88ae50a91af37740b4bba1fd689b320dedb09c25060cad76926e8238c92a7ab0a SHA512 2eaecb18df83743172965f0d98d70842228f3151d6fc8af129e4ea2315e310879a078b122b8482102756f4e311c4a6340100109e4d272bbe0d2613833b8712df
+EBUILD kbreakout-19.08.3.ebuild 936 BLAKE2B 51cad858466af9ee9fb0e69cc8870b2915571de343a4f91ac03dd898c542e6f9e5e12b3d77e3170d8c831488e326dc996c3759297b783a13396fa3564b37246a SHA512 100810dce6aca64460b098a37663ffb5bfeec3f4f4fc7f6d4131fc42b57a6dae92ced0bcf09915c35de18d7df90fe9604effe7c446e05a8b115703c2455f94a7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbreakout/kbreakout-19.08.2.ebuild b/kde-apps/kbreakout/kbreakout-19.08.2.ebuild
deleted file mode 100644
index e1f5e108b1ad..000000000000
--- a/kde-apps/kbreakout/kbreakout-19.08.2.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
new file mode 100644
index 000000000000..33bfa4f5982f
--- /dev/null
+++ b/kde-apps/kbreakout/kbreakout-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Breakout-like game by KDE"
+HOMEPAGE="
+	https://kde.org/applications/games/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 74d63b15615c..a4283734325f 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.2.tar.xz 5603772 BLAKE2B c5ff36482a6f7ee7d8e06f6112b4ac403b69e3ba90a0cbfbb074be49edcfd1fd91d5dfff9ea5c026a113151d573d859165ed3edc7a313bf05614d95fd2035f95 SHA512 4bbe24de8767b1d449ac2b253569b88e8c3d7a7021c78daf057da5b1d153dcb717c03df9dcd416cf787274fda5d6c4825e8d396848da39d585317a472f30f809
+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.2.ebuild 633 BLAKE2B 7d9dca73493184fea9e8a4bb0f5e00e04680b0ebaa940d5a355dfa3a21014f921ee23a7428894d5c51474a8fbf0d93319629d0d5faa5701b253b7800d675891f SHA512 14fb5994e997a34b652c431e85abe6e0c67b3e69c1a22f598a744622b8ada6970ef0d280acf3052dac8618187a2e45c39bdcbfb693ea864adbc4d4cf80382db3
+EBUILD kbruch-19.08.3.ebuild 753 BLAKE2B c3d200cbc2929a305d9f3653b7a1e506f0214451ae1bfada31f5557ff387332557ab2306ea8470268d4b2392e5ae08854a8b4293fe429ddcd9a9c162314eef48 SHA512 9a5f74139aebfaa922965ef567a0e8c422b0982373fdefb8729207d1b1006db01e86a1eb2de10ea76b35a5feb72c9e323322ff311da6fe1df84433d7bcebc9dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kbruch/kbruch-19.08.2.ebuild b/kde-apps/kbruch/kbruch-19.08.2.ebuild
deleted file mode 100644
index a904b1de04f4..000000000000
--- a/kde-apps/kbruch/kbruch-19.08.2.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
new file mode 100644
index 000000000000..a9a26fcfc165
--- /dev/null
+++ b/kde-apps/kbruch/kbruch-19.08.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 279ea47bce2c..a3c189bda919 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.2.tar.xz 808412 BLAKE2B 823568ace332a13ced11d939c98e1ed71a8fcb4fc158e4c4168550851adcec7a3faf01002d0f70ce92adebf592778dd6bad0ecc7180566fa0f17c018439498f9 SHA512 7e2c7dc247e5adce6b68097ae265bbd449634efff581a68a18c725635ac8e976c9e5c92e8dbcde519d57b4fbb904e97afee85407992c8e5b2ab4a9fb04b28208
+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.2.ebuild 854 BLAKE2B 8ca444f9bc7145c22ddd767ba58e3c13146be655fc0caf4ca87c41457cd8704894393441ca55f50147a93a998bd7807f6cf85c96d6c23cc10d1a0ac229d04a22 SHA512 0da14d3629c3bc2222c17de503d6ab97f6ea7c75b15c17130b3d004d7e5326263c691fab8950647a5ca415b0456328948e4a18dfb4fb2df13684d0b6fd884880
+EBUILD kcachegrind-19.08.3.ebuild 1010 BLAKE2B be966e5385e316e0bf82852209cb35883db704c17550107951133a648ab36eb9b63984fb86874696f90f9ddf62d2ea0acde0a38b6a3a87451576c8bd589d5c96 SHA512 78fde076ab4205cd161c702391327ec24adc68d76e36329fbdece0dd2117cab7204bcc10f131efd42dbb9f277a7f47af0e6c78d18f8994bd6215d0f4bed1b7e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcachegrind/kcachegrind-19.08.2.ebuild b/kde-apps/kcachegrind/kcachegrind-19.08.2.ebuild
deleted file mode 100644
index 30cb9300e566..000000000000
--- a/kde-apps/kcachegrind/kcachegrind-19.08.2.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
new file mode 100644
index 000000000000..e4134fa65a56
--- /dev/null
+++ b/kde-apps/kcachegrind/kcachegrind-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Frontend for Cachegrind by KDE"
+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"
+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 e0b4e4ba09b1..b3005bd1adc7 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.2.tar.xz 372572 BLAKE2B 7ae9eeb6aea8ff32e80b312b242eb5e14488785a1532da142fe94691cf4ac12b3397071fed21c0141cb658e3e401e9a8fdd8438723363df4047c2b12f192b19a SHA512 966e1239c11f77c162d5698708e96e8172bc99bc195df0ceff9b5867b7fd9f452091cc4d39286b8bf2febf9a75ee119d3f5282090d6bf8b02783ff8d0ed75424
+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.2.ebuild 831 BLAKE2B 547eed9a4d0308cc193a7c02fd4025b5cea68f2fd4083a64cbadcc883460e448806ed5c164fb92754e3adb3dee0d29ebf5ddfec36c067852985c34d86ad2aa6c SHA512 8239d97f971b05132a163d7906d348087ad7a79b2d0d93878c2b610a42ec076e3171458071d14f18ba17192cf5689ef889ebcfc6425291f2b48604c4e30df3da
+EBUILD kcalc-19.08.3.ebuild 981 BLAKE2B 36a0ab624228834f26021b086ce2628000409cf029df7c7d6e7b2b84e41fe957dbef342d4415f93bef6801f674609dfbaf25101ffa469f23c120d2caf1c23498 SHA512 df3837fdcaf0093a18190344fae80f076f8a76a16cfc915b231818f14a865b5c2cbf8b4c5476e571a4ad210605d3d3630b1e19752d5c104c803cfe392eb5cd0f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalc/kcalc-19.08.2.ebuild b/kde-apps/kcalc/kcalc-19.08.2.ebuild
deleted file mode 100644
index f8010661132f..000000000000
--- a/kde-apps/kcalc/kcalc-19.08.2.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_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=
-	dev-libs/mpfr:0=
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kcalc/kcalc-19.08.3.ebuild b/kde-apps/kcalc/kcalc-19.08.3.ebuild
new file mode 100644
index 000000000000..fd84b5b0a8b6
--- /dev/null
+++ b/kde-apps/kcalc/kcalc-19.08.3.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"
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE calculator"
+HOMEPAGE="https://kde.org/applications/utilities/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 cb85df57515c..20c69320754d 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.2.tar.xz 322940 BLAKE2B 0bb065ca289b11d02e7e95e90c9ba41df61d0cad77004ffd2bdd8e4620b1586dc2e231e7bf7c367a9efa69511a6ee31347f9d2b1514e38fb7d07d7d010952342 SHA512 2ef58ef0fdd48a32984b4d25b09c382435dc30bd4b02e90df6730344a3a8bc0d585bef0426a2cb750f0b9b9ab5dfb0f0324d491bcd12095a0e4aa5662c7b2937
+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.2.ebuild 865 BLAKE2B b05310007b006d05e8745e59327bc4de6b0df9fa2ee3a701b7944fece89c5d21ab6981de964bbe59e595b50a35744087f8c4a4619f3e7b36441e12372b87c75b SHA512 07491b5d11be5f6e624eb17ab37d89f0dedc66cc1099f5acab4d3e54bfd70a836b2920ccb6ba4034a2268a42d78e204dbd7951d49797225e54a7e3bbda2b44a1
+EBUILD kcalutils-19.08.3.ebuild 990 BLAKE2B 4b1a69e4397717a58ee270a270f9b588ad0898f9b4476301b6de4f75289e8ba3dea843079a98d0251f8f9f82c16356b58e90c641fbc48f95ac9d96b55ed29aea SHA512 4461131b3e39612e96d0685194f01c187b5492059011be13efe1f460dcf37046cb878cdb1f6947e7af4368fcb936de5508d2b718b3fc3c018f6a7418bce21d5c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcalutils/kcalutils-19.08.2.ebuild b/kde-apps/kcalutils/kcalutils-19.08.2.ebuild
deleted file mode 100644
index 8656a295b434..000000000000
--- a/kde-apps/kcalutils/kcalutils-19.08.2.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 kcalendarcore)
-	$(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 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
new file mode 100644
index 000000000000..c612f8ca748b
--- /dev/null
+++ b/kde-apps/kcalutils/kcalutils-19.08.3.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="true"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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"
+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 43652acaab33..07d015ba0ceb 100644
--- a/kde-apps/kcharselect/Manifest
+++ b/kde-apps/kcharselect/Manifest
@@ -1,5 +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.2.tar.xz 334740 BLAKE2B 3ffe71c3eb7c140c7130d01fa8268e45827ba0e007495fe9402540a66b1ec399a473e92c565818da98e2ed9acf9ab86f0c35ecef63c3a615044ba08f312048a5 SHA512 4d618a691d1153952b04ad172dc8bd1d87b56f530f05c88c91af3844eacf24ccd0123aec8978bc623009f68dc84b56d917dc4766376ae78115de73b3bff66b92
+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.2.ebuild 660 BLAKE2B 9d74098baf1f92907f529150ed5beaec97b84a7258a82957fc5e52e7f687a64041e6d2fab541f0839574c5a701cea1d5a60ffb08989712ae859d33d7be27f10d SHA512 649239d290fcf62d33ffc92f27c1f592b429a2a6035c4098cc601d0fa52b6db9bd2549c7206df63c8ce80bc00c0224d708fefdcc07500b1792f4fc708b8cfe30
+EBUILD kcharselect-19.08.3.ebuild 832 BLAKE2B 5dfb04cae83e5e3a3e4010be4091ef177dca77e772a9d06f0e4ea6119e49946cb8c59a36d1e2c3a42ff06985f53ffbeb39bf45207ded38cd178ded6b3623d9cd SHA512 9a3a5482636540463952f483b2a79c0dbf7ba0ad5e1e9ae0c5e4579956a3640fa75fd6bce9ff92a68c3aa4ff3468f5821da9667c7bc38082874c98624c772e28
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch b/kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch
new file mode 100644
index 000000000000..884ed6a79628
--- /dev/null
+++ b/kde-apps/kcharselect/files/kcharselect-19.08.3-qt-5.14.patch
@@ -0,0 +1,32 @@
+From 956b63170b2606fb274f0bd90399dac0ae9dbcd4 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 17 Sep 2019 13:41:01 +0200
+Subject: Make it compiles against qt5.14
+
+---
+ kcharselectdia.cc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/kcharselectdia.cc b/kcharselectdia.cc
+index f1790b5..116cba4 100644
+--- a/kcharselectdia.cc
++++ b/kcharselectdia.cc
+@@ -265,7 +265,6 @@ void KCharSelectDia::toClipHTML()
+   QClipboard *cb = QApplication::clipboard();
+   QString input;
+   QString html;
+-  QString tempstring;
+   QChar   tempchar;
+   int i = 0;
+ 
+@@ -282,7 +281,7 @@ void KCharSelectDia::toClipHTML()
+         }
+       else
+         {
+-          html.append(tempstring.sprintf("&#x%x;", tempchar.unicode()));
++          html.append(QString::asprintf("&#x%x;", tempchar.unicode()));
+         }
+     }
+   cb->setText(html);
+-- 
+cgit v1.1
diff --git a/kde-apps/kcharselect/kcharselect-19.08.2.ebuild b/kde-apps/kcharselect/kcharselect-19.08.2.ebuild
deleted file mode 100644
index 4cd14723edfa..000000000000
--- a/kde-apps/kcharselect/kcharselect-19.08.2.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
new file mode 100644
index 000000000000..848cd028f8e6
--- /dev/null
+++ b/kde-apps/kcharselect/kcharselect-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE character selection utility"
+HOMEPAGE="https://kde.org/applications/utilities/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}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
diff --git a/kde-apps/kcolorchooser/Manifest b/kde-apps/kcolorchooser/Manifest
index bf297a2e483c..5b56e1fef9e5 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.2.tar.xz 20652 BLAKE2B 04cad836c0a030c46bff5e9a5506387f36f60a7431c3e1ace047cca90ee09e48f22bc92ae80ae29bf131616ec5b0aa9a1a7cb08e9da70b6a6cf9caba94ee4408 SHA512 a522900c1e849f875f13064400759f698a6c7aa9988e865ba1b645d735ded3910682cc00945b1a99b02c5c8b2473a5ecdf9d2b3597d96f921532221fb47ffba9
+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.2.ebuild 457 BLAKE2B c5a44b48176916f883263ce2b92710f7ed55dfd349b1a8991ff1c81ea28cb1e239a3a2f55fb8f2f51e5248530b5c89e2e95892c90eb5a1bb3e4fb284f8cc8831 SHA512 b09aa8e42e729dabe69cf32b8c80880419b5948fd9c0c24738eb45fe5f68f15c15594ffdea8aad5df622ee37c288a814111341a7f994042075f8d782e905b0e4
+EBUILD kcolorchooser-19.08.3.ebuild 529 BLAKE2B c8c615206da1c1560e933d259bafe0ef2a486f4d6fc6b45d996006b287278bb58387043b833ae7b625609677a7f2bec03db30ad0ca32e3cffd1b2495d405c037 SHA512 61d92b6a38ebc1c50d9c73f62c8265e84ab1acd797706c13032f14a47abfb2dd1c2ce0c331b63a4ecab87c45d01b4a21bcb49595d32bdf01bc29251490d348d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcolorchooser/kcolorchooser-19.08.2.ebuild b/kde-apps/kcolorchooser/kcolorchooser-19.08.3.ebuild
index 5f9141a7a79b..63181f384dcf 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-19.08.2.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-19.08.3.ebuild
@@ -3,20 +3,23 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE color selector/editor"
 HOMEPAGE="https://kde.org/applications/graphics/kcolorchooser/"
 
 LICENSE="MIT"
+SLOT="5"
 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)
+	>=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 90a5eddb683c..7665e87446b7 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.2.tar.xz 887752 BLAKE2B fb551592076aa2e433a33d594ad95d3052052112944ef5f71aa8edf1ddb196e0db457b82e7ee69dfdf986ceca766beb3a4f636335f25bab98b05a739f09685a9 SHA512 ef7d1bccf8542b308d88a41e621f2c173261014fad5ddbfb014244fef0460d9cb32d8e135c36bb7bde2d6389e46588807b1463543fc0dfe4a769149f55cf6f81
+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.2.ebuild 552 BLAKE2B 522295c09fb267e69cebadef9bfc814202956e8cb3c53ecd412a27c21c71331fab16809b20d574a2a18302b960c308317a5c056262ca03c2009144facc90bc7b SHA512 3e405b432a62959c169c4febfb001abf450ffd8758e36a5eaba1b31d09b4c03182d865041f225b93f2da223ae9fc17ae9f9a7a61a1a4ef715407f6a4b9051870
+EBUILD kcron-19.08.3.ebuild 678 BLAKE2B bea5e53c1191d93f675c9c599790556e7381abd62bc158df87b67555a968db1abc46aacd0d378d98e2e6d1ea2c558683c44e5b7db8e8b75b503d94d1ee8afda4 SHA512 8344893fecdd3398d3c339b3de6ce6546cb4a355d967220a24e8e29ccd811b19dcb30ee8d0c14f9065252ce37a02f3b22aabd9116afc24747284ee472e90fbed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kcron/kcron-19.08.2.ebuild b/kde-apps/kcron/kcron-19.08.2.ebuild
deleted file mode 100644
index e932c96c81b6..000000000000
--- a/kde-apps/kcron/kcron-19.08.2.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
new file mode 100644
index 000000000000..1f68903ed101
--- /dev/null
+++ b/kde-apps/kcron/kcron-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Task Scheduler"
+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 74e964badab2..124394c590d7 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.2.tar.xz 50108 BLAKE2B 77908b260a8235502b4099a99b1053bc400931f647facba2c886f141fb7b50516fd61f9417be83d53eaef97d3a5cf118ec1cbac6b2436f234391f090c3da3221 SHA512 e9c86b1681debbc5f0baa9c54830861c54e34519d9635abbbb37f3bb25a1707f4e6a3edbca20d4e7f60ed6a088e1a30faac142311d79b5c0bbfa70417c82124a
+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.2.ebuild 687 BLAKE2B 50126b936dfa99133afde5f46cc57afe6a1f1d3bd7045a87c2860c74b0ad374a46acad197a3175beb4c2c026b84b4e8bb72c2e850be9b73f46964e49f2cf5a26 SHA512 66b25fb3f9b323cbdf8f742b6f4afd92f7f28f75e039ec0ff97e67c637f50a92d907fe7de2acb4aba6864ff56b8b7a1c696f4a1b3d19eeedf1b7d6253d412b70
+EBUILD kdav-19.08.3.ebuild 758 BLAKE2B b886c5888afbb264a727b8b01f261955e444b90cc63de887c1cdb962eb4462964da48e96d1ddd899bbb7a1440b891ff314a7136ec300ceaf0d435abafa6c47f5 SHA512 171159bf2ff2487a64913c90aa7b1403dff42eb154204552a99ee6a32918b09769ef997cbcab44f9f360325d3b9f19ff35e01b92dca9b534f3a017be8894aa04
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdav/kdav-19.08.2.ebuild b/kde-apps/kdav/kdav-19.08.3.ebuild
index 914f7b760247..7c134ce14518 100644
--- a/kde-apps/kdav/kdav-19.08.2.ebuild
+++ b/kde-apps/kdav/kdav-19.08.3.ebuild
@@ -3,21 +3,24 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="DAV protocol implemention with KJobs"
 LICENSE="GPL-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 +32,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 12951b59eed6..e9dc3bb730f4 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.2.ebuild 796 BLAKE2B 6a5c7c6c60aa150ecb503610d3a3a7c5272434aec51b5c12840fe113a24e696b75b7624a5a632ee604a39df01d3853a193747c73fc0f650aad1ec0041dbb96eb SHA512 ad399695f9e715c197f60cec440bd1b95c7807c2b2c459fe13eee0ddf60bfd29c90d1ff17ae5f12a19d29a81fc9dbaebc0d9c3860ac62fb74866cb4d2ac7c791
+EBUILD kde-apps-meta-19.08.3.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.2.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-19.08.3.ebuild
index 5c6da48234b6..5c6da48234b6 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-19.08.2.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-19.08.3.ebuild
diff --git a/kde-apps/kde-dev-scripts/Manifest b/kde-apps/kde-dev-scripts/Manifest
index d4cabc4bd33a..7a27aaf4e8c2 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.2.tar.xz 377524 BLAKE2B f27644f049bf7aae0b36f4ba6b3b2bc3d405e57280b64f5cea381a41a9021947cf8d9c27e38ddbe58a0a68126e14646ebb3d7543e9fb33b6124b3402dfb405b2 SHA512 0ecb6af25744144fd135cfe0b9de6869690fbd6d8bf63b0b61ea0ad8129ec3e4587a41b2da7507661d747613bc6400e70c6f3986f5ce5b4417f436d188442aaa
+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.2.ebuild 565 BLAKE2B b902f1c288051032576fd3778f86d4db45386a00818b4a4bc7b131bcd06a64aa776ebb21db5df1fe307ecb747ba0da312d5e52dd06f8fc9e1b4d27081c199588 SHA512 ce599eed304f98266e44d248515a961567749f26dbccc81971d9688c1ae4af34a812ab894916b7d130c902436ea61c07d426b013db13e0839813e3bd24e8b55a
+EBUILD kde-dev-scripts-19.08.3.ebuild 635 BLAKE2B 2a18cc7aeec35277315212ccd4d3b234e3c6c23eb195d7514a6e6a7f3016898adbb31970341cc0d452e8155c0e3d37990ab07f5e7af5474b455574cffe9b05c4 SHA512 864e08bc6a0cfc55816d2f36ffde055afae95474b86e3038fcdcc451d4c05aadc6803a51547e5cde8dc05c55e26563afbecedf429a77085b9ee72314e03a1e8b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-19.08.2.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-19.08.3.ebuild
index 376983d347c6..ceb8f9c262b2 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-19.08.2.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-19.08.3.ebuild
@@ -3,18 +3,21 @@
 
 EAPI=7
 
-KDE_HANDBOOK="true"
-inherit kde5
+ECM_HANDBOOK="true"
+KFMIN=5.60.0
+inherit ecm kde.org
 
 DESCRIPTION="KDE Development Scripts"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
 # kdoctools - to use ECM instead of kdelibs4
 DEPEND="
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdoctools)
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kdoctools-${KFMIN}:5
 "
 RDEPEND="
 	app-arch/advancecomp
@@ -23,7 +26,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 6371d213a170..7c978cfb1e27 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.2.tar.xz 61840 BLAKE2B 132512fdbd958fdc1ccb0652f8dae9aa8e00794d605937c45a3e3761996c79b8ccd31a1c1b5cdeb5d56ab6e4aadb98c441d4ca7ce136115236233241bd4343fd SHA512 919bbe79d7f6d3151f2c65759ebd3f1914de58bb2aa9cec1f9745cd883ebf186bd2ed0dbf26097a751c5cc1b3ed3f96332e8fbffecf87bcd58579bde9026a190
+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.2.ebuild 618 BLAKE2B 975cac0e258902a3f8534d47444ed03b2dcca3dd500ea20f03061b07eb681f05c1b16289a80d407f4960b9317cf9d9146c4eb964a9fd7f32efeaff9471c3239c SHA512 4d205f268ea055bca16c3e28daa59e9d33549cb1b02e61de3da4128ce0d0b8f98ff77e542307f478892eb7b0470e4508a2f6162c06b854bf0ac321d75e64f25d
+EBUILD kde-dev-utils-19.08.3.ebuild 732 BLAKE2B dca17ffd747cde8714d54e950c95ea6eeea98a87d06f84a20f96e1eaf46bb144c42ef34ec3e6b74925a0fb62c7eefc0703470aeae98003a908b7d3d96e85a287 SHA512 089f65a5f70ce9acd36d4fa87959af8eabdc18d1108a90a0f0aef8efea25e73444df4faf2d7ebdc5916ece3ff2872826ad4bd70d552df2859cbc252b68202103
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-19.08.2.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-19.08.2.ebuild
deleted file mode 100644
index e83074100dcb..000000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-19.08.2.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
new file mode 100644
index 000000000000..a46abfb8f364
--- /dev/null
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-19.08.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.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 881f0d9161db..e8999e8ee1d2 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.2.ebuild 367 BLAKE2B 7ea7261734528fad950da6ef0ed8ba59f33b2c3e262a048f44a44df75e8e5685d80b495f590bffbf0da9541955aca8ff1bf19919e9ef96254236189716d1871c SHA512 0b60ca00da44f6a7c041d9f6ae920330598171780787206ad905ddcd1a29bf9445d94fbd4a815d85a90eddf7de91a31cace81624d3f425e8b65149e8137b863a
+EBUILD kde-meta-19.08.3.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.2.ebuild b/kde-apps/kde-meta/kde-meta-19.08.3.ebuild
index 44a5c489c099..44a5c489c099 100644
--- a/kde-apps/kde-meta/kde-meta-19.08.2.ebuild
+++ b/kde-apps/kde-meta/kde-meta-19.08.3.ebuild
diff --git a/kde-apps/kdeaccessibility-meta/Manifest b/kde-apps/kdeaccessibility-meta/Manifest
index a3cba66753fe..965136af8396 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.2.ebuild 417 BLAKE2B 4fc165baa1cf7627d496606f3f98f3344dc57dd24f5f5b83719b8aacf931b657ec7c95499fff3aba4f96c3daf97b64d6ceba172406157b294bba5760e142d23e SHA512 4a3b08571198062171ee734e763e283ea51c37c9b64aa852e19a942d81945726d99f534b8ed9b09c9e555cf98c2a79196af6899dd46c7f091c9f89dd9995cfeb
+EBUILD kdeaccessibility-meta-19.08.3.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.2.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.08.3.ebuild
index 42c3e4b11dc7..42c3e4b11dc7 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.08.2.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-19.08.3.ebuild
diff --git a/kde-apps/kdeadmin-meta/Manifest b/kde-apps/kdeadmin-meta/Manifest
index 5ccfdafec1fb..00a8ca707941 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.2.ebuild 401 BLAKE2B 0225bace8801d67ce4f803704290439df8942112c7b8a8a5af4170ec60d7d2fe0836776708a7e584df1a077001a9770ae9e5ba2e03caa644e42348bbd2f9a4ef SHA512 e2dbd8a80be6f9744e859c7324d828cf3c75bd29502dc9a02af06c44a19c6e5dd0dca6a5d6edd8ccd760008f2eb02ff757f7a925942941f88864df351b61ac72
+EBUILD kdeadmin-meta-19.08.3.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.2.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-19.08.3.ebuild
index 4498e75ab33c..4498e75ab33c 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-19.08.2.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-19.08.3.ebuild
diff --git a/kde-apps/kdebase-meta/Manifest b/kde-apps/kdebase-meta/Manifest
index 80c7e1ae0064..634158a59100 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.2.ebuild 369 BLAKE2B ab9b1c8993a0f16462deb4e8414157497387c43a57b96eeb737702a1a7f794aa2a69b4a2b8da07848ee2ba36f196ec618a0258882a6f147cddcb7b470cda5a37 SHA512 05e101208cada601d8cf86184d0e385a615512284645da99f6ad715612b8cae00085384ccd2075ae9a30cdbe03fb9ff615ba29ec136d7e4deba398b088f42f1c
+EBUILD kdebase-meta-19.08.3.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.2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-19.08.3.ebuild
index 77499731d30a..77499731d30a 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-19.08.2.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-19.08.3.ebuild
diff --git a/kde-apps/kdebugsettings/Manifest b/kde-apps/kdebugsettings/Manifest
index fd2395b2e2ea..bddf8b15e398 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.2.tar.xz 55360 BLAKE2B 39ae505dfbfb8889e0059df79cfa686837f9a48f76d5ab44157200b55a2b352e2a4456357adfd3508c62b75cdd8ed8c9d856ffd723302c46345767e055547f70 SHA512 bddb00affad04cf798213ba0e7814fe468cc92d034bbeda601d462e3c79bde28b238e19736381c2a09c0d47cdb07e9604fa09281f2962e2e3e2e9f9e2d1e7944
+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.2.ebuild 601 BLAKE2B f7edeace32d54ea115daf7b26ae82408fdd2b13a58f142339bc525c39ee500d9a9556d00c278c48f512ed3530fa4631ca1416ffc724114d58a75c8318dc0a45e SHA512 bca90d55c159e064a01dc489ef16d4e9e6b93d2b047be86b2f6cc2f46c07fe7705e99473a53aa47f621949f1d2ce3c9573c09b7fbc620f864b45da2bd891e46b
+EBUILD kdebugsettings-19.08.3.ebuild 727 BLAKE2B 69f3ec3288e4b83a59b61847a9ad79ec1bbb51697bb2754042d0182b608245c5a8622e995cff9679f7672b03106099f04a0bb6f3960ae505867528f39bbeafaf SHA512 f6b2ba14c7289c2157dc504b5e3bf381c683a81afc67019650e57406372de6549bd850e7ddf6d76b4205ffb4aea2af8504f5c6438cb3f7fa88382947b6ff2a4c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdebugsettings/kdebugsettings-19.08.2.ebuild b/kde-apps/kdebugsettings/kdebugsettings-19.08.2.ebuild
deleted file mode 100644
index 44c06c29e0b5..000000000000
--- a/kde-apps/kdebugsettings/kdebugsettings-19.08.2.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
new file mode 100644
index 000000000000..364a3aa72ab1
--- /dev/null
+++ b/kde-apps/kdebugsettings/kdebugsettings-19.08.3.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"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Application to enable/disable qCDebug"
+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 b4172baa5a3e..8f876b2d49a2 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.2.ebuild 929 BLAKE2B 477ee7e8492d09290050760b998f0ddea78562fa668c516d7c4e79e41b21ba34e7f0033e04bacbbcd15c2420f2fb2eb4853f63d546706df6cf380ef18c708906 SHA512 785e8906b77a343a02846096b56d0225bf7b6e43c4cbf0e770f9704eaf559e2369066586bfdfe7e2b001905a524e67d7fc71d5e5af8fa27db2a55036344d255b
+EBUILD kdecore-meta-19.08.3.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.2.ebuild b/kde-apps/kdecore-meta/kdecore-meta-19.08.3.ebuild
index 154e7c3ad61a..154e7c3ad61a 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-19.08.2.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-19.08.3.ebuild
diff --git a/kde-apps/kdeedu-data/Manifest b/kde-apps/kdeedu-data/Manifest
index cd959d696f4f..c530c960ac11 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.2.tar.xz 328172 BLAKE2B 01e14188e07086bdc4755d9b9951a89f44e9e46622323b4107b9b0ccd21e387f7fbff9eb1f5db0476cabc8710921f8c3e159c20f37cb63a9ab2e7272b0a78dc6 SHA512 ed8bb020594898b1a31e6fb715713fdca4cf13276e8e09115be7ef34fc4f44de8d59324d1ed40103ea5b670f204f3ce68f26378dfddc4e196a3c95cdc411e832
+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.2.ebuild 394 BLAKE2B 223a1c004686d06ec303e91b47744226f1f43c1adc65d49a20b3261e00d338f96efda2b5fd2871b02242aa44eb908556da4f0a90635060590b9d6072e294369a SHA512 2bc39c7146bf248ca240f08b71fd30f825ef30b4ae1874ab7418ceaf32b70ec86cacec4af69d0fbe5ba32b9bca82922d4b028edd2d90ad4e938d232b85bdfbdb
+EBUILD kdeedu-data-19.08.3.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.2.ebuild b/kde-apps/kdeedu-data/kdeedu-data-19.08.3.ebuild
index 22be843a9af2..aaa79343f304 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-19.08.2.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-19.08.3.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"
+
+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 5a7ef5449a99..d902a4b5b606 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.2.ebuild 1229 BLAKE2B 21f255f6d3ccb41710f0d437dc9be3a6948d0bb5e5322d66a5f436bde33512b88d747d5400d7efa3d34bb02bfd6db0e19c9f7333924d92b5d008db9462f94109 SHA512 010cce8c5edd425cc4636ac044cab91530579bf8b390ca567443e9887fc69f39cbe7485ee001e9d99596f53cf63fdc486f1e53ea29b44ed6666a93286cbad059
+EBUILD kdeedu-meta-19.08.3.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.2.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-19.08.3.ebuild
index 24a6d7958cea..24a6d7958cea 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-19.08.2.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-19.08.3.ebuild
diff --git a/kde-apps/kdegames-meta/Manifest b/kde-apps/kdegames-meta/Manifest
index f75ff892da6b..142e049c79dd 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.2.ebuild 1807 BLAKE2B 915a35021c2e0bd23cb675ec6430d841967e5415699161f31399b6aac311c1e7ab50d7d47d14c95f3aa449339c0e60dbea7c39330497d719d478622a2f7dfa2f SHA512 229186f00d719ef951b533a53cb3e77379c5fae67337e44dca81b2b822022c11c5f2f755d12072bcd7a290dff376b2bce549f1bb9502ec226f4d2663c51cca47
+EBUILD kdegames-meta-19.08.3.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.2.ebuild b/kde-apps/kdegames-meta/kdegames-meta-19.08.3.ebuild
index 91b0db75ecfe..91b0db75ecfe 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-19.08.2.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-19.08.3.ebuild
diff --git a/kde-apps/kdegraphics-meta/Manifest b/kde-apps/kdegraphics-meta/Manifest
index 706e5cf1f28e..a89faa0df57a 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.2.ebuild 899 BLAKE2B 518f528f7e4bc44fc2c3343c84f8bc4dc3370bf7736a51da1f1c4db2b30cae3c6419ad5c38c98a08b9f0c1f9abe3c8789ffc6587b3742ac6b911a5be95cfe4ed SHA512 2efa668bdf28f3ca44afa77be1c747d31889bbe30817510421e93f5a29710ba271bcf88e36272d5905a75e4fa2ac14c94f1e19e8e29f4c1daa7c61794e2d24ff
+EBUILD kdegraphics-meta-19.08.3.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.2.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-19.08.3.ebuild
index 23762131d38c..23762131d38c 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-19.08.2.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-19.08.3.ebuild
diff --git a/kde-apps/kdegraphics-mobipocket/Manifest b/kde-apps/kdegraphics-mobipocket/Manifest
index 54818594ecaf..28ae36f36656 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.2.tar.xz 13452 BLAKE2B e19616d9004774f218f4e81ee92f58971a6dcad636cb0fe23a26b63831a68758304ae83f01d3c88c38e8d34c5818c1f3875ae4531979c81430bc1aa3b9aa98fa SHA512 05ca1dc7fbd6e635c1ef4386f074f80059bb2371b829074fb79022b253a2f519986d2ae29fea577504eb805e031438cb3a2e9695f472966d601a0ab0afcba45f
+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.2.ebuild 428 BLAKE2B 59ca79cf5ae2a608e0a5b9e9faa89ecb41045b68186bbd9f823d2cd0af3644c7bd137eced841cc5a02f528d047889dcd2bbdbeeb530d3326eddabf52ec5a894b SHA512 7df7b6cfa04333eaf907956bc1a287c09990c8dcebe4af3a1c295433b3ce75b54139d6b76b2ec695f88404091992d51b15fc9fb32bd588d1810d1485ba2f66ef
+EBUILD kdegraphics-mobipocket-19.08.3.ebuild 511 BLAKE2B 3a6c2ce05ce308e50766068345b16e7ea4620680a07cd1678ba3149c0b2075e7f2d14273fd7d8a6e711773f7a6a9f4751b68565633aa1a778b253884328a6dc2 SHA512 277135d49a3273d73daa8033f5a885164e9aabe9d5da1fd655a4dc866465aadb8513c5085d513dce549563c593ded9b3dc2e96b0919e8160265881d26573cc88
 MISC metadata.xml 325 BLAKE2B 8ec301d2e0047b619373cd33b250090cb4c5c20a62d38dfc9a66187f8aa21fd598733c75d293f226d6bae43c84c56b8fe2d5c72aa2489d84dbfbab6823cd66ba SHA512 9418f0328963c23416a3d0dda0fd491a75e26c2a95b3ae1bce180413297038cd33129d1ea86c9e707280ac6bb00c9584e1fe75abe6b1b84b4dc556d429740d95
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.08.2.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.08.3.ebuild
index b2fd745f0610..bd81f7234916 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.08.2.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-19.08.3.ebuild
@@ -3,15 +3,19 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library to support mobipocket ebooks"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~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 +24,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 d5c357a04e70..daac1b651087 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.2.ebuild 813 BLAKE2B 3d961fe44f701b8d7cf6d3b0fd62cbf2756c17b3e7de18d5cde73a538d0185b1fd897913c7af6527c1fcfcdbdd743d215fc3a93027d5753ccde097597abf3ec4 SHA512 125ed12d192bc61f4634beb1889b273ffafd4ebb723b63762e82826fab53fb4db851dd74ae301457f76d88fa5259e265ca6a1ea2531c401889659aa090340fe8
+EBUILD kdemultimedia-meta-19.08.3.ebuild 813 BLAKE2B 3d961fe44f701b8d7cf6d3b0fd62cbf2756c17b3e7de18d5cde73a538d0185b1fd897913c7af6527c1fcfcdbdd743d215fc3a93027d5753ccde097597abf3ec4 SHA512 125ed12d192bc61f4634beb1889b273ffafd4ebb723b63762e82826fab53fb4db851dd74ae301457f76d88fa5259e265ca6a1ea2531c401889659aa090340fe8
 MISC metadata.xml 327 BLAKE2B 37deeb7aa86563880751c2d17d4ffc48246f0edfbd4d528a718ba0b2baaae58c3a5e479e379d20dec90e7d0e145fc6b548a5037008907a80c82f2cc6bb83ad4b SHA512 a9070d6747bb3ecf1541038b48dc4e71770ac294fbf0a8e3d2268926fd0238b804fd8dfb014e0c1a293192c997a91291657a69b3a8eba679a92726e20c0f3d11
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.08.2.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.08.3.ebuild
index 8051d3dc3ced..8051d3dc3ced 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.08.2.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-19.08.3.ebuild
diff --git a/kde-apps/kdenetwork-filesharing/Manifest b/kde-apps/kdenetwork-filesharing/Manifest
index 10b1daf06e02..0cc720641a4a 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.2.tar.xz 315516 BLAKE2B 497d99b7da14d384abd3609f78b42a5b147d1196a87a9210fa23951f628bf13e08e01a093b85d057326b57e8bf2414aa098c46dba5be097d49f7c3dbc7679efe SHA512 5871b845392fd7230baeb725f6e2da5760a2454156554f5b8e2eaccaaba4412080e86d5b7acb735fad2d6da24756728406d1a22b51dd7935c531b52ce5b109c8
+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.2.ebuild 584 BLAKE2B 58f32535b21e8f6ae3bf14137d598553922a895301b050a0bdb564f368a08a9312e60f0f8fd39617f0dd6dc021b81fa4cd75325a9b1c9be4e71fd9d60d8546e5 SHA512 e283db0fb0d653c3c6800072e357d3e7abacafc7476d8683f29d402e8d0b18d949b7f41426f0ed37e9e4a88149310a2c6b45ecce25cb94949f01132080816968
+EBUILD kdenetwork-filesharing-19.08.3.ebuild 697 BLAKE2B 967b7e5bca02c0a4c46c7f6997810c118756853acf37e761f8af76701289be25448778bce9dd1099cae059a4660919e62a33d576855bc11f0a21f35c7461575e SHA512 bc2dc4c5a3f3c99530aa296320299676d70b7a74dbc8ad297742bc3cf92ce8a17e98cd3d6fcb4d501cb80be7a119d324b180b4d778f0c3760d4bfe596820f273
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.08.2.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.08.2.ebuild
deleted file mode 100644
index cf73bf082890..000000000000
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.08.2.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
new file mode 100644
index 000000000000..fed11d615cc0
--- /dev/null
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="SMB filesharing config module for systemsettings"
+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 c06d981f5ae0..b36b68f556cd 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.2.ebuild 667 BLAKE2B e548e019c4eb6217f5064550a85ade08c940500aaa05c0bcbb6fef7bb8cc2d2afab6d81c3e905e5c17c389f7a82a692b84a54dbf9b06fb08868bb1aa9a6b2668 SHA512 3ebc40d1c2bc73daf4a74a85c3d61b41d10ee1926184b3bd9e36fbc5c5d6202f49ebc028f59862d189bfdeb43b8364fffb493dd2f7f51b97096edfca12575b61
+EBUILD kdenetwork-meta-19.08.3.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.2.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-19.08.3.ebuild
index 093236da6986..093236da6986 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-19.08.2.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-19.08.3.ebuild
diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index cd335306e57b..4aa5be9e9354 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +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.2.tar.xz 12413952 BLAKE2B 1fef68119c30be11af1f0fb973ff90fdb894c3ce3db3f3ec4183bc27dd9471d7829b4ee3e869d041f27bb01164418c95184a956d9fe51ae42fe709c5ef4e329b SHA512 dc347962fafd9e96f90e898e9221dd41e4635fae2fc56ba704066964feebf24fb237c531d0e2b2decde9b4f07b7cf7b9af037ea27cc8e17550639063fbaabfc0
+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.2.ebuild 2285 BLAKE2B 6323c14919fc112b5915821c75c6ea38635bf25dceca2a397f56f99bf085dce6b0610570517912193cce73c98d0ef0e76425f1e3c8df5183126921fce4af88df SHA512 85cbe2823793de219f69338714f78e5ebd31e727f7e2354b4404547c289f702ba2f97275f1966ab542f6f7621aedad7479dec39201eefc4e6c032df062ef0e54
+EBUILD kdenlive-19.08.3.ebuild 2586 BLAKE2B eed47dbe78a92c6d6a735bf8bb5d7cebc51d913187af137b41223ec8a7ab306a3288696d36d7a7ccb4d32b42b911fa35a9f54815b8934a0b38356781f3b96be6 SHA512 e6aadb625f9659794ec3a64bb47f61929672215010e9b43b8f676fa578aaabb0ab52cff6ee6f26c1677146fb8c9d1fdd365e59b84df8b92bf8f0aa221ba21347
 MISC metadata.xml 559 BLAKE2B 4fb6ac38398866a869611dcdc0d9513c5618e7b1864b221d155e5bf1200ffd1081ff8b7dc408d85a97be6146eaf60b1ff1ac695c02e22c2a1537b18a8a1d8f4c SHA512 b76a5322a9fe2a6b7597ac7a6c45525e921cd0102e156939e013c96d876b355b258c0bb917e72a73686819672a2a5a47e7c7d0232468c709e4e88f888ee26cbb
diff --git a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch
new file mode 100644
index 000000000000..76822413f107
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,203 @@
+From 3c287e282f84231f1e71482464e9593d7de27912 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 27 Sep 2019 08:59:21 +0200
+Subject: Port some deprecated methods
+
+---
+ renderer/renderjob.cpp                     | 3 ++-
+ src/assets/keyframes/view/keyframeview.cpp | 4 ++--
+ src/bin/bin.cpp                            | 2 +-
+ src/dvdwizard/dvdwizardvob.cpp             | 2 +-
+ src/lib/audio/audioCorrelation.cpp         | 3 ++-
+ src/lib/audio/fftCorrelation.cpp           | 4 ++--
+ src/lib/qtimerWithTime.cpp                 | 2 +-
+ src/lib/qtimerWithTime.h                   | 6 +++---
+ src/project/projectmanager.h               | 3 ++-
+ src/titler/unicodedialog.cpp               | 2 +-
+ 10 files changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
+index 2214b37..c164bf0 100644
+--- a/renderer/renderjob.cpp
++++ b/renderer/renderjob.cpp
+@@ -23,6 +23,7 @@
+ #include <QStringList>
+ #include <QThread>
+ #include <QtDBus>
++#include <QElapsedTimer>
+ #include <utility>
+ // Can't believe I need to do this to sleep.
+ class SleepThread : QThread
+@@ -165,7 +166,7 @@ void RenderJob::start()
+             qWarning() << "No org.kde.JobViewServer registered, trying to start kuiserver";
+             if (QProcess::startDetached(QStringLiteral("kuiserver"))) {
+                 // Give it a couple of seconds to start
+-                QTime t;
++                QElapsedTimer t;
+                 t.start();
+                 while (!interface->isServiceRegistered(QStringLiteral("org.kde.JobViewServer")) && t.elapsed() < 3000) {
+                     SleepThread::msleep(100); // Sleep 100 ms
+diff --git a/src/assets/keyframes/view/keyframeview.cpp b/src/assets/keyframes/view/keyframeview.cpp
+index 7e63141..867408f 100644
+--- a/src/assets/keyframes/view/keyframeview.cpp
++++ b/src/assets/keyframes/view/keyframeview.cpp
+@@ -267,14 +267,14 @@ void KeyframeView::mouseDoubleClickEvent(QMouseEvent *event)
+ void KeyframeView::wheelEvent(QWheelEvent *event)
+ {
+     if (event->modifiers() & Qt::AltModifier) {
+-        if (event->delta() > 0) {
++        if (event->angleDelta().y() > 0) {
+             slotGoToPrev();
+         } else {
+             slotGoToNext();
+         }
+         return;
+     }
+-    int change = event->delta() > 0 ? -1 : 1;
++    int change = event->angleDelta().y() > 0 ? -1 : 1;
+     int pos = qBound(0, m_position + change, m_duration - 1);
+     emit seekToPos(pos);
+ }
+diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp
+index 13c9b2a..c1127d0 100644
+--- a/src/bin/bin.cpp
++++ b/src/bin/bin.cpp
+@@ -222,7 +222,7 @@ public:
+                     // Draw usage counter
+                     int usage = index.data(AbstractProjectItem::UsageCount).toInt();
+                     if (usage > 0) {
+-                        subText.append(QString().sprintf(" [%d]", usage));
++                        subText.append(QString::asprintf(" [%d]", usage));
+                     }
+                     painter->drawText(r2, Qt::AlignLeft | Qt::AlignTop, subText, &bounding);
+ 
+diff --git a/src/dvdwizard/dvdwizardvob.cpp b/src/dvdwizard/dvdwizardvob.cpp
+index 337d046..f5c89d6 100644
+--- a/src/dvdwizard/dvdwizardvob.cpp
++++ b/src/dvdwizard/dvdwizardvob.cpp
+@@ -86,7 +86,7 @@ DvdWizardVob::DvdWizardVob(QWidget *parent)
+     m_view.button_down->setIcon(QIcon::fromTheme(QStringLiteral("go-down")));
+     m_vobList = new DvdTreeWidget(this);
+     auto *lay1 = new QVBoxLayout;
+-    lay1->setMargin(0);
++    lay1->setContentsMargins(0, 0, 0, 0);
+     lay1->addWidget(m_vobList);
+     m_view.list_frame->setLayout(lay1);
+     m_vobList->setColumnCount(3);
+diff --git a/src/lib/audio/audioCorrelation.cpp b/src/lib/audio/audioCorrelation.cpp
+index 706b48a..66552fa 100644
+--- a/src/lib/audio/audioCorrelation.cpp
++++ b/src/lib/audio/audioCorrelation.cpp
+@@ -14,6 +14,7 @@ the Free Software Foundation, either version 3 of the License, or
+ #include "kdenlive_debug.h"
+ #include "klocalizedstring.h"
+ #include <QTime>
++#include <QElapsedTimer>
+ #include <cmath>
+ #include <iostream>
+ 
+@@ -128,7 +129,7 @@ void AudioCorrelation::correlate(const qint64 *envMain, size_t sizeMain, const q
+ 
+     */
+ 
+-    QTime t;
++    QElapsedTimer t;
+     t.start();
+     for (int shift = -(int)sizeSub; shift <= (int)sizeMain; ++shift) {
+ 
+diff --git a/src/lib/audio/fftCorrelation.cpp b/src/lib/audio/fftCorrelation.cpp
+index c8119e9..6ed61c5 100644
+--- a/src/lib/audio/fftCorrelation.cpp
++++ b/src/lib/audio/fftCorrelation.cpp
+@@ -9,7 +9,7 @@ the Free Software Foundation, either version 3 of the License, or
+ */
+ 
+ #include "fftCorrelation.h"
+-
++#include <QElapsedTimer>
+ extern "C" {
+ #include "../external/kiss_fft/tools/kiss_fftr.h"
+ }
+@@ -35,7 +35,7 @@ void FFTCorrelation::correlate(const qint64 *left, const size_t leftSize, const
+ 
+ void FFTCorrelation::correlate(const qint64 *left, const size_t leftSize, const qint64 *right, const size_t rightSize, float *out_correlated)
+ {
+-    QTime t;
++    QElapsedTimer t;
+     t.start();
+ 
+     auto *leftF = new float[leftSize];
+diff --git a/src/lib/qtimerWithTime.cpp b/src/lib/qtimerWithTime.cpp
+index 1d8b46f..9c1b362 100644
+--- a/src/lib/qtimerWithTime.cpp
++++ b/src/lib/qtimerWithTime.cpp
+@@ -25,7 +25,7 @@ void QTimerWithTime::start(int msec)
+     m_time.start();
+ }
+ 
+-int QTimerWithTime::elapsed() const
++qint64 QTimerWithTime::elapsed() const
+ {
+     return m_time.elapsed();
+ }
+diff --git a/src/lib/qtimerWithTime.h b/src/lib/qtimerWithTime.h
+index ab3e1c7..93f0d53 100644
+--- a/src/lib/qtimerWithTime.h
++++ b/src/lib/qtimerWithTime.h
+@@ -20,7 +20,7 @@
+ #ifndef QTIMERWITHTIME_H
+ #define QTIMERWITHTIME_H
+ 
+-#include <QTime>
++#include <QElapsedTimer>
+ #include <QTimer>
+ 
+ class QTimerWithTime : public QTimer
+@@ -28,9 +28,9 @@ class QTimerWithTime : public QTimer
+     Q_OBJECT
+ public:
+     virtual void start(int msec);
+-    int elapsed() const;
++    qint64 elapsed() const;
+ 
+ private:
+-    QTime m_time;
++    QElapsedTimer m_time;
+ };
+ #endif
+diff --git a/src/project/projectmanager.h b/src/project/projectmanager.h
+index a8a5fbd..d91314c 100644
+--- a/src/project/projectmanager.h
++++ b/src/project/projectmanager.h
+@@ -18,6 +18,7 @@ the Free Software Foundation, either version 3 of the License, or
+ #include <QTime>
+ #include <QTimer>
+ #include <QUrl>
++#include <QElapsedTimer>
+ 
+ #include "timeline2/model/timelineitemmodel.hpp"
+ 
+@@ -182,7 +183,7 @@ private:
+ 
+     KdenliveDoc *m_project{nullptr};
+     std::shared_ptr<TimelineItemModel> m_mainTimelineModel;
+-    QTime m_lastSave;
++    QElapsedTimer m_lastSave;
+     QTimer m_autoSaveTimer;
+     QUrl m_startUrl;
+     QString m_loadClipsOnOpen;
+diff --git a/src/titler/unicodedialog.cpp b/src/titler/unicodedialog.cpp
+index d6b7382..f449aa2 100644
+--- a/src/titler/unicodedialog.cpp
++++ b/src/titler/unicodedialog.cpp
+@@ -409,7 +409,7 @@ void UnicodeWidget::slotPrevUnicode()
+ void UnicodeWidget::wheelEvent(QWheelEvent *event)
+ {
+     if (frame->underMouse()) {
+-        if (event->delta() > 0) {
++        if (event->angleDelta().y() > 0) {
+             slotNextUnicode();
+         } else {
+             slotPrevUnicode();
+-- 
+cgit v1.1
diff --git a/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch
new file mode 100644
index 000000000000..13d2fd39d4bc
--- /dev/null
+++ b/kde-apps/kdenlive/files/kdenlive-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,32 @@
+From caf88fd638f67b505aa28521b6abda430f03e7c8 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Thu, 31 Oct 2019 20:33:54 +0100
+Subject: [PATCH] Fix build with Qt 5.14
+
+std::hash<QString> is already specialized in Qt 5.14 [1], so we need
+to avoid redifining it with this version.
+
+[1] 4469e36d7203a55a4e158a50f0e9effc3f2fa3c2 in qtbase.git
+---
+ src/definitions.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/definitions.h b/src/definitions.h
+index a55ec8df7..d2f67815b 100644
+--- a/src/definitions.h
++++ b/src/definitions.h
+@@ -252,10 +252,12 @@ QDebug operator<<(QDebug qd, const ItemInfo &info);
+ 
+ // we provide hash function for qstring and QPersistentModelIndex
+ namespace std {
++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
+ template <> struct hash<QString>
+ {
+     std::size_t operator()(const QString &k) const { return qHash(k); }
+ };
++#endif
+ template <> struct hash<QPersistentModelIndex>
+ {
+     std::size_t operator()(const QPersistentModelIndex &k) const { return qHash(k); }
+-- 
+2.17.1
diff --git a/kde-apps/kdenlive/kdenlive-19.08.2.ebuild b/kde-apps/kdenlive/kdenlive-19.08.2.ebuild
deleted file mode 100644
index b479ace76227..000000000000
--- a/kde-apps/kdenlive/kdenlive-19.08.2.ebuild
+++ /dev/null
@@ -1,84 +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.16.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]
-"
-
-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
new file mode 100644
index 000000000000..8e7dadce7f30
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://www.kdenlive.org/"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="freesound gles2 semantic-desktop share v4l"
+
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
+	>=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
+	>=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
+	dev-cpp/rttr
+	>=media-libs/mlt-6.16.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]
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
+
+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)
+	)
+
+	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 e609e92a7bbc..4f30169d7682 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.2.tar.xz 2088884 BLAKE2B 095f72d593c6e1a056e61f0391c82753bccaec3211fbadba32667fc5c610e2c56719f78155474c7c88c81d20b54a32ae8695fdd98b9a6fdb6ba6367566cdab48 SHA512 bd04059fadb80ed20b2f071d097580bf4e6ad80c16768215e1880d01dffdfa205bedaf8621b512e56c2e9b94db598e7d081e96ffc937a0365a212dc7d230002a
+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.2.ebuild 2384 BLAKE2B 1b027f5f8d95a7eb0b1cba2d2cf4f615e5ddbfc48e4f3538883ab2c0ab13aa87740eb1d133ee49900800a4d8a72678f944f1ec6539a7d7f782248369a23b873d SHA512 54e8cfc04fe8cffc606077726e8b6e953d52e1d254832787c734b969fea7177794f5cb36fdcbb573ad66440cf8ef1cccb7c47441623fbd5a1b9d91923a7eb72a
+EBUILD kdepim-addons-19.08.3.ebuild 2619 BLAKE2B 38b521390b9714589fe7620f532b1bf9b068bf7ff0d49ac5e64994598001dad8af8086bacd4d3b8ee91cc14833f3a4c60de5106d21407f81fe7b957048782033 SHA512 94582d7422057615934d66fc5a46539912847de7696a2c37655ec91ea1af77d125c0f1fac3d54d7a7a2bae8b34d86d5e980219e6335bb3a896e76b679566d63c
 MISC metadata.xml 466 BLAKE2B 3f47bc3e22bf68542c83cea8d135bb3495f364b18734effe636ce5627a9be865f8a92f4c6a430bd2a7c47e8e88922fac82cf436c25c303abbd6ff895648917ff SHA512 c213ed927dcc9562e52726a93bb9dbb9b2b315bd6b230daa52093785e67ca31b305f59e2900c7100cf66b586880e32487d1ec3227024c9f5460f7e29525d491c
diff --git a/kde-apps/kdepim-addons/kdepim-addons-19.08.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-19.08.2.ebuild
deleted file mode 100644
index 38ccbd41dbbc..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-19.08.2.ebuild
+++ /dev/null
@@ -1,88 +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 kcontacts)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(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 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.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-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
new file mode 100644
index 000000000000..a184d41ba592
--- /dev/null
+++ b/kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
@@ -0,0 +1,92 @@
+# 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"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plugins for KDE Personal Information Management Suite"
+HOMEPAGE="https://kde.org/applications/office/kontact/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="importwizard markdown"
+
+COMMON_DEPEND="
+	>=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
+	>=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/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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}: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-utils_use_find_package importwizard KPimImportWizard)
+		$(cmake-utils_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 7cd2b82fde4b..e647bdc33635 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.2.tar.xz 82684 BLAKE2B 1e88bafd5903d767bfcaede08aadbda470ed8fbd06dd3ad3c2c6105f8be902cb639da18af6fb219984c26ae5d6d6165f72e00366d49eca8d14f915a948636111 SHA512 f2bbac6717f844d3877720a30c19aaa08cde56f75c5b2b255abdf6646454ab86bb20af24311e035b5e1ef4090f1da7edb2387a70eb068cddfc47052c4e08b8e0
+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.2.ebuild 929 BLAKE2B ba8f79f6caa1a412cb80ca36da251c269aaef4d400b1734be200d0a9f16c10bbd499cd3d83e432b01d1bd6979c889287735ffc1ec9bc9f3897695c685df150bd SHA512 5eef6d3d5e3c6012141fbca2ace32665a10a0279845967bd62c5beb66e750b73f83c17a0e0433ff9ce7ed470e7ccb57206c753a8c79302bdb932cc396ce5a279
+EBUILD kdepim-apps-libs-19.08.3.ebuild 1085 BLAKE2B 43b65e65ad761cb8f59491d27df18ef991b6dcdc90180bd945cd5178c30dc65b982eccbed9600584c18311704a6a6bd83f87af80e807070a75ebb6c185401fd0 SHA512 06e5ca7921458015a4f525e580e0721332b5146bccdd2f6c0cc2c4548fafe810f571a9c24dd0ac257c3800cd790b95667f95933d0142838154c1c7e3db83235c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.2.ebuild b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.2.ebuild
deleted file mode 100644
index fd70312caaa4..000000000000
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.2.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 kcontacts)
-	$(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 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
new file mode 100644
index 000000000000..2d5eab6ab965
--- /dev/null
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-19.08.3.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="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Libraries for KDE PIM applications"
+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/kiconthemes-${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 5e14bdadb8a0..9adbf7d2361e 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.2.ebuild 2594 BLAKE2B 3405bbd1acb985b75ce4bc38429cda17dd963986a0a3bb74265556c5c8999948ea443a5dd2d864a230f58118d8afa527cfc50f75b51703f13166d308a0ac8137 SHA512 61a493b99c058e618dcf55dca89d67afd3263d5cc5e2f78e5f77555c4ae112bc8ddc5655f90289fe9725ec4a36114f7346463dcf6c3fd1a3ee5c06e5b12fe037
+EBUILD kdepim-meta-19.08.3.ebuild 2594 BLAKE2B 3405bbd1acb985b75ce4bc38429cda17dd963986a0a3bb74265556c5c8999948ea443a5dd2d864a230f58118d8afa527cfc50f75b51703f13166d308a0ac8137 SHA512 61a493b99c058e618dcf55dca89d67afd3263d5cc5e2f78e5f77555c4ae112bc8ddc5655f90289fe9725ec4a36114f7346463dcf6c3fd1a3ee5c06e5b12fe037
 MISC metadata.xml 650 BLAKE2B 27e2fa91fe17cd24da17294c2c8a54cd4eee5342c07d8a1a7ad1515d9c52bfe47fe938f3c96e4e2d1ae9b99e2100de9252e180d55458a46aaab03d46725ab9a0 SHA512 dff51eb660ecab8f80e9d865f9e2a9ce5ace1cea6ff322cd2b71af2e3ce83e45d0ea3fbd499a37413bd9572853b90fe860a040d3e3828836ecf842872a4eed88
diff --git a/kde-apps/kdepim-meta/kdepim-meta-19.08.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-19.08.3.ebuild
index 798a32b82045..798a32b82045 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-19.08.2.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-19.08.3.ebuild
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index e7c7f404a60c..4512b6f2780c 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,7 +1,7 @@
 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.2.tar.xz 1731932 BLAKE2B 34b17d3f991c0f6c1f5f3fa6e217350cc09232abd52ec902579d5706320ab6fa7267d3a9a4dd78e6c789b51084eb1cf336f5b9befeb1f80dbb7583444ec12e37 SHA512 02dd5a5db0df0491afd2521eccde6a5e6bb0e4cb4f8d620e2a9336029b1463a35b210084cc8874506f144049ec7d83e84dff255c44a399b543321058457611c9
+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.2.ebuild 2268 BLAKE2B 8d12886ba20f4630561fda34521ba43dd88706dc38006b6c1403d8b29dd0d33f9f371f4290609b1007f82e4b497293c2442544c0e9ff4c44c73393f8a2c61062 SHA512 22fa1de37e776f2693f3d5dc9c780f925464bb3a10de150857ad45e29301ad937a63b0e52836130eda76a2e77dd8820b2b803eb69c2c267533e59cfff5cbf1ca
+EBUILD kdepim-runtime-19.08.3.ebuild 2555 BLAKE2B bdd3bc769d4aabb1c5162bbf9b77eea0a6e326219753c6ec79716b59db528d7955802a87b586b51ff7d4623d438b1d0838dfc173738345cd961fa7f1ef62197c SHA512 022e851ef2d6146899c2f361e065c92fdbee558b5ebd66e08d5e09c1e87ddcdddd06aaced2ebbca97eb2853688681d95b0cce2b02cf42d23ca968368fbfdd248
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.2.ebuild
deleted file mode 100644
index b73b75384bdb..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.08.2.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_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 kcalendarcore)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 kcalutils)
-	$(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
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	sed -i resources/CMakeLists.txt -e "/add_subdirectory( *facebook *)/ s/^/#DONT/" || die
-}
-
-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
new file mode 100644
index 000000000000..361533872488
--- /dev/null
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.08.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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"
+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_prepare() {
+	ecm_src_prepare
+	sed -i resources/CMakeLists.txt -e "/add_subdirectory( *facebook *)/ s/^/#DONT/" || die
+}
+
+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 c9262507b624..b41d0e60a364 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.2.tar.xz 37124 BLAKE2B 46b5e6ada080185def39d4474eaac9437e185e65d317840f8fed6e95e868b3179bc4a8c46d8dd6c208f7b79a34239bd730ab12fc3109d7e10369e9a5b4a4d104 SHA512 86bf5fcee7868fa93295c086434baebf6b1aed611e1095d29d0360e3eace084fc0afecc267551c9d54f438388c571032d1cb694c5799f978116eb8f470585d9f
+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.2.ebuild 347 BLAKE2B d57e83c5b601a311b33c3757b31b35e6914db1c0733c9423c896f5d2d0bfc41679cfbd7aaf15d7770c21f0f2b8a0dd97dca667529d80bad6e87be40d87ea9b0e SHA512 9cd5268620193f71be0441314f0b42a02373cb6a394de42b8c2b92b8b36aadf2bfada669eec09602a599f93f1788729ec1d5356a11bc9bfe6b9a16a696adc11c
+EBUILD kdesdk-kioslaves-19.08.3.ebuild 424 BLAKE2B 6c4e4d6b329c71fef7e13c6e942964035256ac927b424c411c51b611b8ef1563da74b79e805558fa1a31bc1a820cc6c1e3baa07a43e85a79bfd6b989361507d9 SHA512 98b89260919f285568b65f2ed2e4c7a38e789c38166c86141c14dd511f67b8633a345848e1f25d0a35dad2748f086618f1059780fde35d510ce1e03286db0889
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.08.2.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.08.3.ebuild
index ff655cfd658c..c388474613d9 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.08.2.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-19.08.3.ebuild
@@ -3,16 +3,19 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+inherit ecm kde.org
 
 DESCRIPTION="kioslaves from kdesdk package"
+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 1b8109eb009a..ac50a7171f44 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.2.ebuild 1144 BLAKE2B 23c61ce4b19a4cb6fe334d615571f72241bd6c39046c001dc8471efb29ed278cab89c5be16c73f311468b43dfa687a22de6b9cb6234b379633074239841e35e4 SHA512 4129ae140494bd736f37e6b2a10fc03c72e00d6d6ecbd0d9066a147405c759973e22ebc73ec31d475043cb549ceec4a60d93dc4dda8d7d02e44d9dafac4ab00c
+EBUILD kdesdk-meta-19.08.3.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.2.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-19.08.3.ebuild
index f5a72f83361f..f5a72f83361f 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-19.08.2.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-19.08.3.ebuild
diff --git a/kde-apps/kdesdk-thumbnailers/Manifest b/kde-apps/kdesdk-thumbnailers/Manifest
index 52d8cbb97a15..73ace4cb7575 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.2.tar.xz 17324 BLAKE2B a86c4fb13512cacdc39c416df71d2ee6ba9502363ba9c226ee70c6d523f5d94efc013f75f2d23a32626807421ae5e8228051faba464203e0a5e4b6908eee990b SHA512 af52dbf4065870424f53c1422ce8f7eb2ba6a6ccf8dcf518901dd3fa6fb488e5235afcf96d052bbb9c93d4ae4e11b689ec3b343a8ba08f435170f83004b3444b
+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.2.ebuild 434 BLAKE2B 3448a4049862b5bbc64464d982eac228f15b0639102e8885880012a549615c71568a3e84657f93daedcde8a98e55cbf9e3e116091b64256b28bde0ba4a76b80b SHA512 2162ff6676d127398208e1e2f78f8dbcd9cfca986b826b57e1a591d33ff028db7727938445a08e51d46f1189688e0392c5d25bf7713d079b3aa244ede391f345
+EBUILD kdesdk-thumbnailers-19.08.3.ebuild 542 BLAKE2B 29288449ded1870f054ffedfeb3c9baf5199be839c2e632c6669deb6a92bb91539e2b8d7aae4871b3bdcbed349982690f13b424ab334927cac065272d4d0f75d SHA512 6bbc8a23a5ba569f42bfa418dcbfa2f7d6eb2a21a0a315bfc1b5c21e8380202682139d4092d50b00c331965ffc2c5ea991848f2017ce1fd60046e4e48eaaa918
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.08.2.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.08.2.ebuild
deleted file mode 100644
index 7afa28764464..000000000000
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.08.2.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
new file mode 100644
index 000000000000..02a6b03101c8
--- /dev/null
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-19.08.3.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.60.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 08ed026d8bfa..ff3d3357b727 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.2.ebuild 1177 BLAKE2B f60be7d97c69e68bd87fb65e6e0405796294ac04003745344b13dc6d43862555d62e6a2749d773ea8785fcf3966147f128e690ff94f8bee1578dec4fdc423dc6 SHA512 c629e84323a087e3ba44c60cccefa37a033c81b21270ffb7756d0bd0eb56f1841ffcc35354427121df437d5e6aa5a26fedf8fcc9b489a2a9eb1e34d351558039
+EBUILD kdeutils-meta-19.08.3.ebuild 1177 BLAKE2B f60be7d97c69e68bd87fb65e6e0405796294ac04003745344b13dc6d43862555d62e6a2749d773ea8785fcf3966147f128e690ff94f8bee1578dec4fdc423dc6 SHA512 c629e84323a087e3ba44c60cccefa37a033c81b21270ffb7756d0bd0eb56f1841ffcc35354427121df437d5e6aa5a26fedf8fcc9b489a2a9eb1e34d351558039
 MISC metadata.xml 888 BLAKE2B fd3defffecb29b53e6f964f18b34fcd05b1c197fbc906172ada81b16f8132dd539f3bc14dac2a179765fd7f06b326fb4a548734cf68cb54bf95ece6aa2a86d71 SHA512 626f2a0e2b2bb876ecb9ec935089c90c83ab9899a3bf843f1c74a70ba183825c9b0be4411e67efdb6a184c92431fceaf1a5ef1dceac7c7d1884e06c0b4548ab2
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-19.08.2.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-19.08.3.ebuild
index 22148c799064..22148c799064 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-19.08.2.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-19.08.3.ebuild
diff --git a/kde-apps/kdf/Manifest b/kde-apps/kdf/Manifest
index 3a385b526ee1..7c7293990e54 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.2.tar.xz 461488 BLAKE2B e7d7f1a5a28b44c16d1f95ceaac9884e67c2f4ac69618564eaf8ef3062d70d0832c9dcb2b7a2161caf10b031bfca1bc45c73c6b59eef580e435a7fa8a4bac937 SHA512 5f3a38e815862e4390191ad9ec23f287aac93c31fcf866d3e1d0ec3828269e9e090c714ed72580d91a311531b9bfd73c397c5ef05eb08647f37f6d89f6d3902a
+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.2.ebuild 730 BLAKE2B 61a0acedf6981e1765b640a50b1a2fd677c09461c02fdf0a542bdec8464b92e53d4c9cde5f52001c0f46df0da687fa8498c94748e25e6301877e7879836626e7 SHA512 54bdf766d88a561cc4e579442750f947458d504b9389a3a88b23aaf8067a6640017b8d205ec7ea7c40fc7c9380686514be998e9c8af5bc9d2ad203ad6bd47ae1
+EBUILD kdf-19.08.3.ebuild 880 BLAKE2B b2602cc4584758ff18e414129cb7f5e4f1dfe0fb7d5fa9fe96d301f147e6edf92e56561811d5d28ae96c39108c5908a1ddd9b3cb24592812cc4d04f4a6d462ab SHA512 1cd377773673676936da164b0a09fa34c75e2e95ddcf7a87ffc9cc398d761591e4802892fdb5e755da4d765e794ff51686935052b978a1d154fdff092995924b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdf/kdf-19.08.2.ebuild b/kde-apps/kdf/kdf-19.08.2.ebuild
deleted file mode 100644
index 73f59e0908b8..000000000000
--- a/kde-apps/kdf/kdf-19.08.2.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
new file mode 100644
index 000000000000..85cdc941f7a1
--- /dev/null
+++ b/kde-apps/kdf/kdf-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE free disk space utility"
+HOMEPAGE="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 cc515f54aa5f..03704a650210 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.2.tar.xz 102300 BLAKE2B dac08a998e2aae60aafd4d6bb2261d500a3fa9e2d575eb305a565b9246f8b170a921068e968be0d8ff06c9b06d2b9ca4b1e7f95ddcef7c68911b8879a822dd12 SHA512 d55588920f5a6c7f460e9455b42c1e8bd24bc2c5c013f88f7bb2eea9d3a40eaf5b5d83b83e214f28978cfb9c7a6f99ec03ce7aad1973487198ce3df082508cba
+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.2.ebuild 841 BLAKE2B 4334c434b4056bcd42ddb058ec10fa2cd108d1fa370dd155205eec745699191ec2fbce1967cdadef506c549e87ed69a10b868cab0415289f889801f8233f07e6 SHA512 18f5e2b22ce4b4a01a1bd9a91753eece6ddb7894a74b9e3a795415ab56fd38e7fd8a9b2f58a82b1881aa454fe393bf7d6355dfb8ce2574c6e3237484f42446f5
+EBUILD kdialog-19.08.3.ebuild 996 BLAKE2B 2cbc2146be66fb2021e3b18ab2a5658656dec85e1c447f799e36f727fe4c16408828f8bd161ba1c09479acadcf683f571d3e548726fed306909a7ba2cf253b6b SHA512 e00ca74a19119110c16cc4aef0c680713c1b11bc35bb3d2ac822130f6aa106545d98510954681f07d80cc97d3948ee0941ad6d84fb85cc84d127b899387a5802
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdialog/kdialog-19.08.2.ebuild b/kde-apps/kdialog/kdialog-19.08.2.ebuild
deleted file mode 100644
index 908c381d038a..000000000000
--- a/kde-apps/kdialog/kdialog-19.08.2.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
new file mode 100644
index 000000000000..b9b8be2dd614
--- /dev/null
+++ b/kde-apps/kdialog/kdialog-19.08.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.0
+QTMIN=5.12.3
+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"
+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-utils_use_find_package X X11)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/kdiamond/Manifest b/kde-apps/kdiamond/Manifest
index 7072b6257dea..8c7871178242 100644
--- a/kde-apps/kdiamond/Manifest
+++ b/kde-apps/kdiamond/Manifest
@@ -1,5 +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.2.tar.xz 4694124 BLAKE2B 7037fcf7cdb43dbb217326066b30aa47ffd23125f36d00578076d84d7a62a2ef63e65c792a30f25690dc4913f414ee54cf76a7f7e5519287f93484c95a5670b2 SHA512 3626805431c7acf3a00ed0d3a8c1d3e6f0cf7fe5cd4712235e916d06697a61e1433e97deea5a6eb96411ce08df660cbf008a22fe98c2e0489c9f28c2f9755f76
+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.2.ebuild 795 BLAKE2B 90b72a902e12eb5734e4df99d2940fed21f30238588ea3fe62dfd4ec38d7fdd530dc06ee37f78c04e1530b260dce6ea0676eeb7f243f1ca5d31eb19acf9aaad2 SHA512 e470a517bd513011463a6cc6174814a44e77f8ca9db08b67520d484187dc49483267244b1c27551eedfd4b43e594f7170c502ef188cbe83be75021babdbebafe
+EBUILD kdiamond-19.08.3.ebuild 1015 BLAKE2B 72792b8e3e0df505ca5de86791e419da18984d3cca3b6c4802072f44157d9f6e9674542901f104be24f4b737ab09bba182a6bdd6e3e10fd270d77750e82fb49b SHA512 7c79fa738356c29c491e92539fcbc6e7c0714c1848b98d77554bc1be56eeecbb850eff5724b0991b9cd6fc8794f3d3ddd34f015db05a62f9809ccd5cee0fea9d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch
new file mode 100644
index 000000000000..e0ea1ef57877
--- /dev/null
+++ b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,24 @@
+From df737a7dd5134ba021dc6228fe815974af4a6bfc Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Sun, 8 Sep 2019 21:15:26 +0200
+Subject: GIT_SILENT: QLatin1Literal->QLatin1String
+
+---
+ src/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 6afdc2a..5f9f431 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -46,7 +46,7 @@ int main(int argc, char **argv)
+ 
+     qsrand(time(nullptr));
+     KLocalizedString::setApplicationDomain("kdiamond");
+-    KAboutData about(QStringLiteral("kdiamond"), i18nc("The application's name", "KDiamond"), QLatin1Literal(version), i18n(description),
++    KAboutData about(QStringLiteral("kdiamond"), i18nc("The application's name", "KDiamond"), QLatin1String(version), i18n(description),
+                      KAboutLicense::GPL, i18n("(C) 2008-2010 Stefan Majewsky and others"), QStringLiteral("http://games.kde.org/kdiamond"));
+     about.addAuthor(i18n("Stefan Majewsky"), i18n("Original author and current maintainer"), QStringLiteral("majewsky@gmx.net"));
+     about.addAuthor(i18n("Paul Bunbury"), i18n("Gameplay refinement"), QStringLiteral("happysmileman@googlemail.com"));
+-- 
+cgit v1.1
diff --git a/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch
new file mode 100644
index 000000000000..9002776d0d08
--- /dev/null
+++ b/kde-apps/kdiamond/files/kdiamond-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,33 @@
+From fe17299b2757d3c0106fbfff325440de0830048f Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 17 Sep 2019 13:39:44 +0200
+Subject: Make it compiles against qt5.14
+
+---
+ src/game-state.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/game-state.cpp b/src/game-state.cpp
+index c0c35d5..b2c2416 100644
+--- a/src/game-state.cpp
++++ b/src/game-state.cpp
+@@ -19,7 +19,7 @@
+ #include "game-state.h"
+ #include "settings.h"
+ 
+-#include <QTime>
++#include <QElapsedTimer>
+ #include <KLocalizedString>
+ #include <KNotification>
+ 
+@@ -32,7 +32,7 @@ public:
+     GameStatePrivate();
+     ~GameStatePrivate();
+ 
+-    QTime m_gameTime, m_pauseTime;
++    QElapsedTimer m_gameTime, m_pauseTime;
+ 
+     Mode m_mode;
+     State m_state;
+-- 
+cgit v1.1
diff --git a/kde-apps/kdiamond/kdiamond-19.08.2.ebuild b/kde-apps/kdiamond/kdiamond-19.08.2.ebuild
deleted file mode 100644
index f07ab4af5ac9..000000000000
--- a/kde-apps/kdiamond/kdiamond-19.08.2.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
new file mode 100644
index 000000000000..3ec0152cbb2f
--- /dev/null
+++ b/kde-apps/kdiamond/kdiamond-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Single player three-in-a-row game"
+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"
+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}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 338138930994..3a1da9879ab0 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.2.tar.xz 187636 BLAKE2B d61186cffc493ebea288282cd51806ea46f9f3ec61ae2ab1648bfc5c48e8b151babf459b0e5ea681c03a4bd218909baf4e55514106e213e354aeba82f86eba6a SHA512 d41c9d4883991a50150754740a95e36f85f7c11a165419376989a2894a4ad4450a010a6066af7d24564e01e8527fa1435e8305db50549c54565350396058f392
+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.2.ebuild 983 BLAKE2B 773b260e2f6017ad0abea5e418798fb6b8bca07111848424a13c4d4868347a84152de2baee7ad008ed78531e23236dcdf9890ab7e50d4905c89936e3cd2380d5 SHA512 b6a484faa333a1c81731100204c01dc4156e51353105ac1234b96f0ee2068eac3c3df11a16d83c322513458d912077ddfd21811070cdfbcbddccab818d1ea399
+EBUILD keditbookmarks-19.08.3.ebuild 1156 BLAKE2B f0ca0567761e7e0e2d5e3cc16dc8c382f53ad879360204f41de1885135df3ff10e4250f60c7099b8fde854f6ad547430ee3d555ec06d2f315c822e6a4550423b SHA512 a4f9a35ab2c33f782d998eb21631f91a6b0ee4e6d1d47c80a3d9468e667ef0c425bf0f7aeea6a2715f61af4024c9daddf8470351731583c28f9e9b9d87a8665d
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-19.08.2.ebuild b/kde-apps/keditbookmarks/keditbookmarks-19.08.2.ebuild
deleted file mode 100644
index 4c7d515594e8..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-19.08.2.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
new file mode 100644
index 000000000000..402e5d21e843
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-19.08.3.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="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.60.0
+QTMIN=5.12.3
+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 6d483beac4e2..b15539042af7 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.2.tar.xz 270488 BLAKE2B a1b02561dd7831c4db8e37043204c2af51916ad4add86d66a86893cf66b474953c4742396e23e50cdd613f0c2ac4cafb9383c481662da520df4a34f26978637f SHA512 36cc81a744e4bf81015e5611c6811034a1c236ce8603ed3c3fa2e0d8acf6cb38e86a0e92a55a726a96043805be91dc4e10e7c12be960a22b97f43928a089fa70
+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.2.ebuild 817 BLAKE2B 50193bec402e2589d3fae9778e73affc037c0d54d148809862451b1e9128d36bf9efd416a6acd60acfd8431fde7bff381390c1ba0cee81e6f92fe860479d9054 SHA512 549d5fd59898c11cf62b278db0ea6fe20d481bd30e31fcace7338c794785f0f217b5da8a69bb074b4bc1dedaa560dc662f216413fdd7ece84c310c085d4fe770
+EBUILD kfind-19.08.3.ebuild 979 BLAKE2B 6ed1d8614088b45900a020de9c34bde4f18f8d23836da0d484b89a4059523e2920c12f60d1d7256e5c05a4f70d1fb9aa118ac51cf441f6af2a82a4920a204953 SHA512 4e9d49b043b3cb4465794cc70d0d51c6d64d605b28907075e35f093b9502e5bbf1fcfa627c2601d5af6ee8590b9a9e9737725fd1ac9dfce605075f1dcd784d28
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfind/kfind-19.08.2.ebuild b/kde-apps/kfind/kfind-19.08.2.ebuild
deleted file mode 100644
index 53a863f34b1e..000000000000
--- a/kde-apps/kfind/kfind-19.08.2.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
new file mode 100644
index 000000000000..933481ea6ff8
--- /dev/null
+++ b/kde-apps/kfind/kfind-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 b867fb9f9481..8c550627aa65 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.2.tar.xz 198868 BLAKE2B 795a4d2fb16061ee99b03583e23795101ef8b9eec493b172134cea13c92235a02369c9e6933622b673143b90af6dfa8acab213521ab9becf182e6186e69536ec SHA512 3da10bcc6b47fd846e20f300b63a114e2742294f9031463bdbcd0d6bae0cef8469bfa477d0e04f3719c639ead81bc97c7617456d8b6b4753b0a508ef55ab2536
+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.2.ebuild 751 BLAKE2B 2928e4841bccfcf8b29c75551f49cef00c6cb52d5ff73a9365c0b6cba687582a6e790b50e61c680204a016b0a902bce17b9af61714ac43018dbfacea2a216811 SHA512 dcfca140fec160f7ed0ea2e34304fa084387403434d38a0ac8b6a78addf1b531f5dd4972ac331984e03fcddd22eb73cee6ad8d36d326b3e996ed6c105b8a5d74
+EBUILD kfloppy-19.08.3.ebuild 889 BLAKE2B 608d7dd83da28b4a508b5a08c0b8c165fbe83076c7a49c408d475e3ac66064185126ebb2e3435b32f5d4a15ab8b78c665312298ad201929ba895c56433fe0efe SHA512 2a484f9429e0306d037fc83cad4a875179e2f92a98acc371fcfec68280575e8f41faf32d6bbe7766862425763a92e8e7e79bfdca32efac741c1c054a888718c1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfloppy/kfloppy-19.08.2.ebuild b/kde-apps/kfloppy/kfloppy-19.08.2.ebuild
deleted file mode 100644
index 10d86751cf79..000000000000
--- a/kde-apps/kfloppy/kfloppy-19.08.2.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
new file mode 100644
index 000000000000..f533ca8c7e10
--- /dev/null
+++ b/kde-apps/kfloppy/kfloppy-19.08.3.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.60.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/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 2b26bee02be9..b769369fb98c 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.2.tar.xz 638236 BLAKE2B 1a9c3eae03ff67009f10b5f9695b433cc650eb9cb55e70ccc04a61c9ea978bd92556fa2e3219070e8b3e8fa42998e0d90d881a4b718c3e93b28a98d741f7f345 SHA512 8fc1e224d2f0b3daf9745172607aa75c6257043928dd2193576e161c019f0f9bba746fee45ce3822e364359eab6c8e0786a7739a0118341c38a50741d1e3629f
+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.2.ebuild 731 BLAKE2B fe04b29fdf217f22f1063deba8911ba8a957fa26eb10088b1f43e5aa60e9ba94663150dc4027c329334c56e62e3463a67ee4e38b3ec7d16de6580986e2e80e3a SHA512 b8c636e04e65099f373816b2a649899cb68a4f49f9ad00ca2d27ee4693595a96c1187daaa2e5f2848793dd676a0c56478c65c4a79b6525e19ed3a1ee7e8ac6e1
+EBUILD kfourinline-19.08.3.ebuild 893 BLAKE2B ed3e18ba7a0fea8c76fd3e0b2125c9b94bd9feaa01dc881072172a7e75aa8fdc3b0ba1e30a6d2da26f8e0bd1e2d54d8895fca405505648ee0a0dc8ee1e50ffed SHA512 38614e0e7bf358d9a82e0f883b549638ace09142a4bf245447f247a499e0dc6be4484941528d5d4e62174707f8f18fe158db66c93bcf3264cc0a983e50249d7a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kfourinline/kfourinline-19.08.2.ebuild b/kde-apps/kfourinline/kfourinline-19.08.2.ebuild
deleted file mode 100644
index 81c504ab7ba0..000000000000
--- a/kde-apps/kfourinline/kfourinline-19.08.2.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
new file mode 100644
index 000000000000..3edfe3507716
--- /dev/null
+++ b/kde-apps/kfourinline/kfourinline-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE four-in-a-row game"
+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"
+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 cdb85ce63f87..ae21f2c0144c 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.2.tar.xz 10892332 BLAKE2B e6416312731b5f0c6aed5b4b58987d66c2c628695f7c44c5cf9f1786082e615d6d0ca7ba038bd6e88790ffc5b810c5689b9f0669e9e1269d1900a63f254a2eb7 SHA512 7eba48bf95972a4733ece313f3553af8e76bb3ff2de29c0154ee98e75e1561191f2b1d0d5c53ce7c7cb8ed11f74cedb28fb1c68a6c25aaf96ac8324dec5c9ca0
+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.2.ebuild 749 BLAKE2B dd5f85ae7ad5c2b3847afdc9cde3146222e9b614860a0269add4fc02d5f19013832510f051796eaa7db2a1d8a55191ebb06b2f8a792b4fcf530914a3987b66ec SHA512 93a5ddba8e0f01d70b13e1addca74364a9072bbd5fd38d6c4c163c06d7f788f29511bb47f3b1f3d78bb4d49e90b26bb0dd98e1587b6db80d6311b55fcfbcb424
+EBUILD kgeography-19.08.3.ebuild 893 BLAKE2B f50e2767eb35281107fc70086e18e0dd1d031b5e1672abd834236e48c4502366957aa99b2c6535536a66cfa77c2de058b2ee98265a2c69cad454a57b148b66cc SHA512 3514762084a9c7893dd4698696c539d1015b5e2df54e4942e33c0c333dd0a760d4a516cecc2618b8bb2a4b89d02cd727bc357af2f6215b9e5b75b0cf2a5b4e7c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgeography/kgeography-19.08.2.ebuild b/kde-apps/kgeography/kgeography-19.08.2.ebuild
deleted file mode 100644
index fc9595b0f5c5..000000000000
--- a/kde-apps/kgeography/kgeography-19.08.2.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
new file mode 100644
index 000000000000..abf2f11a6877
--- /dev/null
+++ b/kde-apps/kgeography/kgeography-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Geography learning tool"
+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"
+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 b058e619ab4b..4e09b49d43ad 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.2.tar.xz 5232168 BLAKE2B e3115b1e67e4fe5ffc778d89f7aacac129d374a40ba43bda8c16ef69047a738788c9a2c183ef6ddb3b30b89a5892c3578e7027691dab2bdb3e5ad2c89dff9f4a SHA512 aec147c2f4e7927b85e660b84d082de4a2ef9d3345cc9e8246da80f46f9eca5a098afc12e3d5c8c5fa14db81decd6087d87002bdce14fc393964bdf3d9d1ea0d
+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.2.ebuild 1752 BLAKE2B be06ff439956a0a54bf78c6ba9bcbf0ba6e110d3e9277310d27f22c169cf4a9e70be60a4f28fdc7c19af059f60fc1f952ac63f75eebddbf71913bbeb6eb992b1 SHA512 8818c652c804da8ba165b84aee57a5ffdaae24c2bfb5e6944de58830157b3af1f9fcf5e9e9d34659354c42117cb63adb6201e5ec7f1cf803acda3cc450fad805
+EBUILD kget-19.08.3.ebuild 2022 BLAKE2B ab5d0d17f3c6908a48ad6c0e055d653db4f20dd3feb75bb4b1cc6d7f35eb4a57b7d3e9ba9ac74bdf92aa7b9aebd4088b3d48b50368f33f97ef2cea801171448b SHA512 f25c2f9c4283842f592ab5e57807333ca1974a2ebdbc3e2c3d3e205a07a97ba605c8ce07aff7648400284a4566f2bdb329bd624d9a025be8bb48a507d7f1619d
 MISC metadata.xml 575 BLAKE2B bb45bf1f9dda42b69d9934b45343f36ad73c907eb7a408b41108237269467b9d77f0f65abfdf88cd9087c6f7d444814c76b0d5a4f65a333cc29908abcf7da50f SHA512 854827c48f8b6120747f6428d3ba98de77217c810664272d7e7732358eb5aef3fdeb6829f5be4cf9a2bf40fcffdcc7cb2aad2a7fedb5850c01237339b77ad000
diff --git a/kde-apps/kget/kget-19.08.2.ebuild b/kde-apps/kget/kget-19.08.2.ebuild
deleted file mode 100644
index e37e30d45aec..000000000000
--- a/kde-apps/kget/kget-19.08.2.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
new file mode 100644
index 000000000000..69f3233003f9
--- /dev/null
+++ b/kde-apps/kget/kget-19.08.3.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"
+KFMIN=5.60.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/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-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)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kgoldrunner/Manifest b/kde-apps/kgoldrunner/Manifest
index bc1e637a2cd2..2018607490d5 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.2.tar.xz 4414844 BLAKE2B 9a7fc3ee9cfdf599e7f647a832a1c9eabc96e8248cbfa10e6a26892727fb8a18e1b3a4ef9222fcd5a98e5f49eba0c91a331783acfa70abfc9d29fa12505c0f27 SHA512 1d6d875d2d660dbac12daa2e04111a590bf3cd5e5e4d9cc14ee433e7d1ddec0d4186560f765ae783423afee0b346a1d403ac8fc78326d5a44127bddca500c0dd
+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.2.ebuild 851 BLAKE2B ede0d340fd9b17672a97eaf094f2ab17ddca06f2e1e5aa2f8f5ecb7342b14b657ce0733948083ae559a5793f328c94b4f1242b47a45efb7511082a6bc1ef3ee6 SHA512 82479af9e4c4f7c4e5389e47610adfd1fa3b44e534ad545c6cc8a6b961afc33b2f1d7cbc1a8f338c0384756ef888f56a8b3c796b7738e9eafe6f2b7b9bc38e3b
+EBUILD kgoldrunner-19.08.3.ebuild 1019 BLAKE2B 879f372534e1f19aa8eb4d118ff3eab5ff74199103305778b9d7fd674c58d2d5bb676a2b24f7fea8f8a0d1158f15bf8d7684616543bd8d4ef2a94a3793095b00 SHA512 16444ad4dbde71d9b2565c94fbac7136b89a84d641a32020e282dca5509f3630c97b837fe2b4132f3664cac39f467f4573756983c35786a135bbcc6b51091b7d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgoldrunner/kgoldrunner-19.08.2.ebuild b/kde-apps/kgoldrunner/kgoldrunner-19.08.2.ebuild
deleted file mode 100644
index 5bc577193b99..000000000000
--- a/kde-apps/kgoldrunner/kgoldrunner-19.08.2.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
new file mode 100644
index 000000000000..64145d2c6c96
--- /dev/null
+++ b/kde-apps/kgoldrunner/kgoldrunner-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Game of action and puzzle solving by KDE"
+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"
+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 6bef95522c3f..bc3f91462c9d 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.2.tar.xz 2786968 BLAKE2B e73a8eabbf24a8a657e9a0bbfcc5059c9f70e82dea9c41da0c19116a34a12b4ac4cac2a9ae1887abd5e964b1f988753c34c467da9b331dfe3f87ac666face3ab SHA512 c6dd268fc3e007d4e4fb93317b64606e2b87299352a460f9c2889f61d9828dda93c6c2767e4a1b787fb62fd3b0288eccb466f0e08fb89af6fae845d2bff38654
+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.2.ebuild 1281 BLAKE2B 5d57fe54680a84d6fd5a8df0bf54341f59e4ce5fb7075659229dddb3a0e233742bf4a56d7f25761bd231d30cb6e3eb0c4b69111074bdb3ae79d9a3782fb73dad SHA512 57cc0541951419a7d3d6ed9fa11e9b02617eefd530542b4401cc4f6b1aa736fbe80aa8c777e432f08cb0ca959b553ab8124400146a0bd594b4af2c62526a6bd2
+EBUILD kgpg-19.08.3.ebuild 1518 BLAKE2B eb91a6338d17a9d448af18fe32c261a5d4d0330ec762685a9057a733ecd6aff05508cda90b337f9455d93e22ae9733128f178189a18c7b139f68068669d4eb5a SHA512 9c50c86e670fcbe55dd18317331f680cd7cae91a416af73ab9eebc4407c67d49471459b479948735b406b4b296ce96ee21fab31c9c7611173448028de3270b37
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kgpg/kgpg-19.08.2.ebuild b/kde-apps/kgpg/kgpg-19.08.2.ebuild
deleted file mode 100644
index 9f966c0c2551..000000000000
--- a/kde-apps/kgpg/kgpg-19.08.2.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 kcontacts)
-	$(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_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
new file mode 100644
index 000000000000..f1d68658c3cd
--- /dev/null
+++ b/kde-apps/kgpg/kgpg-19.08.3.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"
+KDE_SELINUX_MODULE="gpg"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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/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 a6137b9cd7c9..dfe9ea340bb0 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.2.tar.xz 7121644 BLAKE2B 0c5c4f22391e45eacd99213b2f13524d13aabe9df887440b112685098891beb06229ec478eb0cf75e51d2fc317da56ca5e66b02da714fc5bc675d66cff2f2b3b SHA512 03aa4e4de1042c433205a51f187f115b3648580e47337ff84cba6de2dffbec0fdb031231b8195330a0b572853b775be78b5cf354ce45a07df70051c7b589de41
+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.2.ebuild 1042 BLAKE2B d453d88e56fe628f8eb19f7e7e771c2b1d0237776c7bd2b690eb80c758585a1a9274f95c7755e70a1feb965632c77a8b42c17ec3447691b3aac2d4dd6b8b1a94 SHA512 70eee758786e7012255dcc60cf3910782e55199683bb9a41a0202f6eefbbb93c3fba575b0885cefb38a4225e6d57d1232ee9c7c552bd11e68e9773273ee1d938
+EBUILD khangman-19.08.3.ebuild 1255 BLAKE2B d49f9f863cd1b3259759becdb4685f367e6de85b7008e9d87f1af41fa529c1d2c499c7058606368da96316f13fbc9ae520e5da8d47a9b0ce4a0968df3f665263 SHA512 ed5e16b35d577f5a5050d26555b3dbaf180c4c368d07d06c6518ce2c446bf49cd404a35d7f6c735c88c7fa60a94274a7a944e67347035efb288d1a60ef9b3fe6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khangman/khangman-19.08.2.ebuild b/kde-apps/khangman/khangman-19.08.2.ebuild
deleted file mode 100644
index 8e73dd5f8312..000000000000
--- a/kde-apps/khangman/khangman-19.08.2.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
new file mode 100644
index 000000000000..44f7bccd45ee
--- /dev/null
+++ b/kde-apps/khangman/khangman-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Classical hangman game by KDE"
+HOMEPAGE="https://kde.org/applications/education/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 6fc1949076c8..9aacbe93bdcd 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.2.tar.xz 3847796 BLAKE2B 555e7d9a2d68577da513454f9eee9f09571da0c46ed55d3b5870877ef403990de0cd3ce6971602e5dd297bc9b9e4e14828983c6e42944341188174276bb63b0d SHA512 902276720c1b7366fab2cd88091c0baa06a66814a2bcc0360c87a3a2137d65a3482348c351dcc729bdcb674d92351791c9a46bcf36962c52bd190ee1749799f9
+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.2.ebuild 1162 BLAKE2B b9a9d0841fcba5e2b315a76381b777fe8eab24e6e8d62e05d601875ba90af659587cda9222f5f4d02125b0515425df71897abe2d9a3fcb17e9e8467781c60c62 SHA512 d4f4e645d8ec0abfdb8b6697bc2360448d080998ede63117067784a99c570035c92d5ed464ac68a85cddd23aa0cb65d516d1944cf6d51b4d1be66f8c141ee88a
+EBUILD khelpcenter-19.08.3.ebuild 1402 BLAKE2B 6ccc247451a56cdd8b86d78a67965cd1d292ef4c7de46dce4cfa0ab00ac650948cd319aac68bb71b9ac518b0190ef03df2df05b8ec2b58b3d6c1971e3a81cbc5 SHA512 85ad2cd4f5880d8d810fde9598a2e0f3ce7132c601aec4ba3c94595872cbe403ffd74bca962cde4013116434c078fc3abb7b31fd924c2886afcb29a4930f47f4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-19.08.2.ebuild b/kde-apps/khelpcenter/khelpcenter-19.08.2.ebuild
deleted file mode 100644
index d76bb58238b2..000000000000
--- a/kde-apps/khelpcenter/khelpcenter-19.08.2.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
new file mode 100644
index 000000000000..8dc9a868310c
--- /dev/null
+++ b/kde-apps/khelpcenter/khelpcenter-19.08.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.0
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="The KDE Help Center"
+HOMEPAGE+=" 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 495fe7a7db49..bdfd5492eab1 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.2.tar.xz 149220 BLAKE2B 57084eb844ad6a1d528451940960f4cb98918d83b514e50bd6d67246ede0addbafc4e5edf2d093ded0f736d72866f762c9f13e42b37957e697c2733ad2add85b SHA512 eb4e2fedbbe8dc8f5a178b5fc4f6faf509675cbf877e592d6b9881140712336122d6d2569a670a5b6e08b9d1cf61853e2d92fd91cda84edc30322524f779d200
+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.2.ebuild 774 BLAKE2B 951fb60096a1dd94438eb3f6fdd91477d04382bcb429da86d8e806f83433ad7b2cbab2f7eb12b8494bd68e75550df52375db75c6d0183e2773ec22995b696f5b SHA512 a0e4faac244225e38ff852f5bc5a8c8c1763e8e30a6d8612824fbe0ccc27e441aad2332280d96c07b707ca6a0437e5b5e4680ea5328ebc90fba73efd5f294a91
+EBUILD kidentitymanagement-19.08.3.ebuild 918 BLAKE2B 435c2d5f1339118da6c7a8aeeb10ca2e61c28dbefbeb44be295a8003b594b1256b7e257bb784ac2a815ff2a547e2e2b70d023bfeac2aa6d4cbaaa704efb8450b SHA512 c0844e81e4ffca4f4d8c9eb1fd43c625a21fcb16fc51abe101ecdfa9882a4f7f35294e0342c59d15c6b2273441bf7c56d159bfccaf0a962e4f33617572d5b62e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-19.08.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-19.08.2.ebuild
deleted file mode 100644
index 5e299423da9c..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-19.08.2.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
new file mode 100644
index 000000000000..7d69c7b93f69
--- /dev/null
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-19.08.3.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"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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 4f63cb957fec..ab8a42b6c61f 100644
--- a/kde-apps/kig/Manifest
+++ b/kde-apps/kig/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 3501052 BLAKE2B 73409cc17419228844a60928b614ed5511562219fc19577ea4a5686c7fb0a2a100ca2dd8318f69de21e1162133a5420bb0b920e116773e0bd9ac03d22b35db7d SHA512 643fa3c0a737420ce269f1c191cba75b6f15576c72b43fdabe74d6a2196eeb099071bfa94cf61174e7e41945cd8785c8198aba36cd7878ec9b5b82b3cfcc80f1
+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.2.ebuild 1498 BLAKE2B e5207a33e7351cd6fa743de151958fe75ae6a17a18be290dcec037f12ffcfb90c7db8eca51cbed8f694a8925a7370816236ad61556b8a7cec1e5aa8276afbcab SHA512 54d56609c5ade18e3b02c258d11be3532a56fa49fb665d0849bdf440350f6aed95f270f2c5152ccb0cf4ce97c2b4e786933d3303019c5d214b18edea9486c9f9
+EBUILD kig-19.08.3.ebuild 1681 BLAKE2B dc2d2295510a43497e19fde8f6e0ca17d675de327fa1742300c2eb1d20f006763f0ad64ec91e0b4227d84bf06c9bd8c3226158f3cb6a6aa2da09fe2e65380c90 SHA512 313d2e1e2fdb8037713049765894e6e8ec7c476e9244d4ffec1d80713cbcb206ec1c00e68cfc4f655055cce7bac86de915658fad4e12d23018bf3959515b663c
 MISC metadata.xml 413 BLAKE2B 5e95d76858bd4fcc87af9e0d4646b6b52458c2946c792eda4ad7dae5e85165cab5f3135b6659cf76548cb79694d73307706ae3c1b6f197b5e824bb81ce69a63d SHA512 0275eb140eb39e300efe6cb2998698034397e8e1770a94129d716fb48b910a65b6f23f86f347e12e3fe71634adee7de6350ae7de47892e93d5416668338686c9
diff --git a/kde-apps/kig/kig-19.08.2.ebuild b/kde-apps/kig/kig-19.08.2.ebuild
deleted file mode 100644
index ffc402647785..000000000000
--- a/kde-apps/kig/kig-19.08.2.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.ebuild b/kde-apps/kig/kig-19.08.3.ebuild
new file mode 100644
index 000000000000..3563fa63f20b
--- /dev/null
+++ b/kde-apps/kig/kig-19.08.3.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="true"
+PYTHON_COMPAT=( python2_7 )
+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/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}
+	>=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
+	>=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
+	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" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package geogebra Qt5XmlPatterns)
+		$(cmake-utils_use_find_package scripting BoostPython)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kigo/Manifest b/kde-apps/kigo/Manifest
index 1ba72689c058..6bd45593485b 100644
--- a/kde-apps/kigo/Manifest
+++ b/kde-apps/kigo/Manifest
@@ -1,5 +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.2.tar.xz 5227088 BLAKE2B 11cebdc9ea1bcb7735cf4dd25e32cdc67028d702e82e452488d837f0815024cd107baa8a00d133a40b86d65492150c82f55c2a416be5b775d397f2e312cade00 SHA512 dd7eab7f721646e6324637c19ef504491a34fbda110195c96e5bb7f2c6e357628d695b208d00527abc7d32889e2b84233ff1f586dc657b2dd6c522735c442051
+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.2.ebuild 824 BLAKE2B 862fc7add72c0e3946ed83b0fd0d77fa94e8f00ffbf2b70712ff18e45605412e42d88ce5bcf6e963762ec5b2c60b2b02fdb43847f93dd10cf83904f30ed417b5 SHA512 c4f517e00fa3837a3e153f970205328f44c86ef11789797332c6575eef4a22fc56f6ccc6f12afe5450e92079f2bb0728b1fe3344d815c5bc97c93cad40061bdb
+EBUILD kigo-19.08.3.ebuild 1056 BLAKE2B 1e462a9b87eaa1a8e0a44ab3c4ba12be02382b2b1f02461cd7ce60d2f2b94a3cd89486fcac9665b697e84686b5f398a8bfce90a22d72cbc03f1c62d9c99740ab SHA512 8cf44ab565e83cc27bb404f949748a1774d20e91ef7e4d65572a3e9db654a9ed40cf591dc8a2a49eeac765f2d86650ff562eb5474b8b1987274e4e569f700224
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kigo/files/kigo-19.08.3-qt-5.14.patch b/kde-apps/kigo/files/kigo-19.08.3-qt-5.14.patch
new file mode 100644
index 000000000000..04c0df875583
--- /dev/null
+++ b/kde-apps/kigo/files/kigo-19.08.3-qt-5.14.patch
@@ -0,0 +1,24 @@
+From 56480c9c752722f6eaf9fd0fe6798a473a09d978 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 30 Oct 2019 13:33:33 +0100
+Subject: Make it compile against qt5.15, This enum is unused
+
+---
+ src/gui/graphicsview/gameview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gui/graphicsview/gameview.cpp b/src/gui/graphicsview/gameview.cpp
+index 603ff70..12ef2bf 100644
+--- a/src/gui/graphicsview/gameview.cpp
++++ b/src/gui/graphicsview/gameview.cpp
+@@ -33,7 +33,7 @@ GameView::GameView(GameScene *scene, QWidget *parent)
+     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+     setFrameStyle(QFrame::NoFrame);
+-    setOptimizationFlags(QGraphicsView::DontClipPainter |
++    setOptimizationFlags(
+                          QGraphicsView::DontSavePainterState |
+                          QGraphicsView::DontAdjustForAntialiasing);
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/kigo/kigo-19.08.2.ebuild b/kde-apps/kigo/kigo-19.08.2.ebuild
deleted file mode 100644
index 40bf0ba84448..000000000000
--- a/kde-apps/kigo/kigo-19.08.2.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
new file mode 100644
index 000000000000..60e69956fc68
--- /dev/null
+++ b/kde-apps/kigo/kigo-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Go game by KDE"
+HOMEPAGE="https://kde.org/applications/games/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
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
diff --git a/kde-apps/killbots/Manifest b/kde-apps/killbots/Manifest
index 1b4a56979c32..b63a9df6eda9 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.2.tar.xz 1171644 BLAKE2B fc3d598c3c089b278639d7f2e77e6a27ea6971c50638f40d49251a56b323ae16d92dc7d099583cea29169c981ee5ac16624500a54d62b23c426cb81efa044c71 SHA512 e2891b1fa00f57bd2fbc2308dd4df7625e43ecbf089644bebf47923c5c8c1cf2aa57ce4b3f584371b4c5f22953f0ba4fb331277a5d9ef2a7df051f7d3f22bc11
+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.2.ebuild 717 BLAKE2B c291e45e1520255d76c36dfe788eb384fa0b6df8ea055a61af46ffa751f4a1994f6729a7e94940762b9ba2833815008e49fa56e481b03e4309a5d6eddbfbef7c SHA512 c067644e2f87dad8359bb5787a8825cc8903dc382cb21b3a74238564899aced20382fc4099313937334cb36925c4e9d341ed5cdf96b57d01574d9700c1a20b97
+EBUILD killbots-19.08.3.ebuild 879 BLAKE2B 70cf5d8edc1dfd2a8e80788ef24fa060aacd1d2a236d32e634b93895476a27eec8884c2250639993c8c2ffa0de5eb58a451e7b7f727c2aa24bf5a2d3ca7e66c1 SHA512 bf3ae779b9e2a1d8a2a9d520dc77ddd14601323360ea092576d89c26054efde86cb90dbb570e57096e8c02793ed6a19865ad22730f514290a6944437cc11a36c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/killbots/killbots-19.08.2.ebuild b/kde-apps/killbots/killbots-19.08.2.ebuild
deleted file mode 100644
index 01f306d373fb..000000000000
--- a/kde-apps/killbots/killbots-19.08.2.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
new file mode 100644
index 000000000000..4ff75b22bb49
--- /dev/null
+++ b/kde-apps/killbots/killbots-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 e1d4d0b79d4a..8ef5f27d627a 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.2.tar.xz 1070788 BLAKE2B 2b4f4371644fdb6fffeb2e859150ad6b296140a762045eb9a7cb0824a5aacbb9e748c37c689a0d507602b0e87cb83fc8b28f8163d3fa709c0900ccfd9622730a SHA512 00c75c4b69bd6a63cfb5dbca10c04439029c0ec9f6c61b082a2609683ae14e356c5c5649c30bfca1859b43cabc51737e1f77ae7f2acfc80093f999a84ef329c9
+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.2.ebuild 779 BLAKE2B 7c7a00800f03eefe58903275745a52c70bc4fbfe26e1cf376f0159eae7379466c72b5a6036e410e896d577e956502c7d5cfcdde3ab7886c39674ffa06e3fedd9 SHA512 0b9091bdbae2776b1bc68a21545079a780b2ae8bb79b34d22023720523b0f29b9e618ba8ab272ce0dd788366a063a9ef9bb87af13e977a1e16870e1975ff3b2e
+EBUILD kimagemapeditor-19.08.3.ebuild 935 BLAKE2B e88336b08f412fb9d5f38347bae44e5cc4e88b80bb73966c6f473edc52e8b8ed950ee5f5ee38ad41ddc9995d0232639a7c2b373898b5365ca8317130da8907e4 SHA512 cc664674bb253ff7586e3b837368dc8e8b8bb789ba6e7cc20bceb6183fdb43c8c5b641026bf795cd9fd85e9e56a016816b1b97bca5ab0095d7a1ecd93e7d584a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-19.08.2.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-19.08.2.ebuild
deleted file mode 100644
index fdc9f63cee5c..000000000000
--- a/kde-apps/kimagemapeditor/kimagemapeditor-19.08.2.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
new file mode 100644
index 000000000000..c67a459065c7
--- /dev/null
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Generator of HTML image maps"
+HOMEPAGE="https://kde.org/applications/development/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/khtml-${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/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 4c900bdb477c..055099444dea 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.2.tar.xz 119644 BLAKE2B 5f34fc49350692fb816c96e11b6e7cc0c4136829ba95ca4bf0474d574c00e2574a0589e5835770cfe8de5a7ad3d3e84e1ffc64b73a2b3892883cb125d04d4e82 SHA512 c37243160533c3dc52a4ac4248c24857c9bf4f63787b3f507e343c19b72304357abbe8e62d99a2da03ab338dc2703f6dade3132cd80b0aba29011676837a83ea
+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.2.ebuild 747 BLAKE2B c36d501c1e6c039fb34fb04d5c15f090f9c6ee9bb2a6dd972068f1c3977c4570072d6432244fb6ee0943db8b174fa93f4a442f80cb1c007cc92d77f5632acff0 SHA512 6c2d3326fbbfab5e7e188bed785827bc0c71b25bb068488d4a45e0f2ff6bec8cfa520e53c52de529d23a303641d5efc4fa3e2d075f261e4c9cca5e6445262bc1
+EBUILD kimap-19.08.3.ebuild 848 BLAKE2B 0ec2da26a7e8e57b7b02d44c96482310d850b0b57121c4dcda3607c8a8c69c19d0a138863d0c78cc58d71b346326681cec6d58cf358c125cba5d5b52158e365f SHA512 a1719ec8cb385421bd6348d76e929f208dae6888f8eb19ec788f0e92633577376c4d5758d78d6f4461e84379997ec6a0b6246a768fa21ab007e6f09fa6a6362a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kimap/kimap-19.08.2.ebuild b/kde-apps/kimap/kimap-19.08.3.ebuild
index 3dc46eb15025..034392414131 100644
--- a/kde-apps/kimap/kimap-19.08.2.ebuild
+++ b/kde-apps/kimap/kimap-19.08.3.ebuild
@@ -3,26 +3,30 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for interacting with IMAP servers"
 LICENSE="GPL-2+"
+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 +37,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 4efb9d1fb696..919ff16ae4fe 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,5 +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.2.tar.xz 578324 BLAKE2B 08ab700d42dfde386bfbb7e5739834d85b5f0f55679792397d0c2961854ffcd251851c6ebc3e9e51faed6e5e6f400e9a40d1e3d24720607a82817378d52da6dd SHA512 a7a7e9c0ef5e9539b810484027ef7febf81487ea258d5e2e857b2cfa1d59ba1fed52245a0f18fabf9c79c67b3ec3825e32ee1415b818a0ef942067d9516f39fc
+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.2.ebuild 2091 BLAKE2B ecab8666df53a419fc696e1e776004df446b08daa015bf57e7bf00247932e1ba497622e5837d42992e705433da1edf78e1584fd53231c20c33b5c1d0dacdf101 SHA512 1500f85c5697f63c132e42c4c3c1d800f949cd2203f5f330d4cc0c52b20b2b500990a4d7f4a7961ed258a6b1e3c467f8c50944140bd73d7b26c3f02f274323ea
+EBUILD kio-extras-19.08.3.ebuild 2381 BLAKE2B d78b356c4d8f947ec03051750482eea41f65976d79f366c0971d923f9125262e155466e81f7f4055957e8a9da5907feed8a39daaaa7bce72cd95adc6cd146b61 SHA512 8d76662e9d9a628a3b1002074d579817a9a2f621959c2946f2f146a661888a5920049ef5e671a24ee2d88a56245c1deefdef3da24cf20db6f3d198d5d84b6c72
 MISC metadata.xml 667 BLAKE2B 7f837cd50d37a8692d57859a3328770578e13052392bcee145c327e6a07d147f8194ae09ab0c6933fe15eb6964640e8b82495417b3776cac3fce0825fd1fd989 SHA512 3c14222010c942ec878bc049e2e92dc6180305de69804bc024bba1f159d08c97eb61b3e9ad68e14188515bde2b21a026c8068ab465ce8ca22e8e3e0190649154
diff --git a/kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch b/kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch
new file mode 100644
index 000000000000..b133140ac269
--- /dev/null
+++ b/kde-apps/kio-extras/files/kio-extras-19.08.3-libssh-0.9.2.patch
@@ -0,0 +1,88 @@
+From 24506c2af8d1904a99538543804306c6c2b81ca2 Mon Sep 17 00:00:00 2001
+From: Harald Sitter <sitter@kde.org>
+Date: Wed, 6 Nov 2019 13:57:20 +0100
+Subject: make the libssh finder ensure the new ssh target is set
+
+Summary:
+starting with 0.9.2 the libssh cmake config defines a new ssh imported
+target, use this as the new gold standard and ensure older versions
+are compatible
+
+broken ubuntu: no cmake config -> manual finder -> target injected
+0.9.0 and earlier: cmake config -> target injected
+0.9.2: cmake config -> target already defined; noop
+
+(0.9.1 is broken as it neither matches the old nor the new expectation)
+
+Test Plan:
+no cmake config -> target injected
+older cmake config -> target injected
+newer cmake config (with merge request) -> noop
+
+Subscribers: kde-frameworks-devel, kfm-devel
+
+Tags: #dolphin, #frameworks
+
+Differential Revision: https://phabricator.kde.org/D25170
+---
+ cmake/Findlibssh.cmake | 18 ++++++++++++++++++
+ sftp/CMakeLists.txt    |  2 +-
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/Findlibssh.cmake b/cmake/Findlibssh.cmake
+index bf6d797..f37846f 100644
+--- a/cmake/Findlibssh.cmake
++++ b/cmake/Findlibssh.cmake
+@@ -32,6 +32,19 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
++# Define an imported target to have compatibility with newer libssh and so
++# we have a single target to use regardless of the code path taken in the
++# finder and the actual libssh version defining the target.
++macro(libssh_ensure_imported_target)
++  if(NOT TARGET ssh)
++      add_library(ssh SHARED IMPORTED)
++      set_target_properties(ssh PROPERTIES
++          IMPORTED_LOCATION "${LIBSSH_LIBRARIES}"
++          INTERFACE_INCLUDE_DIRECTORIES "${LIBSSH_INCLUDE_DIR}"
++      )
++  endif()
++endmacro()
++
+ # We prefer the config, but on Ubuntu 18.04 LTS (and to some extent later
+ # versions it seems) they've not packaged the config properly. So, go for the
+ # config by default and fall back to manual lookup iff the config was not found.
+@@ -39,6 +52,9 @@
+ # https://bugs.launchpad.net/ubuntu/+source/libssh/+bug/1800135
+ find_package(libssh ${libssh_FIND_VERSION} NO_MODULE QUIET)
+ if(libssh_FOUND)
++  # Certain versions with config may not have the target, so make sure it's
++  # defined.
++  libssh_ensure_imported_target()
+   return()
+ endif()
+ 
+@@ -109,5 +125,7 @@ find_package_handle_standard_args(libssh
+                                   VERSION_VAR
+                                     LIBSSH_VERSION)
+ 
++libssh_ensure_imported_target()
++
+ # show the LIBSSH_INCLUDE_DIRS and LIBSSH_LIBRARIES variables only in the advanced view
+ mark_as_advanced(LIBSSH_INCLUDE_DIR LIBSSH_LIBRARIES)
+diff --git a/sftp/CMakeLists.txt b/sftp/CMakeLists.txt
+index cd09cd3..5d1eccb 100644
+--- a/sftp/CMakeLists.txt
++++ b/sftp/CMakeLists.txt
+@@ -22,7 +22,7 @@ target_link_libraries(kio_sftp
+    KF5::WidgetsAddons # KMessageBox
+    KF5::I18n
+    Qt5::Network
+-   ${LIBSSH_LIBRARIES})
++   ssh)
+ set_target_properties(kio_sftp PROPERTIES OUTPUT_NAME "sftp")
+ 
+ install(TARGETS kio_sftp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio)
+-- 
+cgit v1.1
diff --git a/kde-apps/kio-extras/kio-extras-19.08.2.ebuild b/kde-apps/kio-extras/kio-extras-19.08.2.ebuild
deleted file mode 100644
index ed12668f1418..000000000000
--- a/kde-apps/kio-extras/kio-extras-19.08.2.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
new file mode 100644
index 000000000000..8b8ae07f60d7
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-19.08.3.ebuild
@@ -0,0 +1,83 @@
+# 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.60.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="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5[bzip2,lzma]
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdnssd-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	activities? (
+		>=dev-qt/qtsql-${QTMIN}:5
+		>=kde-frameworks/kactivities-${KFMIN}:5
+	)
+	man? ( >=kde-frameworks/khtml-${KFMIN}: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"
+
+PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" )
+
+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)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kipi-plugins/Manifest b/kde-apps/kipi-plugins/Manifest
index 9025bdeb6e7e..a798568b23a8 100644
--- a/kde-apps/kipi-plugins/Manifest
+++ b/kde-apps/kipi-plugins/Manifest
@@ -1,5 +1,5 @@
-DIST kipi-plugins-19.08.2.tar.xz 1628804 BLAKE2B cf7d04768eb2383d10c87a6d37b08daf007fc5c2803b2ed47f819cc6dc3ced427bc51fd54500eeefed9e139fd2adb101a473f6a864d7c038e2b52903f2aaa488 SHA512 40c1da009d35f79380ace709e514445b84b3fd6de5a28e20a3ac4ba8609ae4f3be4a9fc1c76a6b30149a8307292ba41d59869a01d44f32a895df1c8914eb48f2
+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.2.ebuild 1387 BLAKE2B edcdf1c6db7d96b56a1a8d20dcab110e871921533570e26bc2a0bba3de68749f982671df2d068cabccab42dfcea9e63e33f34bd2081b79b32a60ef4c7533eafc SHA512 d27491c3b27db4b78222b62fe717d587d7a3cf57a652069b273c146a56b06700afdc50e5d9d268c6cbf4636a61df92ee5ca05d833d07d39463a04c8d7b61cf88
+EBUILD kipi-plugins-19.08.3.ebuild 1544 BLAKE2B 46371288c75907353bc9b6cf5a2d837686d3a7936e1a0da93e25d2aebb206a66f93854a4ba626c9e172989ad5cb7c5fb6791fe1ecaf5674bde2b3d83ad09307a SHA512 623de5d3ba5d2252839531827287fdcc741ecdd9a3bd5950eecfbcac420dc077cd79b7baa41fd684ddc83a1a659dccc7e44b8710730eea0b79878f67ec658042
 EBUILD kipi-plugins-5.9.1.ebuild 1470 BLAKE2B b291a907b418ac93d8b1fe4a5e9f0e8b1c24209a02bb9938e2e7613a3cf7d07f160ea6ffbddc1693a2b6564db8e3e3cae0f8f9d78df2ff65a2fbb08fb915b3e2 SHA512 d1e97faea87418e28a653d64691de5d03560fe3de3df1a4c7ee0e996c7db81048c82905ba3f54aca4c52ae0abad98d19d4d7f854ce4e6f6aae1113dc50a9989b
 MISC metadata.xml 687 BLAKE2B 77c5f391f0a6a78baa467283a0352ac6d79f8aad93e57fd6a57b6d61a04b7c45968f55d587b234edd2077bd94cffddcb039ea48b06cc83a255e0030384298ccf SHA512 1d3260f089af7889757e0960f74bd4c30ee7ec1c866d0eda82c09ae13be4cdbfd481e9da856d18f6c71008a58f8680275dd70e572449240062d216cf175079a9
diff --git a/kde-apps/kipi-plugins/kipi-plugins-19.08.2.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.08.2.ebuild
deleted file mode 100644
index ca7690c5f447..000000000000
--- a/kde-apps/kipi-plugins/kipi-plugins-19.08.2.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
-
-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/"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-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)
-		$(cmake-utils_use_find_package remotestorage KF5KIO)
-		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
new file mode 100644
index 000000000000..9ab937a7a9ee
--- /dev/null
+++ b/kde-apps/kipi-plugins/kipi-plugins-19.08.3.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.60.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-utils_use_find_package flashexport KF5Archive)
+		$(cmake-utils_use_find_package mediawiki KF5MediaWiki)
+		$(cmake-utils_use_find_package remotestorage KF5KIO)
+		$(cmake-utils_use_find_package vkontakte KF5Vkontakte)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kiriki/Manifest b/kde-apps/kiriki/Manifest
index c735a69fa323..e23e975a804b 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.2.tar.xz 372868 BLAKE2B dd9a28b320cbdba7546a5799d45ec576b0d56514709d5ce16c0fd68413e20fdfe867eb94044e1d914a9f8bd54bb7a8ad873b07bf6a0878aebc5f35b3fd3e2765 SHA512 042645213bf8fa3e32ea7dca5fbdb3a54663a202ae70131a3f2f75702bdf2a80b09ca1449ac9ac8e4f9200158f465819fc81a4c9d9e1006cda50ac548c28fd63
+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.2.ebuild 778 BLAKE2B 04ebe04cb7bf2c80eee7717fd6f9a8c221fb99e8d20f1bff1402164a4fd3587fdeb51f142fc67a9d96d8d78ba3a04a0f2a32d87e62c07ab8feef53896f065505 SHA512 843cea9970e83e279907ca9c06121fe6a3f88582112d2c07563b7bfc11ab42f43f4e7782de49383cabd9bb40685f1d683f82ebb0adc3a6eb6346e1a65f53cfd1
+EBUILD kiriki-19.08.3.ebuild 946 BLAKE2B f3628257aec6cb188898396cd363d7fbff94bf296b5b6fece0946e73e208a0fbc12daa1e47da2639d746bd970d03175f8aabdc4e833d49a01dff6786b7601cb5 SHA512 b41debd18104fc2c936f23f946d17d50f540a505a168a2a07150e3ba0a92fd1682f20da16930a54a10a477b599d7dfd3a80f3f8ab30f4ddd5b931e848310fca4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiriki/kiriki-19.08.2.ebuild b/kde-apps/kiriki/kiriki-19.08.2.ebuild
deleted file mode 100644
index 8b308fc169d7..000000000000
--- a/kde-apps/kiriki/kiriki-19.08.2.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
new file mode 100644
index 000000000000..c0f4871b809c
--- /dev/null
+++ b/kde-apps/kiriki/kiriki-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="An addictive and fun dice game"
+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"
+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 e6a98b6ba4c8..cfce77fc1906 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.2.tar.xz 11287752 BLAKE2B 538b29900302c6cc10786c604197bcf4627294b7d02a83974b227d5221d8c4524220c07b9c9965683944ab01b90ae87e3658d05be5e13d0dab22fca5387f6561 SHA512 5b897cba7a38e6d18241e1f7e4670500c0f9cd696ebcd8fc584e5456caa168c735011e7de5856e069978d0aecb8c841a02b32a9377e9f4c9f9c4d794a017dd04
+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.2.ebuild 963 BLAKE2B d0b02be20a733479b5446110d529a9e515f7b798b00fb3be9d188ce410d6c4706387d452f6f0050dba04346c16a1f3c05f2954020e974c3388f6ecca1e0b39d6 SHA512 879ebf64972cfaec4a7297548442d055f4196ade5362cc3a682278a0b25a81955965c2ceb2b742aa4ebf14ac628f99c82a5e8484d17a296c2c66e1f7ed80194a
+EBUILD kiten-19.08.3.ebuild 1130 BLAKE2B 6b03fc744dfa523edc5d472c37df696659060ddccb87caeff218be8737aca6e5f09ad46cf3a23a3479ad5ce0c72b0ce38a62bc11632fd51268ad9cc85f55dce9 SHA512 e78dce2edf2581d30cab898353cd142738c3e7e1e5c22fbc393f0600cf4868bcd3d8e3ab6627fb9b6eda9060c0ae9395779a5eaac9680fdc7d52a602684e72ea
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kiten/kiten-19.08.2.ebuild b/kde-apps/kiten/kiten-19.08.2.ebuild
deleted file mode 100644
index dee6f6bb6320..000000000000
--- a/kde-apps/kiten/kiten-19.08.2.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
new file mode 100644
index 000000000000..ca09c8f746b6
--- /dev/null
+++ b/kde-apps/kiten/kiten-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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/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
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}: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 77fc8e926f08..e50c56351ef3 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,6 +1,5 @@
-AUX kitinerary-19.08.2-poppler-0.82.patch 4565 BLAKE2B 4fc0e4e52cede5bdb353c6f57a3f4d9d84a36e528ac9e4365039a08d6e1edd36ed0eef176d2ebe2a607b8b4e395e23ff6fa84132083814939a83f2b7d299e8a1 SHA512 6162e412f6e13c7d6c98b56ccd4fe1eff357fdb8baa93974c9134d64cd5ae69bfbcd9c6ab7beb70c40aa222994e6b2af2c00b2fa69f347bf18fd40eb5d476d12
 DIST kitinerary-19.04.3.tar.xz 689352 BLAKE2B 68f08908e4c8b18791988412ec0bee1fbf16cbe6047bcb6f9fffa469dcf9ecdbf0429b56622afb107cf83b645053c15e798ee27d2fd49807c78be42ee73344e4 SHA512 8edb33f42d10c62006b1676866707a45276259b4e2e3a53e318436a316a2a9da6d0fc8db8c104ee3d5b9a4fd383377fdd100f7d4e3e131c432e8acc5af04e731
-DIST kitinerary-19.08.2.tar.xz 954636 BLAKE2B 16a7379f5fa36bf35aec60a2999623e5358a3bcc3795560f6273046d0e4709c9b4c2d7ff71a84dfdaf89d6e427a3399d48d8f3ea7ba721a0962c1a35566ce59e SHA512 a9278d0b35ecc30e357ccd5d6b1d2aca4237c7a831919478c3628d83bff0583a9ed3e5155cc9df7d42636e2a16fc608c56297755cfddab11d0ae51cf3639ef73
+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.2.ebuild 983 BLAKE2B f661addecfbc054335eb8ab77549bf64ddf7b0748db002a7d75d10dc3e775dafe3bbf0c1b27dbc3e4d5ff3cd45ffc648f795421c0408b30fa19ea64251eb1280 SHA512 5a886831d3228b7a631c078df60d0d96b60fbb8ee4513354abfbe90f31c7276efb981f23c5898e29bd68725462df193db425796bba7ca7cc7137d6ba0c55b128
+EBUILD kitinerary-19.08.3.ebuild 1036 BLAKE2B 913a9d67877fbaa527c7204bec00bf6076c4ac376451187f9419f9ab53b1186a417b2ae84c7288afa4f9d3aba23289465c9912746cd28f4158222024ba3ed7b3 SHA512 6a43a3024977d635baaf5df51d931fa625e2c1d456b67563fa91ece475141b4987e368d32d11ba87934c1cebe6fa4e2adc5d6f731b13e8687e4ae71d07341f0c
 MISC metadata.xml 385 BLAKE2B 3831c360aacb09127cbaf52b779ff5b17708424dcbdc59d3c40739cae4742c9d22a95222aae7cbf188e74ddffd22ac58275440ede013b6c18c2f6b8a148bde5f SHA512 3bca0a73900f8dbdd9baf83b3e108d73e074d5713abfbfb5d4ec2923104096f516f409501e05fe9c42c59a949eac333d36ecb1e31b370a2810d7eeec515e86b5
diff --git a/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch b/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch
deleted file mode 100644
index be2152dafef0..000000000000
--- a/kde-apps/kitinerary/files/kitinerary-19.08.2-poppler-0.82.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 0f8b2babcc69c490ae6548bda7ceeb1ffd27a9e3 Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Sun, 29 Sep 2019 12:51:57 +0200
-Subject: Fix compatibility with Poppler 0.82
-
----
- CMakeLists.txt                       | 17 ++++++-----------
- src/config-kitinerary.h.cmake        |  1 +
- src/pdf/pdfextractoroutputdevice.cpp |  2 +-
- src/pdf/pdfextractoroutputdevice_p.h |  3 ++-
- src/pdf/popplertypes_p.h             | 30 ++++++++++++++++++++++++++++++
- 5 files changed, 40 insertions(+), 13 deletions(-)
- create mode 100644 src/pdf/popplertypes_p.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb222d9..1d66d3b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,17 +62,12 @@ if(TARGET Poppler::Core)
-     if (${Poppler_VERSION} VERSION_GREATER 0.68)
-         set(HAVE_POPPLER_0_69 ON)
-     endif()
--    set(CMAKE_REQUIRED_LIBRARIES Poppler::Core Qt5::Core)
--    check_cxx_source_compiles("
--    #include <goo/GooString.h>
--    #include <QString>
--    int main()
--    {
--        GooString s;
--        QString val = QString::fromUtf8(s.c_str());
--        return 0;
--    }
--    " HAVE_POPPLER_0_72)
-+    if (${Poppler_VERSION} VERSION_GREATER 0.71)
-+        set(HAVE_POPPLER_0_72 ON)
-+    endif()
-+    if (${Poppler_VERSION} VERSION_GREATER 0.81)
-+        set(HAVE_POPPLER_0_82 ON)
-+    endif()
- endif()
- 
- if (TARGET ZXing::Core)
-diff --git a/src/config-kitinerary.h.cmake b/src/config-kitinerary.h.cmake
-index b0bda20..6d3b156 100644
---- a/src/config-kitinerary.h.cmake
-+++ b/src/config-kitinerary.h.cmake
-@@ -24,6 +24,7 @@
- #cmakedefine HAVE_POPPLER_0_58
- #cmakedefine HAVE_POPPLER_0_69
- #cmakedefine HAVE_POPPLER_0_72
-+#cmakedefine HAVE_POPPLER_0_82
- 
- #cmakedefine HAVE_ZXING
- 
-diff --git a/src/pdf/pdfextractoroutputdevice.cpp b/src/pdf/pdfextractoroutputdevice.cpp
-index 2a06c82..0027cad 100644
---- a/src/pdf/pdfextractoroutputdevice.cpp
-+++ b/src/pdf/pdfextractoroutputdevice.cpp
-@@ -30,7 +30,7 @@ PdfExtractorOutputDevice::PdfExtractorOutputDevice()
- {
- }
- 
--void PdfExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, int* maskColors, bool inlineImg)
-+void PdfExtractorOutputDevice::drawImage(GfxState* state, Object* ref, Stream* str, int width, int height, GfxImageColorMap* colorMap, bool interpolate, PopplerMaskColors* maskColors, bool inlineImg)
- {
-     Q_UNUSED(str);
-     Q_UNUSED(interpolate);
-diff --git a/src/pdf/pdfextractoroutputdevice_p.h b/src/pdf/pdfextractoroutputdevice_p.h
-index 9241f9f..5d448d3 100644
---- a/src/pdf/pdfextractoroutputdevice_p.h
-+++ b/src/pdf/pdfextractoroutputdevice_p.h
-@@ -21,6 +21,7 @@
- #include <config-kitinerary.h>
- 
- #include "pdfvectorpicture_p.h"
-+#include "popplertypes_p.h"
- 
- #ifdef HAVE_POPPLER
- #include <TextOutputDev.h>
-@@ -43,7 +44,7 @@ public:
-     void finalize();
- 
-     bool needNonText() override { return true; }
--    void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg) override;
-+    void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, PopplerMaskColors *maskColors, bool inlineImg) override;
- 
-     // operations used to detect vector barcodes
-     void saveState(GfxState *state) override;
-diff --git a/src/pdf/popplertypes_p.h b/src/pdf/popplertypes_p.h
-new file mode 100644
-index 0000000..f9d844a
---- /dev/null
-+++ b/src/pdf/popplertypes_p.h
-@@ -0,0 +1,30 @@
-+/*
-+    Copyright (C) 2019 Volker Krause <vkrause@kde.org>
-+
-+    This program is free software; you can redistribute it and/or modify it
-+    under the terms of the GNU Library General Public License as 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, but WITHOUT
-+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-+    License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-+*/
-+
-+#ifndef KITINERARY_POPPLERTYPES_P_H
-+#define KITINERARY_POPPLERTYPES_P_H
-+
-+#include <config-kitinerary.h>
-+
-+#ifdef HAVE_POPPLER_0_82
-+using PopplerMaskColors = const int;
-+#else
-+using PopplerMaskColors = int;
-+#endif
-+
-+#endif // KITINERARY_POPPLERTYPES_P_H
-+
--- 
-cgit v1.1
-
diff --git a/kde-apps/kitinerary/kitinerary-19.08.2.ebuild b/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
index 3ad5d865506e..0fe8468b5687 100644
--- a/kde-apps/kitinerary/kitinerary-19.08.2.ebuild
+++ b/kde-apps/kitinerary/kitinerary-19.08.3.ebuild
@@ -3,26 +3,30 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
 HOMEPAGE="https://kde.org/applications/office/kontact/"
 
 LICENSE="LGPL-2.1+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+barcode pdf"
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcalendarcore)
-	$(add_frameworks_dep kcontacts)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kpkpass)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
+	>=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
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
 	sys-libs/zlib
 	barcode? ( media-libs/zxing-cpp )
 	pdf? ( app-text/poppler:=[qt5] )
@@ -31,12 +35,10 @@ RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-addons-18.07.80
 "
 
-PATCHES=( "${FILESDIR}"/${P}-poppler-0.82.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package barcode ZXing)
 		$(cmake-utils_use_find_package pdf Poppler)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/kjumpingcube/Manifest b/kde-apps/kjumpingcube/Manifest
index d7f2c17dcb03..2ce88455f212 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.2.tar.xz 287988 BLAKE2B 09d4cd7c25105496a504ecd71d85a59416c3d001339d6a2edcf177c44892f0fef7fc266a054b5496a1336e1195f66315d7d23e015fac65413268d97cdf890e93 SHA512 f00be92f4a4e4b014962b9b767f2dc174272059db81aa257033424d3150076896a72d9a9260d9f57ed33bad6196413c8e30bc5288d077b1a3337fed1318d1213
+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.2.ebuild 774 BLAKE2B fd09947975902b645795a99a51f09c3fd9dcc8651e1381da61b46fa25509efc2cb009ec537931408f02d5a2a105e65c7b59f2624a59b650f03ce53773cea758c SHA512 27939f5c31ba3c5a502c7d11aebdf14816cd950f9491ee941721f1a93909175609ee8ed490a526a3b4e10e9e8c14a59d02cca80f88811fec88ff95f94d58c678
+EBUILD kjumpingcube-19.08.3.ebuild 936 BLAKE2B 2de0eaeb9d58e73a2a23c6409c0a98d5f2d71555426a2ac593910034dd2ba69ae2dd4d859d495739200457fcdcb3f240a4646e070525b782db4a62e0c97b851a SHA512 80ff1ce27104b5ca380790f05a0b2379b4c3f0d2109cc7b841516dd55aff4c6ddd92105bb8fa3e1dbe1cde7a602e520852f861a79dce79e972ba241fa04eb01b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kjumpingcube/kjumpingcube-19.08.2.ebuild b/kde-apps/kjumpingcube/kjumpingcube-19.08.2.ebuild
deleted file mode 100644
index 4778d0a9e1d8..000000000000
--- a/kde-apps/kjumpingcube/kjumpingcube-19.08.2.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
new file mode 100644
index 000000000000..4b662d5fabaa
--- /dev/null
+++ b/kde-apps/kjumpingcube/kjumpingcube-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tactical one or two player game"
+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"
+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 4d05b648a8e5..7fa0f6988de9 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.2.tar.xz 155428 BLAKE2B adcfd1cdddb1207e86e63e7726e2f345a9aebd644d70a2f33fce7daef9769894377cc673c7fcf86d42bd87eb497d9ca2bb7764ccc22fe138f8f3f62622ca02f6 SHA512 55f71ab415b6df4d7daf7cf065c6292a6b480cb09bdbe667d0266585244776a5cb2044b1b8e8935624d454f49f334aef3f30ce0f66594eb54c16482eaaf3506b
+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.2.ebuild 758 BLAKE2B f800fcafbc84117baad5f77d980b8a1aa3a1b92a9824336653a6c2a4e3a016a8df74a1aab4b7a4dfd806d54123f77ce1859df8ec0bd358a0ebee5f2c6e7f7341 SHA512 8a13a25cad61df9b621c4f4dc5bd398063d4b88d0d9fbcfdf22cd14f07f2379fbeb23354da8d2a4b096e09a30c02eef6e1f6bac87487eeb1572cb572b2624bce
+EBUILD kldap-19.08.3.ebuild 835 BLAKE2B 75da00ab7be0ae629d2bc7160103e1ae5324957cc8b9dce958c4460ed44ec15d472080263a0956a02cbc3ca00c404d37ff28abe606295bc1ca0279b2dc40294a SHA512 4eedd569dca8a6827fe3845cded89f6f4e88080f2e68ef33acc6fe0274d8fec10b3082b12e24279b0d6bd3ceb04899f473c22127f75ae5a4bd90b2dbc6915107
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kldap/kldap-19.08.2.ebuild b/kde-apps/kldap/kldap-19.08.3.ebuild
index d63a4f5e4d3d..5ebdfc0f149c 100644
--- a/kde-apps/kldap/kldap-19.08.2.ebuild
+++ b/kde-apps/kldap/kldap-19.08.3.ebuild
@@ -3,22 +3,25 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for interacting with LDAP servers"
 LICENSE="GPL-2+"
+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 +30,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 54df0766d205..7553016a07e8 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.2.tar.xz 1927560 BLAKE2B 3bcdd4ab2786ae2ad126437c3e18ce20e6c642c4469cae0f282f9ba24589af735bfe0996d566d07513a7e4ed174260819d546b04c4b0c7c33f960eaa48dc59a9 SHA512 d2eb5a02e937a93a1c8c20e418203e580f37548e4dcc2ba9519dec244a04f355a32e9daa9acecfc51e6b63f7f1274882a7eb4ac23e6c73f67d5c292d05a50027
+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.2.ebuild 1326 BLAKE2B fa3c3065126ed7a77bc5f6639828a910227c9d96bab4183e26be5a4af6a1b6ba160ef8886c8b2b37b918cc1a5c477969bbde9869a214ac2ec95abb88baa88a8f SHA512 fa83714421bb027d649d7e49e133c5c1cb7e16faa195a086b81e6570977781f43f8337ab61c7f437853c99d50efa54a29fb73d073bccace8eb73c7c96f9ec725
+EBUILD kleopatra-19.08.3.ebuild 1509 BLAKE2B 47cdfda087ffc186a3455d231dac62f16285b58ebcfe9f2c871b3a0a7b712788cbf9a93f91d87e8dd1305770c350c99fcf420fe45a9826a6e160edadeb940963 SHA512 b63a7a5245e21e98c256b1bf81c0731e2a235f7810ac89faffad2aab95146e369fab1dc124f67714e35768df9de57bff63d8e2b5526b33aa5e70362ee5f7b9e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kleopatra/kleopatra-19.08.2.ebuild b/kde-apps/kleopatra/kleopatra-19.08.2.ebuild
deleted file mode 100644
index 285babab0af3..000000000000
--- a/kde-apps/kleopatra/kleopatra-19.08.2.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.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/kleopatra/kleopatra-19.08.3.ebuild b/kde-apps/kleopatra/kleopatra-19.08.3.ebuild
new file mode 100644
index 000000000000..d8bed4a5b60b
--- /dev/null
+++ b/kde-apps/kleopatra/kleopatra-19.08.3.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"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
+HOMEPAGE="https://kde.org/applications/utilities/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 31e517a7ee6b..e888e6a03cce 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.2.tar.xz 40136900 BLAKE2B c866fc71c73d461d7b5b8bd6d4159b81a55df684aeb34b0284cd0262570f0b7937b5ecde0ebc8e2be4ae87d31bfe0b180382c05e4e701e75df47b43c54bfc4af SHA512 59325fc8df2d71066980b6a44339311603d70dbb55a104f5e549094d38bac84c6a0e180c34aae426d158258104d35101f835df064556a8fccbb4ff248a3caa87
+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.2.ebuild 774 BLAKE2B d6c21d125103f4a301672c8a4cd75e76a3241aa69330e439abdc29077a29d5eb721c8c4a0320940c6b7f0209a5a7611681a91e82299b873be6fc3616f74240b1 SHA512 1c858d5161fef61e279f839d84d779d5f8a53b7cd9288eeca48656852a6cc05cba9242a713e540d4b7641db8f4b4da640b0200353312f979328bcee6cbfd17e0
+EBUILD klettres-19.08.3.ebuild 924 BLAKE2B 62633a5892cc097c41b713dcd6e060b10bb682e82993dbeee9865e8c17530045188a42aecb95bc84ae56baae99264403397d5de27b03e94609e198ed2503fe6d SHA512 8df7144df0fe5dc7970669984fbc712f0de39872f21739707aea35b40e29f440a611e015cc07052dc02109cc6aeaa276334e791f85ca2d1c6f3ef3a134585527
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klettres/klettres-19.08.2.ebuild b/kde-apps/klettres/klettres-19.08.2.ebuild
deleted file mode 100644
index 56acc749bc64..000000000000
--- a/kde-apps/klettres/klettres-19.08.2.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
new file mode 100644
index 000000000000..dedcf4b0d844
--- /dev/null
+++ b/kde-apps/klettres/klettres-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Alphabet learning application"
+HOMEPAGE="https://kde.org/applications/education/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 535ece6a38e5..5b620123dedd 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.2.tar.xz 1389260 BLAKE2B c61fad530606bb3205c16b5ac7fb72e3bb98d411b3dbdca242d5ce2837cff1b1a6aee9abc9075ea9ebb9eebb5771f8771d13b2842d03e257f7b3cf78a932047e SHA512 14a21769140889fd45da420d31867c2723b4218b31325e4830a3226a3316aeb89e47130d7c1cbc643ae4dd125932d00f8b9393abee575dc72e82148fa9ae3808
+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.2.ebuild 761 BLAKE2B 128384e92c531d8cab5eee1fd182eb08b3f047f77c445aebdc656579c5bbee6e66e350a83add6c9dc166db083dbae296364ca7a67d2896109dee8de495e1179c SHA512 8856cc1cd98758c98727630f2dd86cebcaf3aaf55d05a496c748df3b963547fa6a151a7d1b1cb79e5f2448b5079a4c14c48df4e85f70cce44c0f71926ecef8a7
+EBUILD klickety-19.08.3.ebuild 935 BLAKE2B 0b98b95ab080f123cc052609bb33832053d955cd852b858b49f7af6e22ae5e28a2cfdafd1c95b06a1f255ac4cbe966d72209823a011c878780dcb86325cf3116 SHA512 e982983eb7a58b625c55e6c3211b6dc46c183041ca543f984503e4e481cb7e04a67bae94447eceba4b9bc83d5ad7928d1c8335ca7d8fb7d8bd3be3dc2a484b16
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klickety/klickety-19.08.2.ebuild b/kde-apps/klickety/klickety-19.08.2.ebuild
deleted file mode 100644
index 24e11900d4dd..000000000000
--- a/kde-apps/klickety/klickety-19.08.2.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
new file mode 100644
index 000000000000..11c8d47aa4f3
--- /dev/null
+++ b/kde-apps/klickety/klickety-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="An adaptation of the Clickomania game"
+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 2f01c2978885..230cc5ab12ba 100644
--- a/kde-apps/klines/Manifest
+++ b/kde-apps/klines/Manifest
@@ -1,5 +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.2.tar.xz 1780672 BLAKE2B 8d7234bb084aee0cabae4372b455ead1d6c53bac58021cc2f8f005dc30fc0bbd9798c411d1039699f2e60d5b60d4505e1df53e2aa208a5876b4219ea6a788576 SHA512 b1bf8d6960f5a48f687574b10abed362cacfdd4b644f9148e913206a809b4a9215b08bd4492be5df3c5e02d76a0894a5c9290f692f74779c476c5d2862c698cb
+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.2.ebuild 784 BLAKE2B 44abad6d02c556a251d30d6d8802e8974c13f046ba6810c90daf3a6a0e67bacf3550fd08758c383ff10a84d92f26942a82504015f622289bdcda91b7df6403ab SHA512 2fedac8825b082a3ebaeaa909acf1aafce8536a283fc278206b44fbe7fc2727be00dc26ca432728902ed765548da6bce9e560dcd5ea619145d41aebc92bda764
+EBUILD klines-19.08.3.ebuild 986 BLAKE2B 7ca951e7e695dc433418372668e04bf79318c33243e6774d3964090a219249ac762f56a8ee92ccc441d8df38f38dc7153ba6bf929086abb08a0c6fc270a5f4a1 SHA512 b7ccfc86e07396cafc9e060faed3b6dc9739391d4d25432351b76a941657221c1e82cd013ebc10f881c62c211a54ea966703d07fef0a45c3e2bcd2147aa78b66
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/klines/files/klines-19.08.3-qt-5.14.patch b/kde-apps/klines/files/klines-19.08.3-qt-5.14.patch
new file mode 100644
index 000000000000..d7507ede611b
--- /dev/null
+++ b/kde-apps/klines/files/klines-19.08.3-qt-5.14.patch
@@ -0,0 +1,24 @@
+From 88d61f11f762cb922a7bef7b7cb1bfbb5bb148c5 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 30 Oct 2019 13:34:13 +0100
+Subject: Make it compile against qt5.15, This enum is unused
+
+---
+ mwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mwidget.cpp b/mwidget.cpp
+index e813ebe..3e31f6b 100644
+--- a/mwidget.cpp
++++ b/mwidget.cpp
+@@ -39,7 +39,7 @@ MainWidget::MainWidget( QWidget* parent )
+     klview->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+     klview->setFrameStyle(QFrame::NoFrame);
+ 
+-    klview->setOptimizationFlags( QGraphicsView::DontClipPainter |
++    klview->setOptimizationFlags( 
+                                   QGraphicsView::DontSavePainterState |
+                                   QGraphicsView::DontAdjustForAntialiasing );
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/klines/klines-19.08.2.ebuild b/kde-apps/klines/klines-19.08.2.ebuild
deleted file mode 100644
index 68a0d4720120..000000000000
--- a/kde-apps/klines/klines-19.08.2.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
new file mode 100644
index 000000000000..3aa2c7be5b66
--- /dev/null
+++ b/kde-apps/klines/klines-19.08.3.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.60.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/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 )
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
diff --git a/kde-apps/kmag/Manifest b/kde-apps/kmag/Manifest
index 9c5f356764f9..f161a88034fa 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.2.tar.xz 674000 BLAKE2B 45ea81235b8ce56c8d4bcbbdd364930ead5f391e067462ba6889d8165517311bb36ca9d8e49395eab2a766e9fc4a30622597276a79e105bd5f287957a812a895 SHA512 cb3c7b41244af293f2aa81998e234008e30a20d7182fe235cb5e8bf09f080f1369b0fb1ea9dd6c803caa1c0b6a7bf269eed0cd8587d0fc858d5dc5e03344d9fa
+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.2.ebuild 833 BLAKE2B e299156dffc39d4671eb89883146a3ce5bdc2131b6c4ff1df22b51b048132dfa3405f0445e8f24147d35ed0d8920c5bcb80fd9ed6a0d10060fd57e6115554897 SHA512 838db944f70ff607df34fb7ea0eb3137f1eabb6105219ab91ea7475730eacae84c7bf7b44bcccf18a7d362e840e8a351c04fa5d9c696454b03ab6bd370da0d36
+EBUILD kmag-19.08.3.ebuild 964 BLAKE2B f1d82417e0ad50ffe2f39848c033fccd13f4f2b55134390288a57d5558b0343f30a43abe0c316dc6ce64ea662dab52e46ec2e5ca83c89a3dbccf4570e44ae0a6 SHA512 8304be922025c2ea5b2f03670b4a8053862a5813309bed0ba939ef2a58af96ea3f1cce1661d6519073df41434373257410d8889423d89d9695e3666a6c93a1d3
 MISC metadata.xml 331 BLAKE2B 12c06c30b4adc428c154fb56d43d13064f76d66b60970b85dce035da1865a50617eb2d5eb0f075a54cbaff9ca6f81947d0246ccb232a13f54f80bc201e93e081 SHA512 1661715553cbd4c5197c89c6562559d528a688f9c12214312dc075c1fda744aa10bacdaf2573ec26ca4f93d5f619170c3aa2b7ba945f28126a0a607c6c3e1ff3
diff --git a/kde-apps/kmag/kmag-19.08.2.ebuild b/kde-apps/kmag/kmag-19.08.2.ebuild
deleted file mode 100644
index 0aadc01359ff..000000000000
--- a/kde-apps/kmag/kmag-19.08.2.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
new file mode 100644
index 000000000000..806d9f504854
--- /dev/null
+++ b/kde-apps/kmag/kmag-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE screen magnifier"
+HOMEPAGE="https://kde.org/applications/utilities/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-utils_use_find_package keyboardfocus QAccessibilityClient)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kmahjongg/Manifest b/kde-apps/kmahjongg/Manifest
index a205ac816556..7787864b8e17 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.2.tar.xz 3378064 BLAKE2B e93a82cc06bef40b68f09345763601cd73b715e768b25555bdc40652e2e925c823dc2bc7849bb30e98c7f2f84b5c9491623373d0fc3904b7c062c64f06f2ec79 SHA512 be220ff401ea1de3ffd18a9db4e3a40ab1d8cf43e016c8c3891f31dc68ed8bfff0df7c5e5fe580afd0818ad23b1248c971d8fc0f2fa2dd044711a2d73cdb06e6
+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.2.ebuild 917 BLAKE2B d0698131eacac2ba01ca304d8c1d1a8064343664ef8972f2ff94112aee5cd0cad97309b429a42897d797c6f8d6a7a542ed00db9e6d84dfe71696780bdb736bae SHA512 bda503394c1710a28085cbeed0df3240558c4c0684eb1e9791fcb3b2b461309efcb813adc03f32f36f6970c98814e01a8ff33d065a51396731109b2d26ae0297
+EBUILD kmahjongg-19.08.3.ebuild 1100 BLAKE2B 71eb607593e65cd4da0297d9a9f88f49abc4832df2f65bce935cc8562d41e8a110e585f5bca733f1cb0f55aa321113da93b115d66181a393250b5cf3a716e341 SHA512 884b1386d17b7abc826cdd17a428d0de17af1e7227befd13fbbcd80e5d57dd4efd6e54eaddfd9270514dbf15d9ec5525560f0515be79569b1d41b03980332868
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmahjongg/kmahjongg-19.08.2.ebuild b/kde-apps/kmahjongg/kmahjongg-19.08.2.ebuild
deleted file mode 100644
index 96638f30673f..000000000000
--- a/kde-apps/kmahjongg/kmahjongg-19.08.2.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
new file mode 100644
index 000000000000..6da8ecfbf5d2
--- /dev/null
+++ b/kde-apps/kmahjongg/kmahjongg-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# 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.60.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/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 2242d7bf82db..59c724a803d7 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.2.tar.xz 158592 BLAKE2B e7d20c1c7bbdb2f34a35da3dadd3c5985e0ddf72cb23c16f0799a62519e6a738f4fc5c4455f4b294d30272563088828264d19b602b2b9b39cd447515ca40c800 SHA512 9c466dda13003dd8d3c40b60d0566cd914d1de496350c84ccd929f8ad8077e4ffc05d74fe12e5ea653605962abd87471bb314971a7641575cfa771b867fc8b1e
+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.2.ebuild 1449 BLAKE2B 780aca6d9d645bd7d9ddf38d41a67cf2e42c436e3ad295577bbdac7d52c660b884735a08cba0be1f17a70eee9ccabf6bd3707b5eeb68079b4cdbec6b6f330dbd SHA512 79c2b77bf402e142e89005b55ef8a65a7e18136862de4abcd91d8c2497ccaf8c399209465bbcd7567dfac250d0cc927d1e679fec9de48d91127870fca398b49a
+EBUILD kmail-account-wizard-19.08.3.ebuild 1665 BLAKE2B b51ab4c1f6227d0f6538a192194c7ffa07a8ee0752825529988c9102342f33c18ff5a8f4ef03b0e708e5f13321b4bb23b42dc3b2b0801ebc0a4aa96fd3fbf255 SHA512 23ed5afa47c87001b450a64ecb4f01560a0163e8f953680001135dbccf228b3392c5823fd5a3746824261ce950be8befc0bf42c7ea6baf866a6f144586285d00
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.2.ebuild
deleted file mode 100644
index 9c19a766bb80..000000000000
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.2.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
new file mode 100644
index 000000000000..e934d8eece0d
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-19.08.3.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="forceoptional" # FIXME: Check back for doc in release
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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 8b243ee8eecc..5b69e96d77db 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 4733752 BLAKE2B 281612ecf228f4d10cae6cad82eab8863c556a31253438bf4f490ac99d4c7a2e269808a4a4a249fc253c3536168201f3ba322508c79ad4f6a795272600525e3b SHA512 3f3ad7b8adec60f07c88b9b4fb5f28dcc74c71a5f0c778af750cbb9126f7bd514c97b0a33c65d83040e75dbdc88889712cd1bd3db103ef70c455a61410fefdff
+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.2.ebuild 3296 BLAKE2B f822081445b9842b1680dccb3636702b5cad57c156d0fcc43395022ee0423a54e81fe44d681ce8af80d65bb2c3a90cf7643f50a465b5f9c7abe54bfe334d56de SHA512 f28b2305cb84b451597c75d5b968d509279e3f064e371daa4e6ba7f039e18a9b797f43ebfd3affa444dc88960f6f7b0938662a3ac5e036185d41555446f1c855
+EBUILD kmail-19.08.3.ebuild 3595 BLAKE2B 8b2c84430a7cdba75ed6aa3aa1c1255e838f108e4ee029a3315f6f5de75fcaf15f3d6bf4f117d1a2d5d03015342e467be653542e15cc2895cf49ed4f1b19197e SHA512 70465e9d08a79c89dbfebb3c4781e1d5fb50a1d6f391171401d2b57cedb452f756b0905f428d389f99549f4ced8f3d9aac6757f6906c357fbe55fb0f31daf6c0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/kmail-19.08.2.ebuild b/kde-apps/kmail/kmail-19.08.2.ebuild
deleted file mode 100644
index cd8e60fd1875..000000000000
--- a/kde-apps/kmail/kmail-19.08.2.ebuild
+++ /dev/null
@@ -1,115 +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 kcalendarcore)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 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.11.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)
-"
-
-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
new file mode 100644
index 000000000000..a15244b79cef
--- /dev/null
+++ b/kde-apps/kmail/kmail-19.08.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+IUSE=""
+
+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/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 e152d3eb1243..a0c232cb9829 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.2.tar.xz 166500 BLAKE2B e827b30a0c3e0831088c85d12538b4b8c2217111c49c3598904204e72c8c14d6412d6e9fb1addaf66610de98760b624d76d8f25202e4f2368fd92f738d97211a SHA512 98f5d21527b6008d57f192fe4abc2f142a01465eb836b153240f9370aa945a1624ec7c1d9ce4094db99d873352763f3cd035384624e6af659979084f53c1e4ae
+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.2.ebuild 955 BLAKE2B 779a5e85b67a38b0e610ca2074c6b2bb5b995ec9b3eac0b46609eae3ea5e2e7c654fb1fd848d0ead71f6f6ea2e52891d62548dab41860355debba6888ad26c6e SHA512 866d64043853135db6102f483ce62d01c914b9b1d88e786ea8425457b161502b3a945db3b293cdd4a2ee58f60fde6614603177de97b02a4e7efcc472b5f65246
+EBUILD kmailtransport-19.08.3.ebuild 1117 BLAKE2B e644833c458aaff56d9eceb1f4665bdc0bf46b5bc11c2ec8e85367486459f9dea03d4524c00e5550a499f09e83122b1837ced5700b94ee841a1a1132b1a1ebd4 SHA512 d4f2a3783fd928e66389f8a289accdc0d2d97669d5a721f5b2a866f4e9269f355b4d358c9c54116c34d39dc6a49b0ab318a2b1f863cc53f2f445b46d2a5e26b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/kmailtransport-19.08.2.ebuild b/kde-apps/kmailtransport/kmailtransport-19.08.2.ebuild
deleted file mode 100644
index 46e041ac7cd0..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-19.08.2.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
new file mode 100644
index 000000000000..8884c3669fcb
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-19.08.3.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="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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 d7ef1bfbe804..c38049131c52 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.2.tar.xz 24560 BLAKE2B 90e72f620b99aaa7a1143bacf734b07678b317ff39c7c4fcc09a9326c5e80be62bb0e5b144d2864e6260a5d07fa5c37064bf2fb9d2bbf35055643454a229a22e SHA512 c9a58f4c0e82a99e26f19360fedd603619bb62420f375f3fcb20e17b6fc4b4816fefde0619fe04b194ae7d4c322281d99aa7421d2e9d1c7f1e6424d418e62f29
+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.2.ebuild 315 BLAKE2B c65b6b47aa0592ff1768a028fa5edf917f1c5838c34f6b11d0bad0c90b14fff5b25f4580ae2d1e22a820ddb5e8edc00a68503e0344e41aa9cd8d0adcd93d5857 SHA512 c85b7f6e726f1081c060cdbd3166d5c6523c857b4a11ca3022405809da972266fb12a1bf8a72a93be7c949ab14b98aa9b924099fe71b23abc7a59baf1e535239
+EBUILD kmbox-19.08.3.ebuild 355 BLAKE2B 808a3187527ee11c63d8960271b73d93e64bec234a02d96fd26928240a8bda65e97cc224e05a5994c0fd8bc88634214250abc32d9da0988cfcfc7cc3a8a982e5 SHA512 0328281a5b3ca0e361e98ce751f3a350b2f74e81ec97963843394619830c1d133c99937b7d0040d9c6084119cdc480ce631691dda247ac2fbdbbad0db7a1a178
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmbox/kmbox-19.08.2.ebuild b/kde-apps/kmbox/kmbox-19.08.3.ebuild
index c3a3f4454af9..f20a6e24dbb4 100644
--- a/kde-apps/kmbox/kmbox-19.08.2.ebuild
+++ b/kde-apps/kmbox/kmbox-19.08.3.ebuild
@@ -3,13 +3,15 @@
 
 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+"
+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 d91b70a8a86b..98034fe35ad5 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.2.tar.xz 147356 BLAKE2B 74ad73d2898bb2a593da137b25a4bfe1c65d11b8b5dcc92762bfa2b245df7c6a625035379691b4afa4277f0e077949489dfb5f3c8aebea9594ed340039908f89 SHA512 2c7b4332197c7fec915cedde4faf2726abd5ca1c0ae9c57642b35807cd9e75f1ef549802a71a6fc22515ab914759f3b01bc88ff964591aceb3c50b39de7b6157
+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.2.ebuild 385 BLAKE2B 81eb110afc07bd4f7b1082984e3c674d2e978409d27df3602f9ff88cc890d32a7f055ec7d21babb2a2c0b9e6a8ce5e17489309c5ef8ef117ecce934fca6fbc26 SHA512 065534cc0d151099eb69b6b2d44aa1c93b1166a31c93dd90efcc5c8bf8ff36279e30b1689be241878af97179bf041e9db36c14e0ceb498d8fdd56bfd969c7c58
+EBUILD kmime-19.08.3.ebuild 426 BLAKE2B 01711e530d2ed649fb86d7f8820aca5bde8e3926bec76ca84504cc957a906a460686d50ef925236a4d5eb3e7f629940fc042b2df26d18b14d2a3ce3ec0559d28 SHA512 cb3aa09b20cbf6018f167369e9952c9006aa9f0b3aad05209b9bd9bfb0462519d128f5bee1831345c6801817b2e0688500f9357d6ad3074569dfc8f78b908913
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmime/kmime-19.08.2.ebuild b/kde-apps/kmime/kmime-19.08.3.ebuild
index 74185b4ee1ca..1dfbfe5324e7 100644
--- a/kde-apps/kmime/kmime-19.08.2.ebuild
+++ b/kde-apps/kmime/kmime-19.08.3.ebuild
@@ -3,17 +3,19 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.60.0
+inherit ecm kde.org
 
 DESCRIPTION="Libary for handling mail messages and newsgroup articles"
 LICENSE="GPL-2+"
+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 3b2e1680bf16..9baadd9e09cd 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.2.tar.xz 898628 BLAKE2B a341f820073be9da4a1d000de4dda12220afe9edaca871758b09f829ad0ce07cdd89efbd6c242d8c329c4e76de639e919c336f1078daf045a04dc7af42b7c7ef SHA512 6bd15215023753cd42abcd9564f71ef98f303c9af80417ff9f18792cc10d70de0f84883538e0b22953e100428b8d6679ee253592ed336bd67caf43af09131138
+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.2.ebuild 771 BLAKE2B 3016bca31ad5c3fc8c22831ae58f84701fe7a3c4667cf212975c6633e293581d72c009cc881e866af7030845d8dc2d93a0b1ea411368cfd408b9a3c9c5d1023e SHA512 e9b812407837f5b1695773a90066422bf0d34bea440499800faec8b8a64cd95abe2ac60755bc4951458ce85a0e39310d33bb26fc060f94a2dd7d2072210751b1
+EBUILD kmines-19.08.3.ebuild 933 BLAKE2B 692a9162bd882bf426acca31939cd8ffcd3cb6184482a8f273b9d5ebb56c48577a7fcbdc110bf7d60aee7313b46db5554e99d807c506de417adbd24eb1d6efdb SHA512 88fda193c8c9d7dd444311b25a35751f1e00a02f1eee90791d54c83f5cf126953aa25f6f73c5fbd3a7b71e5b5ff9a9032b5e5262efc374d7664b61ed184554f0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmines/kmines-19.08.2.ebuild b/kde-apps/kmines/kmines-19.08.2.ebuild
deleted file mode 100644
index 5adc59c160fd..000000000000
--- a/kde-apps/kmines/kmines-19.08.2.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
new file mode 100644
index 000000000000..85ea0b01c6be
--- /dev/null
+++ b/kde-apps/kmines/kmines-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Classic mine sweeper game"
+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"
+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 3d4c0b70fbce..9e0ec5e7bd34 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.2.tar.xz 1005640 BLAKE2B d12fa3022ff6c9ab19f5485625180b9c1b5b6e9269640b2e9f03477ad3547d344eb2656999638cd9a4427f294a7f8c9979e38eab3275d875fb1b1c193a8d49c6 SHA512 79e6ffc966faa5586c711a1af094b4cddbc18e99531dd2849c79b7d9fa9a3603dfcedd4c375b60a0af30e33533a4317eb2c3f05dde53e81430ae1fd677d6a82b
+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.2.ebuild 1267 BLAKE2B 2e065e525d162347c27d01d27f4f42018c88c267247bb44622c180a85347ee3f0c7598236dd4dab16535cb6fe4e0e4aa30361b5faa0287e87a194c4381e3269f SHA512 a43f6dd48a8f5d524071d8d1b8d96ef33934b6bd05834faa7d7341bd4dd4ce9d2173659724fc3da5d0db1713f40a253343f0a7331da2026f2f796b12dbbfc23d
+EBUILD kmix-19.08.3.ebuild 1477 BLAKE2B 94dafe5f6300c17bcda00fe2903c5fc3f690fba046ec8df611f2481a6cf06f791b5bfa62ba7be0ca28a3b97dd76b2972020998f3a79488188f1c9d7fe2e396d2 SHA512 60edf234ed82f9510feca0325aab2d01eec7700b90173cc24eec53df7ef9caab6b1dc88c5462b232a7028f9a49859e516151a87c978f3e3f83284182baec8a49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmix/kmix-19.08.2.ebuild b/kde-apps/kmix/kmix-19.08.2.ebuild
deleted file mode 100644
index 8935712562b2..000000000000
--- a/kde-apps/kmix/kmix-19.08.2.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
new file mode 100644
index 000000000000..d98dd3412644
--- /dev/null
+++ b/kde-apps/kmix/kmix-19.08.3.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"
+ECM_TEST="false"
+KFMIN=5.60.0
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma mixer gui"
+HOMEPAGE="https://kde.org/applications/multimedia/kmix/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="alsa 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/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${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 )
+	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-utils_use_find_package alsa ALSA)
+		$(cmake-utils_use_find_package pulseaudio Canberra)
+		$(cmake-utils_use_find_package pulseaudio PulseAudio)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kmousetool/Manifest b/kde-apps/kmousetool/Manifest
index a7a8b57f7eb6..6c9539ac11f6 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.2.tar.xz 113528 BLAKE2B 98d8f88b022ddf020910d2d9dc75d6ee08e07eb6f90a86b50fb2321a80190822656ae09e3d704fd565ebbe4e27c3ac053c22e89a9bd32fd8c4a72fd8f8fa90da SHA512 a77de3d5a5e5601db7a276e4f14d11ac9d4a63a19231606fafcb959db34ce1d8232b3699dba6749fcf6f7f559f008b43e44e1cecf7746a7764695ec1b482f8ad
+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.2.ebuild 750 BLAKE2B a0eb85760ccb931b2e1e8ab28baa38ef90d55c8e9ef14ace968abe56b8a6d34f05e45a07abdd1c15140eef603ce1ecd993a2191ca4511bd84e0bc4fd305f7973 SHA512 f2bf1b85bcee7b5863884c301cfdab3be9bf5ad397f6884c0a7287b2d1bb8b6f1655c7edfb2cff37b06ceacc1edca76a7758a1244eda5e519456b588dda54561
+EBUILD kmousetool-19.08.3.ebuild 876 BLAKE2B c4c22a401225e646489500a62aca125695425daf7845e913c43507a2ba0aaf380cfb24f77202cd032f1e451a5ddc34daa9dcfdb716cf0858d56c104859d2ba22 SHA512 f06f5b4f696530ecc90d772136769764c1f6eb4aa8b21cd59685dc3aacd4987e4fabec31463ab7a72166038572d9445a37b6055f31cd08e5af9a3d22d16a392a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmousetool/kmousetool-19.08.2.ebuild b/kde-apps/kmousetool/kmousetool-19.08.2.ebuild
deleted file mode 100644
index 46abd934a5d5..000000000000
--- a/kde-apps/kmousetool/kmousetool-19.08.2.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
new file mode 100644
index 000000000000..fcf015a34232
--- /dev/null
+++ b/kde-apps/kmousetool/kmousetool-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 d91f26d4736d..10c2aa2afb87 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.2.tar.xz 1964932 BLAKE2B 4ca042dbf45fac4669b0777c0046f621e430aace9e53edfe76e802ce9bba1a63626c334efe271efba619337ba9fef05d22629adc30ed09ea77c9dba10372913d SHA512 19b08fb5e8da836f03fe2d15d2528613329c54b2d572375d6686f3293524cfe33b5596a4fe430e65eda8d715d7408391f423d17debca723270ab439ffc301c9d
+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.2.ebuild 750 BLAKE2B e66272fbc0d7a85dfaf8269d4bf16f85414a31958695e6a83ac2cfb30a50b474b61ff2cad070901652095bdcc9cfbe2f7dc798e91a8dab784fe870cece2159db SHA512 703f900f4e85cf1207446130d52649d64996fcbc568e8385f3de70926702330c3454fd753b6e8dcad7a60ebede409f3a06a26cd5fb1e6872b740cb8ea8426c7b
+EBUILD kmouth-19.08.3.ebuild 906 BLAKE2B 26ac5de39f9b456cf40b361cd7519f475eb1a4ba3fc91952bcb918e01685d8b34eb3b1c254d2b405b49cb1b4959009f805c49ab9750d3b7e068a1b7f5a402f7b SHA512 594cd3d2386420457c61732d52512134dd165fcffba08bc2b23e6cfa9cebd1a2aa0d0d3aef12b1e2f964ebb0f471c3b23a4feec63c1e3f51995f877027a71163
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmouth/kmouth-19.08.2.ebuild b/kde-apps/kmouth/kmouth-19.08.2.ebuild
deleted file mode 100644
index 2384c4b8c06f..000000000000
--- a/kde-apps/kmouth/kmouth-19.08.2.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
new file mode 100644
index 000000000000..789358a6ed7e
--- /dev/null
+++ b/kde-apps/kmouth/kmouth-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 8c2451bee515..c8860c427450 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.2.tar.xz 3054008 BLAKE2B ec203c691ba97bdb65b4a37aa76bb69a12c90d06572ec220904858fea5edc1dc7b5eee00b041491153d9836b425b9b3a762c4205ab67537902e501b50f6e08be SHA512 4f6f9f6d5aa3f995ac5d5b9173c90dc02427bdbcab0b825120d6281e6fadb7c3c3730abc347e882e6a854b462fa4dfdc0f807359310495e2c2bdd3124e59cb40
+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.2.ebuild 894 BLAKE2B 3b00e8bc5f75dd3885bd5da1d90c10f7a9c2ad39b4e336e650bd2b2497c643baf6b203e8be69ecd1b13d04f5d0a59fbccf65d44fd02b21d0667a5f782a4016c6 SHA512 7b6fa0c03f7e3ac076a50b2f17a830da9a02808620de9b971bbbac8deb8759fe55e0a10042e03ce521e0d4798779b3358c62b64da21fcb9ab0a7206098f7a63d
+EBUILD kmplot-19.08.3.ebuild 1074 BLAKE2B 4563cf7991e2c2ffe2ea04628750a6beb8478320af39d0d62ef66e84ea5f682c1e7f33e4333c3be7f2dd770a750ce49252bf8b224a2490ccb86205f0a1f9d18b SHA512 cab34a6c4c5356c24eba613200c402faf0a8f115baafc8e6ebc18ad3bc14b0c8d1ec66caaa219e2a4a308f303e5fa8e9b154c290ffb00997fbfbb91aa37edea7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmplot/kmplot-19.08.2.ebuild b/kde-apps/kmplot/kmplot-19.08.2.ebuild
deleted file mode 100644
index 24545ff4afda..000000000000
--- a/kde-apps/kmplot/kmplot-19.08.2.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
new file mode 100644
index 000000000000..797bb443ab97
--- /dev/null
+++ b/kde-apps/kmplot/kmplot-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 a06f9169c20d..5a1685d07657 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.2.tar.xz 1280500 BLAKE2B 9d522d6b3723aabf595af342f1d43efeefb5496fa7a97f586abd17f3595dc22510ed840892de6a1af6174da992feef803723bcf85d2b70291647ad5a56cf5729 SHA512 9f438467e138594b2d45e426d7a0295c07dc20508e21f0753b51de5394122dad9832bd47c1faa93b13f2d9d88909e7f46f16a9752fd9c4b8d39d9b9b8e6a754a
+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.2.ebuild 882 BLAKE2B 9685cc7d62dd3e92442d3ed4a7061445f4fdcff8587df207d88535a0de6d84ba1b98fd31d2f023bf8836516518a2f101e80eb6e6bf474823c46457486ffc12f9 SHA512 df7c1ca42ad0698987a5c22b7ca9041e912a63d55a75ffbce193f9bb46e25f2071d7942525056b13f3ef5b4912b896707df3efb12cad948b7fd48bf36ffa73be
+EBUILD knavalbattle-19.08.3.ebuild 1062 BLAKE2B d79dd4de7c2ab7b51684834d433519dd19b3bda9f27179f81b0f7e06c206ad6e2af9e3c23a0a7e626e4cadfa5a94c375daa12511f8a19b756b7d1f3fc42a4cfb SHA512 2c597ebdc515a58fed9155c3e30790d4f13984ecb453c9e92d678f294f8405092904cf26dbf35964c3d69813e58720df42158b87e178778c9a9e95d5cc5aafdd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knavalbattle/knavalbattle-19.08.2.ebuild b/kde-apps/knavalbattle/knavalbattle-19.08.2.ebuild
deleted file mode 100644
index 1533c0dde187..000000000000
--- a/kde-apps/knavalbattle/knavalbattle-19.08.2.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
new file mode 100644
index 000000000000..0c8364dc70dd
--- /dev/null
+++ b/kde-apps/knavalbattle/knavalbattle-19.08.3.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.60.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 255e7d7412ec..39d10b8adc21 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.2.tar.xz 1038336 BLAKE2B 2fad5992e40f981e56eac739590796b99c91ca0eba4d866bfcb3a2c45df4cf0a289327c3ef69216bab18d123536ae5d80c5cc2b9886480f8c3fbbaee031ed1d2 SHA512 b19c846f0d2c909f0f84d0bc04c10306761ea202ab24f9f11ddc03daede7dd01f182f25e172043d7e65b43027235b255815f4fb0a6709d1d5aee28657c0047d9
+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.2.ebuild 866 BLAKE2B 8d8af1057c844ffe5d37da3539c82b12ffa987fa3a7dfc3ed15cc8922a5702c440b3787d8bcad081a9fb1cbf29c5d06f29c8cce0a8666ad705fbae7d4325a4ad SHA512 bd96f408151ac450ed54b9b8444ff7d85bc841732e31118e56b9982b7a7aacdea8043b8d31628c76de93d4aa3311633e0c64a35010b7e68194a75aee5623a99d
+EBUILD knetwalk-19.08.3.ebuild 1034 BLAKE2B 8ca00685c8efd94ea31e87cb36f02cca004ed00cf3828d90e38b8c3cbf7f60ecdc7e0800f1d2484e388519d8360088159539a5d70b62fafa005dbc074dcc6cce SHA512 cdd0ed92d07dcf6b67dd66f7410808855f48c29da188d2a9a0ee41516011f33232b01b6c40b1c158f831333bb09c36b08995cd9e29707ce7a212890301f27ead
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knetwalk/knetwalk-19.08.2.ebuild b/kde-apps/knetwalk/knetwalk-19.08.2.ebuild
deleted file mode 100644
index e18ecc06e27e..000000000000
--- a/kde-apps/knetwalk/knetwalk-19.08.2.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
new file mode 100644
index 000000000000..57047b258971
--- /dev/null
+++ b/kde-apps/knetwalk/knetwalk-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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
+"
+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 d8a95eda536b..2da2d9913d17 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.2.tar.xz 3512748 BLAKE2B f992322747c7c7689fb5732f314bdeb47610215a744fc534cbb31bf471ecce9693d15304ca683c51a7ae8c00411a231ba5c359f01b385add58b2169e7db5ddd2 SHA512 f8471836f90fb3e3fcab1f6172e3b43f0673fd51acaa5ccb67c8b882d3a1096691c498c295987f31c683d59264476d0e394c90eafabf8bb2b1022e53821c44d4
+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.2.ebuild 1156 BLAKE2B 664a0817c3dd619a843abc9f4db6c7f6d0922ccce63d474467fbaee42c1290812f3da4b35c71c1c0c297b7737a5da8350f1c16f1dd7e7a96b2aa48cdf975c3a2 SHA512 288086e4246371b0ba93e4d4f2431ed9ee1b4863c7d12776920a1678493130c8507e7b30cf0d2083562c3f226fd0c25f34782e3c306eac8969b4da8f3ef338cc
+EBUILD knights-19.08.3.ebuild 1348 BLAKE2B 963311756892b9410d22092f43c40fd7b58c80146986b51abc6fdf13f45814fe68c33352c115091ac5e3740360f868584fd8b895cd706077336a5062599c4437 SHA512 276705ded2d4d45b8e1ea332395a1bbd211ff09a4b3b088718072b8aedfbbb27ecc4942f61a8dac8a1fb9807700039e377690f26cc1d34774712ef0682cbf68d
 MISC metadata.xml 437 BLAKE2B 9c89e54279e181045c5bfdd8cf6586306d84fc37e5f087ba3f3e2db62430ee6654cdc0181c3690105a6ecb33ad584f827e96585314a25e0b5016b1ed51d43885 SHA512 89b588c23e621805fab8a15724dc03ae8eeed23957fe19415c9846ad027ac80a1cebfaafaea0e6fbf2a27c785c4e6dfb81892bcdee1b40ac6af7cb5f8350e0d5
diff --git a/kde-apps/knights/knights-19.08.2.ebuild b/kde-apps/knights/knights-19.08.2.ebuild
deleted file mode 100644
index 140219545882..000000000000
--- a/kde-apps/knights/knights-19.08.2.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
new file mode 100644
index 000000000000..f8997e247776
--- /dev/null
+++ b/kde-apps/knights/knights-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Simple chess board based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/games/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 e3ff755094a6..c3b16696266a 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.2.tar.xz 319280 BLAKE2B 6c9fb39924b45499c0f41a6c2202e46d43bf122f50390da053cdacbe2576b5f5487bd26f7e1b0a2ba328cceac6659862ff6d1b05ae85cfe433fc939b9daf3252 SHA512 3def23dd0837fcc7632a6c1835c499b39d5baa1ae89617ea76f3d4e64ca009daca675e61fe2aa58680f35470b5ae883fad9740ecd267b8b54a3d744d47d7cfee
+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.2.ebuild 1857 BLAKE2B 0ee355881ddebc64779574ae2ec2d1059d412f3c224c8abd85d706d5261f18cd0d71144321da406631a4752bb72177560efc0d313d9b24ce84556769d654993c SHA512 6930bfe00ca96edcb86f7423872fec579eeb0010692d4a5137953a280eb6b19d8995a5156ed62a7aaa6a8e9acfa346b93a4f58246a6bfe2bdff2a04d0229af35
+EBUILD knotes-19.08.3.ebuild 2111 BLAKE2B 93cd622f429b4fbe214a4fe371a20c63dd231bfaa5764f407886ea90a88ebf17140a27e5de20782bf447acbd07342395434f010b59d83cf95a76ecc7e0f518b5 SHA512 c102fc3ae821629ef345bca60df24dca71be68a0cdb0ba0c9a7e2a9d77a0959c0de7824d7d4fcd5277fb681daa5c8d934869cd28982e7cc98b97a783532b61b8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/knotes/knotes-19.08.2.ebuild b/kde-apps/knotes/knotes-19.08.2.ebuild
deleted file mode 100644
index 376bfc35c6b3..000000000000
--- a/kde-apps/knotes/knotes-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(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 grantleetheme)
-	$(add_kdeapps_dep kcalutils)
-	$(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
new file mode 100644
index 000000000000..bba43d5a8cd0
--- /dev/null
+++ b/kde-apps/knotes/knotes-19.08.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Note taking application"
+HOMEPAGE="https://kde.org/"
+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-utils_use_find_package X Qt5X11Extras)
+# 		$(cmake-utils_use_find_package X X11)
+# 	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kolf/Manifest b/kde-apps/kolf/Manifest
index fb8bf30426e6..f7c7ecc474e2 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.2.tar.xz 1026416 BLAKE2B 1425436088f22409ed3c88c1ce557770368b3f8f71051514b644f33b539473766e801397353ab7ed772fbf1d02c7e36f0ee5fb4e23ab12b4ba6db612a89d0736 SHA512 456ac17fb28a4bfbb449f31c2400fcfbac5cd5bf0d3596d359eae69b05c89adab517bd2cbbf83358d529bf228ba217f0d8c6fd3648013762dab9cfca1003ecef
+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.2.ebuild 836 BLAKE2B 18867cc4ce8ac61619f1313f76890a0d4f93b288661727fcb939fac3e5e3e4fb7468807cc58149c4ed8356f8cb3a09624e7a46814e7413e96e0f733b77b1da70 SHA512 7f47c5e34cc06020108bd47245ff229bc6f5d12207b2038599e65c1ef057c91aec64d5d1eec92aca6d6e1837c872cd65653e9eaf94dd7cd9cfdce5927118e268
+EBUILD kolf-19.08.3.ebuild 1010 BLAKE2B bbe0b5384e845b84ed5425368aeb0151677316e0ccb74a19b1dfb84f486341d5ef58e65fc621511d165a0f2a47cae1be8fc93a1d09e94aa14414d8d5e611aec7 SHA512 fdd0fc42070d239287abd8f34aad48626939476c084416e5283299900278efb56f2f9d48160746dc73a6066d04581d13b5b48c69ae6d822f0d5c044142758130
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolf/kolf-19.08.2.ebuild b/kde-apps/kolf/kolf-19.08.2.ebuild
deleted file mode 100644
index d0930c6a2dc9..000000000000
--- a/kde-apps/kolf/kolf-19.08.2.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
new file mode 100644
index 000000000000..664b1b1905ce
--- /dev/null
+++ b/kde-apps/kolf/kolf-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Minigolf game by KDE"
+HOMEPAGE="
+	https://kde.org/applications/games/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 4758eb4f9d58..9bd6294fc8fb 100644
--- a/kde-apps/kollision/Manifest
+++ b/kde-apps/kollision/Manifest
@@ -1,5 +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.2.tar.xz 280732 BLAKE2B 3946acaf54ad6f13911812d628726cb21f731fbfb691178380e3b04c783a4570b934562c7b5b67adb5ead9e05a6f5b0f044ff5a90971a5da5fd55846e1c5416e SHA512 3f53ddda075ccc0afb41d2a85db7fd2192fb6c78703b11ea09969f77c8c860efa45a86aafb870d911fd5d5486af280fa235f9ba204f42539d2bbbe61d7dbe921
+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.2.ebuild 679 BLAKE2B f9d7ff84e6b10a880da47d3e018604b06050d7cfa8cf1ae307001427d3d95849a3a6d12a444284dca4adb6fdf6c78fcb65c1c3674e1d2bc0b75d81055d6dd736 SHA512 a9df202ebc4716181f5324162b66136ed6b0e7dc92a2a41d379b92a20f05c207169738273be8e221e66d687cabbb0a85855b6592081e6112dc1c1ce26633414b
+EBUILD kollision-19.08.3.ebuild 881 BLAKE2B 2abb98a539f43d322bacdc0a18645802373bbc289dafa034c4526e0b9af43d209512204e91f622cb4a61218a4a52a90e3047033d33bf51288e9a47b6ab5c0b7e SHA512 4e860047d1a32dd1b97d4fc02da8fc89f95af82e8390041177d8ca7b97c3c58d3747edfe6a19e5b7d76096a0f4b8e42d7df0403c47ce965b6bcb42463cba86e6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-1.patch b/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-1.patch
new file mode 100644
index 000000000000..8995827a83ee
--- /dev/null
+++ b/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,56 @@
+From 77958df9caf1c12ff92380ea4ea382572c2e8447 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 17 Sep 2019 13:39:36 +0200
+Subject: Make it compiles against qt5.14
+
+---
+ animator.h | 4 ++--
+ mainarea.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/animator.h b/animator.h
+index 3fc944e..5a501f4 100644
+--- a/animator.h
++++ b/animator.h
+@@ -12,7 +12,7 @@
+ 
+ #include "animation.h"
+ #include <QTimer>
+-#include <QTime>
++#include <QElapsedTimer>
+ 
+ class Animator : public AnimationGroup
+ {
+@@ -27,7 +27,7 @@ public slots:
+     void tick();
+ private:
+     QTimer m_timer;
+-    QTime m_time;
++    QElapsedTimer m_time;
+ };
+ 
+ #endif // ANIMATOR_H
+diff --git a/mainarea.h b/mainarea.h
+index 782ad21..2a6bae1 100644
+--- a/mainarea.h
++++ b/mainarea.h
+@@ -11,7 +11,7 @@
+ #ifndef MAINAREA_H
+ #define MAINAREA_H
+ 
+-#include <QTimer>
++#include <QElapsedTimer>
+ #include <QTime>
+ #include <QList>
+ #include <QGraphicsScene>
+@@ -35,7 +35,7 @@ private:
+     QTimer m_timer;
+     int m_lastTime;
+     int m_lastGameTime;
+-    QTime m_time;
++    QElapsedTimer m_time;
+ 
+     /// time interval between two balls being added
+     int m_ball_timeout;
+-- 
+cgit v1.1
diff --git a/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-2.patch b/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-2.patch
new file mode 100644
index 000000000000..d665345c7120
--- /dev/null
+++ b/kde-apps/kollision/files/kollision-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,24 @@
+From 09de155160c41b2746623a3e4b338da7d79f553a Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 30 Oct 2019 13:33:41 +0100
+Subject: Make it compile against qt5.15, This enum is unused
+
+---
+ mainwindow.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index 7ac41c8..ad453fe 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -29,7 +29,7 @@ MainWindow::MainWindow()
+ {
+     m_main = new MainArea();
+     QGraphicsView* view = new QGraphicsView(m_main, this);
+-    view->setOptimizationFlags( QGraphicsView::DontClipPainter |
++    view->setOptimizationFlags( 
+                                 QGraphicsView::DontSavePainterState |
+                                 QGraphicsView::DontAdjustForAntialiasing );
+ //    view->setViewportUpdateMode( QGraphicsView::FullViewportUpdate );
+-- 
+cgit v1.1
diff --git a/kde-apps/kollision/kollision-19.08.2.ebuild b/kde-apps/kollision/kollision-19.08.2.ebuild
deleted file mode 100644
index 8cd239d19fb8..000000000000
--- a/kde-apps/kollision/kollision-19.08.2.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
new file mode 100644
index 000000000000..c36210ecc3ca
--- /dev/null
+++ b/kde-apps/kollision/kollision-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Simple ball dodging game"
+HOMEPAGE="
+	https://kde.org/applications/games/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}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
diff --git a/kde-apps/kolourpaint/Manifest b/kde-apps/kolourpaint/Manifest
index a75097b7cc2f..9c7c2338619e 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.2.tar.xz 5655368 BLAKE2B 25310ad61a1e652457132be11e04ba043900acfd38eaaab49798d4d07e60d5f140962bd9cc27cdee2c883b0f4d7522da8c199c9b0b82b769306986790eba9d78 SHA512 beaf80f8cdc13f23ad19e0832fdb7d95d17fa11a84137e0d2c84c8f5fadd57e4c6cfa03583ebfa52d2c55923dfd9802362f63e04e59829ef205947033b47590f
+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.2.ebuild 1051 BLAKE2B 5feeb360b49c436df12f080a47e847ad8fa04a5013c231f27ba10b5cfc084229df8586c0011eb7ee761aa2bf97346684e1c89fc31547869337b72434b61d13b6 SHA512 e5f70d737041ef65ef0589de38d2f69de8f86a563f9b0fce4e8d920cff60a66a2b6441a4395d8cc67b22f8faad8721ac2dae158d5c2e808f770380896f61132a
+EBUILD kolourpaint-19.08.3.ebuild 1206 BLAKE2B 7fb818cfd4bd648c69b5b173bd3bb2b16097750c41b89073c377a2c869246b12427926f4f91848310b1274498ac2fb23141d2b22d3bc3d1a9909e311b853568b SHA512 ca5e2d2330a55ced466be2c29802cf77dda2abf3ea7e4deffab69cc90254215b76cecfcee097a997bc87a12c5f2eef059e012ad3d544d04269b169b7d823ccb3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kolourpaint/kolourpaint-19.08.2.ebuild b/kde-apps/kolourpaint/kolourpaint-19.08.2.ebuild
deleted file mode 100644
index d36c8c7865a0..000000000000
--- a/kde-apps/kolourpaint/kolourpaint-19.08.2.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
new file mode 100644
index 000000000000..0524d9a1a609
--- /dev/null
+++ b/kde-apps/kolourpaint/kolourpaint-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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-utils_use_find_package scanner KF5Sane)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest
index 8dac4774af07..b7dd60c2f9f1 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.2.tar.xz 801976 BLAKE2B f99847b2a9ac4420116b9fe22f604981b7d5ed6e9c53f3251e31f07a944fa5d4d50c6f6e6ae32a0ab76af9630d7a3012c2bdd25995a6c4047a13c6e4763dcbbe SHA512 4967040ee0788e4add8b0a10cda76d8e67c289674840286652d7aa62ad0d0456c2e487a05f065423749eea013ec8960c9e308501c9256bb2f3371e3da242947b
+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.2.ebuild 922 BLAKE2B 8376252c2167bc57e594a96bf55ea557d33f9e8732df8c62965c05b02e94aa4a489eda5f8a38910379dc3f52c54b30f4445652cdb6c93f6f440300bc8a347ed9 SHA512 eac21e0ccde999ee22b57c69fefee9fee57913adc98135b71948dc9e2180f1fc650bda8e9f4fd52a07cb2045779017528ea050fed5f1f3c73f8008c59ec8d523
+EBUILD kompare-19.08.3.ebuild 1120 BLAKE2B 91630c247620b43393a093416ad6773bd6994e7ffcddf4e466bb9b028087b29b104bad36fdf71622fb42d9776c443b1a74f129923e5f0dc6556a46ccc1a8be2d SHA512 7cb39ac3122f12190beb8f62a7bcbc904e0da8ccdc7f6d592a75148a4de8b29b982593c2aceda1f18a375057412670d9b5a900cab2425cfcb858579e8cbcec4c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kompare/kompare-19.08.2.ebuild b/kde-apps/kompare/kompare-19.08.2.ebuild
deleted file mode 100644
index 70464071af8e..000000000000
--- a/kde-apps/kompare/kompare-19.08.2.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
new file mode 100644
index 000000000000..49c0893f2c10
--- /dev/null
+++ b/kde-apps/kompare/kompare-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 ee883a3e8c9a..18fd9185c617 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.2.tar.xz 7610208 BLAKE2B 44a5f1e4b13c03e4413d100d72b0a3ba7cd1691d4a14ed29f59f2dbfa621ee1889e531f259f618bff171595dcd9b7169c4e74fc9d9f28f1530f1193020c413b5 SHA512 0c1035082716c20232ddcf5c28b0ebdc61225beb4ac604c58e035b7212610f8e94bbabe4e1f8d2c2fcbbcc16a8037d6da6651a08cbfb04a729209aaa27180ac7
+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.2.ebuild 2993 BLAKE2B 1931af494e8f39ab6e5f419c51ff2f6faf7864f5e70a46b62589090d11cd9b1b8a2ac80e271a364513194407bef0a39e676d2deea2c975fa5189b6540fc21531 SHA512 ff04c09e151e3aacffa5f3734ae411a56650bdeb8191e98956415dd6f25f0a058b98f74fa27b300ad61b7d2b56d6d86387836da22857b612c1d09a2396852afc
+EBUILD konqueror-19.08.3.ebuild 3324 BLAKE2B a6f7d7e26ae70fc9ebba6318c0e9632b3033409898b83ce009a2bd23e178e319e77e6d8f545e4fc3517506119826df7df1886665cb3de97ba4614956c62f418d SHA512 aee4d451a7cd6f0f7c0f77c65295de95074710d2f788dc561ca92662f5976bb993bbd21a6696adc8fcac272162f1ead4df575bebf2f3a5872bcc1750882d353e
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-19.08.2.ebuild b/kde-apps/konqueror/konqueror-19.08.2.ebuild
deleted file mode 100644
index 1e545b7f4b1c..000000000000
--- a/kde-apps/konqueror/konqueror-19.08.2.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
new file mode 100644
index 000000000000..b65450437434
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-19.08.3.ebuild
@@ -0,0 +1,116 @@
+# 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"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+PLASMA_MINIMAL=5.16.5
+QTMIN=5.12.3
+inherit flag-o-matic ecm kde.org
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="
+	https://kde.org/applications/internet/konqueror/
+	https://konqueror.org/
+"
+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-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)
+	)
+	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 6f96486930bc..bdb6a35ee0f5 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.2.tar.xz 658604 BLAKE2B 117be77e6742f1f5ad54f0f2b35dd59898fc7e5aa9a87edca4a36532017bde4311339e1e766175deb24bec2236ecc539b161f8f77de7a24f3760eae618082019 SHA512 bb5e0b6c1b17b64f54aa74907a5a47bd15ddeb0c3c10093db0bc80a014e1bf82d70c455728c66fe0e6b34dc2dc776adb68ef48f6a9ee910b3326da41b16f39e3
+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.2.ebuild 761 BLAKE2B 9ab8ab13404bb5d10dd0fea2b266f6003e06df6c58df8e9178578f60221a6ae2f7ce87ff99924989bd288434cd50125e30e1c176b9845b9fd719e6b1192ac0ce SHA512 a6eb07071412548d1d8af03c4fa9fcda74d22c6b277c4f58a5a14959df4799c72acc3fc17829fc6069bade699941c82699d8c1360cccf402f378e1f4f6d07d74
+EBUILD konquest-19.08.3.ebuild 923 BLAKE2B c5c899e38428aecdfaeb92b0f641894bfaa762c7c0c972e0831962bb614067783bb486d64000a9ff72df52421100d1ed6c94ee33e8269c4ac542ab5b4274870f SHA512 8303ebab96a6bf1ede73f071e3a06edd80644dd87b8b04092b4d1b7115160ad85107f71d61e4b15c823df67ca542c856217c5022da9bebcbdcc6fbf75d1ebdd9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konquest/konquest-19.08.2.ebuild b/kde-apps/konquest/konquest-19.08.2.ebuild
deleted file mode 100644
index 7985faf9f3ca..000000000000
--- a/kde-apps/konquest/konquest-19.08.2.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
new file mode 100644
index 000000000000..4abd1959a783
--- /dev/null
+++ b/kde-apps/konquest/konquest-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Galactic Strategy KDE Game"
+HOMEPAGE="
+	https://kde.org/applications/games/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 261fccade048..47dbac460259 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.2.tar.xz 1144976 BLAKE2B 1688d3419a2b10405e4301f600c1d45cef5480944efb8c4b7c8d7baa7215d2475e0a752d455f51f6c7bd1a8c4d7baf9ae9dedca07a1cc65b62ccb0016214e859 SHA512 b781e1e6a19b81a49722fa04d568a53dda2c22f72ee197ebf7bacb9142d260ce3071a12cfada905d029dc2ab43a047205175cde5906a4033fb8bdd20876c1af5
+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.2.ebuild 1422 BLAKE2B 227d1d1f91d4bafe82f8c7f9b583eacc5815352906f6a03a6224f6eb4d1ab4da406ff16352fa5a9368a46871448cbb561dab83e493bc597b93d15c0b64159687 SHA512 8f2b683d030c682f2ed471298bbd11a20a50a525e6059384909652339ee09d99234987b935857a6be7d8546f6566fdf2f1d451a928f524172edf7d898b5570b5
+EBUILD konsole-19.08.3.ebuild 1667 BLAKE2B 07cab1e962a2585b7d089f9ee0b7c05a6010225f598d6871179e9b5f64a32349142eced7bd813c8ba992297ff1fe554b80fa71c86a0aefe6a6be9b0a39f74d19 SHA512 a2a897935ae53bc97460f76810fb70849686da7a5d032f4b59d526be9f89ec2340a9c59a2d280216f809ce0bc5e3c97c23d01b272f979c9c43ce752a0b162edd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-19.08.2.ebuild b/kde-apps/konsole/konsole-19.08.2.ebuild
deleted file mode 100644
index 260b1d755126..000000000000
--- a/kde-apps/konsole/konsole-19.08.2.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
new file mode 100644
index 000000000000..1f6d3ecd4d4c
--- /dev/null
+++ b/kde-apps/konsole/konsole-19.08.3.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="optional"
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://kde.org/applications/system/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-utils_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/konsolekalendar/Manifest b/kde-apps/konsolekalendar/Manifest
index efec797204a7..dc916d852c81 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.2.tar.xz 224508 BLAKE2B 05dcffb5eb960f4bda16075e8f729089390e76b32f0ca6e6ed9a380a69c380ec6796a2a801a04a49a00213cc2891ce3dd01dcb39419f0e13d80bc2b6f0ca0809 SHA512 ff57af694d8fdd6c3bf08c0bdfb58d5cf2e54cccc74fcef1a74321fd1109b2fc0f4a902597fd2461fe91e6e17dd457db50f6b1d22b468afd391175cea0822627
+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.2.ebuild 917 BLAKE2B 6569d9cafc679dc7d5c5c69506889b9fcb7a20eceabf998a7cde7bf39865fe6806a0b5a662649ed9472a613f17346d44250f94e69d0d6881c3f536b8de9e67cb SHA512 38cf6e31f6c2849548bf41888163f115b79facecc735d7e53df82a04b568173292fb51f2ffe955ebd1a98135c4c19f117619033a21510bbc8dd30db1a1d12b9d
+EBUILD konsolekalendar-19.08.3.ebuild 1008 BLAKE2B e913a9658ad77ceab3df743350b791d8b95106a0eb6a902ea7c7495ad8113dff5774867eabb69f6dd5c18b27787cc7382bf12e4550b67c37186edc8a88ebf265 SHA512 c96092a978605d1006130755857c4815523b836fb51214c77fbc6cea3dcb5da765f1d1492f869f630b5869f457f5aa3ce6518e118c36d9a3c5a79d286cfef94a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsolekalendar/konsolekalendar-19.08.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-19.08.3.ebuild
index e73da819da7b..d59e0d58720b 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-19.08.2.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-19.08.3.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.60.0
+inherit ecm kde.org
 
 DESCRIPTION="Command line interface to KDE calendars"
 HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcalendarcore)
-	$(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 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 2add6e3a1f5f..c3e27f9fb559 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.2.tar.xz 794412 BLAKE2B c802f8cb78f688af1d83b8903480bbf6e9429b13418a6576aae3163904f30d0b411d8390f51c3ea39e858068b81f086afe8587bd615fbe8df3acf5f5f85ef60e SHA512 984e71f7cd28b5908441c8f36559e1669ef8719860af9967cb735906f30231ddbab9dab4aad9bfaba3e9394f621a0d2647f560637e9870355ee9ad383b0458e8
+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.2.ebuild 1207 BLAKE2B d8d9a9f41f853f7a4e0075237985adc91ecd341ff222e5a40f5f9ae0264af637c502ef8d32881b584cbc9bed567c7efc7b0f87cd6b3ff8b77836720b30ecc046 SHA512 31a541f5a23ec4081b186b86358d923a67911ddc7dbb1c1ec0211b0340db76434a511506c59b3890b08de0f833b476d570d90852a257b4a057df280298bf2162
+EBUILD kontact-19.08.3.ebuild 1404 BLAKE2B 61b1545bcb481851b9558f69850143f307bc17ec16ebfbd7536be9bebbb755b460d2720a63224f01848345954dc9511186d2950383627262fda22be3acb9634b SHA512 dbbc388a340ebf895ed4595b6d01e3b18b51681a114da4848a624672953bfbbabef956d5cb708c6f71fef0448c596ddf5339d425c1d62a60ab461ad56bc313d8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontact/kontact-19.08.2.ebuild b/kde-apps/kontact/kontact-19.08.2.ebuild
deleted file mode 100644
index 0c785c30110b..000000000000
--- a/kde-apps/kontact/kontact-19.08.2.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
new file mode 100644
index 000000000000..7d015af34bdd
--- /dev/null
+++ b/kde-apps/kontact/kontact-19.08.3.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.60.0
+QTMIN=5.12.3
+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"
+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 6063d32316ca..f4266ca9fc8d 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.2.tar.xz 33188 BLAKE2B 861fd4837c022aa96c78ac9116924a5c6dc2573f70dbd1de4782012c344f1b56f1333e679cb157796c34890eaf8492ddfefa7fc0e231db66c3d3e7ba107c3913 SHA512 7856a72027634596eebe5f3b5b359615be736b610f92c8dd5e935f3489a24e02630dcdf0166948e9fafc242fa8a1bfc88f492ecb6c6a694d0326136e88667e2b
+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.2.ebuild 598 BLAKE2B 411bd40ff805877095190de3414bbfec0237501a01752643dc93890ce43048b54e324cbfe0279773fe35236f8b27f6f32dedeca575f4f8d9c97f8256d235ff92 SHA512 86732064137d60511bcd15ec0ea843569ba3fb3101724126094d26a9178405d263fd339f37c7f96c86c2c4ba42a7ac65dfd8e1b0252fc2947de36c2291f5db31
+EBUILD kontactinterface-19.08.3.ebuild 700 BLAKE2B 1c1498c9ff13d4e331dc1a3e492f86d2c033fb8471cace962e257c76d32b0bc3df3d86890f5f075ecc66268ceae97541df571c745425ee865a9cde21af0faa98 SHA512 8cf416718bfb967ef0523afc403d803cdec275fae171d04ebab33cad218bc9a0c780be89cf1e0b39c1921fb537b1c75363cdd8f6b308900d2323288d106871d1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kontactinterface/kontactinterface-19.08.2.ebuild b/kde-apps/kontactinterface/kontactinterface-19.08.2.ebuild
deleted file mode 100644
index efc7e0dec390..000000000000
--- a/kde-apps/kontactinterface/kontactinterface-19.08.2.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
new file mode 100644
index 000000000000..a743fd5932d1
--- /dev/null
+++ b/kde-apps/kontactinterface/kontactinterface-19.08.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.0
+QTMIN=5.12.3
+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"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${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 96402dd052f5..a5e6bea2a66f 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.2.tar.xz 9350652 BLAKE2B 0333c8270c178bf65a75286b07c7bf826ced5992523678f75a96ce751e373c5b3acc4829ea65a595fcbf1a5ac37c7bf32cf1f1f1344235a5cd5ef9c8e876efab SHA512 2bbedf09e41e83cd34f6fc8acadf44880750c08ca95ed514dd0718d9ab95aed6198a8179c9df26110338ebe350efd5d557015fabc269b79202da5d4d8fc63f81
+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.2.ebuild 4500 BLAKE2B bf208e37e0ce9a493a9cd8be89c174b55f1353ffa64d67483c6351720fa2de562a8d8dd5b80b9699bb21678223d8cc7fc59542bdeda87be700bacd795709f9b4 SHA512 6dda14cd7096148c9bd31bf2066ba8cb5a608f76072af348bdcc032b98806b0fd35da3d7d89320ddcb97420b7e90967da642567211e7d14a8ba856930a1bddd2
+EBUILD kopete-19.08.3.ebuild 4720 BLAKE2B c7d52f100307ebad824057d2b3f9db11667d7793a901bbeb2d307a4bfe649fc9d797544c5f0fa343d37b18ffa841be3108ccf232503ed26d4a62f2d7225a3045 SHA512 f26d776becf380e68bc485f3106826208136bca21ffc7b1dac44fa3669a8085ca98cf929d1be59b41a7e0cbdf11bd95892c1600dd69d7b95596b79871a255e28
 MISC metadata.xml 2161 BLAKE2B 84471657b718896fb48148e88a6d42ea8779d0a34a459a1a134b6a2d5ded707ff3348857521e96d5f7643e100b249aff5b2e77bec686991511851f1890a7764a SHA512 e884576673c0739b0a3b2a12e6cb33ac83da1b99b6f2440f78d6cdd7689cef7622ef7db44bcf6246311754246c0f896d3ba4f5d46580ed5feb365ebafbe910a6
diff --git a/kde-apps/kopete/kopete-19.08.2.ebuild b/kde-apps/kopete/kopete-19.08.3.ebuild
index 136f7458ce7d..b63404fc64ea 100644
--- a/kde-apps/kopete/kopete-19.08.2.ebuild
+++ b/kde-apps/kopete/kopete-19.08.3.ebuild
@@ -3,12 +3,17 @@
 
 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"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="ssl v4l"
 
@@ -58,27 +63,27 @@ 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 kcontacts)
-	$(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 kidentitymanagement)
-	$(add_kdeapps_dep libkleo)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=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
+	>=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(+)]
@@ -108,8 +113,8 @@ COMMON_DEPEND="
 		sys-libs/zlib:=
 	)
 	zeroconf? (
-		$(add_frameworks_dep kdnssd)
-		$(add_kdeapps_dep kidentitymanagement)
+		>=kde-frameworks/kdnssd-${KFMIN}:5
+		>=kde-apps/kidentitymanagement-${PVCUT}:5
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -161,11 +166,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/korganizer/Manifest b/kde-apps/korganizer/Manifest
index dd577fd95091..0783300dafe8 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.2.tar.xz 2225808 BLAKE2B f255cc2d30f624a37025f6521e54bfaa7d2146851ad2583155351cfb89487f308a5011d3ed8074ae1482679619ed29864a02da39cb8e9058b8bc2a6cbf3aa4f1 SHA512 7b73444ef6b7d094a0d4bacdf642abca6ddcb74161e8ba8f4665d13739f8b4b080b8033bd7a18062556ae616b8c3214f84285ac202f4a17627580646ede86eee
+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.2.ebuild 2507 BLAKE2B 464353af58f2a01708818b7282a07ac7c71e7a305d26458ee1b9e8ecc17e25f042c4960b1e27294957d6df29fef9b30fa727d7b91522bbba865ed8aa39e5c5ad SHA512 3b786b1ae842c66a5c4fbc278903e1d3c0ac473ed932be1634461ce6477b6ac4b564706262109d001886e44ddc59ab9a53db093aa3db24961c2b5f51ca05cc7a
+EBUILD korganizer-19.08.3.ebuild 2813 BLAKE2B 321e49549a607f1f56fa3244e671b3762cebf2ebf798f725f1f4f62ade50edfc481e8dee03978d3a3369c3f3d52121b96719dea67bbc9458373b5975810e37fa SHA512 a13fef4191a56120ad94ca65708682d1ca89d7b113538e819c86f2108fed788288bb28dd3bedd35f36ee615b5936e477cf408feac3d8f52194f7dd766548d55d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/korganizer/korganizer-19.08.2.ebuild b/kde-apps/korganizer/korganizer-19.08.2.ebuild
deleted file mode 100644
index 027eb9faa002..000000000000
--- a/kde-apps/korganizer/korganizer-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 kcalutils)
-	$(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 qtmultimedia)
-	$(add_qt_dep qtwidgets)
-	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
new file mode 100644
index 000000000000..7eabd1e6f519
--- /dev/null
+++ b/kde-apps/korganizer/korganizer-19.08.3.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="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
+HOMEPAGE="https://kde.org/applications/office/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-utils_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kpat/Manifest b/kde-apps/kpat/Manifest
index 6b30d914acbc..476bf85d0d2c 100644
--- a/kde-apps/kpat/Manifest
+++ b/kde-apps/kpat/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 3577248 BLAKE2B 4bf2f59c41a4e9b4331136378ef3bc0ac7d45181ee5f43e20fc1fe959339ea2bb5ed67b3d9fbed6c42b3dd009769c276cdad49e460cfaab7c95bf3bfdf5ecc68 SHA512 4ac8068a5f8eb7385245a9accae9652eb8c0b1919f5b96995968f961288e36dcaff3762cfec3e5a307601e3df0b1d31942881d8d90869a8a930c678593b17107
+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.2.ebuild 859 BLAKE2B 98847c8b817d02930a8b07f55b7b2c3b719bd18bf7dc822bae87360f42994bf41f1d57aed725c239e0b452d8a57317c2183298011a7a1dfc27068bd0a6a54028 SHA512 2a11f535aa08e26f4940abab00647b8143dd1615564035e17f1ebea88792dd389c8d879cf4c5ead84bae34fef3d8533d6afda99e2f699bcf28d55da1a143b26b
+EBUILD kpat-19.08.3.ebuild 1045 BLAKE2B da8673f073e5eed56ab9542f1162012396d40a680c92192fc200cb3cf693f17b0e2afd9a04b27cdfd37259b6f1f64afc156029fb43f9459897418c80a1b3e0b4 SHA512 e820614e56824e7df8da5f181da9e3db300ed087cbada0634ce9e2259e17964dbbf8d620a8d4016a4092e88dcae32ad314668caf9eff960969a5b56363aac7b0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpat/kpat-19.08.2.ebuild b/kde-apps/kpat/kpat-19.08.2.ebuild
deleted file mode 100644
index c11a0502692d..000000000000
--- a/kde-apps/kpat/kpat-19.08.2.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 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}"
diff --git a/kde-apps/kpat/kpat-19.08.3.ebuild b/kde-apps/kpat/kpat-19.08.3.ebuild
new file mode 100644
index 000000000000..ad66db73cfb1
--- /dev/null
+++ b/kde-apps/kpat/kpat-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE patience game"
+HOMEPAGE="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 9db7a34e6b96..963e483371b2 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.2.tar.xz 155012 BLAKE2B d763edf6ff2476124541d4f00532e3d6c203549d4afa39095a8331afe1180d9e6c351b72199990044ac5bb89d120e566c1eb986bd6aa9d3f68973813ae16817b SHA512 ef28ec4732fa1322143ded1f4efa27f15111cef2d038d38454b9cd22d32219f63398d764cf1a7cbd29635e9885c2d16463a5b345c22be3b2ea2937727fbff061
+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.2.ebuild 994 BLAKE2B b722a0fe39375427eb0b2a32af476712e81fbd6c33634198c632d9f5675e6ded9a0445e52bb30c8909feb5d2a77b91b4b1292da319b03664a74388a90cb71d9e SHA512 3d34f52ef2e7d017d2c7cfc52caf761d5acd09d76f09e1da924df47143098ec2676b4c48678a898d6da8c4be5a9016e4aa4a0895ba9501d8971b48382675c120
+EBUILD kpimtextedit-19.08.3.ebuild 1138 BLAKE2B d960ea2d1289af466868dffff4cd99502af723a66da4645b12e092bd7b25fc6085675482d7b6a91245b0382899ae08f9b00a99742d137ac57d9b4b20ed622b5a SHA512 34fe6ffbe5cc2d69de80db43dc1b394828fd8ba39f47f07fcc8056ffd6a08f75c80f0241ef81508cfbc124c3cbd24939a0c1414be06f88281a1b997f718ecea4
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/kpimtextedit/kpimtextedit-19.08.2.ebuild b/kde-apps/kpimtextedit/kpimtextedit-19.08.2.ebuild
deleted file mode 100644
index cd5729223306..000000000000
--- a/kde-apps/kpimtextedit/kpimtextedit-19.08.2.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
new file mode 100644
index 000000000000..efe06fcecb00
--- /dev/null
+++ b/kde-apps/kpimtextedit/kpimtextedit-19.08.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.60.0
+QTMIN=5.12.3
+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/kemoticons-${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 30aa91c67106..736fc567a736 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.2.tar.xz 23232 BLAKE2B a603d6834f599ff7113e1bd246315ae8c5bebb7729b40cf1ea89ced8fe9508b56ea727ef310db60e45780beab80c492c9fe034f0d7d222807cfc9de098607261 SHA512 08fbc091cef7a0de2fa091639edbc10471851e5bd3a27ee7538515149c57256769e017b2b3879dffed38ec4463c1fd74fbc66d61cfbcc3c5b418fc76729c797e
+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.2.ebuild 472 BLAKE2B eb5cd545e5b4c2d0dbcf7a0c10c23ecba932b9e0dcd56affba06bb8cb0bf143f8e68983837b1e891312b4800191b9813c3833c835c8c74d86db03d0d685a4f2c SHA512 5c528afbdea9343cf00df8c2c7ec05f251dac68f8eb8939fe3b911e3e68e2cc9ce12abb35d4ff8fbac70d02c2fdef04f237a11370a99a17ef4c230b848b63657
+EBUILD kpkpass-19.08.3.ebuild 526 BLAKE2B c98f0831a7e216948637f8d1cc9d2d8dc20dbb23067b23592f246fb255f03c8e6507041c7933a125b18a5254974ae8e9a24f6ca6326a55b1ba7fe01a5ea6e163 SHA512 c1325c1454f4df9bce55446847fd7312a2584d4dfde10dd6bda2917a8c85f32ee4afbcd99bc999d089b0d9c298641d422230f9a7d719d2651862cc2964174b63
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kpkpass/kpkpass-19.08.2.ebuild b/kde-apps/kpkpass/kpkpass-19.08.3.ebuild
index ad5acedd9c55..3bfd9336dda0 100644
--- a/kde-apps/kpkpass/kpkpass-19.08.2.ebuild
+++ b/kde-apps/kpkpass/kpkpass-19.08.3.ebuild
@@ -3,20 +3,23 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library to deal with Apple Wallet pass files"
 HOMEPAGE="https://kde.org/applications/office/kontact/"
 
 LICENSE="LGPL-2.1+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_qt_dep qtgui)
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
 	!<kde-apps/kdepim-addons-18.07.80
diff --git a/kde-apps/kqtquickcharts/Manifest b/kde-apps/kqtquickcharts/Manifest
index 11f507e804ea..25f38eeb2775 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.2.tar.xz 25408 BLAKE2B d32e4f1e1c89f2a350df059b3bc6b4cd0f2f5c124a0398bf280ee52376e3bf89b8bda0be89f298ece2e6b4c43dcc9bc2ec77ca76881bff36514ac9b664d21b7f SHA512 5548644e673379fe1a570fc2af68d9ad7c3147179eaccce7045008960b4cba4d4de877b13cbf6a671b76a2d89de09d8c2cfaafa570b8e043480a7e8a08b527db
+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.2.ebuild 314 BLAKE2B 48884de9ba301fc74b51e64c23ff3900a648d5ff8d92f09f761ccde30aaaa74c5e81794e9607884fd0dea03669a4edb3e4052cebdb7826faaea5bfb5de9c8d68 SHA512 1926455a9dd19df98756b3c52d64590d2004d640263b6820a4148eda468e385ad42f657aec4002af3378fbc7a1e1a0e2af228824859307cb8cfcd8a81fb66b9b
+EBUILD kqtquickcharts-19.08.3.ebuild 385 BLAKE2B c1c524f9dc7fba64df0ef3d11426e10601c020a8e1ef9afdcae7a3b773eaec254697b89e746d8d3967704573e70ec15c7ab59518886c2ab813e9219c2695e9ed SHA512 0393b9f07bacb36079d2ca051e79828cb7dd6d519a28f6aecc55b0f646a641c4bd1948acf1ce3c18608577940259bba18e3e58754a757e4e26f22315c44294d0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-19.08.2.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-19.08.3.ebuild
index e10a5f2a6e23..d326ab572f76 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-19.08.2.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-19.08.3.ebuild
@@ -3,14 +3,17 @@
 
 EAPI=7
 
-inherit kde5
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Qt Quick plugin for beautiful and interactive charts"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(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 884d7db1ae14..4b7c2334ab89 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.2.tar.xz 1421932 BLAKE2B 53ea7a01aacc98dbbc9cc203199be49feccc3b8e0700fadfd9a3111c2d185a8c34f0db39bbbcb35e7d4c13d5b64d3130d18b249bc905e824f94c9835afdd3e5e SHA512 45ce82235899e6b090fa3c2d015dfd9e80c436317fe3f288276dabad7568ec3caaba7225e2641dbc8084e71e31ee4a633cc91e6bc5dd9d91676fd4f5f7bc9db3
+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.2.ebuild 1230 BLAKE2B ab5392ec7fb977bf7e5500f0f9c95853d6c391d130e6b7d860e57ccf70aba4416c37243898e376d0fc516a1a8f3791c4637d596e67e2beaae44e7097ec02d3c9 SHA512 0b65f20f123b1a7c9f5be56d75eb868366055468e4d6b50e58cfab2f91e37db4c00ae28b84db66f18e1d18fe81f56bae9f88ca673971a3883d7f1da74728d14d
+EBUILD krdc-19.08.3.ebuild 1415 BLAKE2B 39bc26b00106f32eb0358b262c9b1bf74f0e8301fbf74dda4aecdc3d50da5a2e38c3f83345f7d8d774770de772c61b4b81884efbae837d14cbdb4a0638730250 SHA512 e37936e951772f0fff801c551b4e7856c0befc59e5add5455fe1ab5bff3f45bb84b7eaa029475052f68f3c684639e16386c32f6c6c6204b566c024e69aea59bc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krdc/krdc-19.08.2.ebuild b/kde-apps/krdc/krdc-19.08.2.ebuild
deleted file mode 100644
index db508c801c21..000000000000
--- a/kde-apps/krdc/krdc-19.08.2.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
new file mode 100644
index 000000000000..15754f15603a
--- /dev/null
+++ b/kde-apps/krdc/krdc-19.08.3.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="optional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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-utils_use_find_package vnc LibVNCServer)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kreversi/Manifest b/kde-apps/kreversi/Manifest
index 3a403ed234fe..22cb1716630a 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.2.tar.xz 943620 BLAKE2B bbdea58c5af4264cc168ef5a8d6bea37fc31a6674ad135aeb2215bb72d94d99137bec2f7cd4a81f79920dc173ffab9943887a06e1974e53bbe5540b3b8c94aea SHA512 c32bc80bc05133cbf10c59cba7d661ecdf25d5119857219ff72f3f0e583e1c96995e42256aa784fbe26bb34f060c1782edc8d8071451e9a827ea71cdf19512a5
+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.2.ebuild 899 BLAKE2B 56935094f917684592a1e69338fc5d52f04952e12785027c29832009ac9e9f7905d88cf4768f6d895af91af14731ce251be79ad8087ba36e1bbc603de73384de SHA512 1385cf49d7d10f339ef200fa6b7cc09bfa18d9215f64d06c191ca84e2b38b616b5e8c2cbf988833abab0bab20f874d25705edf1325cbfcb5e1bbea2eee5c12d7
+EBUILD kreversi-19.08.3.ebuild 1091 BLAKE2B 4dbde1964eee85d3d1ca318b4ddd8b00d925b3489137a37edab887805084baebe8db79132ab7100c5932b184426f50ba8b83c9cffb03f17ef58ed3e500016434 SHA512 eee0709f8a66c8b177f92e4938e923192ed3ff6b1f910fe0a494ed11cee1d7661656910ed92de8b0054455e444ac707dc470d7e816dfab38994205b130e2d6fb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kreversi/kreversi-19.08.2.ebuild b/kde-apps/kreversi/kreversi-19.08.2.ebuild
deleted file mode 100644
index e387eb6b89b1..000000000000
--- a/kde-apps/kreversi/kreversi-19.08.2.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
new file mode 100644
index 000000000000..6c706f698585
--- /dev/null
+++ b/kde-apps/kreversi/kreversi-19.08.3.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="optional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Board game by KDE"
+HOMEPAGE="
+	https://kde.org/applications/games/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 3e7651479705..83d032bbff29 100644
--- a/kde-apps/krfb/Manifest
+++ b/kde-apps/krfb/Manifest
@@ -1,6 +1,7 @@
 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.2.tar.xz 1277268 BLAKE2B c31fe7dfe4e0f48d1e48a91dc1d442650ca0cecc73b9a7d39f1b4650b568b45281be451d8e0a2a35940979c3337014bdd137159cbec87b524607e3cebd410b76 SHA512 dc1842ce4f3641d29e879f510f42a0fff1b83d2be18fa396fae113f0a3321195b56da2df32102dedaf5588eb57814d8d532a3a15ced889239c667d2220a32f82
+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.2.ebuild 1222 BLAKE2B 317524ef5c536fe2381ae1d486d811dc637293acb829bf06266f875e4e6a62c85bbffeacb663a5f7f60f29f1ba045c325e0c5a23d9696a75b7d0bdcf86d66295 SHA512 d7d0edf8951de664a9ed5bab9c9a38300882dd4a212993a2f6ff79560adef27488e5bbe6c0bbed310747517d975dfa66d56541797a19a3b96a586ae5dd2260bd
+EBUILD krfb-19.08.3.ebuild 1454 BLAKE2B a0f756380d71d74c2fc18aa6c24d10185f04465151ed25c8eba77a35173f9b47d1cdc7427f3add06d42db6fd2de6a80c17cee65baa9583836b93696785cd65f6 SHA512 ab4958e5c12a2ef633445eb9331aaa72823a497c3709a48b58e32df5f8d73256e916a57472391ea5b9f1ce603aab1997ac600e09c69f1468904499a429964687
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/krfb/files/krfb-19.08.3-portal-support.patch b/kde-apps/krfb/files/krfb-19.08.3-portal-support.patch
new file mode 100644
index 000000000000..cf27528c2039
--- /dev/null
+++ b/kde-apps/krfb/files/krfb-19.08.3-portal-support.patch
@@ -0,0 +1,27 @@
+From 80db244c7ddd98d284a1412540c8f9e368e86f65 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Wed, 6 Nov 2019 12:05:06 +0100
+Subject: Un-break portal support
+
+Summary: We need to mention what wayland interfaces will be used, otherwise KWin will not let us to use them.
+
+Reviewers: apol
+
+Reviewed By: apol
+
+Differential Revision: https://phabricator.kde.org/D25167
+---
+ krfb/org.kde.krfb.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/krfb/org.kde.krfb.desktop b/krfb/org.kde.krfb.desktop
+index c610c5b..7cd0ac7 100755
+--- a/krfb/org.kde.krfb.desktop
++++ b/krfb/org.kde.krfb.desktop
+@@ -217,3 +217,4 @@ Comment[zh_HK]=桌面分享
+ Comment[zh_TW]=桌面分享
+ Categories=Qt;KDE;Network;RemoteAccess;
+ X-DBUS-ServiceName=org.kde.krfb
++X-KDE-Wayland-Interfaces=org_kde_kwin_fake_input,org_kde_kwin_remote_access_manager
+-- 
+cgit v1.1
diff --git a/kde-apps/krfb/krfb-19.08.2.ebuild b/kde-apps/krfb/krfb-19.08.2.ebuild
deleted file mode 100644
index 9de6287140c9..000000000000
--- a/kde-apps/krfb/krfb-19.08.2.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"
-inherit kde5
-
-DESCRIPTION="VNC-compatible server to share Plasma desktops"
-HOMEPAGE="https://kde.org/applications/system/krfb/"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="wayland"
-
-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 kwindowsystem)
-	$(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
-	wayland? ( media-video/pipewire:= )
-"
-RDEPEND="${DEPEND}
-	wayland? ( sys-apps/xdg-desktop-portal[screencast] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland PipeWire)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/krfb/krfb-19.08.3.ebuild b/kde-apps/krfb/krfb-19.08.3.ebuild
new file mode 100644
index 000000000000..fc89b16763a7
--- /dev/null
+++ b/kde-apps/krfb/krfb-19.08.3.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="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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] )
+"
+
+PATCHES=( "${FILESDIR}/${P}-portal-support.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland PipeWire)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index 424c3cd89ab5..b9981a410c61 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,6 +1,6 @@
 DIST kross-interpreters-19.04.3.tar.xz 150404 BLAKE2B 36e620728e390f6d26887ae6e80324ba5cbeae16d7b6f423abba3cdcf74955320eafe9921cc2fc34fbdf0d95feec87c0eae8883d5a5f767fb29092c19934bdb9 SHA512 3c9810d9870b69af984d416d031ac30cbe26514ea9734feee70a32d915acafea531a621a085adcd95e0d0e67c92f8508de94e749aae89c825520c2adf6a674a3
-DIST kross-interpreters-19.08.2.tar.xz 151460 BLAKE2B 7dcc996c25ad954dece2ea0ffe495e1be02922e30e9e41e791341d0feb485963a1146ffe63ce91792ae656aaed89626379384f4c0c478b848681c42dfe09ed66 SHA512 d7c4bb752bd5ccc3c52b531a02878444374120cb1a27bdae72fe3b9cb4b90d14303a8ccb140f85e90bd2ba9c7bad93d1b3685cdea985ae1e7dbcd7dd90f569ff
+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.2.ebuild 748 BLAKE2B ca4319bd98e46729cd907e9ef3dc9c781c038c8aad1c75a5c4f63dd181fd2c0cc4061fc9f982f7b5eba0d80aa33d281ac5c7bcae7a7fb3e5201c8c114f152003 SHA512 0070562e50866457108c306ff9dee0c729bda0d9853afeaf61b033715b9b0a1f0dd4179e97e3819b27354177ee79829fe8dabe7f50571e7683ed51eb4bdbf9c1
+EBUILD kross-interpreters-19.08.3.ebuild 836 BLAKE2B 8979c737288f66c7b68140794196b2680d8f4a2940f845bcba86bfb2340a2ea789dc8cf8d008ab7de91242eea4eefbf6990fd5dde8a9ab0e66bd1619cfedf6c3 SHA512 e86c2c82accba72336c9fdaf7f60cee87bc68dc2f67d0669986eae65740c68e04d5bf0897e69d0cae4b26dcc375432b2013e5218ab9ef353e40563139763a54a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.08.2.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild
index 4b577776782d..9595b479bfef 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-19.08.2.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild
@@ -5,18 +5,22 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 USE_RUBY="ruby25"
-inherit kde5 python-single-r1 ruby-single
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1 ruby-single
 
 DESCRIPTION="Kross interpreter plugins for programming languages"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+python ruby"
 
 REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
-	$(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 +28,7 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
@@ -33,5 +37,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 c0042d54308d..637e0f2fb1f2 100644
--- a/kde-apps/kruler/Manifest
+++ b/kde-apps/kruler/Manifest
@@ -1,5 +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.2.tar.xz 249424 BLAKE2B ac5854bcb2214aa69803b9f33134ab1b3399cad6997d9c09d3fc77682bdcf570f8bf0c4a3ece1fd1b69071b227b3829709db31e0413b55ec5ce2b59a5b93fab2 SHA512 88d45697d29a887b32a98a577fd438cdc2f73c23483522de3e3ee0ac9ee88977548ee423db827f94d69588ed929e54e1eee073f6a98045e7cabadd9323d740ab
+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.2.ebuild 846 BLAKE2B 78015830d149c0828b8642bf8f0be277161578ff8a2fd64441760ea68275bf574963d655b0c8da0cb192f1ddeafd63d8b957b805c753f7bf1e358c453b556d8a SHA512 580bb29a11e6eb7471466de0e5b3bd91ea75fb065cfd24626636239ccc9ab8b112c270d1c7a4341c49f143866acf1c22a41475b3d39facd930a15def9003b182
+EBUILD kruler-19.08.3.ebuild 999 BLAKE2B 8e1080aab6ef1b3f8dbd3dfcc2b70b16ea34cbe25c62889666f08a461497d61629e4a34dbd9fddc85992808bbf36b606368877414d7c9aec4682ea4beab3b26c SHA512 1910220dc29e97e447bf31346b41f1537e35428b8257f68bf1cbc3e1d45aa4f1d08070df50e94868d665a4c249a9ca57c53a4e0420c0c33e41dcb38d9dc1a448
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch b/kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch
new file mode 100644
index 000000000000..ae87b047507f
--- /dev/null
+++ b/kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch
@@ -0,0 +1,45 @@
+From 90ebe8e37b8699ef26c10fb2928cf673cad04a06 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 18 Sep 2019 06:41:34 +0200
+Subject: Make it compiles without deprecated method
+
+---
+ klineal.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/klineal.cpp b/klineal.cpp
+index 8b5d3c3..0f9bc48 100644
+--- a/klineal.cpp
++++ b/klineal.cpp
+@@ -705,7 +705,7 @@ void KLineal::mouseReleaseEvent( QMouseEvent *inEvent )
+ 
+ void KLineal::wheelEvent( QWheelEvent *e )
+ {
+-  int numDegrees = e->delta() / 8;
++  int numDegrees = e->angleDelta().y() / 8;
+   int numSteps = numDegrees / 15;
+ 
+   // changing offset
+@@ -756,8 +756,7 @@ void KLineal::drawScale( QPainter &painter )
+       }
+ 
+       if ( digit % 100 == 0 && digit != 0 ) {
+-        QString units;
+-        units.sprintf( "%d", digit );
++        QString units = QStringLiteral("%1").arg(digit);
+         drawScaleText( painter, x, units );
+       }
+ 
+@@ -771,9 +770,8 @@ void KLineal::drawScale( QPainter &painter )
+       int x = (int)( i * step );
+ 
+       if ( i % 10 == 0 && i != 0 && i != 100 ) {
+-        QString units;
+         int value = mLeftToRight ? i : ( 100 - i );
+-        units.sprintf( "%d%%", value );
++        const QString units = QString::asprintf( "%d%%", value );
+         drawScaleText( painter, x, units );
+         len = MEDIUM2_TICK_SIZE;
+       } else {
+-- 
+cgit v1.1
diff --git a/kde-apps/kruler/kruler-19.08.2.ebuild b/kde-apps/kruler/kruler-19.08.2.ebuild
deleted file mode 100644
index 7f4f3fbd4ca5..000000000000
--- a/kde-apps/kruler/kruler-19.08.2.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
new file mode 100644
index 000000000000..ae9cd336b7d1
--- /dev/null
+++ b/kde-apps/kruler/kruler-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Screen ruler for Plasma"
+HOMEPAGE="https://kde.org/applications/graphics/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}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/kshisen/Manifest b/kde-apps/kshisen/Manifest
index 342bfa767a6d..326ba4d10539 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.2.tar.xz 822960 BLAKE2B bfb800a3d7e6362e42dd5464f2ad43a7bcef2aca13c979f53c4a5dfdc124179aacc7930cf11ae99a42e0ac32c34fac2c031bcb250846488f4e0046def22f95cb SHA512 9445b2cc87c483332fbce5f08235185c5f5db34a9ad7e1d30e7c770cad0ba77995b9c967725713e8ce1a8d32db856ac727ca96c171726d44b3d85fa10b1e60bb
+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.2.ebuild 780 BLAKE2B 90912881140e5d00d747788e14616f37a3c6bde0ce14ee3489e6ed9bd579512b3c32c9d20410a2933edd31a62f706830e877779633c8a69386f46131102ff63f SHA512 29e75dc98e4d32551950dce1cf41f1a9af174198b0c96541dd0d791c70a050ae461fd904c78e7e7c4791037de71e518b87e6171b7ff76084bc1df080b28128b3
+EBUILD kshisen-19.08.3.ebuild 939 BLAKE2B a3227e57985ea875dc0f566095f9e500ec63ebcca93993ae72235de8644ab3d23484319979e4cb5caeaff199268d782c655f0189e37cef3d7cb0662e9f4f8bad SHA512 aaa15958c92b4c3810d5e77f4017dd1824becbe58f4a860be2ab74639edf6b2ac095315ba2390a38e8eff88e4284cb2df8f506059e57b8ea372586374dfa0174
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kshisen/kshisen-19.08.2.ebuild b/kde-apps/kshisen/kshisen-19.08.2.ebuild
deleted file mode 100644
index b4db67d60f3f..000000000000
--- a/kde-apps/kshisen/kshisen-19.08.2.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
new file mode 100644
index 000000000000..896733308102
--- /dev/null
+++ b/kde-apps/kshisen/kshisen-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="A KDE game similiar to Mahjongg"
+HOMEPAGE="
+	https://kde.org/applications/games/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 d13aa627cff6..6f3e5b2025b4 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.2.tar.xz 6992192 BLAKE2B dcd9c48347f3b09b089f7f3701804346192332d0baca3e1dab1ee2a5a2fad9d5546c607a556939caeb707fac14e620bf7aa2c1ea235cd1842c8598846788c1b0 SHA512 0ea7566e2de52424e568bba254e4380ce64b943fe212f7a877dc054ac871ff0daef8a9d592bd69fef140e2aacbc07c36244f83bde99b5da636452bf8ac3694c6
+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.2.ebuild 972 BLAKE2B a00915356ba584190e453470d291e06806bbe78bff6533ca59880d5bd55284f39a39cd257e2094b776823a60909ab71b7be0270aad43d067a12df16ef79eb6c6 SHA512 5eb99553a1177a6c40b151e8b51ac26066dfc9d25b1b0ad13b75f677c5c666ecaecbb8b48305a4c69bd63115855711e410668d7e66c7eea954fc7d5412eb0768
+EBUILD ksirk-19.08.3.ebuild 1170 BLAKE2B 21ee7a20e53d9a6e45fbe84f74c1d4e7bd7d21f108a8fe5f135ce604f4c30cc234d4eea74a74b39850cfa63d512cca1594008e365b9eed360b6b1acc48dc6711 SHA512 d2831f5722eeebb262433b90c9ece8ac47335396e11f48e57c54e047ac59181e732d8ee60593571c3c13e1c2e8031d0464041f5c55b7826f0341f1ea2f840c0b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksirk/ksirk-19.08.2.ebuild b/kde-apps/ksirk/ksirk-19.08.2.ebuild
deleted file mode 100644
index a215855fbdc1..000000000000
--- a/kde-apps/ksirk/ksirk-19.08.2.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
new file mode 100644
index 000000000000..a59f875c14e3
--- /dev/null
+++ b/kde-apps/ksirk/ksirk-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Port of the board game risk"
+HOMEPAGE="
+	https://kde.org/applications/games/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 cd591a048784..7052d8b575f5 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.2.tar.xz 40444 BLAKE2B ea8066c729e4893942bbdf60ae7a8f860d76c82f3d00ec77300e62ac1645ca0b32887e689baa6ad817f8fb18651594b1c97c9f2ef61e818c4623ec134090387d SHA512 a5b5202b8beb93ca44df32bb90aaa2984e0a17bd50e73915838c9b7844bc90bb91a2fca16bad9168797f442c686826fe27d7e63d6eb66f5de4f21223b4037239
+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.2.ebuild 471 BLAKE2B ca71a79e18a72f13d5a7850b7567faa3719650c76ec9f5ba112b0a8af0376c6e2d88ba92d943aaf760a9f471b33f2863466c98331aa763a0bbba1cdd227b637a SHA512 ba823150820fd82f7de3dddf7e661cdd0a4957533253e3fb67bdb945d79871ff05eb13a8cbe611e70dd2af98d18eed76c385fd4e57b94163ee91aa1098a7455e
+EBUILD ksmtp-19.08.3.ebuild 537 BLAKE2B 3323a5257eb71785c00d2267a7046b7f2453502fe1ff0eff24192ee453af5d9b5e7fcecfd66e040da44b44683efa57979551d4a382931e899f07d27f6de1723f SHA512 9b374481f83f75128ea8a079b611110cf09d6a5601f41827bd7f99103c0f227cd1c400005c9bb3ae022ba153974c1d3dd55286ea4cb410c364a2a75a7ed40cc6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksmtp/ksmtp-19.08.2.ebuild b/kde-apps/ksmtp/ksmtp-19.08.3.ebuild
index 47c02b1d08af..d0570a3bbd03 100644
--- a/kde-apps/ksmtp/ksmtp-19.08.2.ebuild
+++ b/kde-apps/ksmtp/ksmtp-19.08.3.ebuild
@@ -3,19 +3,22 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+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"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtnetwork)
+	>=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}"
diff --git a/kde-apps/ksnakeduel/Manifest b/kde-apps/ksnakeduel/Manifest
index ceeafa006cbf..075267c5abf7 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.2.tar.xz 605304 BLAKE2B 7c4980b50ef93679ecfa7e87f3e40ad7a3cadf20575d69e3fcfc9c7237f1fddb64693c5141ac5cacd7ac1b37bd62461b31a3511e6e4ea36addde6821e014e2f7 SHA512 ed410956fd369e5e2a170ba1e9fabc952f7d50ff5d1053cf570d39ce14d356e3da946b975ff3761f54ec50f47de049c48b9fc990795ab92a0f6f32b98a6b0d6e
+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.2.ebuild 769 BLAKE2B ebba5e444644fdce71ab19c44a3d4dcb07901bc4d03af2e81b6c1becde05cf2bae25ea2b64b3736ec4ccee4c4cc2963685f717e3e09fd0c324611bad97acdae1 SHA512 21f5d679eec8974c9f9ec953438f8a6ef35020a3ddc54cd6ce4c01e870125efd14e8496dbb0f15a81517448c5b7acc0aacbdede18960cb19785a7243763b3f2e
+EBUILD ksnakeduel-19.08.3.ebuild 943 BLAKE2B 4a657bde08d4f927e4e44aea360427b6ff0d7c25470c2ede5d8f3c0a29ffa52ba1b879a444fd240a8702696c3a14c679ff1d44068899df7744c15c973b9cec12 SHA512 f1757472fddc3cc06c4090c93049aa1090afa134af313f0899f58c641325f380c87f8506951e926fb0e27075a6fd0be388d6ac452f61ccebee4f810825987996
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksnakeduel/ksnakeduel-19.08.2.ebuild b/kde-apps/ksnakeduel/ksnakeduel-19.08.2.ebuild
deleted file mode 100644
index 0d21cb3fb1ca..000000000000
--- a/kde-apps/ksnakeduel/ksnakeduel-19.08.2.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
new file mode 100644
index 000000000000..fc94271df9f6
--- /dev/null
+++ b/kde-apps/ksnakeduel/ksnakeduel-19.08.3.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="optional"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Tron game"
+HOMEPAGE="https://kde.org/applications/games/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 9f53e139b996..2878627fc419 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.2.tar.xz 611448 BLAKE2B 9530ad50758b1f57fc7ac9202f79487329d8d7ce1503305ca7c096017b0f8dc4efaa22b08a77c2e085bb782c2400cb35f5c51bc377eaeaf6ba3ddc3e8d8663fb SHA512 13e7391b50d371569882f599c408b476bfcd4fc6732f31d4e4554a38f82721cafcc94e6bed037dfaa5be33d24a635c1dea11f457db854c30a19001d1597c2633
+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.2.ebuild 722 BLAKE2B d04eeb269e760a58cf700805a51a8c234d9d26243d8b750ba1f5e2b40cc0d8065b7f9e0bbb95939d9d90accb7b2f8c3905fd9ddabbe0071f76226fd67de95c5b SHA512 982d43eb583d187e11fdd82fc8751fa6dbc375f42166b57c1ab87aaadb7b6bc77147d3b14ed0c2f7924d80726df3756bfb90ac00dc2abb029f9177384cd206fe
+EBUILD kspaceduel-19.08.3.ebuild 878 BLAKE2B bea3cfc383aac3919f0339dbc8356796086c92ff7c3aee1beae650291257734ec3c1aaa91167d43feff12c83d032006f100b5487b394f76b4d183506b57158ec SHA512 9096268040874d2198f700eeac0913eb4c9af5451eb5fef98f0926f13200ad068a943fb43cbad5f78a0a93c47b15bd26178c30e6143bc892fee90dff35582676
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kspaceduel/kspaceduel-19.08.2.ebuild b/kde-apps/kspaceduel/kspaceduel-19.08.2.ebuild
deleted file mode 100644
index bbb3b152b97a..000000000000
--- a/kde-apps/kspaceduel/kspaceduel-19.08.2.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
new file mode 100644
index 000000000000..7dd6cf096c7c
--- /dev/null
+++ b/kde-apps/kspaceduel/kspaceduel-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Space Game by KDE"
+HOMEPAGE="
+	https://kde.org/applications/games/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 3127a460638b..eb02a74c72c7 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.2.tar.xz 260104 BLAKE2B 833099a5f29a678ec46324a2699210c3dc105f757da4b1495fb155596222a22eb410a35e240e05b6770a44ed40e0c0f7246a3eb4db8b18236009b80ee463c25b SHA512 fcab0d15f48f0b72d005828ea014ede23c7ceb1949fada90580a9f83f7f6096a240612019080516c67496a99d1a831858c37a829eec864b90f42a5595bb9a711
+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.2.ebuild 755 BLAKE2B 1bb97b1845e11e78125067cec91534628c7ea3b5988cf856d998d753002e008a074f8a0b91b0a24c88667446d14bc1f93ff687769a57a33a51a6bfb1d9261e7d SHA512 7b7568c395b7f3570db367fb4f5858bf54dc5d80e0562917333b831506db253f66991918868a3a55db46c72adfe1b146614fee41aa2755026457abcffae3b3ec
+EBUILD ksquares-19.08.3.ebuild 917 BLAKE2B f84d4f631ffc82d0a1d042920287b84c2cf243b5e1c7249bf1e2ffbf8a46417e2bf85c8e8187de441406dc85154b89cf972104ff2bb43254b641798ff823b938 SHA512 69efbb1cdd7dd4daa64c8bff9c4354f99706cf01f33073d8b87718683207e5ca2e42764d2a00d2acc6b45cd50a61f8e9d810b6d0912192500d5a6ce16fddc28f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksquares/ksquares-19.08.2.ebuild b/kde-apps/ksquares/ksquares-19.08.2.ebuild
deleted file mode 100644
index 02e653df7aa9..000000000000
--- a/kde-apps/ksquares/ksquares-19.08.2.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
new file mode 100644
index 000000000000..db316cbb1fd2
--- /dev/null
+++ b/kde-apps/ksquares/ksquares-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE clone of the game squares"
+HOMEPAGE="
+	https://kde.org/applications/games/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 c3ec0a7c83cc..04d8aba390e4 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.2.tar.xz 1650384 BLAKE2B d7bfb27d066ae7de5f3672f1c3bf158925c059f9946c40e4d0dc299eb17cc0c5b7fbbea08ed1c308ec0bce95b0f3834f979c53eb569cb79a9d15ec611801dd0d SHA512 e44f94eafe05915529358411f47d13855ce25cd65a6c722827aaf56b96ccb9ba07557047a7c71e1eebf5d00390187bed151877fd5a572bdf98c8864999fbe116
+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.2.ebuild 1104 BLAKE2B 36ee56c9e0275152cd90bec78eedfc7a2c9c246eaab8e2a2144df9bea5f19f835475d2cf5e3bc399969705f111466b5a9231b72d3fab5661a3bd8febc86e1385 SHA512 7db543472de032133b7a81405b163aff8f95526fb301c46efa677b345eccc4ef3d4ffc7fc128bfed1c343c082dfa835fed1b906a0ea7aec277eafe5923617fda
+EBUILD ksudoku-19.08.3.ebuild 1307 BLAKE2B 17cb958d93cd535d7e1ab32b3f64c377a5e44ef56d10a14b869d72f333fa0cdb01eecafb7b9759b6d6bc34a73003af84023c9ed77f6b56f73e37d128bf6a037e SHA512 0b9d136d57f2b0df9e5b1500fd382e98f87185275bee14e3e03290a1c647fcd8998639911fa0db6387b7fe6a904709f12cfa2bbb62967bee299645daf93ed154
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/ksudoku-19.08.2.ebuild b/kde-apps/ksudoku/ksudoku-19.08.2.ebuild
deleted file mode 100644
index f2545ff5ac1a..000000000000
--- a/kde-apps/ksudoku/ksudoku-19.08.2.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
new file mode 100644
index 000000000000..b9c0b043f0fd
--- /dev/null
+++ b/kde-apps/ksudoku/ksudoku-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Logic-based symbol placement puzzle by KDE"
+HOMEPAGE="
+	https://kde.org/applications/games/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-utils_use_find_package opengl OpenGL)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/ksystemlog/Manifest b/kde-apps/ksystemlog/Manifest
index e65daf254d29..6f90b62e4007 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.2.tar.xz 1927372 BLAKE2B 89f6a38b8626dcab9d5060c829a84f8cbfafc4770a63d013c6eb9461cde15318bc36d09d1f2fcd55df29220ba61bb0f14d7d84d608be267dc08d3e5477eb8094 SHA512 9e97b16fceb7052427a61b22e71cb479c4e470868b263e7fe5747e8bcf69a5e676ae3ea2fde8532edc289bd487e86169625b445c72c1fb3a4771fc195fc254d1
+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.2.ebuild 1585 BLAKE2B c085fd6c68958562928e63347de6e1280dfa2e5b1ab0bdc24f845cb628db27890eea03e68bddb15fc033efc665bb2c34c9b47e0f5fabf7212f986e11b32a7d26 SHA512 825578fb56f625526c7da390feef8d0b33dc6d6347bba6b8d7d4f52a37b7c809a59f110d8d6e573b2037934b3c7dffcc6959d33dcbd616cb09ffa879f8cface6
+EBUILD ksystemlog-19.08.3.ebuild 1751 BLAKE2B 7a4b9689205668b7125f6020c644381cc047a8af0e61dae5a4153b5795350d73370f3e57c1e0fe419831bb6857978882b8be0c004d062c109552ddf423054ac8 SHA512 2ec5702a840aa0f74ad714e3453dd918fae3b1e02da41cbaf2c9c8fc829be294d366d00b3e120a7dd63749e6b220866725fa0593ad9901cd357bfca4739df869
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksystemlog/ksystemlog-19.08.2.ebuild b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
index 66a4582b810b..ea0ec1797f1b 100644
--- a/kde-apps/ksystemlog/ksystemlog-19.08.2.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
@@ -3,13 +3,17 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="System log viewer by KDE"
 HOMEPAGE="https://kde.org/applications/system/ksystemlog/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="systemd"
 
@@ -17,28 +21,28 @@ IUSE="systemd"
 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)
+	>=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() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if use test; then
 		# beat this stupid test into shape: the test files contain no year, so
@@ -57,5 +61,5 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package systemd Journald)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/kteatime/Manifest b/kde-apps/kteatime/Manifest
index 6edb356f807e..3e2c041a94ae 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.2.tar.xz 286812 BLAKE2B 8e4d460584542a474b44092c23bb18d75a734246e09ab386d7b73caf0dbc043cc822ea4fd3de1a35bdcd1da60fe19eccce5e44ff7b1f6857566604afd6065cb4 SHA512 d0bd3b972ebf0539cf3bc22dc7bb5a0660bb99d75664ff2974a4da92de8bdd4bdc24925e6186e270794e7b4e21c47be71fc53f03b4aeb48d70464056dcb02f55
+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.2.ebuild 720 BLAKE2B 432a707cc981b1f6a1a8628e8176122dd503805b32f93470a753860a9eb361ba3b7524a6d77f2abd89d2bab8bade5a893a94d7502f0940c3b94a1b0954c0d906 SHA512 299dab08c0661d3318e8661ece6c8dbc80c2a9fd3494e34ad564c89f650016e2fcbe806b8310e6468a093a55369402bacb9f1169735981620e85326870758a29
+EBUILD kteatime-19.08.3.ebuild 864 BLAKE2B 92e2cff0684d1b9689971a68e483dc3daacbfc29f0390bdf10eeb599b28d428e67b87c1cb339faeba4b3b18e191168b5fc8629744c586b1aa6414c10e750f5d4 SHA512 cbde1dcd14ffda4d0e5a5d5864c60a3153fc2eed76024d0faf398ac0a30b6c5c620a115c17a9647ab04ba0a3a9055a2de3138ff5de55964d6fe17cfa4001cb41
 MISC metadata.xml 389 BLAKE2B ad9fbc771cd4608e96f4687330f7e6d42c003b24bf99ca55c8547903f6ffb2a8b08b7e0419c9431d8805f1f738c40e35fe67e9b68383ea1dff25f93c0cefd2ca SHA512 c898b3887333e169839d1d96ccd69a45e85a8fcc3a68c609df27d244dba1a7e9b7d7f66c273dddf8d92440c557c10137d722f62661612fa797375ab88daec071
diff --git a/kde-apps/kteatime/kteatime-19.08.2.ebuild b/kde-apps/kteatime/kteatime-19.08.2.ebuild
deleted file mode 100644
index 2fc95842610f..000000000000
--- a/kde-apps/kteatime/kteatime-19.08.2.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
new file mode 100644
index 000000000000..0129a048620e
--- /dev/null
+++ b/kde-apps/kteatime/kteatime-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 c81a962e3da6..265065ac0436 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.2.tar.xz 377024 BLAKE2B 11334d1745c2fe601652b64ccb0fcab8a3988964a9dfc2f6f6d7f61aabc3907f41963a7b0d874a5b4d168f39a97f3b7192834e2306fd9a5ad4ea127a50663bc9 SHA512 60e2c16b9fa44bbd9e7cca3a487d9a78d572c1cd20e09782735fc30c586b82691736be2a30c21e07a893856b1c9a02f432bcce00a123219bd857e988bc477ea7
+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.2.ebuild 701 BLAKE2B 08d7890e69538016362edcc4036cfe84638dfd8eba152666e8af8c46740aa1bf2ee1c5bd66ec4c00a7fded67c988e03ce309097eaaa63437ca06c905200f0e3f SHA512 fce515661f987b6d608bae909c93970ae6310c8bd994f93d138ccff4a5034325c1be5cc1cdb7a557b4a62ca71dd8a2d6fbbf5e18d488376d7be932820ca92931
+EBUILD ktimer-19.08.3.ebuild 833 BLAKE2B fd00770d3e2023dddf1f36d3c5a57b23d4cd00dbb7d2b8f8a991923409905a5000662b1190d5a9cf0fee8e1ea8b5119e231176a8194342b5db20e2782f6987bd SHA512 3c2d67ccf7d4000f7750091145a34b70e70bde71eec12c1904305e839fcd80be2e996262cb620dccd00b576685a80e295c4b1a58b79619b4c4ca3c1f9b39a224
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktimer/ktimer-19.08.2.ebuild b/kde-apps/ktimer/ktimer-19.08.2.ebuild
deleted file mode 100644
index fe0d03f778dc..000000000000
--- a/kde-apps/ktimer/ktimer-19.08.2.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
new file mode 100644
index 000000000000..8a23f51ad4c3
--- /dev/null
+++ b/kde-apps/ktimer/ktimer-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Little tool to execute programs after some time"
+HOMEPAGE="https://kde.org/applications/utilities/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 e96be45cd95d..40d08eedd3fb 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.2.tar.xz 4934684 BLAKE2B 6c20976400637c2e29646e870125c6793abb369ac7f8984d06e7c581d3be7d2eb67c572e7ecb9a047f06ed9521c5d7e5ad7397d1106d50f9166200fbf92458fb SHA512 46438ec9cb3c45dec0156c13fb780b87b3ce7c3f9272435f0d6b634db7955a1f9fb33384333d42c353f2ac1d91bd3adc725b2eb39b9de1345d7a95780c573fa6
+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.2.ebuild 1430 BLAKE2B 3e9d97dd38027da06ed7a184616806fb006eb2faf4eb92763cb482d213db49b83d1390b1ec149eda9a587f9c6b24c954a96d9e891f154aaabd38231e89771cd2 SHA512 84bf0dd4132e160415951f34e43c455d8612176ec81f51467c8f3bfc348dcc69d23f7684fed57a9ead9f9333fe66160c3a41b2c11c365ffd09124ce82ae65fbd
+EBUILD ktouch-19.08.3.ebuild 1663 BLAKE2B 974060cb46c8554ac6cfc72b16fea7d88e437a29be0274bc82d8dcc4c3a63677b3e640a1bd907bf1cf6b1f67dcbc178c9001eb94f7e9c84e6f2120e2d2927906 SHA512 965368e6f6f1f5ca78e83f147432050358329a7d64f34039e9a8741c445214d532f3441b03fba16395b45eaf9c13cc38542bf9748f3fdb0d921753481a2161d5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktouch/ktouch-19.08.2.ebuild b/kde-apps/ktouch/ktouch-19.08.2.ebuild
deleted file mode 100644
index 446c85681a67..000000000000
--- a/kde-apps/ktouch/ktouch-19.08.2.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
-
-DESCRIPTION="Program that helps to learn and practice touch typing"
-HOMEPAGE="https://kde.org/applications/education/ktouch/"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="X"
-
-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 kiconthemes)
-	$(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 qtquickcontrols2)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	X? (
-		$(add_qt_dep qtx11extras)
-		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)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCOMPILE_QML=OFF
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/ktouch/ktouch-19.08.3.ebuild b/kde-apps/ktouch/ktouch-19.08.3.ebuild
new file mode 100644
index 000000000000..a1a0c243f967
--- /dev/null
+++ b/kde-apps/ktouch/ktouch-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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/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-utils_use_find_package X X11)
+		$(cmake-utils_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 a7977a81ecdb..45e91dbfb1ad 100644
--- a/kde-apps/ktp-accounts-kcm/Manifest
+++ b/kde-apps/ktp-accounts-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-accounts-kcm-19.04.3.tar.xz 262348 BLAKE2B 2f8227ae00e36b079d0a536d7d5769e0f45d8d2101e09974e59e61e734f1158614b823629bd1963498465728c82f574817e9df0e9cde4c59ac809fa869f1a15c SHA512 4b800d81dc6a61830d2e2da6ee006be2266e1d6862812d6f21b3fc9f85f5ab2ed0f617b8f0889529cd869e836c4dab51c35ce88b3a1c93877ed50949a67ad48a
-DIST ktp-accounts-kcm-19.08.2.tar.xz 264680 BLAKE2B e6765c303d0107eaa5e23ef91e859ff6f570675886817419e1de7d0ac4b702a6aadbe3d2986c3ff7a0c635055461710605ef4b890835051d23613e783da01d35 SHA512 c19fb357775fb7ddcd844a775d1bb8b5ff40268c75ce0dadd0c39aa3221d51b13dc862e961452622569d7466dca0a757a7ea62d3f897fb6629d9929c0d0beded
+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.2.ebuild 1576 BLAKE2B 791284e8d2a5fbded5c549eaf5352bf37d167c0c335d7c4d400843cc8da17181fb63411b8f7494b43674fad6321856c8079da0c02d5069f536d32765958e712d SHA512 6c30884fa5e12884baf39f1658750905659a6f6471ea3a06713495990cd8a23ce3dc30880e45cbe869e6830ffcfe3417e91d34361b249ac755609553bf56e93f
+EBUILD ktp-accounts-kcm-19.08.3.ebuild 1739 BLAKE2B 143a0b1caeb6521c4562db7751e37760347a23e8ff52db0043e9133047c53b0c9412a6cb49c92c523284fbc1484c72c92fc665130e4e853cdff3fe089ba77d46 SHA512 a07ab9a1524c731906d836a672763a824e512df9edac9bd0457fc719d033a08a83c7d004eea5146a601bd78cfeaf81887ff0946c9f8b0cf261d0eac889f1e48e
 MISC metadata.xml 358 BLAKE2B bed2948111adbc5773b15f13c4173b128243fa31e206c711d5b703d477999011f5508ec9fe95a4e0917145194cd66229e83bba5e96cebfcd0c5441246a8f2d27 SHA512 c3dfdd12ba493b5e382136755f3c3f4504f388af4a0620c764fb469031f5b2de1f20817e0080927ead546f78e533a3750daa18eb12516eca341495f4329e7229
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.2.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.3.ebuild
index 9e36e7d45e41..4cf442172f67 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.2.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.08.3.ebuild
@@ -3,12 +3,16 @@
 
 EAPI=7
 
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy account management kcm"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="experimental"
 
@@ -16,32 +20,32 @@ 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)
+	>=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
+	>=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(+)]
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kio)
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
 	net-libs/libaccounts-glib
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kaccounts-providers)
+	>=kde-apps/kaccounts-providers-${PVCUT}:5
 	net-im/telepathy-connection-managers
 "
 
@@ -50,7 +54,7 @@ src_prepare() {
 		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || \
 			die "couldn't enable experimental services"
 	fi
-	kde5_src_prepare
+	ecm_src_prepare
 }
 
 pkg_postinst() {
@@ -59,5 +63,5 @@ pkg_postinst() {
 		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
+	ecm_pkg_postinst
 }
diff --git a/kde-apps/ktp-approver/Manifest b/kde-apps/ktp-approver/Manifest
index 89e471f73841..1896adaf8dbe 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.2.tar.xz 37356 BLAKE2B 52bdd73ae992d6dec20bc66047421f59cecc01311d85383506a7f2373175747813796fea5b92131f52d568d179596c538ccf07f76f6d63ab70fb10b2cafcf9a8 SHA512 a3efd5ae33d1aabfb878080cf0f56b6d85eeb04d00b4e16c2769687fffdbacb4515c39a131f7435e2bd2c930a9fcc5bc578b2e06c00f919f17db30e99094c4e7
+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.2.ebuild 682 BLAKE2B d54ddbfe656a902bec2fb0515cdc8a85f7df83e6d3fa1e92543ddf6a27df748d34e524b1fa7f1b13d03d60f8b19e7a4dd05729b491d0fb32fb1d6103e4e0cce0 SHA512 ad18ff347493b92916bbd7cde4786adeb3a5b7edfc5f40ac28b6846f5b8261fe0814fe719e0c3a137b8e64d9a6659c6ccfa31e01fc508186c8946f5b85ec66bf
+EBUILD ktp-approver-19.08.3.ebuild 802 BLAKE2B 3fb5b8506641c9eda514381bc2f27160c23022de1aa10ce421494707a540c7baf64da3e8c308e52686b318819b3a534dc468823b1c8b2ece5e52a605e83e04bd SHA512 4155e001d32ce82dd124d47d9f080bfd049c3598380cea12851bf12463e9d788d2fea57d07e9bbdf4afbe2bd4b5dd9b6605b6ee643cc64a65acdbcf99c12eeb0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-approver/ktp-approver-19.08.2.ebuild b/kde-apps/ktp-approver/ktp-approver-19.08.2.ebuild
deleted file mode 100644
index 12784aea1f92..000000000000
--- a/kde-apps/ktp-approver/ktp-approver-19.08.2.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
new file mode 100644
index 000000000000..264a52c0de15
--- /dev/null
+++ b/kde-apps/ktp-approver/ktp-approver-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy notification handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+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 d414fd30ca60..720bf514bb0c 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.2.tar.xz 46492 BLAKE2B 0cffcdb3ad73b95b771eb38aedd32455c99e2f32cc5beea7755dff23d2a0c54466b02ebac3baed54a72a5231244ee8716d4b696f71887b99d363423e45e0ac8e SHA512 de767c86f5f82d6b01adf1c060b6177041ae464f56c519df131f15fde51154e0274451b2333b4421fb55970cbb134c93a4a16bcefaa416369d53f79a30c23e48
+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.2.ebuild 833 BLAKE2B 9c607b6effd79211428fa349040de4009fc5c4f4e1066d6d1d8aa88a08e1df88bd70b6fc421cd393d242e4237b1ad705192cdacfdeaa1fee56743acd938f4a09 SHA512 888e398fb3e04b88b0c75864a233092adb9a56738434897351105416f50972236c5e9c0eacb8db0ac578281bcc82a3d50dc7d183fbcac9c9913da263d73307ad
+EBUILD ktp-auth-handler-19.08.3.ebuild 962 BLAKE2B e4c3e50a1b52a62b44c2c90576ff17401f7f9471e32b3f651c652d6751e45bdbfb39d44e72fcb04f53eeebfb14b17fbc14221bd4064fc6db407ba7740f8a3006 SHA512 657c81b7e9ab6c36f7f3a6b7dbe4cf33051120b0a3b3abbdf6eaceec49a5a8c84fbbc8d2075ad6b939167523d46176b15acb509a8109aa7538b5c8570af65c2f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-19.08.2.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-19.08.2.ebuild
deleted file mode 100644
index 1797006dd554..000000000000
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-19.08.2.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
new file mode 100644
index 000000000000..3eda70ef4c8e
--- /dev/null
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy authentication handler"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+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 3aa130878e61..a6eb4283af84 100644
--- a/kde-apps/ktp-call-ui/Manifest
+++ b/kde-apps/ktp-call-ui/Manifest
@@ -1,5 +1,5 @@
 DIST ktp-call-ui-19.04.3.tar.xz 95968 BLAKE2B d27f47217af83c18c3feeb507a63e96cb6743f49eee968ae02739894e74feba3f0e916ee5a1cbfc2144f96914863331b08248e024be1d7c3bd146f9718b0b840 SHA512 cd31a06c5c36de20564aba7a083642eff0c6bfc33de115a893220e410164d81e6e6b6d3679022a05e6eff7918a4e92caba85a9f3d10ba844704fe67230c8a5d0
-DIST ktp-call-ui-19.08.2.tar.xz 97152 BLAKE2B 2bc6aeb492db519be29a747edb690c6fed212c5c9fa86c4f3bf3f8f81bf775c7b81edfb6e62c7fb711584f6337249ce3ca1908b418c33f540b529093f1b28191 SHA512 fdcffa8d01602b3aa8ece38f11c5ed7b6a943501ad86952a08baef1b75a067e1182a2f140fcb5ad5849b1d7188cc38c869cf3473ad20d41de61790eda2057078
+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.2.ebuild 1064 BLAKE2B 5ff6f0412bc23aaa3d6f7a5735fe5dd7d9da5bf90919a8dd6668cb0f6f564756da3979a2674a6101ba6000314424fcbe81f89453287dd87cc8ad0ca9ba70dbac SHA512 9088a0e2169956a3dba28d7caff7d372f898764565396a654dff95b4572bbe917f5a823ad6a4cfb8413e418fced90ba52b77b4746cb28c7b6feac0d9c42a6372
+EBUILD ktp-call-ui-19.08.3.ebuild 1220 BLAKE2B d73b2f437ba73be534d664bd09fc8c310007ddb9b7d54cede857a42ee7eb255fde324b7cec18b56f4c485924835a59552844ccbff3a1d8d7e593ac4e08475f70 SHA512 44e0a9a39513c1f69153059f432821780140b424f2bc4dfc13f2d1fee829873fd3e8a2cb9aaa77ec73a41aa09b9f7d217d3c0b19c3b0bd48621465d9d0386fb5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-19.08.2.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-19.08.2.ebuild
deleted file mode 100644
index ea5c7e4e0955..000000000000
--- a/kde-apps/ktp-call-ui/ktp-call-ui-19.08.2.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
new file mode 100644
index 000000000000..eda2799c8721
--- /dev/null
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy audio/video conferencing ui"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+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/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
+	>=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
+	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 909dfa59ec35..6a26675a6359 100644
--- a/kde-apps/ktp-common-internals/Manifest
+++ b/kde-apps/ktp-common-internals/Manifest
@@ -1,5 +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.2.tar.xz 443916 BLAKE2B e46ada7c7c065f0ba04952e28e20e08a91aa020bba46c1b040ff058430c699d1f26315b068207a13366f935df9d2d50035a6aabf9534079fecc0a35c6750208b SHA512 dda4b54497fe85067e0bf6f14b892cb0a718e4eb6a997628a07f6d26c3062d2b413766c70a014372bd5708c7b0d6c75da4749b694bcd8062aed01a43bf3b2b3b
+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.2.ebuild 1581 BLAKE2B f0686fec49af3b0e7772855e7d44324b7175a0c2350f9988fd3a31078e1a90f6c60a1f6ee9a4b4a7025d5f81f30da1cda02bad50f19e306d82fcd0975594c596 SHA512 80a27ac6184a07b43fb4b08e3d7c12235d4e8a36ebb744e10fa84fb4925a1c8c58c94d95827d6457b9db8b70c81a3bf881dfc0f32665df0536135034bd2e9aa4
+EBUILD ktp-common-internals-19.08.3.ebuild 1838 BLAKE2B a4df77b1264e3d5f20c7579739d7340f7dc7a8dc28b833bc0983153d7e3611ddfb8dba85d05681e871033aa047d1e6ae79d702a73a6e89b559b16ff751a44d2a SHA512 2d0e5934a7f7770b205d97497b8c341d4ac992d1ba2ecda7e22098a6f9d31aa4e8ca1b0f9617919ab0ae2e1300a2ed95dba5a0fca40d397cb20bfb45eb4cbd67
 MISC metadata.xml 443 BLAKE2B 716a88e6d9b4319fa0b851db9169b7e2a330cf94fbbb74197f38d82314f398ec819fad0dd00aa0cecf4a5eea7aa900bae0c6233371a5b4ac0018ffec174bf119 SHA512 ae521d8e0b37831b7335c42b03a569fb7d597b3bd91432fe01d8e924eec4cd99fa9b0bc08baadb61d510201780d8b378f6ffb54c27807a3e68caf06e13b69579
diff --git a/kde-apps/ktp-common-internals/files/ktp-common-internals-19.08.3-telepathy-0.9.8.patch b/kde-apps/ktp-common-internals/files/ktp-common-internals-19.08.3-telepathy-0.9.8.patch
new file mode 100644
index 000000000000..9cc3b301e0ab
--- /dev/null
+++ b/kde-apps/ktp-common-internals/files/ktp-common-internals-19.08.3-telepathy-0.9.8.patch
@@ -0,0 +1,57 @@
+From f030b527c4d390ead78d2e56a1655444f97b5545 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Thu, 14 Nov 2019 20:34:21 +0100
+Subject: [PATCH] Fix build with telepathy-qt 0.9.8
+
+Explicitely add the necessary link targets which are no longer exported by telepathy-qt
+
+Differential Revision: https://phabricator.kde.org/D25269
+---
+ CMakeLists.txt         | 4 +++-
+ KTp/CMakeLists.txt     | 2 ++
+ KTp/OTR/CMakeLists.txt | 1 +
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 187400e..2650321 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,8 +20,10 @@ set (KTP_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_M
+ set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
+ 
+ find_package (Qt5 REQUIRED CONFIG COMPONENTS
++              DBus
+               Qml
+-              Test)
++              Test
++              Xml)
+ 
+ find_package (KF5 5.11 REQUIRED COMPONENTS
+               CoreAddons
+diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
+index 85d578b..ffbce10 100644
+--- a/KTp/CMakeLists.txt
++++ b/KTp/CMakeLists.txt
+@@ -91,6 +91,8 @@ set_target_properties(KTpCommonInternals PROPERTIES
+ 
+ target_link_libraries (KTpCommonInternals
+                 PUBLIC
++                    Qt5::DBus
++                    Qt5::Xml
+                     KF5::Wallet #included from wallet-interface.h
+                     ${TELEPATHY_QT5_LIBRARIES}
+                 PRIVATE
+diff --git a/KTp/OTR/CMakeLists.txt b/KTp/OTR/CMakeLists.txt
+index 12e28de..0743e25 100644
+--- a/KTp/OTR/CMakeLists.txt
++++ b/KTp/OTR/CMakeLists.txt
+@@ -28,6 +28,7 @@ generate_export_header(KTpOTR)
+ 
+ target_link_libraries (KTpOTR
+                         PUBLIC
++                            Qt5::DBus
+                             ${TELEPATHY_QT5_LIBRARIES}
+                         PRIVATE
+                             KF5::I18n
+-- 
+2.24.0
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.2.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.2.ebuild
deleted file mode 100644
index 923585ea03a7..000000000000
--- a/kde-apps/ktp-common-internals/ktp-common-internals-19.08.2.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
new file mode 100644
index 000000000000..2df7d44da82d
--- /dev/null
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
@@ -0,0 +1,70 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy common library"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+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
+"
+
+PATCHES=( "${FILESDIR}/${P}-telepathy-0.9.8.patch" )
+
+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)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/ktp-contact-list/Manifest b/kde-apps/ktp-contact-list/Manifest
index b5df351d0890..e581c06980e7 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.2.tar.xz 149240 BLAKE2B 1973f9b944c5f48d0e73d2f423eb41f15bfc474d5bc57d49303d3feedf879cf360c5a47cff73e642f26f3642af30e5ba835f38fdc91ee258c4624c65fad025d7 SHA512 518f04b6c6fb5bd6ca9a821a01024f6859dd016f466b53e76b3fb79c7db4f485f82315a10e356484087f74f05337cf6195053dbcaa56f3c0ff2f6a2987d9d206
+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.2.ebuild 1038 BLAKE2B b1b1133475cacdbe5dc576fd428fb3452d221833f3f0901214d5d2061268943f1430e7852d34080e14a348fbcc3db804de50208988b853594f3d7d65605bfcbb SHA512 873285c144e4a86aa96da78e075523b914ac7e4b7eae730ab38f0a2ce7836085fa43b3df717b168d74cc16e8fde5bdcd084cca71c3d597e13ac345188485c4fa
+EBUILD ktp-contact-list-19.08.3.ebuild 1224 BLAKE2B f548acdfaa2627200a5362e2e50b304c48d41901b6dec1fde8c0260ff96b68f85b07202e2fe76ce96aa0735c847f5163c98b09844625f579e71fa8b1bb570014 SHA512 ef529b0046b82f0f4268878a758b1d8b65229103f9c82b5de770341c25111ba12b58216d69f8e8a6097aa792299086d9c562942088bd1b4a4ec5cbdd0d511789
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-19.08.2.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-19.08.2.ebuild
deleted file mode 100644
index 5aef626cdf56..000000000000
--- a/kde-apps/ktp-contact-list/ktp-contact-list-19.08.2.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
new file mode 100644
index 000000000000..527f5d2121df
--- /dev/null
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy contact list"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+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 e47297a76e3b..058e83b6ef81 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.2.tar.xz 43068 BLAKE2B 36ca09627ba19094a8ee2195c048984c436ed21d7dc6cd1c8439c23d599cfa56448ef83db9a4c12bb3424cbfc9f7b1385777bc283fe8278aa149a35d165cb1da SHA512 e11b9465c0bed0a009e04a70d834c4dbcc83c803355a06d73e54211d11f917018ee2505411e916df2a403d3fbb31a521e3a50be5018215617f7e105fa5c31d16
+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.2.ebuild 608 BLAKE2B c1dd553727c1d13b7d41514d10c28528e8648fc5e265ed0192f3acf5f8ffe8f12cf6df7a8daf3bbd545ad07e9d81e01929874d8ff218289568a729c4361c2ae3 SHA512 e0169c8d12cab6537a70130694ff04fbb3042f60ccb2fdae2993baed4cd35055c097821f7031029f7db0e9294884774820aac6110c4eed0c4835bb50135da6e9
+EBUILD ktp-contact-runner-19.08.3.ebuild 716 BLAKE2B 5a187b40580cf5c6557cda8cf2b67bb7bf1cbb5a8ee71464379ea00aa5920658c2dc65bdd0e34a2bc4d92e1b7aa394f559c3ff6edfb6e3ff4659c757b519ef66 SHA512 9ea50f220a92ba39f6e3f8d37aa6b6c7f03afb17f865faf1ebc5a4d58ea050fd4765b1d91816af1563f7c197984a44def77ef1eb2a85ddb470f4580686d88706
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-19.08.2.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-19.08.3.ebuild
index 6be737ddb465..4324a7271363 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-19.08.2.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-19.08.3.ebuild
@@ -3,25 +3,29 @@
 
 EAPI=7
 
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy krunner plugin"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
+SLOT="5"
 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)
+	>=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}
-	$(add_frameworks_dep kservice)
+	>=kde-frameworks/kservice-${KFMIN}:5
 "
diff --git a/kde-apps/ktp-desktop-applets/Manifest b/kde-apps/ktp-desktop-applets/Manifest
index 8893c3278a48..8dd9a9ba4e16 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.2.tar.xz 43512 BLAKE2B be3dae5477d31d4d90dd239888306f64227016ecd96ad2da7e997c8123f292ff8ba40e9d0e3f19d4e61d4a4294bcd13a1a3d46b7b06e47640b5695efcae721f5 SHA512 92d850ad679900d348abcfc5b81572fb64cdd826e0a32b4dc7c9aead8dbbb500fb4d0363249a507a3163c99c3ab8feb751fcc761c1b901cc57b67ffa83c69288
+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.2.ebuild 578 BLAKE2B 5624a7f45132861f76f9fe988384cdfb63fec884dcc7945da367f4e9e908abbaa93a5800f99584468b309835a75e26a8c0e60bd1684edcb4262e0d0914856fee SHA512 8fb14958931703ffe7f473503d3d008d8964965170f0ef06d0f6b044bda9564072a3d718e4026a48f1f2526745af38645a539299e81fd325163f8b689a02d937
+EBUILD ktp-desktop-applets-19.08.3.ebuild 656 BLAKE2B 649eafe2f17f0f927ace01dfad852ca95441cc257ba9f91e61936aa72238ab8c4daca4c5cd88bb1cccff8e949535830fd444f29430935d95045f1a9ba9080ac8 SHA512 f98c720951d3cd4f4eae46931d3d6524d198d56e267205be56b08b8549b9cfdbe55a9e88a81dadf79b8b8596835c7b06160e9f6485e58339e0c3294b791771e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.08.2.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.08.3.ebuild
index 25de75b7f618..4205a7e0c31e 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.08.2.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-19.08.3.ebuild
@@ -3,22 +3,25 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 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+"
+SLOT="5"
 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)
+	>=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}
-	$(add_frameworks_dep ki18n)
+	>=kde-frameworks/ki18n-${KFMIN}:5
 "
diff --git a/kde-apps/ktp-filetransfer-handler/Manifest b/kde-apps/ktp-filetransfer-handler/Manifest
index 2632f6ed718c..fd4d6937e866 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.2.tar.xz 46212 BLAKE2B 3d22eae63905a451e02114d5b97c99f3f228e1443e81f34e6e268ce061806fb34defe1c5b9ff40f93eb723cec0644a9b5754fd04d1e6ab942ea39e2de2145477 SHA512 1a954587be5ad29e889a1d791a251f7eb10bb0e958dbbbf3469303c9783314f8fc44145ed44b44ffc9fd678ce90dbf3d5bae2de1b120c26d41747e872ffce11a
+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.2.ebuild 624 BLAKE2B ce4684391fb442152c8bd0f55b5a67443f31a2185479d6666faeb7a91799f9c5d13ca37388b708e2758616867598ca425435374b5309699299a139e837ac20c8 SHA512 45558f1692079ca8ee23c389af67db608fa6ef52c5cf7a68985be312a1ba3c1f984542fb579581b20855beddc8f1cbab723f299a6ce39fdd2dccdc6d597c2777
+EBUILD ktp-filetransfer-handler-19.08.3.ebuild 732 BLAKE2B 18266eeee4870169744df142d3677d9c1f9b8157850f96a4fcdaaaec6ab2de86102c0fd51d2d70605ad8a64f5e07c920613be2519c9c0cf7d9285bb92334d0d3 SHA512 85653223ceaf3d43596bb6e9a36c94506949032c8f2dfbe0c3ea3f83720d2b6425091ba2140251fe9f7f23300e2ab8349c8b947ba8b902f3cd2a40bbd53bd377
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.08.2.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.08.3.ebuild
index cf803c7f1937..b4f3b6b4bb07 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.08.2.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-19.08.3.ebuild
@@ -3,24 +3,28 @@
 
 EAPI=7
 
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Telepathy file transfer handler"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
+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 ktp-common-internals)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=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 77994ab72798..526dc6a53f29 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.2.tar.xz 97028 BLAKE2B 007c88dff00b7295f01e77c6e5146e8ee9755e2334c5a6e1116361ffc03febc26e02a7c337f86079629bb408f31570183b9e16cb75a20e2be7d2bc2bdc72778b SHA512 213589c7e879d45deaa4277b4485049dbe9940c387e190c5c0395dd0e752fad2a4d8a1a2527c66adccc0c5317d34180b10f0612e178b1df3d84b8dae124a6b12
+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.2.ebuild 983 BLAKE2B 8386d7baf0a5d9271f851b44a1776d993bf431c6574ea53dbaa15b58ada80f796a88d0afe74c512a0030d4c94595d68791f942dcce04733df52ded3ec65cfb32 SHA512 a9393c6e95f14da9e6716b6cbc26ecaf1dc2a260afda122cd11b72a12243a1ef0bb004c09bd864c03a1e9551424fbd503013bb0202a085f5db343bfaacbb9340
+EBUILD ktp-kded-module-19.08.3.ebuild 1148 BLAKE2B 769ec4f29f244b55ab4b9caf6f10c42794570c56ed8f4867a4f12dbfce254f5ce65d7c163c558f98fe830199e872aacabbdd3540f4daee532420be20b69f4771 SHA512 9e4dbb3784ab0e52f60ce3e35375354dbe9f7d1b748f78aa5bafcc03679b390bf43adef4d04537a4e9f00682f21375bbe2c00ae83a7d464b599f80de496f14e3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-19.08.2.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-19.08.2.ebuild
deleted file mode 100644
index 1ea2ae25d29a..000000000000
--- a/kde-apps/ktp-kded-module/ktp-kded-module-19.08.2.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
new file mode 100644
index 000000000000..c1a0cfa2b301
--- /dev/null
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Telepathy workspace integration"
+HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
+
+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 de49d8401e15..a77a83624ff0 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.2.tar.xz 29108 BLAKE2B 410b3eb2867e787d350dca79ee8017fd5257dd2020222fef3ba5cdb6cdd3a66a0c5ce5f1f98d2f2f3a1df50372a82fc131ab49780d8caf46731d2cf73f295624 SHA512 adbc516f276bd71042aa9d458a176e4fb9f0eca3fc510249fe456c959ca336222d86940b9e586dab19585b744816cad67229248b7eee4d7e094722e33a9c00c4
+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.2.ebuild 831 BLAKE2B 848d5273cb62df4d4a02045c7dd158e31a65f32cdef9fea0d37a7552cf7fabdb243b7be3426e40d0e46b5e99675371c7f48f76848f632e3ea46605c14e13ada8 SHA512 544f9433fd0ee8687b5fcff7bb82581aa25fa2a85af376aa4f2baf33fd882d86b91b27950c784366e1611d04fd5816da06354fe08b60281f6479126ced5d9102
+EBUILD ktp-send-file-19.08.3.ebuild 957 BLAKE2B b2021762bd4038c3aa65e6651ab60836f4dc6cc75af5bd24df93bbba6f0f970c90955300903e6fcb7f26066c7ab4a6c2ff99ce9e3686e59392319763916ba46a SHA512 10be93fbbf6fb555f51787a06824e3b4c28e841d9b47cc8ecc8c6fac78e5ae6322070695c7ef395c9de8dc863cd59e9d6244fa453dbe995a722260953a36a85e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktp-send-file/ktp-send-file-19.08.2.ebuild b/kde-apps/ktp-send-file/ktp-send-file-19.08.2.ebuild
deleted file mode 100644
index 85a5c614ccc8..000000000000
--- a/kde-apps/ktp-send-file/ktp-send-file-19.08.2.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
new file mode 100644
index 000000000000..11670c5a82e1
--- /dev/null
+++ b/kde-apps/ktp-send-file/ktp-send-file-19.08.3.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.60.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/Real-Time_Communication_and_Collaboration"
+
+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 095fad890a13..8f1368ef86dd 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.2.tar.xz 471240 BLAKE2B 1ab8238e1e79c7ab0da87cb85bfe24acf5e2ff14fb991dad203f8bae31fc19672f0da677f3be2a0647938dcf20ba8ab97423f516aa43cea6718ad464f056156d SHA512 404c31433adda7ef66308495c065bfd86b37255852eb410ca68470b6fb46504ab2d60d0b3d15f847fecc4807e3f9e6783d7e40ca5d76dc6ae375ff5dd1e1f700
+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.2.ebuild 1460 BLAKE2B 0e0487b6a4c0a52d5c03859421d47ac4bc132397d6213fffa48db044fcb0b8d975919d73d71ed6c1e2d0c989b3564365cbd6ed9d70be804c1e1e28f7484cb420 SHA512 67bd63734a7dc99ea62cfaa7d8a41ab03d0760c5df5b74157ff1ee34efa3a5de244d562c0a0eec32704a3d742c2d5ea7160da7a96c6b42025132ac0198d03a8a
+EBUILD ktp-text-ui-19.08.3.ebuild 1684 BLAKE2B a99ce25ba4d878e4f1e0ebe940953b6b018afe9f66b2c1f98712e9ba8b64ea20a312e286cf09c24488fd2984187cd8297b5bfeb3df0bb7a30bc003e1cc4b4494 SHA512 dd1d406b941270473995f17acb1f653a135cbeec6c129ad68820f274e6dac979c82ee1367b4ff1b2579fb1daa05947b7d41d8672b0869ac5b7de5e4dfeee96d7
 MISC metadata.xml 354 BLAKE2B cb80df865c3fe1cbf07ecafbdb6c555f913951adfaa265c8e67600b8a53621944e66ef3009bba05c1114c40581d596d86491b2ae97ba522bd2cc98457bfe6722 SHA512 cb1c4a01ee60e82620746b37e989c9a79497c10d816b746420c8b3b248b5a1a84ff82464516ae38d4dd9d2cf3e176af0793d67c8567287394a6828a781a6b301
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.2.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.2.ebuild
deleted file mode 100644
index 98fb8f6ea946..000000000000
--- a/kde-apps/ktp-text-ui/ktp-text-ui-19.08.2.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
new file mode 100644
index 000000000000..3de2a22952c5
--- /dev/null
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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-utils_use_find_package speech Qt5TextToSpeech)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/ktuberling/Manifest b/kde-apps/ktuberling/Manifest
index f8692704aff7..f25fdb21ec6b 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.2.tar.xz 32641376 BLAKE2B 68402b20ce830827a576714907150e2950b073fb54909945fe810fc3130eaea7fbcff255ef258753a276c6259fa28f76c8249d6c1e6e50cbfd23bdb5cd769e50 SHA512 6a5ae8be1804ca90853a0d56cd86f42bc1f6260066d0c6244b6838eb5a86a2d564adae3f0d8def677001dfe3007b2f74831731b57be4b42911a9eb6d0ed28b31
+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.2.ebuild 938 BLAKE2B 8f010076e4cf66e32b08d224239b5b08b8260f6be4396ff2dfda34f20838e1b7724e151fc5f332cac25b63813b91a5eeebd1eaab659ae41319d69ae0ad064fea SHA512 31b3b2fd871d87a1567ac23a012d27a333033b5189375154fbd2883a454ce14bb12df296b5b29c9fc3c91b0a56328d1979ef09ed506ef00caf9acd3c4e30e94f
+EBUILD ktuberling-19.08.3.ebuild 1130 BLAKE2B 03b84e8b3d2ecf69176d1821924b64589d2e2c8dc81b46feab77ff3f5350f738c467f5a18aecdfa8e5f01b2b984d0c871d0ec01fa0ef28363eee248f6b635636 SHA512 1c135f8be9953525114fe45104fc614e9ccf9947fa24bfe49e47a0664b60add595b57be528beed7df7c3ec155bf64eda3d49f2694fdc65844d220906b2757ea5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ktuberling/ktuberling-19.08.2.ebuild b/kde-apps/ktuberling/ktuberling-19.08.2.ebuild
deleted file mode 100644
index 6bcbeeef0c33..000000000000
--- a/kde-apps/ktuberling/ktuberling-19.08.2.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_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 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
new file mode 100644
index 000000000000..b95453e3e94a
--- /dev/null
+++ b/kde-apps/ktuberling/ktuberling-19.08.3.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"
+KDE_SELINUX_MODULE="games"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Potato game for kids by KDE"
+HOMEPAGE="
+	https://kde.org/applications/games/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 0fd8c22720cb..ffa2a2b25c38 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.2.tar.xz 1827044 BLAKE2B 4360da04c1a6af8073ad9cd626a3ae4ba51b5e526bb29ca5c956d72095cbab7ecfd10e3b7e6ab6d3179677cd1c08c1235c72120fe8b1c024c65e395bc955fb86 SHA512 91348b26842469ce8287828649f701ca3723048a943837fcb18febef94fbd95a48e9500da0cffd4ff0c8b9e35db5c7d50e10900e0e10e47e2c95bb7d633977cc
+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.2.ebuild 846 BLAKE2B a9165b25bc9675a93e3cdda7e6e9b0af693fff584e2243dcb55dc1290ec874d05df15a93952ad1adde146bb459354e9259976a72b81b039813e89d920950d67c SHA512 d30ff7e3ed1d4d2a499df659644b45e7118c9302066528eefb1c31b30a4a757fbde51a8fb50014d883cb7321253da056fa6684d7098cf46879c9a10cf22e21fe
+EBUILD kturtle-19.08.3.ebuild 1008 BLAKE2B 1fe53069fb9c4250d6566e7c829aaa1f1b6d264626a9fb1bbeefd5d8b2cc84b6eadbcf9155063562dc896406a4420461073c64b0ecf87f3a3a45d50ff103c023 SHA512 406fb6f55375306e57d8782331190b9abb9e47711c5b3980cef98028dcb286a4d029aa07eca4bdcfd07bfe8a76b783da3e04bcd2f81a87255be3363148f6e2ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kturtle/kturtle-19.08.2.ebuild b/kde-apps/kturtle/kturtle-19.08.2.ebuild
deleted file mode 100644
index 3fac3b7667b7..000000000000
--- a/kde-apps/kturtle/kturtle-19.08.2.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
new file mode 100644
index 000000000000..0f75266ef007
--- /dev/null
+++ b/kde-apps/kturtle/kturtle-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Educational programming environment using the Logo programming language"
+HOMEPAGE="https://kde.org/applications/education/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 005c4fb85f44..52f62405898c 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.2.tar.xz 312928 BLAKE2B b5485be05f283d645cc64b5790eea6fecae7b187e5cc2488b43e2c1161bf76667246d86926d6a3923bc39d44f18e0504c89d86c4e51c4db3c5e412ffeb6e6226 SHA512 52163d9cfb04033309f5a16c68d92d13be61ecb97f12c2377a3274d4d8ca439b68cae13ee92a45dc2b0b9117e8d450a414e5eb0cecf3ae825c7fe2886af38a5d
+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.2.ebuild 728 BLAKE2B a424fd6af542a549ca76bdefcef60026eee4c12d8637a2552edc4cfe0a33488e3c7d9c77dafaeff8a6376ef4d9140ee2c14deb0bcf42422d9231656d040f7e80 SHA512 2d7f30d5ef7d8ccab8bc3e82c6afeb88925cc8b2a24de2e7a2c82116605197ef14ac084938206fe0ff36766a9cc1926bfe3cf824eaf24478106966dd3427efcb
+EBUILD kubrick-19.08.3.ebuild 890 BLAKE2B ec341e2534423f8b9e8a525cfcc5e69c15c5244c6f57b2b359f44bb65d2b893dd13e652e066cd9a3397def56a11d2afda58ac741f95d7c57854717ea806aa9a1 SHA512 ae91423497b0f83e0e982ffd9b77cb9fd665b05ee5437fefd01585372e93b40833f4746b995de3ece4964f06dfcc36af047ca4e5fc8a4c704f2697ca84522168
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kubrick/kubrick-19.08.2.ebuild b/kde-apps/kubrick/kubrick-19.08.2.ebuild
deleted file mode 100644
index 58c7ac189c8f..000000000000
--- a/kde-apps/kubrick/kubrick-19.08.2.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
new file mode 100644
index 000000000000..37721e3751b4
--- /dev/null
+++ b/kde-apps/kubrick/kubrick-19.08.3.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.60.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/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 7955743fd467..b6e0805c3af1 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.2.tar.xz 786768 BLAKE2B 20b3bfe1a99cd7245c59685b23a1dbcc758eb1e4336eee5ab9f6287da5cca6d6be0325a19801e5b96278ba9c81d87dd56fbc8dd598fe01e7d67c57aed2cf0a82 SHA512 2cfcd8d72f686fcc808c15ee84b62ab6ac8b6955c4c194d017e9c76991e96638eceb7f4a6e538eb8b3d5cb9d8df7c0717cbc2e3ce48b244de8a4bbcafd4dbec0
+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.2.ebuild 1159 BLAKE2B 2fb7b62514b4ce5046f6d4f241702cdaa83b3750be0a56caabacde2c7e82b98ce102821c160d371d0b84a48ea862be61ccb926610a5df6cf8f2d8ff91556592c SHA512 6392b08fa0a6209823712ee5964fa6ae417e5159f24c31571ec55790e5b3a49f8949d7538eb81f20da16e94222bcbd0dad43080392e967e6b23fd2a06bc3e977
+EBUILD kwalletmanager-19.08.3.ebuild 1381 BLAKE2B caefc2c302ddf9baa681a63135938c1e014685417940a6476ac04e978827f7db76e0dca4d8324d1712e44299d5968f258cf58e5c9f83dde9c2a07f508e8a5d2a SHA512 ef44f512c1e6ad7b2b04c12bdd526cd7371cd04ab567215357cf0e27622ec9430e97a13186c528f683a1323e4db3e39674cbd563068cef5b879b1b2b26a31850
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwalletmanager/kwalletmanager-19.08.2.ebuild b/kde-apps/kwalletmanager/kwalletmanager-19.08.2.ebuild
deleted file mode 100644
index ee8a985d37e8..000000000000
--- a/kde-apps/kwalletmanager/kwalletmanager-19.08.2.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"
-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}"
diff --git a/kde-apps/kwalletmanager/kwalletmanager-19.08.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-19.08.3.ebuild
new file mode 100644
index 000000000000..9b9da822342e
--- /dev/null
+++ b/kde-apps/kwalletmanager/kwalletmanager-19.08.3.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"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Wallet management tool"
+HOMEAGE="https://kde.org/applications/system/kwalletmanager
+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 55c0762487fc..e65a12620b11 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.2.tar.xz 6194828 BLAKE2B 54a17ce6ac105a0963ffdb943b6571925a88adfd474557e0adaa0789d1bf9ddbcc63eecc833bb4fe0a2c44bf93ac4b325c27bddd14abf9c91c0819d0c6226062 SHA512 f282730973c6568997b732b1dce82c4e0426f460b3f14627a21045bc65a76b190f6da83828280d89f8f727a887dcbd7b3c0f005c77956f32b901724e0de888d0
+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.2.ebuild 1999 BLAKE2B 539f370ab349a3b0bec9dd501695acae7b9a5b6cc891d511e31d04b4399373406f6d4456dfb290f3cf55d791a750b5b4154da02214343787445cb1882ae52c42 SHA512 8eae7b7a77579e309fc261bf02adc7e1ec0bed9251a2ce4b5c06ebd2e9778a1ba5739a0c62d84a42a71f137708fc45ec603de5531c16b7c16bf3aa50e0b33406
+EBUILD kwave-19.08.3.ebuild 2160 BLAKE2B 655941749c1055087f8dc4dc3d71382b3fde156040d25bd6b3a935f12efbabf505cd1d53f9cdbce9a87be7e252eb8833bbea5f435a4faac88ba3e8bd2fae8ef3 SHA512 a517741681f3439ac542cd673b77aafdcd6fd45d55427488e479fddad954c093846183712bbfc588abfb0641c664bc7cf009c68a4f69ad685362983cfeb1e3dd
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-19.08.2.ebuild b/kde-apps/kwave/kwave-19.08.3.ebuild
index 9b6ae0c206e5..e1302c6a1b5a 100644
--- a/kde-apps/kwave/kwave-19.08.2.ebuild
+++ b/kde-apps/kwave/kwave-19.08.3.ebuild
@@ -3,8 +3,11 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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/"
@@ -12,6 +15,7 @@ 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"
 
@@ -23,20 +27,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 +51,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 +63,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 +83,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 b56da04ab698..03c9387157aa 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.2.tar.xz 4174044 BLAKE2B 958dfe32ef2e76fe4000ea0bccdd6fa10da78faa8347e82a6da53478ec0efc75b57bd2216a004f16f7f42f9453069b9f557e855caafb1f2e9142765a55983680 SHA512 c8eec15289a8c7cbb11896cc3fd6178e113dad105439e0e1040ec0e919a84efc46ca4565a9a50526d7b222ef10022a130d99c4269b7073f4bd5f49dde3c8fda1
+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.2.ebuild 1024 BLAKE2B 4b9e8d6f7a7397bfad792ea739526ce17b3c61852c1d20ff00fd7b3412aa14f69a16fc0560590e1611554e58c2da7fde38ee64474ff900054a8e0f57b43d4c67 SHA512 928b4c96ee681e3d2acec483f54578ba77a2b8a418867079a4f0c15a06a6af9bb10caa0fd53f9e4b6266d4b1f807c6734cc486735f2701f3b69629fdebd64af9
+EBUILD kwordquiz-19.08.3.ebuild 1228 BLAKE2B 6f9c9a2437f246e4d1cecc16ab4bd0e363df944a72d4948dc7b3efe39e452afc4c4d0611228d20273f72251b510b928f074433d7a5e1d54e8dd83a6a8639b513 SHA512 3e6b88b4265d4fd4083b62daedff6148fa961d018702ef4ce386b467b3634598c548d8f638246092dffc22353a4c1510d33eed19bf21407909188bdf77705d21
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwordquiz/kwordquiz-19.08.2.ebuild b/kde-apps/kwordquiz/kwordquiz-19.08.2.ebuild
deleted file mode 100644
index 34d377463c1e..000000000000
--- a/kde-apps/kwordquiz/kwordquiz-19.08.2.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
new file mode 100644
index 000000000000..42f2d271ea06
--- /dev/null
+++ b/kde-apps/kwordquiz/kwordquiz-19.08.3.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"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 a4f4b268bf5a..22e9e51ec4b0 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.2.tar.xz 5846748 BLAKE2B 74e15971a8d5b80be1f4831238074559b8b22142516d2487d5814bdbd20c27069337cf4eee4d709e7f6e55551ca3d964a52b9640ae1d228cff3eaf4d474268b6 SHA512 3e1608843a749af75f12011e929bec0cd18e28b73e6b531b885855b07aec343007deb3def2de1215ff134f84052ecf956d834029267d790cc99ddd76d36a212a
+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.2.ebuild 1189 BLAKE2B 0d78c4f8458f37b176bcbc83fca6161a750f31f3f2211723d81a306ab25092ede1d1c3861034fc4c41ec6433f22dadf86fd5038a199d6a400b5162de04e71c9d SHA512 d7c56b7992c5c1f115f467b430015a4118b405e9b3789b44e521e7bd946fbc54738a2ca9e0ea5cc049ac3294a92bd6c8d42be994d86c914b4c72696e29a8d82d
+EBUILD kwrite-19.08.3.ebuild 1355 BLAKE2B 727080897d82d55a8075eb3e6d6da8713b79577d9db8f4ca6d52a06c6a481d01fb6f8937ec76bd75f060c8a1f1880994dd6250ab021266279538e5253b5a9cdd SHA512 c2119781c821df9e62735b0337eccb68ba78aefa954390cb325d8e5fbca8daeeb2cbf7c74a14c53c87e49667cb14d3d794137d113574b50ac920a2cbd378fa36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kwrite/kwrite-19.08.2.ebuild b/kde-apps/kwrite/kwrite-19.08.2.ebuild
deleted file mode 100644
index 41a4ad5e9a3d..000000000000
--- a/kde-apps/kwrite/kwrite-19.08.2.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
new file mode 100644
index 000000000000..c622764d1b11
--- /dev/null
+++ b/kde-apps/kwrite/kwrite-19.08.3.ebuild
@@ -0,0 +1,54 @@
+# 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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE simple text editor"
+HOMEPAGE="https://kde.org/applications/utilities/kwrite"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="
+	>=kde-frameworks/kactivities-${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/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
+"
+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=(
+		-DBUILD_addons=FALSE
+		-DBUILD_kate=FALSE
+	)
+	use handbook && mycmakeargs+=( -DBUILD_katepart=FALSE )
+
+	ecm_src_configure
+}
diff --git a/kde-apps/libgravatar/Manifest b/kde-apps/libgravatar/Manifest
index 9d5241780a6a..1f86279aa47b 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.2.tar.xz 31012 BLAKE2B 275748725776321d9ccdb983aafb17a2d43f188a5898f754fe4ad5e6084bc9972330b1e5a70585f16be3521ca518f0f321aa32183797fd0402a200a2cff583d0 SHA512 e00a51b11647b7297df0680c0a09ab80b59e066bb8e391c0374fe6f099bcd06a91ae7a5e6809e3efc7c7106d57db8bdc12a62c5248544a6e8a44dc334d9afe65
+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.2.ebuild 728 BLAKE2B ec0252cf000d53b3193f08ecd0265e1d8e017b15bd79195411bb87d10133f902da5aa4093e5495cc7a2003eff277cdb4a4bdbb120f70c28ad85814e60c5373bf SHA512 a9d9f561efbcc696e9a2d9d462d27bd7602ca97b12235c67bf434d6fe8586e5e596f7e1c080e46e9e25ac6aaa7ee4c37c0902574ad500e31debe8ec3d6921bc1
+EBUILD libgravatar-19.08.3.ebuild 841 BLAKE2B afe441c01168d36817ec46ce0f5b6cbb3fe17cab0a0b7f691decf4a835945051086bf3d01ab35a2bc5001f4533fccf63ae018137fee532c618ac783ab8632f48 SHA512 e9892fbc2db2da9058ac94fd795460fee415a415edac97318cce998fbcfced6f1ee4a3700277711fef7a09e041248db38e2ae7a4a572f0d640d0539d4ed81e50
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libgravatar/libgravatar-19.08.2.ebuild b/kde-apps/libgravatar/libgravatar-19.08.3.ebuild
index a29c9b1e60e5..625ae3343fe3 100644
--- a/kde-apps/libgravatar/libgravatar-19.08.2.ebuild
+++ b/kde-apps/libgravatar/libgravatar-19.08.3.ebuild
@@ -3,25 +3,29 @@
 
 EAPI=7
 
-KDE_TEST="true"
+ECM_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for gravatar integration"
 LICENSE="GPL-2+"
+SLOT="5"
 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)
+	>=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
@@ -32,5 +36,5 @@ src_test() {
 	local myctestargs=(
 		-E "(gravatar-gravatarresolvurljobtest)"
 	)
-	kde5_src_test
+	ecm_src_test
 }
diff --git a/kde-apps/libkcddb/Manifest b/kde-apps/libkcddb/Manifest
index bc8c25486cee..27c78ce80eb5 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.2.tar.xz 423708 BLAKE2B 59789fed7bdabb538bde8ced4f381efb029e97f25b8bd74a5a2976d920fe10a7e21e7749da66d847b0c03d419716526b9c148e45f4441d82a1e13acad97b3a6e SHA512 b19685387233bc845bce7be8a5a8a89ae1339b12a8ea64146da95159e3257b9ce387c53f537673aac048f64c4fd08b76988f2d57ee019102ca60795aa754011d
+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.2.ebuild 1051 BLAKE2B e7d368873c294bd8d2d3f5ff72eca9f8500b593ca54dffa9fc9d3b820b5b216d15ea817fccdb5abcea55d3f20ccbc2e9b83b855402c70727c9c3fc49d09c3fd4 SHA512 9e06a82fa6a730bf865cfc8aed4b9ee41ceace67f9565f8a1a4ff4bbb3649c2ebd9968eca6704d630072662391c6ba08f6e54ebe820b4ebb062ff0d934684eea
+EBUILD libkcddb-19.08.3.ebuild 1151 BLAKE2B 6b3b9772552b8e91ab6fd13ec396271ba75f7f1e23be7e3cad3031ecb02813259d4c3c14032ab72daa5783e27ce54fb1c59884cbd80f10f6a02c172ba952febf SHA512 1641ced4875de90ccb7034a7d39539cafbf606cadf6c4f866a3b1038409a50160787257ce295edea48562085e654d6ba5ce5b62180195bfb675c2d340b75bd09
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcddb/libkcddb-19.08.2.ebuild b/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
index 05aa44913966..da374aa6143a 100644
--- a/kde-apps/libkcddb/libkcddb-19.08.2.ebuild
+++ b/kde-apps/libkcddb/libkcddb-19.08.3.ebuild
@@ -3,26 +3,29 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.60.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="
-	$(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)
+	>=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}"
@@ -32,7 +35,7 @@ RDEPEND="${DEPEND}"
 RESTRICT+=" test"
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if ! use handbook ; then
 		pushd kcmcddb > /dev/null
@@ -46,5 +49,5 @@ src_configure() {
 		$(cmake-utils_use_find_package musicbrainz MusicBrainz5)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest
index 3539a6ab3479..25ab96f225ff 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.2.tar.xz 89016 BLAKE2B b36a4a51400caf4dce327f97cdfaeab6c8ea8fae81f265bb052732d404b9c5ab0670eee2ee2cc7544019f986c2c3dacb45cf6f1b41702e745149ccac81574674 SHA512 4113e1fec72b4a1b4a054354dee8daf3ef1115b9f986581faadea4326cde2d7f9d153a34601151627d52b7ecd56a360772ad0e8869b992596ebdd7e5d8da014f
+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.2.ebuild 556 BLAKE2B 1c63c72f157779026545b73487809a0593f77ff0b9c42c46c87564c9bb4620d4805e85ea4edbce1a7c4f3a8ba99773857d98c80c85a658334c1f7bea875cf7a6 SHA512 baa3c2e293b246d23cdc1a5c304e9672192c45c13c3b5ff0c6caeecc894591ea182df5f44e20b37c6ebfbd0df023375559a4e41b93f468fbbf4adafb0d27cdf9
+EBUILD libkcompactdisc-19.08.3.ebuild 621 BLAKE2B 81054f8aba0b9b3048d287ff60dbb686f6dd38b4e8d749bcdb06b6905703836b3f30ff00ebedd6e852655f220c522d6177dbdd5a0943660f53704d9bd4977fd0 SHA512 58a2edd6892a7fa284eb4e6a314925903aba09b12f4c4981e4c1923b1af79a5ba33a2f9b1ec40609ffd71ca05c5ead6c56344264e6ec9c8d596008aa2b774638
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-19.08.2.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
index cd87a1684eb6..f1e208366e17 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-19.08.2.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
@@ -3,18 +3,21 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for playing & ripping CDs"
 LICENSE="GPL-2+ LGPL-2+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="alsa"
 
 DEPEND="
-	$(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 )
 "
@@ -24,5 +27,5 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package alsa ALSA)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest
index 5dd90dedc8cd..168c6be0469d 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.2.tar.xz 42012 BLAKE2B 5fb7d2197b4fcccd07800ee6ac2a88a7b845b59c4243f63d0e776ebf4f557d3a33a6e7a129195460e7e8fae0a5aebd0e2f2c1f18fbe2d12f688e6395eaf33f46 SHA512 b7f88ebfaa70e4bf1478b8463beea5e0d636704e91d412d973e5b9fadd7e767d8595137b2995f426180c5234f323587c1d1ab67121e71c78026d3b1f6ea59f89
+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.2.ebuild 318 BLAKE2B 5f68bdec491ef00ce6a7bbec822a298ea481fa0e49292519a7923c07d927982e9775021fe0839301a7cca76cc3117eb02cc7d33071234e1ea5bdd5c82628ad56 SHA512 774ceb2379cd967c650e56b1804b5155014994a2cab1f2f6448c00801b803e344fc7c08730a01d977a188033151c9fa3cb816b71c8c3552f0403611c6e39dc83
+EBUILD libkdcraw-19.08.3.ebuild 353 BLAKE2B d5317dbb87a709d12bc3cf797c500cedb413d9d355c1a52bb9dfecf028d07eecd348b39d96abaaf2153d3505210b4ec1108a86501a0e3b22ce6c2014f4104e1e SHA512 1a1706e518db7df31852479415e0f2ba9ffad5496a46f72da47d27a8cd9facbd51aa65b5670452911033cd16e13daf195ce98c6940c7d2d85a32b4ebcdd217cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdcraw/libkdcraw-19.08.2.ebuild b/kde-apps/libkdcraw/libkdcraw-19.08.3.ebuild
index 0e838afb3569..ff3c078184cb 100644
--- a/kde-apps/libkdcraw/libkdcraw-19.08.2.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-19.08.3.ebuild
@@ -3,15 +3,17 @@
 
 EAPI=7
 
-inherit kde5
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Digital camera raw image library wrapper"
 LICENSE="GPL-2+"
+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 601719c13976..5f1ab017ed91 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.2.tar.xz 6374880 BLAKE2B f54d999331ad83ab9fc2439d33e2fc7f93495624a6b7119478c398345fd3aedbff6806e528e7a81ab2c082babe2fa3684a4d4c4d7a248ac9cb2aa0945f70d758 SHA512 68ffcd6696b903c0d701996ead9f05ea2d35d72871840cb11ed05d9034bd2cc89017e5ef8fb8508452446075ed157dc6cbcda32762ed5d79ff35bf9e070c7b67
+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.2.ebuild 1243 BLAKE2B 35dedb63ec2f5eca2bdedc2e10cd656ae4937911fcc81c7abc2e160e67fecf11551fefde335175d541df1093b73b2ba0c70b878cc35cd7ec7c569c087290993e SHA512 bd6289d944332bfdb23bcc9f1934b8f0f6f570387692ddd771a732cc35d545dfde657b2b3447e9d8d58b7e0a1a20edd5654eaf5d5b28a87f70bac3c36cef2c13
+EBUILD libkdegames-19.08.3.ebuild 1482 BLAKE2B 31e82c035b7f47c708fdb6ab12a136a5d4ce503f8d25dbedfe4716595997b11850c0b93426d83b8c021ab71c25500bda8b92ececc18ad04d27add2be3ac5837a SHA512 5198091c7982a32cd71687382cbab5e94b26fe31a8f96af346fa4eb8caf3d2e7a0b5ceee00672f8af0479739e1cebee239e97f9c2991200fdfa5ddf4d8e9e9ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkdegames/libkdegames-19.08.2.ebuild b/kde-apps/libkdegames/libkdegames-19.08.2.ebuild
deleted file mode 100644
index 803b15db3b77..000000000000
--- a/kde-apps/libkdegames/libkdegames-19.08.2.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-recursive"
-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
new file mode 100644
index 000000000000..7d503ae81762
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-19.08.3.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-recursive"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.60.0
+QTMIN=5.12.3
+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 5157165f09dc..daa8a3b67ca4 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.2.tar.xz 333548 BLAKE2B 0cba5c868f079e90d8c227d3090208f0c1596b4ed0f1d1b7932cb6ec62ec3170e4b057fbae79e8efb42ff726d051e9c74cf50d8e25d3b6b4fe40dc4fc0e9a623 SHA512 431d267bc15c30a889f8a742f061eb005b1b51bc01708a8f37a1b9e600531ab4725a54de7bd79d704b07feeeaa6e0715bce7a22498e2e48c6cfbd57dfd423504
+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.2.ebuild 1074 BLAKE2B 2195b3ea9c24c2b35e0b0b5b905d976f3bb73559762353e1be7116a75a2484ae49216ba840fc90b81b842f31b16a3ecec2279f865eecb79c21a268cbc7f5aaa8 SHA512 bbcb61ff3433e4cc4acb808bb64c7c85e8ec0cac69d0ddb3fc84ffb55ca3a155c38f74ad5422846117b79109ee770a7664525867dc9bfa567a827a3909bee6dc
+EBUILD libkdepim-19.08.3.ebuild 1257 BLAKE2B 243e2720bbb75d3d899e3b65a3ccc449a5b51e7840d34d98656a74407da135abef49a9ba99c61781de0f451e80acbeb88f1cd3e7f62b466873e999f4ee6e7cb9 SHA512 3541f2d3ab0211b9528e859411a0f60c5fa61ca259c25eaff8a140ba4e63725e3679d0c7318dff36b57a8131fd09a4a31c1d9f3c2c7c82b8b749ddd181bbc3fa
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/libkdepim/libkdepim-19.08.2.ebuild b/kde-apps/libkdepim/libkdepim-19.08.2.ebuild
deleted file mode 100644
index 46077c1cbd3a..000000000000
--- a/kde-apps/libkdepim/libkdepim-19.08.2.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 kcontacts)
-	$(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 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
new file mode 100644
index 000000000000..9818fc5e9400
--- /dev/null
+++ b/kde-apps/libkdepim/libkdepim-19.08.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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/kiconthemes-${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 4022e4b671ac..52b0b070c76b 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.2.tar.xz 210732 BLAKE2B 081756c6014801fb796328115401d5ad27f36d9dca17286b290476f92a8b7d72dcca94406a8d21ec977e9f83422179d59148eb1729aa867d594d6671b1866fb8 SHA512 b367486f5e756ffff6e6e7c96cb4acba95d5e2ea1ecd6f2e0679d2d794582a24ba9944b4d906dda618b945e7e8a9a4064592b7f429c581aba4bb8d3c26f5c0e6
+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.2.ebuild 612 BLAKE2B 9da7e3f595dc68a3eeab49160a1104332d563d419527ab16bef804209c80bc6ae83ffb8daa2671075529bf9124566d438a3e442d0c3605924158c61e5eab7483 SHA512 4e0f75fa500035ae34d1b3dac990c76fa728ff7a8424846a3cc804a4668851518a2cc4c9753f64b130e1397c624c8c410b322dd657d8a56b4561c84b96575680
+EBUILD libkeduvocdocument-19.08.3.ebuild 713 BLAKE2B a722d3da17e786d4b0f455bd08eaefd35cc858795f01d6d2a05d17282426131f2639e49b137f52b0a8b260212398e41dca41363a329f7c93803425fad0b8c1ca SHA512 24bea8f06b1a6d6b31a85d0a96bd2c0ac0abc321dfc907ab6cedaf1a20068bc0f38fe784570b97e3bcdaae0dc2612894977fedbb53ee69c9f17a644db9df0e7b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-19.08.2.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-19.08.3.ebuild
index f41a2235cb20..cda42e5c1f1d 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-19.08.2.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-19.08.3.ebuild
@@ -3,24 +3,28 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for reading/writing KVTML"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(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 6f4401d6d5b8..1b58a94f09fb 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.2.tar.xz 64436 BLAKE2B 07d1e1a4827632682b14d08674e01bf1dcb2b0a56fb16ba0adeebd089657f407a7fe0e4f0f4b73a7ea5eb723204d531c8049dac21584b1237aa05574a4dccbc0 SHA512 6e5a9be84daaa556d6450ebecd412b9daa2be37a9f40583c88c8331009349b3092c03e1e974d8bdb435ddfa8c0d1e37dd5d067ab4334763cbdd0f99f0ff1dc55
+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.2.ebuild 314 BLAKE2B 52f7078a8755e4bc423466b756470e94267f513db380604e23614b8134a3cbcbd66e8d77ceeff74b2189fa8620160574195b64c195e58346f8b52157981e729b SHA512 5ac1808a850f335a1dd5a374cb1f354bc096879062c14e19c497e6532c88f3f2373dae9eb73540213d0e056b96e034298b7a2f0526909217a4520e45b28cfb55
+EBUILD libkexiv2-19.08.3.ebuild 349 BLAKE2B 9a3b1762a448e529b0832035659fe2f2ac45edd6b56b7e89e011fadd684f09c7e4cc7a381e65c5a3a5a478951cdd846509f53daa41ebb50f0172155549fa3df4 SHA512 682f84aa0f7961412d72ee58f88f3bca60b0a4f6cdd5a0aaf7bb1e8f13ad5844bd7001b173e0f52bfddbfbfb13d6bf6876f4ba5a174edf2f26a8db1d292d9199
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkexiv2/libkexiv2-19.08.2.ebuild b/kde-apps/libkexiv2/libkexiv2-19.08.3.ebuild
index 3b36b390a757..843b857b7de3 100644
--- a/kde-apps/libkexiv2/libkexiv2-19.08.2.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-19.08.3.ebuild
@@ -3,15 +3,17 @@
 
 EAPI=7
 
-inherit kde5
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Wrapper around exiv2 library"
 LICENSE="GPL-2+"
+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 83ec2a9f0701..cdd4861625b8 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.2.tar.xz 234956 BLAKE2B 437a9ff16be3a15fe2ff214fde39d1c2b3fd40a20c53ce406699695c83d3cd5c92cdf8ee7f2b68185cbd025bbfa733c67a2aabdc625d6d2568b6b4b13c2dd3bc SHA512 2926da0741026a1a1cfd882defece8571e40b041931a0e0b353f80155228e4ca18a51e79076f6a78821d4e076cd6fc38caea680820f6cc5f67f44d430a9fcd6f
+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.2.ebuild 780 BLAKE2B a9d62064c81e1e8efef20fb8904966f852b7f1d978ee8f65e2cab611b8d6676e62038434d20c0139f4ff20acf6aab8c2e59e15de740ca2079706e19205701854 SHA512 5ca2654392a495231f9c959a6e123f3e0893f593cb915f8105576e75cf97b7c97a46866efc3faa45810924dc011e6a132ee69913e336589e1895883af26050c6
+EBUILD libkgapi-19.08.3.ebuild 881 BLAKE2B 0bd9ca9420c2cac234a7eacba4c1524b3c53fd734a66638eddf42263483a6659ace9bde36b2acbc53998aa209506fa8cd8a871f593caaf5b278fea20f59d6c35 SHA512 f68b9975cdac78cd723ea9c332bda4dce3e4ab54680f5b199a9c3be1a5998c20abcf4a0ebfd1a5b8d9625310ead1129047e2b8b1a2140cda6836bfc2f9ce2910
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-19.08.2.ebuild b/kde-apps/libkgapi/libkgapi-19.08.3.ebuild
index 6219894e2ba0..230e2eef7a1f 100644
--- a/kde-apps/libkgapi/libkgapi-19.08.2.ebuild
+++ b/kde-apps/libkgapi/libkgapi-19.08.3.ebuild
@@ -3,30 +3,33 @@
 
 EAPI=7
 
-KDE_TEST="true"
+ECM_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Library for accessing Google calendar and contact resources"
 HOMEPAGE="https://cgit.kde.org/libkgapi.git"
 
 LICENSE="LGPL-2.1+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="nls"
 
 BDEPEND="
-	nls? ( $(add_qt_dep linguist-tools) )
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 DEPEND="
-	$(add_frameworks_dep kcalendarcore)
-	$(add_frameworks_dep kcontacts)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=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}
diff --git a/kde-apps/libkgeomap/Manifest b/kde-apps/libkgeomap/Manifest
index aadbcf659e7c..05dcf89724c0 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.2.tar.xz 150664 BLAKE2B a31fca519d1fa3847dced34184be6dbdb3b1f3568f955ab8f67fda0776f9c0a2738c6b513f529309e5bf86b4b02279c3400acbc7a94f0ac0730138b8c5bada85 SHA512 5c8b65fbc55940827641f6f75c34ab513f9da30f256e425a552bb16804b8c44b3faca61e11f5fc2f59a06917eb485d3ee4dfac10846b8353716f3d97afe1e60d
+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.2.ebuild 806 BLAKE2B ac587821ca1add9856bea2471f65e6bbf520c7a1bbd8588469ea1e5ca340cd81cf393434bf0c6e762865934d31bcdfe21be5898bbeae69973d40e7bfed05b84f SHA512 8f6f608a5a2df9b9788f6b418427a81bfebeb94ac16750b62882252185685f7dfc993db09d39f10a3d63cb0d1283ea02ac5f796303130cb895aa38ea4d41d588
+EBUILD libkgeomap-19.08.3.ebuild 911 BLAKE2B 4cb75b867d73645e554de86ea9c65b93a6ed218fda1351ac9cd14cc5e01fb0d9e0011ab6061d3c140a123b980495db3d234c27dd6d63faf882441b3f2d68160c SHA512 4f4687747cb5fa41d00d94a37152ea61979915e6f7a9df6cff34398a56457697f83671f01e0404f62d9824876751e0523f2b7cd710ba22ec16f0c3383e36d262
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgeomap/libkgeomap-19.08.2.ebuild b/kde-apps/libkgeomap/libkgeomap-19.08.3.ebuild
index da482cacacee..a1b9df57ea59 100644
--- a/kde-apps/libkgeomap/libkgeomap-19.08.2.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-19.08.3.ebuild
@@ -3,33 +3,37 @@
 
 EAPI=7
 
-KDE_TEST="true"
+ECM_TEST="true"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Wrapper library for world map components as marble, openstreetmap and googlemap"
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(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 de17e0ec1648..928f7426f095 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.2.tar.xz 103288 BLAKE2B 6a3f2834bf709c726db47673b139652a850612075f368147c92e2cb0d09346d13950035a1272e4e0b1bc846e58b563b4588fdfcee35483de4e9de0dae553fc17 SHA512 a0ec6fa7bb16a33bca198cd292b3d5c5ebcf7983979e1bcee7cc4863a50a6b82cc8b0072bbdb2209cb855c87fc039e165dd3deb0a342214f9377998d5d913640
+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.2.ebuild 489 BLAKE2B cc90b39994272932eb4dc126b4f99923bf7dfca63c1517c111059e8382433c89a824df6741c91d5a5468a9229ef179fb493b2d7cfcc056e4c58efa45657ff8ec SHA512 952da74816f6606f356afb153d20f8e12df46352697e901b85e741938083bf344f47d2b1ca8edf2e2eb58a070c808aa256e5694be65d4d0d780f3e88eb060475
+EBUILD libkipi-19.08.3.ebuild 564 BLAKE2B cc73fb97283e7340f365dbe2cbabbbef108230d255738f3a8c4e211ad95a72a3257cf856cc1709db8d1a23aa132e7f2244e4dccbf881cf28d9c418e6f9863f63 SHA512 3d1b44b4970ac496955e42a0a395eef0a844c20e9acfa59e0c8e4a1bfa4af5f934f41b252aa8868d381edd0eb8e7d2485a8c13fe387ac45685637bfed0974270
 MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/libkipi-19.08.2.ebuild b/kde-apps/libkipi/libkipi-19.08.2.ebuild
deleted file mode 100644
index e8d77a8e68f0..000000000000
--- a/kde-apps/libkipi/libkipi-19.08.2.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
new file mode 100644
index 000000000000..dab87debe2ab
--- /dev/null
+++ b/kde-apps/libkipi/libkipi-19.08.3.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.60.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 b3daa8a601e8..47ba7de44b94 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.2.tar.xz 337736 BLAKE2B 0fccfa3cdd33b83740ea4c8a800fdcfd3d3589549a3e32c96f8f37d262e4f7f29a59f5abcb01367aefc31f9ea658fa154e15ecbe712a69405616b07459971a39 SHA512 2b68d7d6b154bb16638bb5b533f1239cbbcd610eca14b8e346f14d75c3277f5566e4773797612966abd6dc94fd4f20918c581fded790431e572ba51e59ea1e5e
+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.2.ebuild 906 BLAKE2B 2005ebd7cac0c900d9eafed52b7054b018a4bf4dfe4fbb076aba96cefb75bd75d3b796f82111e07a9854f37cc806cda171d278ad15edf75321c8929ba7a7fb76 SHA512 fe585848cc67959b5d23bebec9f35557bb26f603feb342381c5b498806e19054bc6b1bbee3fc267ed70bc9e8105ec85febd681cc227127150610ca42ba661bd3
+EBUILD libkleo-19.08.3.ebuild 1032 BLAKE2B 0c8928e9f19cf5bcb225fd72cd4e7a744f9471abfbfb399154da7ca4d752eb2d0fc27e5e92e75ddc7ab6155972bb8108f3d0cc1f8023bafb2ef0179a877ed96f SHA512 ce7d23dfe0c3b204d24672980ff27bef60b74ffc1c8718058d1d935a21edb9b598065fe017f36831726fd98ea1b75d42ab42a8433f973a8dbd286a9b893a5485
 MISC metadata.xml 368 BLAKE2B 971372ca098974cb69299f52e0b44e479517a0fb2f70b6c23fe762d93675674d62e46d5d4faea403edba12828ffc0c32fa274d287d1c71ff499df69d2e52a2d3 SHA512 dbef1e7970af1f4cc05ea180f5beecab9288d5502c365d2dcbdc418a67868baa9245bae8ae0c9d637ddcb3f88a03061285fe144a3a117c722654045fd7a4a58d
diff --git a/kde-apps/libkleo/libkleo-19.08.2.ebuild b/kde-apps/libkleo/libkleo-19.08.2.ebuild
deleted file mode 100644
index 6497a8377ac6..000000000000
--- a/kde-apps/libkleo/libkleo-19.08.2.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.11.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
new file mode 100644
index 000000000000..7362069793aa
--- /dev/null
+++ b/kde-apps/libkleo/libkleo-19.08.3.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="false"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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-utils_use_find_package fancyviewer KF5PimTextEdit)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/kde-apps/libkmahjongg/Manifest b/kde-apps/libkmahjongg/Manifest
index 1aff987f4e29..3545a5856fcc 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.2.tar.xz 1683252 BLAKE2B fb04e7e1f36199e8db9641e9bd2907eea131624023f7c7d1a17b9db68b9b7a809443ca9910f7786e658a5a5b73de2b35676771ac93b4e13e072c93f8861e313a SHA512 63f2479283756e3d51caf604547565da0fd2edab3737e77faf9148290ddeeb1f0517250988d20a936cee55716acd1e01a536e4b73332685f25f3df5cc235e4e1
+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.2.ebuild 528 BLAKE2B 444b7bfbcce0003d4ce3202b33f469d3822333f660b8392d54ee3e04334e75d5fd59bfdda7a59fea08f6fe0e287f8ad158d81a29e0d554159af41fcb4955698f SHA512 0e2aa5bdef1b2de28ae64284d693ba9e364451bc09e90edd2c1477a9fdbfe717f2ef4827071020ef783fb3a57bf4e91133300577f053a49cb595d4259f13a902
+EBUILD libkmahjongg-19.08.3.ebuild 654 BLAKE2B 95f80bb3a3a85364cc07ed35f1b1aabf3bb8a96ec451d68651da68110e40ed5ed26158c81cb6e76ab26b45d3740e63dae2b2bf801fa2987e043d2321f39d2ada SHA512 c8acd3afe065950a4e50a4ab6e551d0d83d89b15bf8983a3fcc46ace371559230963ac802b0d888fff2df3988c831d03d8a328ba4668b3ad240d89dd77a93c10
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkmahjongg/libkmahjongg-19.08.2.ebuild b/kde-apps/libkmahjongg/libkmahjongg-19.08.2.ebuild
deleted file mode 100644
index 05486a065120..000000000000
--- a/kde-apps/libkmahjongg/libkmahjongg-19.08.2.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
new file mode 100644
index 000000000000..a7bb317ee76e
--- /dev/null
+++ b/kde-apps/libkmahjongg/libkmahjongg-19.08.3.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.60.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 e85db711cf95..fe84f8c6534d 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.2.tar.xz 173800 BLAKE2B 704bffe0df9fa8573adf8f0980dfbce09d6d79dea4b018a22ea0ef17b66e14ac86b4e67252c5d449dda79a4dcf7e07a0199b53ef71be0c191fb930431253ff4a SHA512 7018b25a723fbb1a331982e9d4f2666e23fdb1f82354d141b0cf85ba180c9fee766d320ea664f5d4dd80beb708896da2cbc99d078157f8ea1437dc4abefb83f5
+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.2.ebuild 536 BLAKE2B ee5273182d0b69372dfe34bc732acda8e9efef42336006729ef13ee665cdc086a0929901b7cad810570d7c950ce009a1c868533c94f2d4b155a0363361136533 SHA512 830a3384df3823a0d87ea22c60c6287406442e31e0d0b99d1c75cf6701cd4a262be59886e3a7b524014a6fcf6edce55df54332cce28ddb698e5e6f850178ea3a
+EBUILD libkomparediff2-19.08.3.ebuild 662 BLAKE2B 9af6235af9e23ad93c16b2684bc13150e26233fb58ab4ea0b00fe36dcd4c7f10bee1d504506620b7782f84e4a615e59a686c71953929284bee2b0aee18b0f10b SHA512 8986b565c2f28ca3a7e4f9b01d03835cfd85ac0289ef98ee3c639575f91b8f57a930d7636685af3850c509400e15283fd56dfa0d543aaa385dc0a5e9f972863b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkomparediff2/libkomparediff2-19.08.2.ebuild b/kde-apps/libkomparediff2/libkomparediff2-19.08.2.ebuild
deleted file mode 100644
index ef6d32a42c0d..000000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-19.08.2.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
new file mode 100644
index 000000000000..499fea1a5895
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-19.08.3.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.60.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 9a650790aee5..18e40d12c8ff 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.2.tar.xz 138704 BLAKE2B 018f5befbd9b7f0d1e1431fadf76cab28bf8510827ea9fabefc965519222be2e6b61944927810bc98cbeb7d7f88c5a609aeaa7a0d83c8bc1f4e48d871677a811 SHA512 94418deb33f53e227b9269deb43974fb6add9658e5d894d277e5bd467b8c5b526a78419b0775a175ba28d058bf627d5b129f702c6829aa76c357817234956a99
+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.2.ebuild 633 BLAKE2B 5a2df094c2815a01584374b25b0a242e85c845e238e2a0ab8405acf74a7d22a12523939d57f33637f35bed42a5325a20ce38156eb3d683871dbe97e35985837a SHA512 5b928606a4e0755231f088d3ce3f3a0f473fe7d7a132f5d47f2090a80b093986e95b4498bbdd78579d7cb2aaaaa91eb37dcb3e4dc7a845258c85525065549300
+EBUILD libksane-19.08.3.ebuild 710 BLAKE2B d540aabb5b4e11e39b678daba3f5ebaf5f7e2b2b20679a7005ead3368674e0b97cb82315e4aafeb6fea80c9bae82aa5d75edf750ddf1b6fcb3b2a77c501f5db3 SHA512 f59089b8bd638cfcc5323626203ad4efdd89148c73674ac7674d5c59a82b657e8e0014e093b3ec2148127a9f68549ffd19c062d07ca2ae2aa252de736b8eb991
 MISC metadata.xml 371 BLAKE2B 4fbcd776ba06242c814789438f42b01bcb3b45296b55af151b8addbd410027fd1a434e7ea50c8dac5596b9c92e3eef16371eb26a16907ca4d9948432dd7c3ffe SHA512 94812bcd2e25f8a334ddf9fa7f0477ecef688a8aeae57c87651763fb7f8459baeb4f3578cfcd35227e0466d2d4c8636f489a018ca012c522323880132f2f0ee9
diff --git a/kde-apps/libksane/libksane-19.08.2.ebuild b/kde-apps/libksane/libksane-19.08.3.ebuild
index 4e9cb28adc85..443352904806 100644
--- a/kde-apps/libksane/libksane-19.08.2.ebuild
+++ b/kde-apps/libksane/libksane-19.08.3.ebuild
@@ -3,21 +3,24 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.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="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=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? ( $(add_frameworks_dep kwallet) )
+	kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -25,5 +28,5 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kwallet KF5Wallet)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/libksieve/Manifest b/kde-apps/libksieve/Manifest
index 3a07b8d770b0..f5003f3787f0 100644
--- a/kde-apps/libksieve/Manifest
+++ b/kde-apps/libksieve/Manifest
@@ -1,5 +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.2.tar.xz 549824 BLAKE2B 143cb860c89096e31e3a9c1cbdf73ef9b78fa2cc17b5707d11640e6a3190994644c51ff8bf2c240ec20bc922a29e241bc589cad66320fbe02b56963de967dded SHA512 93efd3f400e25d9e6e4178da2a91b2d9a46b643947bc5bab6ac56a13ebd5f0d90f921958f0c95b698e8ee82866d3883256bd1f89fac55ff2b6e41f13acb8c686
+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.2.ebuild 1533 BLAKE2B 47d6a658a4affc536aa872ae2714af6ea29ddbbd31a293b368a76280da12a22524c1cce3bc9e3f2445bcfbcdb4405e58dec562c4959adbd80e0bbf01fdeb0501 SHA512 205b5d1a72e93024c7c91f60efb38745befc4c16aeaa3c70a350e9388e46c241e6167a16d0332a9bb05a656dd94ac2e177e64f74d61fcf625445ef11f5b28ea3
+EBUILD libksieve-19.08.3.ebuild 1765 BLAKE2B 65bfca3bda12a617d049c6db0d730be776a73e20f191580b21b6143c2a1911024816b443bdcc09267d8f1266e6412c6cd527dbcfbf4120b74b5bbe5795396b74 SHA512 37c2c857939ea50f71bd3c83eae155dfe755e2e31f85d0552a3308fa9c0721d77c793dc15c381d0a415d8b7b3e7d2c8c14bfcfdbcf05287d9174928ee7a4785f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch b/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch
new file mode 100644
index 000000000000..403e58dd5f8d
--- /dev/null
+++ b/kde-apps/libksieve/files/libksieve-19.08.3-qt-5.14.patch
@@ -0,0 +1,36 @@
+From 31b0ec79d4d58077bbb391c170fe9fef08d460a6 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 15 Nov 2019 12:07:37 +0100
+Subject: Make it compile against 5.14 beta3
+
+---
+ src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp b/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp
+index d4968dc..87305e9 100644
+--- a/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp
++++ b/src/ksieveui/editor/webengine/sieveeditorwebengineview.cpp
+@@ -16,6 +16,8 @@
+ */
+ 
+ #include "sieveeditorwebengineview.h"
++#include <qtwebenginewidgetsversion.h>
++
+ #include <KLocalizedString>
+ #include <QContextMenuEvent>
+ #include <QMenu>
+@@ -61,7 +63,11 @@ void SieveEditorWebEngineView::downloadRequested(QWebEngineDownloadItem *downloa
+     const QString filename = QFileDialog::getSaveFileName(this, i18n("Save Web Page"));
+     if (!filename.isEmpty()) {
+         download->setSavePageFormat(QWebEngineDownloadItem::SingleHtmlSaveFormat);
++#if QTWEBENGINEWIDGETS_VERSION >= QT_VERSION_CHECK(5, 14, 0)
++        download->setDownloadFileName(filename);
++#else
+         download->setPath(filename);
++#endif
+         download->accept();
+     } else {
+         download->cancel();
+-- 
+cgit v1.1
diff --git a/kde-apps/libksieve/libksieve-19.08.2.ebuild b/kde-apps/libksieve/libksieve-19.08.2.ebuild
deleted file mode 100644
index 214ae5bbaeae..000000000000
--- a/kde-apps/libksieve/libksieve-19.08.2.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="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Common PIM libraries"
-LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-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 '' '' '5=')
-	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
new file mode 100644
index 000000000000..b702cee164be
--- /dev/null
+++ b/kde-apps/libksieve/libksieve-19.08.3.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"
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${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"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.14.patch" )
+
+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 695a2ef59ae7..81acfa9ad77a 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.2.tar.xz 299312 BLAKE2B 12b31d1a537005a25ee441cd01f5eb9beea90f89bf91702b09c99236988300dd349cb4ffdf98e862563775a54a633a8713f75755f2069e8ac7422dd9953869d3 SHA512 14bcf47eebb748399d67c6989e512ecce0878cf4ad443a80d7749b91e952845460ec9755d576becc96b767096cf58de8d82dda39305e5320534dd4ac67d305c7
+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.2.ebuild 468 BLAKE2B c51984e225fe0387371b81d67355c8d4221688b01e3bf5020b9ce5556f284ecabcff8aabf2e674429a9fb5bc4f126fa8d0c54c9e210944ce21c5856b52edff37 SHA512 b7199faf987b45b3f24e312305af0030c56297dc44c0e0495822be6a619fac745b794598b02da35710594d7d921cbb90ccd63e6b2140acca7fe916497c4a4e65
+EBUILD libktnef-19.08.3.ebuild 564 BLAKE2B dcd5719804147d1238162e73379ec4a42e44aec9085b891f4e2817cc4380b95783c2df8bc9f22bb791e088d1ff905c54894a1d84f523d6944db2e94a34ec14a8 SHA512 508552f07a072df3eff52ea0573a7a245eb919265d96018a82e55ff39176e83a2197cca805570f327de26702dc0280a0b47766447787791c0694717790122135
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libktnef/libktnef-19.08.2.ebuild b/kde-apps/libktnef/libktnef-19.08.2.ebuild
deleted file mode 100644
index a56dd0d4acb4..000000000000
--- a/kde-apps/libktnef/libktnef-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kcontacts)
-	$(add_frameworks_dep ki18n)
-	$(add_kdeapps_dep kcalutils)
-	$(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
new file mode 100644
index 000000000000..cf690b1a88a7
--- /dev/null
+++ b/kde-apps/libktnef/libktnef-19.08.3.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"
+KDE_ORG_NAME="ktnef"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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 b9539749c481..dd43fcf62c15 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.2.tar.xz 1693048 BLAKE2B dbe1c9ae74f40d6248e5e9c05d1f681d5666bc0bc4cc5792c71970471fa7bfcc03bdd9bdaaca10e87d4f72dfa84e1f38f37ba9756cb32fa881090ad199d1278d SHA512 963c40e7c29fb531a0155ec0ae9f0f7b2af7f1e54e972a79d74013cc36a9d83cb76aefbede62e2c962757579bb5a33e5be36749eff82b1f82728e9ff0a6ea744
+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.2.ebuild 1534 BLAKE2B 5234500662bec70f213f6ef1869dd30697985afec79be7d82f2dcd898455249d93b9a3cc1b6b2fadf431fce52eb5d271226322d09f46855de23fef76b13738e4 SHA512 8f678b279124a270cebe1b81c01e5749175a15e2dff63dcf93fcdf847669b6feb360e497d95696e067da25a62e00e56ff44cd0fe5a71b3142fe7700242f8672b
+EBUILD lokalize-19.08.3.ebuild 1734 BLAKE2B 9dcd4f4003f6fa692accb7b079a368953e572da16d9ceecb78bdc55e74bdea3719ad364014ab0c583eaea53370e6b8fb34c87b2f0a41df7e3ef8e207d3487d0d SHA512 8ce0da27cc9cea9ce895c232b350ede31d9c8d52880132b61d055c466ff2219ae671c25f5b3b9d4a1cc25e15a381dbd67452372d6afa6c1205d6046e5196b0e8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lokalize/lokalize-19.08.2.ebuild b/kde-apps/lokalize/lokalize-19.08.2.ebuild
deleted file mode 100644
index bd26a46f9b92..000000000000
--- a/kde-apps/lokalize/lokalize-19.08.2.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_{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
new file mode 100644
index 000000000000..d3e9e514dcce
--- /dev/null
+++ b/kde-apps/lokalize/lokalize-19.08.3.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"
+PYTHON_COMPAT=( python3_{6,7} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit python-single-r1 ecm kde.org
+
+DESCRIPTION="KDE Applications 5 translation tool"
+HOMEPAGE="https://kde.org/applications/development/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}
+	>=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
+	>=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
+	>=app-text/hunspell-1.2.8:=
+"
+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 9750ef099b84..c172ab56d30e 100644
--- a/kde-apps/lskat/Manifest
+++ b/kde-apps/lskat/Manifest
@@ -1,5 +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.2.tar.xz 1218832 BLAKE2B 68795f168492918061d344cd10d6386b43ffdb5eec724eec8c4ac777fee35138174a8afad18e75c067135f47cc4ac9dceee40606551b4bbb02b2baf55b012425 SHA512 cb83c64de6cb6988bdd9a0abe14aa88085bcc76f5932709fc74baf91d9f98a9189d29081d422db573c31f84333e9e05de65714311c418b5b218e90c8ed66995e
+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.2.ebuild 710 BLAKE2B b9ea8bbb8959335d093740774b50dde3e57c6384f147ce69442d4c13e9e1c1fc217ced6d66d103093ea2a6ffff9d636ecfabac3fb9526eefa1f595b4ecd0272b SHA512 2d35a3178f800a45d4a4c045850b0654c7c78e8eaed8b7aea44f0278b14a74dd81e536ba6e64916642f3675b235d161c9c8d0a7428b84d7db43dd1862ac38e52
+EBUILD lskat-19.08.3.ebuild 918 BLAKE2B 87aa70ca2bae615dfa0c17637b2cc221a63414b62ef8b13f08ab0a8e4067cd86a83b7a65e9c83ce0780025809d0d20bc6ffae918d10ba676423b6f7d18a5b6f9 SHA512 1ab469aa5b810b8d28f4451f181ec53c39c7c5e13dc60f40d69374ebb48c21b5f7c7adf96fd8cafd22e581c6f7e1467645c31f4ad1a28a45af19c513ff3df60f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-1.patch b/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-1.patch
new file mode 100644
index 000000000000..0e819d33161c
--- /dev/null
+++ b/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-1.patch
@@ -0,0 +1,83 @@
+From d2eae3d524bf84b843eacdf45ecfc77908e12ad8 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 17 Sep 2019 13:39:55 +0200
+Subject: Make it compiles against qt5.14
+
+---
+ src/gameview.cpp | 10 +++++-----
+ src/gameview.h   |  4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/gameview.cpp b/src/gameview.cpp
+index 69c94a7..a9bbbac 100644
+--- a/src/gameview.cpp
++++ b/src/gameview.cpp
+@@ -26,7 +26,7 @@
+ // Qt includes
+ #include <QPoint>
+ #include <QTimer>
+-#include <QTime>
++#include <QElapsedTimer>
+ 
+ // KDE includes
+ 
+@@ -95,7 +95,7 @@ GameView::~GameView()
+ void GameView::updateAndAdvance()
+ {
+     static int elapsed = -1;
+-    static QTime timer;
++    static QElapsedTimer timer;
+     if (elapsed < 0)
+     {
+         timer.start();
+@@ -118,7 +118,7 @@ void GameView::updateAndAdvance()
+ // Slot called by the framework when the window is resized.
+ void GameView::resizeEvent(QResizeEvent *e)
+ {
+-    QTime t;
++    QElapsedTimer t;
+     t.start();
+     if (global_debug > 2) qCDebug(LSKAT_LOG) << "RESIZE EVENT " << e->size() << " oldSize="<< e->oldSize() << " at " << t.msecsTo(mTimeStart);
+     double diffW = double(e->oldSize().width() - e->size().width());
+@@ -182,7 +182,7 @@ void GameView::rescaleTheme()
+         return;
+     }
+ 
+-    QTime t;
++    QElapsedTimer t;
+     t.start();
+ 
+     if (global_debug > 2) qCDebug(LSKAT_LOG) << "Theme queue rescale start at " << t.msecsTo(mTimeStart);
+@@ -217,7 +217,7 @@ void GameView::mouseReleaseEvent(QMouseEvent *ev)
+ 
+ void GameView::drawItems(QPainter *painter, int numItems, QGraphicsItem *items[], const QStyleOptionGraphicsItem options[])
+ {
+-    QTime time;
++    QElapsedTimer time;
+     time.start();
+     QGraphicsView::drawItems(painter, numItems, items, options);
+ 
+diff --git a/src/gameview.h b/src/gameview.h
+index 8c5c995..d2da977 100644
+--- a/src/gameview.h
++++ b/src/gameview.h
+@@ -31,7 +31,7 @@
+ #include <QPoint>
+ #include <QResizeEvent>
+ #include <QSize>
+-#include <QTime>
++#include <QElapsedTimer>
+ #include <QWidget>
+ 
+ // Forward declaration
+@@ -116,7 +116,7 @@ private:
+     // Active input offset
+     QPoint mInputOffset;
+     // Theme queue delay time [ms]
+-    QTime mTimeStart;
++    QElapsedTimer mTimeStart;
+     // Debug frame rate sprite
+     QGraphicsTextItem *mFrameSprite;
+     // Time between updates
+-- 
+cgit v1.1
diff --git a/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-2.patch b/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-2.patch
new file mode 100644
index 000000000000..2e8c9454246f
--- /dev/null
+++ b/kde-apps/lskat/files/lskat-19.08.3-qt-5.14-2.patch
@@ -0,0 +1,24 @@
+From 7361a17fa8ffe607ad7f050062a5e4a1eda24f26 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Wed, 30 Oct 2019 13:33:58 +0100
+Subject: Make it compile against qt5.15, This enum is unused
+
+---
+ src/gameview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gameview.cpp b/src/gameview.cpp
+index a9bbbac..2ca126d 100644
+--- a/src/gameview.cpp
++++ b/src/gameview.cpp
+@@ -52,7 +52,7 @@ GameView::GameView(const QSize &size, int advancePeriod, QGraphicsScene *scene,
+     // Cache on
+     setCacheMode(QGraphicsView::CacheBackground);
+     setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
+-    setOptimizationFlags(QGraphicsView::DontClipPainter |
++    setOptimizationFlags(
+                          QGraphicsView::DontSavePainterState |
+                          QGraphicsView::DontAdjustForAntialiasing);
+ 
+-- 
+cgit v1.1
diff --git a/kde-apps/lskat/lskat-19.08.2.ebuild b/kde-apps/lskat/lskat-19.08.2.ebuild
deleted file mode 100644
index eb135a61fed2..000000000000
--- a/kde-apps/lskat/lskat-19.08.2.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
new file mode 100644
index 000000000000..edb54ba5df73
--- /dev/null
+++ b/kde-apps/lskat/lskat-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Skat game by KDE"
+HOMEPAGE="
+	https://kde.org/applications/games/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}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
diff --git a/kde-apps/mailcommon/Manifest b/kde-apps/mailcommon/Manifest
index 80f5432c2025..1060f112bc35 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.2.tar.xz 693916 BLAKE2B 53827e72768fb372ae59c501bb00e8c1e8ee5b71e5fad41709089cdfb38f5ee323ec6977d56c10e3951d99b6f454f43eb7595b2753692a25da00899f8c4f6a6a SHA512 1f7e7824a366658c8c17c3ada11d47d55132a50609b2d43f5872dc5321e25f2af83abaceed1fb62467dab096b6bd0fad7667c237febd3b6f7e3cd54eb866fe4a
+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.2.ebuild 1518 BLAKE2B cbd0cca8fb71605629f3a8af2c268812fb42a36df18e08f83b2e6e217f73132bf5043758d50abb69ce0576643ebf407c37d33684980da8bbc0dcece41fd8d2ab SHA512 eb453f6ae1ef4e2d09395d9d4211b8120a391f60379ffaeb9db95359915afcc4bcbeee452a5f1d626ba6e4fb482023efd906ce1f342c4613ce9516db71675a27
+EBUILD mailcommon-19.08.3.ebuild 1733 BLAKE2B 3eb9d54bc2db295f4165d80d000c45f219ea1fa43a43d6f2589a13721b8daef6963ef6daa6a3aeb85b27fa0485078c16070314f93468fe0b65817da816131a6f SHA512 184fa17627dbaaa77e8e3df4499fd57b6c4f5314083882c2048d33a136c63b124b16893a0030934d6dcf1568059d39348c53d18f7bba8153aecd79ef0e31fd54
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-apps/mailcommon/mailcommon-19.08.2.ebuild b/kde-apps/mailcommon/mailcommon-19.08.2.ebuild
deleted file mode 100644
index 7670211af1ec..000000000000
--- a/kde-apps/mailcommon/mailcommon-19.08.2.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_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=""
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.14.0
-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 kcontacts)
-	$(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 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 qtmultimedia)
-	$(add_qt_dep qtwidgets '' '' '5=')
-	$(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
new file mode 100644
index 000000000000..508ef396813d
--- /dev/null
+++ b/kde-apps/mailcommon/mailcommon-19.08.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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[qt5(+)]
+"
+RDEPEND="${DEPEND}
+	!kde-apps/kdepim-l10n
+"
+
+RESTRICT+=" test"
diff --git a/kde-apps/mailimporter/Manifest b/kde-apps/mailimporter/Manifest
index 90606b42cf05..05a798db9837 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.2.tar.xz 540380 BLAKE2B 58ac6341f634a5e2fee4c9c7c8daac6347bf8685af99ca56122d3edf6f4cfc66b467c6c0e2d57f95e008f24d416cfdec4c1bf17aa09a63923f4ebb58c082e812 SHA512 95c94db263638972805022457bb80c8eda4acdcb6191db94ebc2296e3cd8f86014fc3fb35b8d3f83dd2439578baa52d88fda1931586145581ed0d73170cbd893
+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.2.ebuild 658 BLAKE2B b0d0786af5da32cb0b03727792706683bf26e4136ac0f55e9a4a7633254a54ac6f9bfa01d65a3bc6dd607a4c6fbb14116012a6559592d6cede79bae4aeb0e03f SHA512 8aa54780e49823702380950117c7d476c4f43183e58e91d04165d2bdca4d5d03580d99208e45de3b3fff957972de29b5bf33861b3851bb7b70e97f449a6723fd
+EBUILD mailimporter-19.08.3.ebuild 775 BLAKE2B c90fe969f72ddb28b52dd6573113647d9c81b07046a02c48935705e43233b44458325e1c8a0c035bf6443bc90423acd41a42c11156163ac482b5add3c59c2ee7 SHA512 792467ecdbb454cba0ec786aa6ad1c69d99b00c49d0d630eba896be86521c3da7c485dffecb560822f8a8fe1dd47d577ee4e25c96b560210d12b65f86fc176fa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mailimporter/mailimporter-19.08.2.ebuild b/kde-apps/mailimporter/mailimporter-19.08.2.ebuild
deleted file mode 100644
index 5b4147cf8735..000000000000
--- a/kde-apps/mailimporter/mailimporter-19.08.2.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
new file mode 100644
index 000000000000..8c9ca5eb4bbc
--- /dev/null
+++ b/kde-apps/mailimporter/mailimporter-19.08.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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 ddb262395fa5..86c29312b243 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.2.tar.xz 52327484 BLAKE2B 7f5f352fcec6467b6712526a7fa1af137f020b32c22e291d5a1145ea91cf54c0490cffcbcf28322fe158c5e0b2f996ecbcb116f122aa56d8812df709aa87283c SHA512 d18cfa59be6b360271afc711f61925a09dc4a304eaf41abbaeb6c7c6dc5aedff35eab658c47abba6fa5919940b6a7236292d38cc2e6eafe792c4188f090c1c61
+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.2.ebuild 2462 BLAKE2B b9db98e0496295a579e548e5cb99ae832644b55f3da91b21c94be9524532e99fc29be9ce1908c2678a37d85c59f36eff1403d251d1172b385e83c8db01519036 SHA512 c9e2a5630a314482c472d409d4cb09c0e97b8bbc9194a127dca4ccd22cda89c1de9898be0c0bf5d4ef61bb4a0e2f81693727478b6f1d332bd42c9c46b50ff5e2
+EBUILD marble-19.08.3-r1.ebuild 2683 BLAKE2B 1178336b2abd0cd969b20be93b0b7829cd99ba3a7cda81408ff9556cfe5e4f5fe427bca7f46364500f99a9df9ad1a8f9d25a4c2a1709aad8f491cdddf4c040cd SHA512 fb7312a34bb984adc5db3b45bd947d5a8489f0508219a81a0bb1c6134a70548f0ea8904e465c75646c13dc37d01680a02b1cbd8d86c4cd163978d52e5e6b6ad6
 MISC metadata.xml 744 BLAKE2B 30ba725f71b40212a305dbe604efa03d57cc35812bb1533168fda73401076dc1941f357f45aa7ea84a59e9107441318675e223fc01cf7ced5978ba57f2aa56c6 SHA512 8992b885dd614a6f784fd516a4fc8c38cb127bdce2eab9aaead3af778a0972fa0297037b2132b9a9180e416331e15b6691c4a4213158f7425d58d5cc369f6473
diff --git a/kde-apps/marble/marble-19.08.2.ebuild b/kde-apps/marble/marble-19.08.3-r1.ebuild
index 7253e190f875..bc9f779ba6e1 100644
--- a/kde-apps/marble/marble-19.08.2.ebuild
+++ b/kde-apps/marble/marble-19.08.3-r1.ebuild
@@ -3,55 +3,58 @@
 
 EAPI=7
 
-KDE_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
-KDE_SUBSLOT="true"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+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? ( $(add_qt_dep linguist-tools) )
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 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)
+	>=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? ( $(add_qt_dep qtserialport) )
-	dbus? ( $(add_qt_dep qtdbus) )
-	designer? ( $(add_qt_dep designer) )
-	geolocation? ( $(add_qt_dep qtpositioning) )
+	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? (
-		$(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)
+		>=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? ( $(add_qt_dep qtwebengine 'widgets') )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 "
 RDEPEND="${DEPEND}"
 
@@ -59,7 +62,7 @@ RDEPEND="${DEPEND}"
 RESTRICT+=" test"
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs"
 
@@ -86,7 +89,7 @@ src_configure() {
 		-DKDE_INSTALL_CONFDIR="/etc/xdg"
 	)
 	if use kde; then
-		kde5_src_configure
+		ecm_src_configure
 	else
 		cmake-utils_src_configure
 	fi
diff --git a/kde-apps/mbox-importer/Manifest b/kde-apps/mbox-importer/Manifest
index ee41073e88b9..903b06cf9c26 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.2.tar.xz 33420 BLAKE2B 62c7fc99606f31a731c14d5d65e77d20949133e37a425a7a4507e188e5d54e4bb8fd17340d2785567899a7a453433f68ad50c5f301d9b09d24a56430b8ab71b3 SHA512 c961ac306683fef59facbc4adefdd5fc43fdc156eb0ee8eecf96b3c14714195b5547eaa4164f0675cd50635795bb38e5fadd3ad7f15eee7b8dca88557d963113
+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.2.ebuild 831 BLAKE2B 0ca4117b5bb32dd832e44d2fd69cd99f65e5b4fa166cfb725f101c7761e239d3c58fb16e4d210b356231ce7ccd8ede94de2d912966433d11bae4b8e30089e196 SHA512 98e1b596b28af9b4334c2f782aa9cc78e93b79a3b4308e42512520486f8c139754c8e2babc1be7b83722da0a579faae8022c9dc85de3b12a5c0d39b6e3332006
+EBUILD mbox-importer-19.08.3.ebuild 960 BLAKE2B 316907637630e340918d37bb130a9ca37dbf7b2e464d6450f47e8344960e9d7dc1bb9d1a844c85399bab71b265bd5d21bda24287a4f38150292a5b0b44d5cfb8 SHA512 1911eece644d3dc21ec07e6127e7e5c611a1b4371b2870a50c67b1439c5c6ef53e1dcac17cbafbcad3dbde099b5e2148f4bd0bba147edf7820a2f5cd98005ef0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/mbox-importer/mbox-importer-19.08.2.ebuild b/kde-apps/mbox-importer/mbox-importer-19.08.2.ebuild
deleted file mode 100644
index a6f31cefaa38..000000000000
--- a/kde-apps/mbox-importer/mbox-importer-19.08.2.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
new file mode 100644
index 000000000000..a70c3a16b47a
--- /dev/null
+++ b/kde-apps/mbox-importer/mbox-importer-19.08.3.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" # FIXME: Check back for doc in release
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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 f973989072c0..7cf35fb214d2 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.2.tar.xz 10393260 BLAKE2B adc592ce2817225ee0a692b36b34296bc9ac17a935607d16b3bca9072bc84d1d42f33aec112774fecab1a0d93c343099b7fcd9123758e9329e4f3bc10d46fb48 SHA512 87003ba1f6181c553be8a77ca0bcc9f62c7691c79eb6fde0ff2690520a305b2137c51a0d0b762deb9ecc35005253afd4dcfbf1f73fb4a62dc0b10201704441f0
+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.2.ebuild 1917 BLAKE2B 99681c6cd419f252f050e685fa2cca5e90f2db213a208be3894010c5b456e1a3b29753b3aba1c6b05d699986bd216e9d84487acdd56d140b84d32a24aae95699 SHA512 a1928fd0ebd856520b7f24d385088cfcdade6ee80111c2cbc59a8dbaa1c1c73e4373cb1a9cfb0ec4339b759f3f8530c0258096e8a65ce9b20d2b0fee55f81e0c
+EBUILD messagelib-19.08.3.ebuild 2167 BLAKE2B 7b78ca3b189805e8c0a9e5e1621e4f8e0728ccdfc3876773f26e4e3d36e605ccc46fad0b8f67edd316d5a6ca6c46d1657cef711f7d32d934a0efcf993eaa7c65 SHA512 a982b0587b6ae9bb43ddcdfd21a0539445f7e2d24f6248ab18dbe37262bfcf5300222aa5660bf6ae0905a1d774c3b6c4be73fdb40da60456324382d4d860f90d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/messagelib/messagelib-19.08.2.ebuild b/kde-apps/messagelib/messagelib-19.08.2.ebuild
deleted file mode 100644
index f50b98e3de69..000000000000
--- a/kde-apps/messagelib/messagelib-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 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
new file mode 100644
index 000000000000..0f21bc7f336c
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-19.08.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional-recursive"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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]
+	>=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 a64a74168b6c..b54aac5ddb71 100644
--- a/kde-apps/minuet/Manifest
+++ b/kde-apps/minuet/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 27597428 BLAKE2B 1341fdb1e2bae38b8c4999c665130f15cb19a8a1f0a25568ede88b4ab6c3915d73057a3f9b51d42dcff65c922933b874527b479b7de73a6b4f0f74b250647c8a SHA512 38b937e85c60adf5241ed16402563b386a8ebee4ae9eddef4ffd1b27f8ab9535c6507f1889c0a9fcf1ac0e6ff20bd100a17a30424b3521a91bccc2fbfacf751f
+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.2.ebuild 561 BLAKE2B 97831c063f1ce6ce58bd31a4e862488b4ab8ea627025b824f48c3d73c695f194c0042fc0724d2ccdd7e265543c5efc4ccab1d71230817c9209f47336a9982c46 SHA512 575ba89c256093b924d4bfcdae852b54cac181e1bfce5ccbe179e92d1850bd7af81805f188968feea28372a84b13f14a5226c718b4ce77239db7d7b27c1de930
+EBUILD minuet-19.08.3.ebuild 675 BLAKE2B e467e6dd56ef4f7ca769f9d0d6b0ee2a1c5884d74e3995fdde2ddf9c4eaf5d27bd50d3dde400bb73ec0bf3e47a29f02cc803d60da78816ff209384342de1c432 SHA512 2990028fcabd369f11efb55aa8eb60c106008ba4673a65aacf2c05a77b55d468d20b689fb09235a4e8fd09c92036fc6316aba5495bfe855bf09e2329a91a9bdd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/minuet/minuet-19.08.2.ebuild b/kde-apps/minuet/minuet-19.08.2.ebuild
deleted file mode 100644
index 591a5e23f18e..000000000000
--- a/kde-apps/minuet/minuet-19.08.2.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="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}"
diff --git a/kde-apps/minuet/minuet-19.08.3.ebuild b/kde-apps/minuet/minuet-19.08.3.ebuild
new file mode 100644
index 000000000000..f222d681f861
--- /dev/null
+++ b/kde-apps/minuet/minuet-19.08.3.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.60.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 425deefbea00..50cef98db0f8 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.2.tar.xz 7066232 BLAKE2B 426f9804381b3cec65b5e36432fd4e218308eaa0a4c9b627ec2387c02dbc620222a1d43e02950d73f9d2975f4f58ba28577d69aa48e051c838a9641cbb284a29 SHA512 fbf6285e65f45b2d49596169216ded2da26a73abec1d2279bc510db5df0bb6dbf9794e864de06837c5b7bf1db19de1774c38c18eb78c4b0c2d3ac49cb35bb9f7
+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.2.ebuild 2968 BLAKE2B c4f2d31b70a46ffce7d9c530991d51db3ce93cdb38176edbd222e6a2749266512fcc04a7798762018010df037768a30b6395e05558260ae8bff61387733595f9 SHA512 46843a41ded3ce4a2ecf6c9dfa53d9409d5514fde82921cda6df5c4464139d46fb5878ec42689b5d2e1cf01990adb9e10e4f1d8ff9e522724e6be2c1e3e952db
+EBUILD okular-19.08.3.ebuild 3219 BLAKE2B 0f0fca5aec8320a5ed8da49e57141ab5138568a7de764ad9f3d31309042a3b3a419b3b35317003422e7c49f97c6980ee775d0c493dc007ae05483866d6994657 SHA512 e4cd8e74d0412ecf6bad50875f9f04cf4d72c09f311de6bd4b0042a5a2ee162a3a44f12f5bc10c24023541c155b1fcacca652cf23877a1ba22a15319ea3f39f6
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/okular-19.08.2.ebuild b/kde-apps/okular/okular-19.08.3.ebuild
index 64bf34f1cfc9..458f2be94e27 100644
--- a/kde-apps/okular/okular-19.08.2.ebuild
+++ b/kde-apps/okular/okular-19.08.3.ebuild
@@ -3,64 +3,69 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 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"
 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)
+	>=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? (
-		$(add_frameworks_dep khtml)
+		>=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? (
-		$(add_kdeapps_dep libkexiv2)
-		$(add_qt_dep qtgui 'gif,jpeg,png')
+		>=kde-apps/libkexiv2-${PVCUT}:5
+		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
 	)
 	markdown? ( app-text/discount )
-	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
+	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
 	pdf? ( app-text/poppler[qt5] )
 	plucker? ( virtual/jpeg:0 )
 	postscript? ( app-text/libspectre )
-	share? ( $(add_frameworks_dep purpose) )
-	speech? ( $(add_qt_dep qtspeech) )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
 	tiff? ( media-libs/tiff:0 )
 "
 RDEPEND="${DEPEND}
-	image-backend? ( $(add_frameworks_dep kimageformats) )
+	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
 	mobile? (
-		$(add_frameworks_dep kirigami)
-		$(add_qt_dep qtquickcontrols)
+		>=kde-frameworks/kirigami-${KFMIN}:5
+		>=dev-qt/qtquickcontrols-${QTMIN}:5
 	)
 "
 
@@ -70,7 +75,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 	use mobile || cmake_comment_add_subdirectory mobile
 	use test || cmake_comment_add_subdirectory conf/autotests
 }
@@ -92,7 +97,7 @@ src_configure() {
 		$(cmake-utils_use_find_package tiff TIFF)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_test() {
@@ -102,5 +107,5 @@ src_test() {
 		-E "(mainshelltest|chmgeneratortest|parttest)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }
diff --git a/kde-apps/palapeli/Manifest b/kde-apps/palapeli/Manifest
index 533eb8164596..76dfff2604ac 100644
--- a/kde-apps/palapeli/Manifest
+++ b/kde-apps/palapeli/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 2068180 BLAKE2B ac96bf7f29b7d3f023eefa7f2b8804fdd09b5dda02d95567d0959412d291c1f4cdf4f7f30e2d409141ae612ec2dfde22f7c10dd8944efd4dcb63bcad57df9bb5 SHA512 717107fb7ee402c74257377d6e3a026463fd7ef87fcde5ecc55a334bbc583345c1d44a91d3fa5d10ff9f1f2d7ff5d74768e51614cdbbd942165a0215cc9c2646
+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.2.ebuild 876 BLAKE2B 37911527f17796d158447815cf4a3ac1f2bc3bb40d64a4502c43bd8751dae64cccc36f5e5cb49753c70ad798b8823b15afe9a3618916fa39198d58dadbb8cbe4 SHA512 6a5f923d9dd59d11778a5f9eafe68477721971a660dff7cf5eddc4e84892b12b7620b36c7664bfbfda2deada19d11b92a16896c939a8135cb8f6e00374db5dc2
+EBUILD palapeli-19.08.3.ebuild 1074 BLAKE2B 0e03965ab65be745433b37b25ea3eaefe55987cf70adc79c3c5e0b0437838335e89d94f15d2d9bfabbad073e2ca2416cb0a7de6d5524858406f43b6b3009b711 SHA512 99a17745294fa72b8737445d821c8afdee8fcda8c431f3b7613ded10fa9d4fa86c4ba427806c4c8e43ed195f292f064f4317c8455eaa7e2c3515e62c3c0f6c11
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/palapeli/palapeli-19.08.2.ebuild b/kde-apps/palapeli/palapeli-19.08.2.ebuild
deleted file mode 100644
index 67ab13161009..000000000000
--- a/kde-apps/palapeli/palapeli-19.08.2.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="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)
-"
diff --git a/kde-apps/palapeli/palapeli-19.08.3.ebuild b/kde-apps/palapeli/palapeli-19.08.3.ebuild
new file mode 100644
index 000000000000..12b132f3c33b
--- /dev/null
+++ b/kde-apps/palapeli/palapeli-19.08.3.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="optional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Jigsaw puzzle game by KDE"
+HOMEPAGE="https://kde.org/applications/games/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 6b838c7e3111..845b4d114cd7 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.2.tar.xz 8831840 BLAKE2B 7dfb4dc1d1d3ac3c9c2f9c959913c6e5edf77ac566ec5b662d033c7c92202b6598397709bbd138a0db81c9575281f9973912f6c40e093dc6cefe52e33de113c3 SHA512 a87409f6bfc0da0e5b78c49860df93e8dbdb4a9bb73ca1cdcc1c73a19ddc479473cce1d89805934dab1100b0f627e6c551fcb3d4892e4793a4ca038e24453be7
+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.2.ebuild 1228 BLAKE2B 02a109163560f3eccf0c103d3c0e3676f21ec5bf144c431dcfe87237df1999135aa4b80fd8b6ab9aa8fcc0291bb1d9645433a20e811dd41c9d272365403675de SHA512 f7c9b692b72b7e5529a0bb180af3cea3f858919242878d576f5362cbb9d0a1cad127b511b81df70ceed6c719696dff74ec324fb6e6187334c09b7d2a5d22d476
+EBUILD parley-19.08.3.ebuild 1469 BLAKE2B fb93dd02d78628221642f71aa76280f769f0a06336d5238956c8dec6e760d1df6a2628cb8fb71988843a29bddc1bfd0131e0fbb99eb6d6822074629824d015a1 SHA512 9abd8935c745c6f71825e97aff613e61c10b155cd6db1975477af3c297c3fb2ec254df7649fe01ac0c4d7462acd696441c6effa424736b6b6d59e1dbce474298
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/parley/parley-19.08.2.ebuild b/kde-apps/parley/parley-19.08.2.ebuild
deleted file mode 100644
index 5b295febf83b..000000000000
--- a/kde-apps/parley/parley-19.08.2.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_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_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 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_kdeapps_dep libkeduvocdocument)
-	$(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
new file mode 100644
index 000000000000..2d94cbb2ae5d
--- /dev/null
+++ b/kde-apps/parley/parley-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="A vocabulary trainer to help you memorize things"
+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"
+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 f13324972eaa..01ef049b3ff6 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.2.tar.xz 1357556 BLAKE2B bf3f8b6455f00e52c3b2d17d2ec357d6c0168da56f9873990439d7898f4d87753b2a476fe7828bef8e7ce21eb4c2cc4d31e2fa5d7af69dd44629fa55b4158124 SHA512 fed2c8a06d13b682bf83baae375d05be0486874a7ae13ce38c785009de53e70a7947c46a71fd361d6ff563e54d2c7092be09ece49ff35eb0c4b33641cf460208
+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.2.ebuild 851 BLAKE2B ae11bcef4689f98939d1beae6b0dde2ceb58b00bc667c1a75f28c65661739e0af47d96c29522957961553c4b6f5d51a45a7a04a5a58813ea291bfeafba10d92c SHA512 c967665a46a2b23d821f46f6bdf02dc232737910f4b45115aa2bf0c254f1a81ee895a1e95d2105774143c11a2e1d527bd7c9b04367e170dd4689fe5552409b52
+EBUILD picmi-19.08.3.ebuild 1037 BLAKE2B 41a9951e3ec6c2564afa1a4eae8c7f0c95b358e3f65dab1e837f236b69e73655bc11b71d4673a32e50ac1e71e3b0a79f15711812fc1c5af74538c9bd5df744b5 SHA512 b566c17a750529ba7c7cedce72b81c9fd07c9a607d91a2e3e383ea8af4f1b81284e9c8469cfa09075fa8bbe10cde2672a51a178b4706c3f17de3e7d58476bf59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/picmi/picmi-19.08.2.ebuild b/kde-apps/picmi/picmi-19.08.2.ebuild
deleted file mode 100644
index 8daea380c1e3..000000000000
--- a/kde-apps/picmi/picmi-19.08.2.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
new file mode 100644
index 000000000000..85625f250674
--- /dev/null
+++ b/kde-apps/picmi/picmi-19.08.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+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"
+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 2590d30f7ba4..22ab01a5a53e 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.2.tar.xz 203804 BLAKE2B d73e64e3cd832b238be75b9a029bf1387eca9bf7e27a0cf8894b3a6e62091a43078e611a0976b5b158b0b584d79b099e1dcb45776b8708f6b6e2d7b06bff2023 SHA512 6014c3c463f1cc379bcdb1c8d21739220c05a465beeb0975809d2dcde6861a9e83033c2e6486c44fd574039c22f6ecd017684013df7f8e98efce107724444a94
+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.2.ebuild 1221 BLAKE2B 1cfac915a5dbdda18bc54aee863517b3ec247df5079a3fbb43e328121e85d8fbc36636957c476c19fc82e8eb4616b943eed977d882bc724a50c2fab674ccd4f6 SHA512 1e220a3e2321eb6d10f67e7e0957dbaab92b11ef52aa92193b228c937a309238ad4ff2d9eec39d01e5d7724d06161d88eebda211f2ec969f0342f674ae94248b
+EBUILD pim-data-exporter-19.08.3.ebuild 1398 BLAKE2B cf9727e75f5daaab7db0b3fd9b05a5422dee01065f3cf46af83e0728f67ee727afcce25151b0c978618066130a6f78690fa74b9b6f60a78f54be7499b651e1c2 SHA512 14db0f43c5ceaea154250d68fbbb86f567c3336f9e7a36e56feacfdf29010ef85603d49869a82ee11bf5274dea8976ed12a02f369da9825074f297af6ac0196d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.2.ebuild b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.2.ebuild
deleted file mode 100644
index 3545d7463ac9..000000000000
--- a/kde-apps/pim-data-exporter/pim-data-exporter-19.08.2.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"
-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 kcontacts)
-	$(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 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
-"
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
new file mode 100644
index 000000000000..ba182658f891
--- /dev/null
+++ b/kde-apps/pim-data-exporter/pim-data-exporter-19.08.3.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"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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 235c5654b824..fac083d5cc64 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.2.tar.xz 451444 BLAKE2B 0c86c6a867067475f00b89404fab39cfc156509f3723ab4447b796eb031621e1cfc981fc1c085d8b5d5b6dbd387f3ab70a74877fa29a5adea9d274d4c0ac2f1e SHA512 a59dba891d242cbc43fa325b4173262225bb23c5ca381bb92a1ffda2bd13add83885391fce748b9b3c72efb4992cc8cc7c86a3d1d69b3e4886ff77f42369e242
+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.2.ebuild 1164 BLAKE2B 32662d5fbb38abc7937c9ba15157cca1efb37fe4f7a2f1fe06165850cbea76eeeda7b4ad6f543c87f1f6bff922b4f911d86c0f1e763af9d61cd4f377f1c60981 SHA512 9b3e2c79ea536a5990f5f9dca5e356133468e2343b2af5596a302d84069c5cc3f896313640bfb8383f802bf14d57b19c53cbb06c75b59fb562c72332d4b5d574
+EBUILD pim-sieve-editor-19.08.3.ebuild 1344 BLAKE2B 6632a9bc20d7fa49bafcef928b618c4f38d8a5e2647c2aa7bd7f85debb93a46ceef7e2e4beed7d28932c5d68f1f64f405e55fd785d6c1b6df1fc3711fcf1beb2 SHA512 327c826735e673c90c0edda3f50c802ecc645d43ecff3422def610b9ce78a463b4c3443393c38f56994ae8f422fc3f53208e50b9da0cab1b423a5c9316e444f9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.2.ebuild b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.2.ebuild
deleted file mode 100644
index c5e0b971ee67..000000000000
--- a/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.2.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 kcalendarcore)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcontacts)
-	$(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 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
new file mode 100644
index 000000000000..4363a4d87b91
--- /dev/null
+++ b/kde-apps/pim-sieve-editor/pim-sieve-editor-19.08.3.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"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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 7648a29e176b..6e5e1a4c031d 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.2.tar.xz 293952 BLAKE2B d108ac861071c3119c9fc78709ec8c368d783329598a87d711702cedce26dad9369374dd9b16a33c86886143bf64a71ec7949bf60bf90bdbc1ce28ab85f32c68 SHA512 e36be359a524e747f22cf11f411fd053c43636e1e0758192bb9b8c2ea577dd116f9ac8471328ee986f19d0327edde58a7d3563f7ce36e3e2fad967b0d8b9fbb7
+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.2.ebuild 1535 BLAKE2B a9e9178700c8b43c619a4cf6c59935820ad90020a4a07ce9a91f26460a9931535a1ac724cc723ba8a0464cf4f94d017dc1333c42ee238fdfb00c1d89ab1b4ed2 SHA512 f8a44efd4aa268b1e1b7123551581215656d31921efa1d438ccf4c6271ee181b8e55275ab65237ee0a1e0b225f5db2b5fafa02a15831bb2e70eaa138c783426a
+EBUILD pimcommon-19.08.3.ebuild 1759 BLAKE2B 5e1444fe8da55bbad06044232b641bbbf5d01d14b453ee69ec8fd8a2bebd61676f7c0502a57100df04b8bfd452e707ee941fae7597e609816a52e251e6681cb3 SHA512 7197ae264c760405592471e4b59eac456afc6ef7a26debe31d049729a3a1998933e314ce1b0ca97c2b5030c451452f7cc61466d868356cc72c7696b861184bd2
 MISC metadata.xml 440 BLAKE2B c55b83f7b60d3baaddaabe967f26ebd46bc02e8c299bb6a08bd2b2dc637aeb9014d1151401dd5818fa638e35a52af07b4f4a1c26f11acaafb12af39395987b8a SHA512 270a30b21908e27b18090298815c52c80c90a6411f16692bb725449217411932627cc3ac530c2838b539e1692ac00972461bd6b016d92e7299588e71913a304a
diff --git a/kde-apps/pimcommon/pimcommon-19.08.2.ebuild b/kde-apps/pimcommon/pimcommon-19.08.2.ebuild
deleted file mode 100644
index e8f9a1e6a4f7..000000000000
--- a/kde-apps/pimcommon/pimcommon-19.08.2.ebuild
+++ /dev/null
@@ -1,65 +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=""
-
-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 kcontacts)
-	$(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_frameworks_dep purpose)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(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)
-"
-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_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
new file mode 100644
index 000000000000..9a4f406c48e2
--- /dev/null
+++ b/kde-apps/pimcommon/pimcommon-19.08.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+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}
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	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 21d1c5a9c367..ef444b65d5a1 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.2.ebuild 984 BLAKE2B fe8ce110dfec685d6008f1cd4e77308b451ee75a4d14fc75a1779c92c4255e8a7ec5a4a79f53a800a5ea4a7b0f782da2b517fea572b8abef782ba410b9a471d7 SHA512 e8cd7a4de0dfd9163a18878c3e069e194fff64b87aefbeabfbdfcacf8943e779a2a11c77f311b1784367cf260ebb29b8735a163df487e28915e2021424dad125
+EBUILD plasma-telepathy-meta-19.08.3.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.2.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.08.3.ebuild
index a68369603cd9..a68369603cd9 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.08.2.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-19.08.3.ebuild
diff --git a/kde-apps/poxml/Manifest b/kde-apps/poxml/Manifest
index 79c8d6f35446..2df3f388e90a 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.2.tar.xz 43396 BLAKE2B 2a730f643551aefe3b5c50369ff73e178dfa3b901de8e3c111221a7893e26d9052e5e2ea07b86468a95f0c0a7954849b0b8d4711a5c20ecb69095df2c1b92521 SHA512 a0b86afcca6b5efd0f9f40ebdbe043ad6a152af174660908410ed40cf1568d1b88cf96b960fac8b0d4edac2dc3f9ca7176fbf76292a3afdec7f4d41a2b3c1871
+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.2.ebuild 346 BLAKE2B 86633922057b8ab9594161a6f2dd73f8dcdf2a3d6fd5adccd6c9d5c1530cef6a85b625c339893e97377c894016fb668d68b0967065725dfb7045948b22d8f466 SHA512 0739976d9c9048220e323a0a04070d36e8966f706f31874bab77552d6ddb68010e1487e6b6231a720a0d5ff1011e07bdad91a301d838ee44e90add404a47b928
+EBUILD poxml-19.08.3.ebuild 411 BLAKE2B 9da7bf270b4c79fc04399cff13cc43848049478313c3a5fafa3f0bf9df30ea6701574f0c4866f2eb47bb398969521351b71300c610f14f3733cb78d63331fef0 SHA512 759fe6e8d614f7d05c607ceb966848a7065af371c1ee6cff19b782497fcb71d8835172a0127166d17a364808c539904ae606d62cf4153fc02eaa216c928af357
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/poxml/poxml-19.08.2.ebuild b/kde-apps/poxml/poxml-19.08.3.ebuild
index 52cbeb724b61..034af592f7f2 100644
--- a/kde-apps/poxml/poxml-19.08.2.ebuild
+++ b/kde-apps/poxml/poxml-19.08.3.ebuild
@@ -3,15 +3,18 @@
 
 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"
+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 611e20ce285e..b3a914e8b95f 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.2.tar.xz 244572 BLAKE2B 6e095836691fe4eb38f9dcf8dba3467e01cfe19dbc62e3c0a855f2082604acc71ab99b3bca5fa6d8aefbb07231afae747fa9daa013de7cc5bd59ad8c2ba22a08 SHA512 66a8cee7b94b19df46ca62d0735b4eaaafdf76cff6f4ca22540102cd2c95ea2c1d5f5eb2e990924024a7e9786ac62c2c60dbd7ab242df3977083be9bdbb60105
+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.2.ebuild 1485 BLAKE2B d6f8d43828523156178d6dec228302628d3e07abb2d1cc483d1d45355077e0b89779d18974db460ea4c652e40f2105f526e6f4e9dcec0f20a3f2a6ca3b8bec26 SHA512 3c18f4ab09bf7fdf4745e14be033ca1fe2541fb158be38dcb3a56777e667194caf36cb20334cb88a89ef57be4efd8e3855b93bf02a475f5ddb3c8ea724c74610
+EBUILD print-manager-19.08.3.ebuild 1701 BLAKE2B 3456704cc79cefafa19d527726eefa44caca5bcbc3df1c69d37c533fb5609c41d52d061fc3f0c1b7494b3ac7b75045467bcb11929aca23fb172a5ec5582cadac SHA512 1375922a8214aa1ad235bdc6c6a646bc97ba83b8d57d50c7bdd2324faf623585d462df0716e2cbfa938ef32b02d45d9922b4b562d1418d5fae36848f3a24a71b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/print-manager/print-manager-19.08.2.ebuild b/kde-apps/print-manager/print-manager-19.08.3.ebuild
index 1ae66560761e..0b87778f9c26 100644
--- a/kde-apps/print-manager/print-manager-19.08.2.ebuild
+++ b/kde-apps/print-manager/print-manager-19.08.3.ebuild
@@ -3,40 +3,45 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.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="
-	$(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)
+	>=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}
-	$(add_plasma_dep kde-cli-tools)
+	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
 	gtk? ( app-admin/system-config-printer )
 "
 
 pkg_postinst(){
-	kde5_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"
diff --git a/kde-apps/rocs/Manifest b/kde-apps/rocs/Manifest
index 144e8452dc38..1c9a61c37cdd 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.2.tar.xz 1516448 BLAKE2B 34bafc79ef40646a981d240123ed90f92e8c2ecfb3644438bafb5180a56ca84e57968cd6910a873c6dfcafb3a65e6baa4c6e922cdf22dac8163e63ac7fc0a71b SHA512 2832a0dfe83076100357c86eeb3ad0fccf55f667bd4b86c0cd8bd2db21f8b323a524d3016db9509f7bfee1837820d9bcdac0dc4dd8a4e5d2af020f8102b4aa0d
+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.2.ebuild 1178 BLAKE2B 7dd95908cdce5050a86d95bbda21ecc18e5add17bcb4ce183c02cce7ce263eb365eac80f344ce9a2d5ac2aeea647c25b06edad588f268b2540d071d0093f1466 SHA512 34f342f485b4e7b80420d176d6e4696d9bcdec9b13832f0e8c6c9c5cdacd7e2cf8147e44fc36ed9bc3c55f497221d1788e7b27aad4afaf1b54251ce0ded998dc
+EBUILD rocs-19.08.3.ebuild 1374 BLAKE2B 129847da71a1e7af2d5594c66b22d021d8c360f33db9185733a3685cbdf10a20a84757ff614d1a75d2386f8438535525bc81e88ec67b38908ffe87b81e37b141 SHA512 96135cd0652dde8d9b22980a7635922eb78ad4d96fbd987cdba4fbc19e0f8b5d4b47d992531148af1eeab5478d357c45916b2b530262c1da566fe79a8c2d759e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/rocs/rocs-19.08.2.ebuild b/kde-apps/rocs/rocs-19.08.2.ebuild
deleted file mode 100644
index 6f79ed59ae80..000000000000
--- a/kde-apps/rocs/rocs-19.08.2.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
new file mode 100644
index 000000000000..38ad411761e6
--- /dev/null
+++ b/kde-apps/rocs/rocs-19.08.3.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.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Interface to work with Graph Theory"
+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"
+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 faaaadd17a90..497ac8f63f6c 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.2.tar.xz 10592 BLAKE2B c010b507e2b5f94a75439a93ead35e2384ee6d30362c14391dfe1f85cbecf4f739ba0f9fa6216b1cdee8e2af5f2d10b818aacb892451dab6d2dd8a208117cf59 SHA512 47bef03b02c10ec1fc99560ab4d4c923c8115c1af42232da87fec131e06351cb61e4e72701be523ad80f7ce862cbf1756d6e73cd490f4375ae9660bcdfaf1257
+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.2.ebuild 331 BLAKE2B 76f001f59df1c55a04a459dc6e0c71b70024ba4f77d4ed679b36c6e688dfbe5a2995deee039df92e56d4d28ba207b44c0e0769606ad2c7acb3a1f0e4325ff3b8 SHA512 7025a4e03ac3c69bd01f13bd590d2be249067e3de31ff662b5a5f8d94248a4684348da8f1fb899beefbd2f72bd5b625a6aaffff236eeb756cc9080a6d4eb7b91
+EBUILD signon-kwallet-extension-19.08.3.ebuild 366 BLAKE2B 40da899b106afa86a6e0e7302f874bd19a99e6dd2ecf7101bf823820edbe5dc8d230e898cd778bc9f9923a95aff39227e08ca3c27e6a90232eced231db979f4d SHA512 b99ff4868add82ba2984806b1c3913e0c29a41d5c516ef3fd0a8c36e511fba2d048a6c8dd70080d1dd179406920f5ba38c88d20ca8b364f6f7fd77e725ad4563
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.08.2.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.08.3.ebuild
index babcbf554b28..0b2289f3213d 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.08.2.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-19.08.3.ebuild
@@ -3,15 +3,17 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+inherit ecm kde.org
 
 DESCRIPTION="KWallet extension for signond"
 HOMEPAGE="https://01.org/gsso/"
+SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
 LICENSE="GPL-2+"
 
 DEPEND="
-	$(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 18322884acc3..9b044a4c444c 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.2.tar.xz 965432 BLAKE2B 7cf8802a973772a2140a27fee1f7bd552cb6f19dcd9cc74688c3faa2f12cc5e92561c1ce0f8802775b77d7b5c68842cf26ff5cf6c2c1be0430559041877b6695 SHA512 a03dbe13aa0e0cea07b6505ead130946233574863fc5994d42a971d8a9ae0a24be5e4dfab38640857d5bb89f33dc3736bad7e87a3a76aa83b450156e8db96723
+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.2.ebuild 1341 BLAKE2B 128e5035159b4e55e596f2e4ff02565c3ecce2b45573c9338b6fcc206453c33cbe66479ff3e5109782b7e71a5fb9b92bc88c80d2957603fa99660cd7afdd97e2 SHA512 30c923cf46605f6687114d6844569bdf6d92c1c72a915c275d9b66e8b7f312a71ff778e74693865c099c71394e4f6e5c1a83213bdbdc8e3f0c2ae5d475d79d5a
+EBUILD spectacle-19.08.3.ebuild 1519 BLAKE2B 00f89d9109d7ec6ec700433d6e7a28c742ef99bf96a3ea455e25682896f47e5007f2e6b0408dab791322ca41fd59f63184995c5cb56f041c7d228c6d97293a1e SHA512 496f83f56311631fd8ae8b332156f2ebaad06ffd0a98441bbf936ff9dd76f0f0cff9e29642d0f465cb64f45ba5ec114f97614fc3e779947a5fbfb88f4f12ab3c
 MISC metadata.xml 441 BLAKE2B 82a565ee86151104ad5c24329d7649230f817d78c9fc6a393ec028d4d92cb6e8c968deba9f3f344125da283a14eaf671a6105f548eee1051290530a2d33d9143 SHA512 674c31c3c5639f6ba218f5cc9342ec5a00b944212563db07dfd223c4897a3d1f315dc7a0735be7b30d75d3706e6355f3547cd17c9ab20e7387974ff1adfe5716
diff --git a/kde-apps/spectacle/spectacle-19.08.2.ebuild b/kde-apps/spectacle/spectacle-19.08.2.ebuild
deleted file mode 100644
index 4509c6106770..000000000000
--- a/kde-apps/spectacle/spectacle-19.08.2.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="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 kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(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? ( $(add_kdeapps_dep kipi-plugins) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package share KF5Purpose)
-	)
-	kde5_src_configure
-}
diff --git a/kde-apps/spectacle/spectacle-19.08.3.ebuild b/kde-apps/spectacle/spectacle-19.08.3.ebuild
new file mode 100644
index 000000000000..a2747989c551
--- /dev/null
+++ b/kde-apps/spectacle/spectacle-19.08.3.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="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Screenshot capture utility"
+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-utils_use_find_package kipi KF5Kipi)
+		$(cmake-utils_use_find_package share KF5Purpose)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index f1014830c8bb..1e87c05107f6 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.2.tar.xz 871208 BLAKE2B f381987f9ab1fbef8f06f7771c6d3172ab4b3e9538e913270e27d14d512f3bd4fd138789bc267ee601975fd74c779b45957f919b04464433d5a0dc31e8138c37 SHA512 8f2a90ef74bad6a3b73470f0342269da2dc6d53f2ce05a14e13762c02e2ff28f621d821f31fdba9733cb0a7cbe0b3ad099e3c36cdfe2198dd50106eaea63b8a6
+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.2.ebuild 1422 BLAKE2B 2077eaa0b42bf3bf3885107b7676ab9fcd50c99dd58270d1c2500be8d328ea4243bfe186bb7918c32539cf9fe356e4cd51fd3a0447fc8b37c50cff0609adf2ce SHA512 21e96e7e7146f7b353f4d70831c37487fd1d02766d449edd033cc124c4d6e895424a0612e29ab4084abe453f8932735318c3d73320a71dfbe5a69a544663b5b6
+EBUILD step-19.08.3.ebuild 1618 BLAKE2B 642eee7a6597815d6b76b307153528e302a1429f0824eee4bee830b1f0e1c4f2ac9237359d54a6a2cfc80eed6609d215d06d3ca247dc0202a6b1f81705d68d5e SHA512 d0a63019da69027b6f843444772b55eabb736e305a6a2def7531872796f6e5f8027198bc5d3c1a02adffa162f96c4d6f4b3477d2cc4ae9fa0a4df6b7978d642e
 MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/step-19.08.2.ebuild b/kde-apps/step/step-19.08.2.ebuild
deleted file mode 100644
index 0c8734816df7..000000000000
--- a/kde-apps/step/step-19.08.2.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
new file mode 100644
index 000000000000..3864e7b04a04
--- /dev/null
+++ b/kde-apps/step/step-19.08.3.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="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Interactive physics simulator"
+HOMEPAGE="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/khtml-${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-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+	ecm_src_configure
+}
diff --git a/kde-apps/svgpart/Manifest b/kde-apps/svgpart/Manifest
index de5efcc81acc..ab0070568c77 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.2.tar.xz 21228 BLAKE2B 0d5bc11afde0f73a9d5319a58749a2b4d5fa23333d8860dda7aa8d7f4bb965550dae8b10b18c3e6d8e2828e36d8814eee435ad41a0f4ac15d62b4c0655401ebc SHA512 40cf7aeb0bb5fc38a424e808685a1d23a5984ff87ef09f0efe09f472b0797f5ab367c6c288db1dd7ec376272206c9f63e569e8efb5435e1ceea91802bbd6ada9
+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.2.ebuild 481 BLAKE2B e2544be22c6fce3a7ed63a098c745097d5187b2d246f273ab3abe66828ca8ed02f8507ec4e4552396a20c1fff82efd5fb62c88f1bb9de090dab49bd7f1944cf3 SHA512 4e52ac8a29a5afd68cd6e1a1ea0e57cd6af75311fcacd2086d038a31101ff5ea260e66d953a189f507093d461e8a0eb324712eba5fd46b82f9b6e7d66fa144ec
+EBUILD svgpart-19.08.3.ebuild 571 BLAKE2B 6d05d1393c8bd819feb105273c15942309f2ebb0f096b833428d98f63968194f9365442941edf17261fc122ef9ace2ac92198d0fe7c8da4fa1a113a7fdfb7811 SHA512 9eaf756c194c542850807a3403a2618e5879be0e84c30eae910d4616e699f923b99a18866b7af3554cb26ec41951eae0c804e1c382b4bb0ce11670d009f0d42b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/svgpart/svgpart-19.08.2.ebuild b/kde-apps/svgpart/svgpart-19.08.2.ebuild
deleted file mode 100644
index d67c7189d950..000000000000
--- a/kde-apps/svgpart/svgpart-19.08.2.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
new file mode 100644
index 000000000000..014290bbf231
--- /dev/null
+++ b/kde-apps/svgpart/svgpart-19.08.3.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.60.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 bb3c775d97fd..f50c8d92017e 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.2.tar.xz 368548 BLAKE2B 3223c90712e81052cc7ee9c9158708eb714610777dd98094cb1c4152a811d3ce5ace1ec66a32ffbca682bbc512e79390c893b4bf14c6bd042725d114380feba2 SHA512 69fae1203580526611ae35452979b6ba9962eaa916e01ffc5547c89327b580e7c63168877ca2ea3d85855fddee58f216fd5e488b4c1c2851404fd64098ab8128
+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.2.ebuild 861 BLAKE2B 9971e1325f1d63eba795d9ad451324b26ff3cb69a5ba61b75fdc21e652023c884dce9fc98c0babe2d7e06d8c60465495195cdb23055b17f3d923333e20a7bacd SHA512 80b5958c9348c5ca6deab104b9d46801b8ffc77bd07387e919eb814525dd887fafade54b3ba6d60b9e95c65abded72b4cb088ceca25177e1926b74977b85a55b
+EBUILD sweeper-19.08.3.ebuild 1023 BLAKE2B e61e5252baf738b5995a84159730ac649012aa21b584128fbaf41bb057df1a28cb5da33c83781d4a6258b6732e793539bf755067e0509cecbc4e67744079bb0a SHA512 f3dd49f2da60f2a015c5c4f601566d8f38dc2e24cae495b964be7191c595cf43c46164989505b3b2c0339d83af8e11a39147bd6172838b27cb0fcb15c1836730
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/sweeper/sweeper-19.08.2.ebuild b/kde-apps/sweeper/sweeper-19.08.2.ebuild
deleted file mode 100644
index c861ff5ac604..000000000000
--- a/kde-apps/sweeper/sweeper-19.08.2.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
new file mode 100644
index 000000000000..0dc69327eded
--- /dev/null
+++ b/kde-apps/sweeper/sweeper-19.08.3.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.60.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/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 c8715109d4de..4be145a20cba 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.2.tar.xz 43372 BLAKE2B 7ea6bb8f2f9ae9ccf7bbf035d7e26a8abd59cb66aba5866416c949f51e0d64bdc5c6feef185fdc91e8b1818017639e696d6fb144d0ec01ec6f08c9516eb207bd SHA512 72360eac57b541858e6dbaf34036452ace5776f371773194be4b83defb0e512f856430221c83b3a063c532a6181faa2a8821abb16143de1d3aa44b23eda8037d
+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.2.ebuild 626 BLAKE2B 1a78ad8841babcf2ed8119c6e4d766621077ffe421d5781fea1695fa07ca8328588a5e806824fec70a397f5ba83ba46dfbd2bf1e0383092537b4129ba50ccd61 SHA512 ea1f88d29fa69485713a0973ed34fb4dca5952c9957aa5c6cd0e8631382718e57265d23b917b01f6c4524e2e4ae309523f3d55f68793477dd7eff998bf9f2595
+EBUILD thumbnailers-19.08.3.ebuild 718 BLAKE2B 06d29de34d20516e9179aa9ec083afd97b769cf835f34e1a76e1f04be5e26f14e52eee1391013410fed0bd784df0149e7daf950b480aede2998182bd3ccf04b5 SHA512 8c69b0195f9c7f2aa1eeb3107677303a9e067088b25c2751a0160b8039fea4ecc2a84884314f50ec4d61776195f750d5bc4da9189dc8c3981e944497e2ce672c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/thumbnailers/thumbnailers-19.08.2.ebuild b/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
index d9395112cc61..9214a476dec9 100644
--- a/kde-apps/thumbnailers/thumbnailers-19.08.2.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
@@ -3,21 +3,25 @@
 
 EAPI=7
 
-KMNAME="kdegraphics-thumbnailers"
-inherit kde5
+KDE_ORG_NAME="kdegraphics-thumbnailers"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.60.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="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtgui)
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
 	raw? (
-		$(add_kdeapps_dep libkdcraw)
-		$(add_kdeapps_dep libkexiv2)
+		>=kde-apps/libkdcraw-${PVCUT}:5
+		>=kde-apps/libkexiv2-${PVCUT}:5
 	)
 "
 RDEPEND="${DEPEND}"
@@ -28,5 +32,5 @@ src_configure() {
 		$(cmake-utils_use_find_package raw KF5KDcraw)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index 166f55c83314..d1e7b74647b0 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.2.tar.xz 3702092 BLAKE2B c21541f9a7ef64a1f699ef2f1da00d1ac0be8d0bba338f4c7ad0fc1f2f95ac85a8bc9e92b2c907616c3b018820e8700dd1e2661eb4da8bf189b83e1d530aeade SHA512 a251d6e65cb0b177fee88cadaea1cc9105ac5a0b0b8ab09b31a279c4e473fdeea3acf9a7b54b66178b4d77460bc1406caf4bb03844f8c57f46175bff6c587525
+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.2.ebuild 1320 BLAKE2B 761e3b7227a0b7d57c2bf3a4ebd6891e0104ba67ba48b2a8998fef7015f65298462d058cd418f851391a8f955b2d10e1964fb21735fb5f632631c3a9aba6d887 SHA512 b9f65d04fc6ef7439b8aab0c6293e848a292d3d080298a28721a21525b4a4b879fb4bd054837b131346888009ae456fbac0a04d15ef6c9b60dfb87f069163c7d
+EBUILD umbrello-19.08.3.ebuild 1517 BLAKE2B 022980cac4f45b1a2bbd39f7fcb5ca6e22bb26035701fa8635095d7f26cfacb8610166ae4a2b0e7b459db0443cc8200d1a58ded6dc388aa7df00a9452da023ed SHA512 c22d5f274f0778f0caf7b5ffa84da05fdda9c11bfeb29b2b60d5d160c0e36c83c1d75b8f6936fe0187091b88da04918b7b884aa113a43cf8a90252ab8cff7422
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/umbrello-19.08.2.ebuild b/kde-apps/umbrello/umbrello-19.08.2.ebuild
deleted file mode 100644
index a75e8d122d85..000000000000
--- a/kde-apps/umbrello/umbrello-19.08.2.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
new file mode 100644
index 000000000000..f50839f024d2
--- /dev/null
+++ b/kde-apps/umbrello/umbrello-19.08.3.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="forceoptional"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE UML Modeller"
+HOMEPAGE="
+	https://kde.org/applications/development/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 d3c4c3068d8c..a41303b4fc9c 100644
--- a/kde-apps/yakuake/Manifest
+++ b/kde-apps/yakuake/Manifest
@@ -1,6 +1,6 @@
-DIST yakuake-19.08.2.tar.xz 370952 BLAKE2B 3b850bd5c436fce32f27e22450c0c4fdee0cffd025b0affd53b005fdaeb035c87fb6a29ddfd107b1e18ef89fac010949b886da70d33af1cb0abcd1d6020f7cf6 SHA512 fba00f8658ed799af1d7fe2e486fb450e456f6161e69bbf61bea344f4b58e9cc5933cf9306a89863440610f5f394431ee14fbd5605b2a929a40073dbdf902351
+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.2.ebuild 1364 BLAKE2B 7f6f8963fcb4afc7526cae33e5784e9a8c43f81be9e1549f39501675fe1a7bcea938737bab8abaaaacba69e098a61cea84e0e0745d391e35fe1242df79778665 SHA512 d91c785126d93b7ee9ac361b26c043557ff94627f26620056fcc3ed7a73820cd319dcacf359a68e210e382e780bb100fb172c3525dc869514600340d392c5a42
+EBUILD yakuake-19.08.3.ebuild 1573 BLAKE2B 4b97192bd98cbab8af162ca94e7a3527dcf7cf4dafc31a27ef533e9b6f8b212b584db0f8c250ebb9d47fd5635abd4215f938d39dcbc074c6426650b147835856 SHA512 721917e1a96786cea26af50509a958ecca96d36994e1735f660c296618815e769372232039d5c32f061dacadf09c7ba846ad1cd24ab1dedd7c86cd2de45f7a90
 EBUILD yakuake-3.0.5-r1.ebuild 1541 BLAKE2B ee193f05532f1ff554577cd10a610e148b48a682b7dc33c074eb65db4c4f16bd3a7b9ee08e1aba83db3ea32ca3e45aeccb4211713445ecbbb7788c99b3de9229 SHA512 6ffd18d724193374cb66da852b22a23161fdebf728f53a7d4ea75fdcee0859ad09e4c33b186b29cd16c7556cbe85b3422d5e5651ee8e4fe84312ff50d5415d89
 MISC metadata.xml 661 BLAKE2B c0ff7bbfa76614ec0d6ed52ca7af363bf4c441cc06343c613ba6100a68269915d71dea39329d02fc95384ce71331bb367d4cddfdc0c560ea2748843ea7c31c8a SHA512 a842fdcbb48892a13e74eacd0aca111cbba02bd4c43fb9544ed4e4a9c72d122a3190f0090e8b7f63cceba1d449fb7bf629954a9e60dd541e40908818478fcb13
diff --git a/kde-apps/yakuake/yakuake-19.08.2.ebuild b/kde-apps/yakuake/yakuake-19.08.2.ebuild
deleted file mode 100644
index cff4ec80765c..000000000000
--- a/kde-apps/yakuake/yakuake-19.08.2.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
-
-inherit kde5
-
-DESCRIPTION="Quake-style terminal emulator based on konsole"
-HOMEPAGE="https://kde.org/applications/system/org.kde.yakuake"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-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 qtsvg)
-	$(add_qt_dep qtwidgets)
-	absolute-position? ( $(add_frameworks_dep kwayland) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}"
-
-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/yakuake/yakuake-19.08.3.ebuild b/kde-apps/yakuake/yakuake-19.08.3.ebuild
new file mode 100644
index 000000000000..5a9f3cfcafe2
--- /dev/null
+++ b/kde-apps/yakuake/yakuake-19.08.3.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.60.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-utils_use_find_package absolute-position KF5Wayland)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-apps/zeroconf-ioslave/Manifest b/kde-apps/zeroconf-ioslave/Manifest
index c862ac7fb3f0..c4ea4b77e09c 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.2.tar.xz 39144 BLAKE2B 5314f4ccc0124a9a74046e4488eed17af6b27387b1263cfd2ccee45465642260031766cc14db2dc0fad01f62c5b82dcd0a96fd55c797d744b73c636828143226 SHA512 d29f9550e3a6d2accf13550d979e192b123d0c0a99b7d21822c20018ad2265b5e09d36a9c4334152e1f3eb1362fc379d7f684537e0c10e7d3e7c467a15baa218
+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.2.ebuild 464 BLAKE2B 8451291689a9bf2d1561c462d96fc2e3d37a94a2262866a96ea7069fdec5fbeebe347b8c1857845f97f3f302602358e6a3d6a1f2c19a36c97e016384408a781a SHA512 afa8fedc6de865cc90eb22d24144a878acfe2c01fc4c59e25088a4511a1055fcb14ef65ec2a72d729d57d68a25a300d342c4e0b2fd85d694617fd13a6e20cda7
+EBUILD zeroconf-ioslave-19.08.3.ebuild 572 BLAKE2B 727b394f31373eca37cba7c4bc12b93df74250cad7b518f7118e2a0bef76ee0f81f085f60c1df987b046cfa2b844a1f470afa141f1aacc6be6a59405d571aea4 SHA512 7b29afd6ebaae1c4ec6cd5b5493da2910adab35d2294fba2b1a4b9b790c905429eb99a8a10c8599ab5ff9a8c6144ccb0727101a09df4d80fe5218fd9f22f88b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.08.2.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.08.2.ebuild
deleted file mode 100644
index cf2cfa6db83b..000000000000
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.08.2.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
new file mode 100644
index 000000000000..7e28abc605ab
--- /dev/null
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-19.08.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.60.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-11-18 10:15:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-18 10:15:03 +0000
commit	b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree	16fe44748708acacd909d4e2e160a09a7f6d936a /kde-apps
parent	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)