gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /kde-misc
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
46 files changed, 368 insertions, 409 deletions
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index c0104c64e99a..463b848108e7 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index aa91d74c55d3..d6df4ad06406 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1,4 +1,5 @@
+AUX colord-kde-0.5.0-icon.patch 1333 BLAKE2B 3514a23167dc7ff2082afe389d7f3a9e289ffde005427ec92c6a933002d22cdf8eeb2cbe46a5ffd0b9e171ee9d541e89a5bae0463eb094e1c148318eda1b703e SHA512 916874e00ffd586213d1089e9c723177ba0db12284bec522f9257e642a6ff026121e81a167035863c5e7520983e8d596798f785ab9ba4ea0fd00fbf44cde8946
 DIST colord-kde-0.5.0-patches.tar.xz 9500 BLAKE2B e8f4b2f07b7e17eeaddf1cba94945b47a5485213941d7cce3fb9bd0f67bcef37467541e154dfda8babac22fd46778809e84691cc4bebc2e149888a3927e73da7 SHA512 0f153413bd55c294eef1bbb8ae0af60972cdd68df4fe41c1a6fade34c4fa37d7195766561a9570a712b87c055cb9bbc54a5c2bf725c7776066f8fa91c00563e5
 DIST colord-kde-0.5.0.tar.xz 97572 BLAKE2B 7cb5434c25e576c98e2ffbf428bf81d37605fd489199bacc2c040d443021f1f1055b3640f2698b622b021e34f4c517e168a45cd2c1006fdc2c24590789b482e3 SHA512 f285931f0f97462fcf173f64aaf2f32752bddb0b724d2055055ce5beb7dbe89ccebc62cb8c2ce455a8d68beb737fd55bf89be8e4dc7eaa37f09878b757370f07
-EBUILD colord-kde-0.5.0-r1.ebuild 1236 BLAKE2B ee7d992c933d1c04a387f95f0d90187a04204333bcb950800380198cafce15af57e701a393effdfec8fecd9eead55f65c6d87827e5bacff9fae6f642e3aa855d SHA512 d8fa43e82d626c01e33eb88d77024ff03e180f74078507c544e69d153a789e4fdf8b3191256b0d9ba282f90b5abb0ec9be01264fe533e58e1c2b2d2d2a5759d8
+EBUILD colord-kde-0.5.0-r2.ebuild 1376 BLAKE2B fbdddbfb4b6600a8efc3edb3469fd81e5d519a7d7239c6f591779143d4cfe345a60646d354aa6dabadbc8c360714a2c8cfba13a581aa1519dd2979469c008580 SHA512 f1dd9ce5333e9556a9a2d7e7dd86f32aaf8bc4df408944618b6371dbf70063db492ac8585a5ababdc73b22a5a32d0dadb3fe723b7de3939dcda5d870f342c712
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/colord-kde/colord-kde-0.5.0-r1.ebuild b/kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
index 74efceffb01a..734e396cf1bb 100644
--- a/kde-misc/colord-kde/colord-kde-0.5.0-r1.ebuild
+++ b/kde-misc/colord-kde/colord-kde-0.5.0-r2.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Provides interfaces and session daemon to colord"
 HOMEPAGE="https://cgit.kde.org/colord-kde.git"
@@ -12,37 +14,41 @@ https://dev.gentoo.org/~asturm/distfiles/${P}-patches.tar.xz"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
+SLOT="5"
 IUSE=""
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	media-libs/lcms:2
 	x11-libs/libxcb
 	x11-libs/libX11
 	x11-libs/libXrandr
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwindowsystem)
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
+	kde-plasma/kde-cli-tools:5
 	x11-misc/colord
 "
 
-PATCHES=( "${WORKDIR}/${P}-patches" )
+PATCHES=(
+	"${WORKDIR}/${P}-patches"
+	"${FILESDIR}/${P}-icon.patch"
+)
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 	if ! has_version "gnome-extra/gnome-color-manager"; then
 		elog "You may want to install gnome-extra/gnome-color-manager to add support for"
 		elog "colorhug calibration devices."
diff --git a/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch b/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch
new file mode 100644
index 000000000000..bcc8ba2586ca
--- /dev/null
+++ b/kde-misc/colord-kde/files/colord-kde-0.5.0-icon.patch
@@ -0,0 +1,38 @@
+From 7ea14bbaf6b0e923496cb5e50dfcd5068c7858c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Feber?= <bfeber@protonmail.com>
+Date: Sun, 30 Jun 2019 17:50:38 +0200
+Subject: [colord-kde] Use more appropriate icon, because the activities icon
+ got changed
+
+Summary:
+Use a more appopriate icon, because the activities icon got changed in D22155.
+{F6948366}
+
+Test Plan: Open the Color Corrections KCM.
+
+Reviewers: #plasma, #vdg, ndavis
+
+Reviewed By: #vdg, ndavis
+
+Subscribers: #vdg, #plasma
+
+Differential Revision: https://phabricator.kde.org/D22171
+---
+ colord-kcm/ColordKCM.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/colord-kcm/ColordKCM.cpp b/colord-kcm/ColordKCM.cpp
+index f14b4a9..fffbf54 100644
+--- a/colord-kcm/ColordKCM.cpp
++++ b/colord-kcm/ColordKCM.cpp
+@@ -158,7 +158,7 @@ ColordKCM::ColordKCM(QWidget *parent, const QVariantList &args) :
+     connect(watcher, &QDBusServiceWatcher::serviceOwnerChanged,
+             ui->profile, &Description::serviceOwnerChanged);
+ 
+-    ui->devicesTb->setIcon(QIcon::fromTheme(QStringLiteral("preferences-activities")));
++    ui->devicesTb->setIcon(QIcon::fromTheme(QStringLiteral("computer")));
+     ui->profilesTb->setIcon(QIcon::fromTheme(QStringLiteral("application-vnd.iccprofile")));
+ 
+     auto signalMapper = new QSignalMapper(this);
+-- 
+cgit v1.1
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 1b7ffcdcfb95..7e8a8607112f 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,4 +1,4 @@
 AUX kdeconnect-1.3.0-no-wayland.patch 523 BLAKE2B c29b58a3f1f97f09c67270f6b55f8122ccca834b979717bc1c5ad279675106acaa23da1d4a4a08dcc4194b6837cb5fce23ecfd12d5d8d1ed4adb8b4fdd077eae SHA512 68527f15ec3f0af14e33e857567c2fcc622f5dd5fc0652dc0af95e91dc5b96929df9db4961d9aa528be73b87e021877d7f6ee5894a2a195446a7235ca979b664
 DIST kdeconnect-kde-1.3.5.tar.xz 292248 BLAKE2B 9f3cf111f7ed6ed0fd5790e3de19a4f60aea464b7048da423051475824f73ac8ea47f909a88d831e2372c650dcb62cbc845dc519f597f5932c6f973f0ae734b1 SHA512 ddcc8fb9707618e1dadf03fd74d4561c91fe944e72aefa2e6b488efc2fc4803e1f12d889b15aad56582e48bcd0f219b450d6c68e40b5f01d6b0ae109ef45a99d
-EBUILD kdeconnect-1.3.5.ebuild 1999 BLAKE2B 68c6f2e3fe53fedc4527e06957be4a1a8bd1c14d315e0ad6a31c770a78c9deaec7fb51fcbdfb6687381767c035b27d8eaad14c31ee317e45e9546dc0493333ee SHA512 36f7fe31b5847be7cd82881b7c48f110f13e984054f6f565c700915b681000f6be4e45bcd99c1baaf1cbbe0b89d424ab489f57430b51389dd7adedc4b1d2e806
+EBUILD kdeconnect-1.3.5.ebuild 1987 BLAKE2B f211f9760c15dd1c6c6ecf0729a6e3c8d30065ab23c9ec0993065418f2d878424385c60a94246972f10dee81be5c6a16ae8c632531e6fc70f28bb351976d8da2 SHA512 c2b53134f904bc733843e81c17277c12f55e98febbe9d3afb46e36d54af49d651a13fd38b901be5d408466495016bbad03c1a0372d79fa18d473804a1b10c4f0
 MISC metadata.xml 542 BLAKE2B ca880a9dbf862f3b76d30b2fe8bdcf83487606179785fa7060dfc50342df4b73c55a45302b8eb0306559d5da907d958c71ccde0028f23ddf3353465b446a536a SHA512 76c1a4ccab6959be8982ffaab3830fbbe4e3c1c55ad5793bd07fa1c037b1632a2b568d2049bf83f71d437b72f01638d6fe54e17744df95cfe04b2d99828a08bf
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
index 16d096057aa1..719b921fb545 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
@@ -61,8 +61,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DEXPERIMENTALAPP_ENABLED=$(usex app)
 		-DBLUETOOTH_ENABLED=$(usex bluetooth)
-		$(cmake-utils_use_find_package mousepad LibFakeKey)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package mousepad LibFakeKey)
+		$(cmake_use_find_package wayland KF5Wayland)
 	)
 
 	kde5_src_configure
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 72a99a01d7ba..b38173eff5b5 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,3 +1,3 @@
 DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49 SHA512 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720
-EBUILD kdiff3-1.8.1.ebuild 858 BLAKE2B 173e3604e8a1687f0eb7f781e805087b51c1a2ad65a3dcbef9cec3a946a235713a4c12db7c0305d886719da0f12119c719af74297a8d548a8cb5c62588dfbf14 SHA512 2c5ba21287fb4c766d0ab0582b09db4386e95f99a93d72cfaea889706a3aa593c526f97b90ce0d3be5f3c2932556b48655112698b3ec11cfecc46654555dcdda
+EBUILD kdiff3-1.8.1.ebuild 1040 BLAKE2B 9d2b4a8092d8f540f2f5bb52d798849094b5126fea95658b8faa4c8568cae16f17cdc84eb8cd2b9b20617fb9f6a5379a15f323c1991c8da3da315353531a7d4d SHA512 b672ed175e1f0ea373beb43486e4883b2df8070ef887dfaedc9e0c5484b69e89a2cd5046fd70c585917ad1c2014ebf6a51dea5759cd9c0b98e1339055e5810bc
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
index f78a6bf8684b..cdd2662525db 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
@@ -1,34 +1,38 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/KDiff3"
+HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
+https://userbase.kde.org/KDiff3"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="amd64 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 kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
 	sys-apps/diffutils
diff --git a/kde-misc/kdirstat/Manifest b/kde-misc/kdirstat/Manifest
index 6a802ea7d78f..4dd42d8018b9 100644
--- a/kde-misc/kdirstat/Manifest
+++ b/kde-misc/kdirstat/Manifest
@@ -1,3 +1,5 @@
 DIST k4dirstat-3.1.4.tar.bz2 230737 BLAKE2B af1f22c3ab636a78f402fa002aa08f8ae83f57f134b4c7a2087d9be6cb9f89aca6065316e59cedbbb3d9c92a82d0dafaf465c66e1c0a2921e5064c6683431ffe SHA512 f931440541a663f83a9c6cb2ad32a9e32b8b83ef6a5b4bba0f07b664e3a2e5d5d3e97b6e53819bac75739f236138b9f7945354cc7b0c31909710b37e9cfe296d
+DIST kdirstat-3.2.0.tar.gz 249518 BLAKE2B 81575cb7356ebef36f83cedce3720d38387cbab1cbcafaa2518551eb1c73e0a96470b2fba725ab6b2ca5d55df2a13c262f72af359dc8882d40cc1165868a2396 SHA512 b664fc8a74f37af39960be27c81d2ae4a2d67ecd8f9eda4ffb8b5d1da6936083353f89ba9cf25340acc5789bf6fed93cb5b16b6b3d146a089af9ef51ac1fc370
 EBUILD kdirstat-3.1.4.ebuild 981 BLAKE2B bfc5fee47bd37bf79fc4ed2f073c6b010bcf9e6026a5f9f7df08bd1225d02c156b26e49ed7134b3a80495eefdcf2e34a2f8c20cc239231f2fd0c8a64092bbd81 SHA512 29f30de205f1b6391013cbe1585a5c1cee951061b0727d3220c3eb118146ef2100e8591eabde1a0f87135b588cb4f532056be621353a00b089008e0ae85cbe6c
-MISC metadata.xml 339 BLAKE2B 4d90cd665c996f0ff88b63c4d0184f1b090af57d024918fddb2fbe59f8d5de1f01e4acfcae03e08368958abb93abb841a5e18affc7e6345d60d556aaabbf775d SHA512 5ca88965bbed764c5ad756afe72df1aecf665b9325d1c40161836a0cbf44b117e20679dd8e62795b5a85f8b4b417f56a02ad8ce7a739198f4f5084d7c63dd3da
+EBUILD kdirstat-3.2.0.ebuild 918 BLAKE2B 10c4ce423f5584a88f55063d7bfa65b49da12bd3ff37986f9fcc7aaf19fd6eb8cee950680578a7a9888aceb6ea327acabf9f6c29d2a0c05a5e11d840d0c85dfd SHA512 32e4e76297bd6fe19df2d2647f53a5c2bf46142de282a4ff76a32a5f90560a1a00847bf8e1604ba7561a52e48f4bb2acda6eeb97709e706d2bc1ca56d369aed5
+MISC metadata.xml 336 BLAKE2B 6cfe6d8423053d86fc829dc1f07931f5ac6db61a09739d750e028a1a504195625e73076d5b1c49df1e144a02cdd140c1567c9f6649b7194d77729e09ad13c3cb SHA512 deafa0d3745ab7b572e8c0820ac067bc5346c26c4e3e27984e01225e9b836c584c8b389def69ab7662bced708e3e1afd506e758fc619619de6729f15f5239a84
diff --git a/kde-misc/kdirstat/kdirstat-3.2.0.ebuild b/kde-misc/kdirstat/kdirstat-3.2.0.ebuild
new file mode 100644
index 000000000000..ba3b65a800b9
--- /dev/null
+++ b/kde-misc/kdirstat/kdirstat-3.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+inherit ecm
+
+DESCRIPTION="GUI equivalent to the du command based on KDE Frameworks"
+HOMEPAGE="https://github.com/jeromerobert/k4dirstat"
+SRC_URI="https://github.com/jeromerobert/k4dirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kiconthemes:5
+	kde-frameworks/kio:5
+	kde-frameworks/kjobwidgets:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kxmlgui:5
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/k4dirstat-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DK4DIRSTAT_GIT_VERSION=OFF
+	)
+	ecm_src_configure
+}
diff --git a/kde-misc/kdirstat/metadata.xml b/kde-misc/kdirstat/metadata.xml
index d39facde0827..698f14057139 100644
--- a/kde-misc/kdirstat/metadata.xml
+++ b/kde-misc/kdirstat/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="bitbucket">jeromerobert/k4dirstat</remote-id>
+		<remote-id type="github">jeromerobert/k4dirstat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/kde-misc/kimtoy/Manifest b/kde-misc/kimtoy/Manifest
index 2db938e104ed..6d6c31a625d4 100644
--- a/kde-misc/kimtoy/Manifest
+++ b/kde-misc/kimtoy/Manifest
@@ -1,3 +1,3 @@
 DIST kimtoy-1.92_pre20190225.tar.gz 435142 BLAKE2B 86f40774cc5c01a49996f80a4257c3ad18787a9e269a0cddb489530ac1d0a7b84dc5f6eace35374975f24fc15738c02d03da6637e6e6edcba48b27e235ca030e SHA512 9b6b6c316e683d3ae80226e91e17a367970a9380ee6f100798be48f1e29c14b39b9ca679a36b26cfe6a09aae4deaee2f7db4b2a1a7b587e3d7b26983ae6eaffb
-EBUILD kimtoy-1.92_pre20190225.ebuild 1680 BLAKE2B 4b2fee446d1a3feb84f1280db53c16a36ab04cf8d50c7030049a0972252a7de9bc48329cc57b07e64314dcf9d44ba54424ceeb61d391759dc498718dfcf4e5fa SHA512 525762acdd5597f63e253bd384f390e6f32002ba841ca0cd45211e4dbb95d2ce8b80b6ed51f3b2841aa2b23ae8be366494470ffcd442cce2bd28b57bf9ed7986
+EBUILD kimtoy-1.92_pre20190225.ebuild 1882 BLAKE2B a54202fdb0b88690eb2c699dd9fd93a2e23f21bae0fd69388a683db64fedce687f70b3ab349c1e3c3e59275c16dabf7a9ef5b5fe6e4a055f1756ec6edc140801 SHA512 8007f396b186438d4a68d3366902281ee43aec3014483960e730c1ad7dcd12691254f27c0d3ae31b41f8944a213effb9790baa5abaf60269fa836da0423155e6
 MISC metadata.xml 332 BLAKE2B 76b0c29f1f9f6a1ae4c576ebfeaaa4faeb0b8ad04b1bf354a23c358c2c7fc73fadc27e19d68e1bf8b7436fdae5ed896c98018f43d76abfd303cc3868678bc080 SHA512 ef7ec3391d65f9fb9bf6d7efe6ca50137f7668dbc855694e14a8999eb48a7277bf64d0480e4a91d3ce2d74e144d4424576522f4e15ed6bb57a0b9f24c16cb285
diff --git a/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild b/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
index 0efb2e94e073..9c204ca7344b 100644
--- a/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
+++ b/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
@@ -3,38 +3,44 @@
 
 EAPI=7
 
+KFMIN=5.60.0
+QTMIN=5.12.3
 COMMIT="c8b3da65bfd289d0a0262aa673aa6b697022d4a3"
-inherit kde5
+inherit ecm kde.org
 
-DESCRIPTION="An input method frontend for Plasma"
+DESCRIPTION="Input method frontend for Plasma"
 HOMEPAGE="https://www.linux-apps.com/content/show.php?content=140967"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+SLOT="5"
 IUSE="libressl scim semantic-desktop"
 
 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 kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
 	app-i18n/ibus
 	dev-libs/glib:2
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=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/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${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
 	media-libs/libpng:0=[apng]
 	x11-libs/libX11
 	!libressl? ( dev-libs/openssl:0= )
@@ -43,15 +49,17 @@ DEPEND="
 		>=app-i18n/scim-1.4.9
 		dev-libs/dbus-c++
 	)
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}
 	!kde-misc/kimtoy:4
 	>=app-i18n/fcitx-4.0
 "
 
+S="${WORKDIR}/${PN}-${COMMIT}"
+
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	# bug 581736
 	cmake_comment_add_subdirectory po
@@ -59,12 +67,10 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package scim DBusCXX)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package scim DBusCXX)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 77775f81ad30..ff2a2a3b12d0 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,4 +1,4 @@
 AUX kio-gdrive-1.2.6-refresh-credentials.patch 4224 BLAKE2B f70a40eef14d31f296effb554308303fe9b82c21b8e3c3a56020d5548dfbd9a967ef27d24ac4b44398c681db64dabff87a088ad3e47fe9e5f962af2080471f31 SHA512 8fc99adb52f1e9b9c49c94357103a51d3de367ea1d5a98afe361910307fe1a424b9f0c5fb0ec1e5f0cc2183ac87f2d6cb1730ed12fecc76b68e8860317dfbedf
 DIST kio-gdrive-1.2.7.tar.xz 46748 BLAKE2B 308c7d8d55c4eef175e2ef6030f1fbcdb59fdc6cd33f6c0bd5c35efe7bd21cf7f6cf7293b355f30b7b05effae79b91e357cc5a93ed866db850953f392bd65e0f SHA512 f1eedad2cd244e38f6cdf397e9488cb7f31fe7c4b17825f3b0882ff46f7f62f087e7b2bc59db434b4a55641920b8b03f3dec6adf7031ccc2277c7a0b166f9c80
-EBUILD kio-gdrive-1.2.7.ebuild 1149 BLAKE2B fe76e5cc791a3450396cc13c113e50c218790534fb5b7ba2afc303a02ae67565ef00600e74510aee034c166b3d02f7d1ee01ee98d593efbceb49f7e7ee2e5154 SHA512 ccc5370d3b1db91e7701605bad5b8043001be3844af57e7307f9ed570f4c0afa2ad378d5f8c3d083619a9927b7285b35a73f42aa90850d4cd23dbb5d74a7de76
+EBUILD kio-gdrive-1.2.7.ebuild 1214 BLAKE2B 03b7724d56dc9fa28e0e674bc5937bbc0abb3890f09b6ba263f322583643f1b47b09bcbd095715ff44564f7eeade5b56b08bdd29a1eca5455c31c3c7046735b9 SHA512 d19d252f772c009ce80e8983ab5afdecba737a3bdb8a7bfc9eceb49d4f6398c10fd9994948c43104619091ee50ff873a54b0319e0b26334c4ff41c1d63d1962c
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
index 0f5910c0bb34..52c588af79a2 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.7.ebuild
@@ -3,10 +3,11 @@
 
 EAPI=7
 
-KDE_APPS_MINIMAL=19.08.0
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="optional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KIO Slave for Google Drive service"
 HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
@@ -16,25 +17,27 @@ if [[ ${KDE_BUILD_TYPE} != live ]] ; then
 	KEYWORDS="amd64 x86"
 fi
 
+LICENSE="GPL-2+"
+SLOT="5"
 IUSE="+kaccounts"
 
 BDEPEND="dev-util/intltool"
 COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_kdeapps_dep libkgapi)
-	$(add_qt_dep qtwidgets)
-	kaccounts? ( $(add_kdeapps_dep kaccounts-integration) )
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/libkgapi-19.08.0:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	kaccounts? ( kde-apps/kaccounts-integration:5 )
 	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	kaccounts? ( $(add_kdeapps_dep kaccounts-providers) )
+	kaccounts? ( >=kde-apps/kaccounts-providers-19.08.0:5 )
 "
 
 DOCS=( README.md )
@@ -43,7 +46,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.2.6-refresh-credentials.patch )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package kaccounts KAccounts)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-misc/kio-gopher/Manifest b/kde-misc/kio-gopher/Manifest
index 7fc6a9132bb0..2d47487031bd 100644
--- a/kde-misc/kio-gopher/Manifest
+++ b/kde-misc/kio-gopher/Manifest
@@ -1,3 +1,3 @@
 DIST kio-gopher-0.1.99.tar.xz 34176 BLAKE2B 6f02b96941c81c1658ebee6fdabae24a134993365a490f6de875009f5f303963b140412e2e440ef27cdd6666e06572ba2c57e6a5b001d7eb8c86a008ea62806c SHA512 1a61e79eacb88080f89c173ef87d48693ea874b4bf767f0854e44d0f918851baad02fed884ad2a915d5c2cd877cf17c6f076b242652ac6f483fc9a47aea86412
-EBUILD kio-gopher-0.1.99-r1.ebuild 499 BLAKE2B 68e66b14b7201c3c8a9b866c95642c70b6c1b58a6e419ad83274877d3a36b5acf3c24841f4117a2b34e900f75f6fc0ebaae8a0ae67e4093da780b5972dab8bf6 SHA512 7c764ef35b3e9f586a9c19dee1a56687a3f2a2f25d254794b835e6f78b6d5def7a35175f2fd4ea4d4bc1ebca4220bb2cb9e0eaaabf99b907b5b7174ddda9fb95
+EBUILD kio-gopher-0.1.99-r1.ebuild 565 BLAKE2B d16e67cd3abb77bf1cc9a224fa668cbc2473e4b92ff9d23923a09f636e7a4295120180c488533ff7574f2bc45ee9cf47234c57aec2b7ac9fadbdc9b5d98f2b0a SHA512 6d3c714ddcad0b689851b023c0329cccb43436ca6e7f56ea228028dd2c16541d7ccea23c1da0ca36af98fe49ae0450d3f416b9f6b6256aeab515e5d047093462
 MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild b/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild
index 15c846228abb..5a483ac987a4 100644
--- a/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild
+++ b/kde-misc/kio-gopher/kio-gopher-0.1.99-r1.ebuild
@@ -3,21 +3,24 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Gopher Kioslave for Konqueror"
 HOMEPAGE="https://userbase.kde.org/Kio_gopher"
 SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-misc/kio-locate/Manifest b/kde-misc/kio-locate/Manifest
index 1295b1d7d814..92da72bdd137 100644
--- a/kde-misc/kio-locate/Manifest
+++ b/kde-misc/kio-locate/Manifest
@@ -1,5 +1,5 @@
 AUX kio-locate-0.5.3-gcc-4.7.patch 178 BLAKE2B e346e1f161147b1ae2c583f268a70d051a83e1ca246d53e8913ffb9e85d5ecb22bbcadb304389cb7b4773f56cdadfa4254546f5c82f64e7346e946e96d0a2a15 SHA512 a891bbd12b42eadc95403a5486415d52dd191cfb41c98ccca2a9539ab546551d2bba6e02b98c497f4bcf119ea3ed7b5a26c2c44be3bc0c2b0ade6a2619e9d71b
 AUX kio-locate-0.5.3-kf5port.patch 3459 BLAKE2B 0411a8fba1ec0c852e692b3958d0c18e8e3cb4058e8e41c568100598897c35a5a8e540f5af19b80b485cf3ae6d29f37579629f3b94d67a0ce54341cf1b520818 SHA512 54731f5945a7cd48114981554a1d0a2a9c2717519399798b28646e6387317bfa2ee8e3aad791b696ea8cef67563500e2117a7f0f4ef11ab165bace3c6844e302
 DIST 120965-kio-locate-0.5.3.tar.gz 95081 BLAKE2B 378ee064da5799339d5853ff727573f6ba9f264520c67d12a2c9f9126a2ff625d33d8a72c796b830ba524c720d6b3a903cdab25b500b1889f543cbe580391f1a SHA512 04d80e65fa33b59081c71858efca97c7c53ad91fede6882daa207c6b7b4bc19c9b28056cc701eee5b719dd5cce8263e8d13f6bbf285934640eb2aa8cca676c36
-EBUILD kio-locate-0.5.3-r2.ebuild 777 BLAKE2B 92eb6793c86f9b94fd247fa63d0e7c8eb66eb35757aee4d931ca4db0cd1566671c3c1f1bd73f9006a04ec8ae94cf833b58266fe302cba24e065fac1f66e10f70 SHA512 9b9bc2b101ae116f3130d3abde60328cf6c0cbf19406591fb96e282daa0cee974f370a5e2e48493ca5106e3b8223c366b8d05aeb20273e617b00bf2f7c53716f
+EBUILD kio-locate-0.5.3-r3.ebuild 955 BLAKE2B cb16514b0f46c7e18e818cb322abab53263e37a890c5a088cbdb01847b488be175655e88b8339cffb6b4ed07c0b891bdac1bfd482f09e113744a7f2d75c6193f SHA512 8977f2ffd0c75e9c7a00fb839e614ab71f6d35e68a5be48e349c39cfe0c46c8db5a06e3cd6830a9ef31591c554cb467e48210e29a41357219502178b1db14c09
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/kio-locate/kio-locate-0.5.3-r2.ebuild b/kde-misc/kio-locate/kio-locate-0.5.3-r3.ebuild
index dcfec179e885..785b50d3006a 100644
--- a/kde-misc/kio-locate/kio-locate-0.5.3-r2.ebuild
+++ b/kde-misc/kio-locate/kio-locate-0.5.3-r3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-inherit kde5
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+inherit ecm
 
 DESCRIPTION="Locate KIO slave"
 HOMEPAGE="https://www.linux-apps.com/content/show.php/kio-locate?content=120965"
@@ -12,6 +12,7 @@ SRC_URI="https://dl.opendesktop.org/api/files/download/id/1460972255/120965-${P}
 # See also: https://github.com/reporter123/kio-locate/commits/master
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
@@ -21,10 +22,17 @@ PATCHES=(
 )
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtwidgets)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	kde-frameworks/kcompletion:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kdelibs4support:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kiconthemes:5
+	kde-frameworks/kio:5
+	kde-frameworks/kwidgetsaddons:5
 "
 RDEPEND="${DEPEND}
 	sys-apps/mlocate
diff --git a/kde-misc/kio-stash/Manifest b/kde-misc/kio-stash/Manifest
index 1843988bf867..89e074ceb8cb 100644
--- a/kde-misc/kio-stash/Manifest
+++ b/kde-misc/kio-stash/Manifest
@@ -1,5 +1,5 @@
 AUX kio-stash-1.0-kioslave-no-desktop-app.patch 1407 BLAKE2B 5ad6fce0758832de2f2a765f747afe141a730d135f244eb4b58cfe5c0c0e0314f90dc9abb086091f19e39b8e4ae8539fd186e55e56703a08bbfdf0639c47e96a SHA512 f65426d9b201d9db7ba4907ee7276f9cc4e766116d418bdfc0a8f69266754cb9f655900cebf0086e54bbfde696d82e8e75729cb9ee1b2e216871c47ddef787d3
 AUX kio-stash-1.0-no-kf5config.patch 1172 BLAKE2B 99c6f09278e649b375ff8dd4f42790aa25e88d3c7e8faa703111f585d315977eee2172f5baa12206d6ecd0d3acef93b56b8907cf6bb1328d22c07a701bf99574 SHA512 f50ca12e08a04fff8c4066875007237a97189a83de97d62b3f133b3ab79bb90cdc9c7bbc4160281800df16cb7fdce35083b5559f18698238c0b719894e0b13d9
 DIST kio-stash-1.0.tar.xz 25308 BLAKE2B 36329831bacd9cd271a52f7018ef4a46894a9ef65190d3372584cc489998197057e7d3ec64017446963ea024e9c50afb5fd5dc8c2d01c27cde7bc83844419cc5 SHA512 ca345a2cd2d8df72ad1f8de366ba290a21f0f3a98ac098d0393d66ec43334258e1e7222a19f89de9a53f152fe4c63aab1221dc045efee94385299fc63e65a931
-EBUILD kio-stash-1.0-r1.ebuild 729 BLAKE2B 2f3f09376f1e01693c35b0bc47b0780d0267015f3aaa10905808c6f9f93259da4743a6c38f3d0c0745866f13b7a8ca4b9a83393b9f5a4b630378aac6dad63b6a SHA512 8d14ed4a2c0b81a4c599a4ac56bd48c35d11be889b9ad48cb16448b0e0f01eb56ede45defd506e0cbf751a35cfb54ead20c1eeba2cc9e2038a6b0a922972266e
+EBUILD kio-stash-1.0-r1.ebuild 792 BLAKE2B e92d522ecc06a59233dafce2825c2dda680f45029e5b99c28a0b8b7fb0821cf39ea19da780f8dcbc7c35f1a085ef9094e821c69d73f70b0ea11aaaece28bcdd8 SHA512 7a8d1cda4c4ad2b65e645e78bba374f062ebf424eebdc8b056e93a89999f0340e013c9ba2f0e55c4b8789901cc08eb93e048d3e897330df33a7dec24e770a683
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
index c35c5f5aaee4..a79001b1e4ad 100644
--- a/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
+++ b/kde-misc/kio-stash/kio-stash-1.0-r1.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KIO Slave and daemon to stash discontinuous file selections"
 HOMEPAGE="https://arnavdhamija.com/2017/07/04/kio-stash-shipped/ https://cgit.kde.org/kio-stash.git"
@@ -18,11 +20,11 @@ IUSE=""
 RESTRICT+=" test"
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_qt_dep qtdbus)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest
index f45e3386a364..57634d4c20d8 100644
--- a/kde-misc/kmarkdownwebview/Manifest
+++ b/kde-misc/kmarkdownwebview/Manifest
@@ -1,3 +1,3 @@
 DIST kmarkdownwebview-0.5.5.tar.xz 64468 BLAKE2B 7116173ace51c3b4189c5af433114e6a7156ad6ce8381078d61aa20e17c4e067b2affa0f816fed27b02c4ddc0f4c15263220384a9afc6ae592b287dac2d93938 SHA512 c10bb4da4ff2b3a05dc82887ddbc45447387a4cd4bee64cefb5f21e42dbbb777b3b00118867e78af684c579e4f3c604be1973b1ee4e18692fc6bfd6b24bffeee
-EBUILD kmarkdownwebview-0.5.5.ebuild 883 BLAKE2B 0e3eaf599ae552f688ae2a2d8ddd48e29794280edfe45c671372fd4c81e95e2278858a6c7f8cb3acc7bfaf2ab0838a049b8d7ea14d826345620f3907ca3c3aeb SHA512 ba025591713fe1accb850fc07759cf326f776b5931af5839e1518b1f722f34cebd485b2615443d7420c007acc8690910cc66981f3cea27965fba4f45a9507fd6
+EBUILD kmarkdownwebview-0.5.5.ebuild 985 BLAKE2B 01d7bf488c3f2398868c53a783de5d961fc11e6aef491c70f19a3067abadec76cbb136f6a68ac98071d3030a0c6c22e4a945972bbcdbf43accbd9bf469582a58 SHA512 396c37caa382f435eb41b80f8ccc64aff285a0198b8ac103f7326f8f80a7d8308f605fc476f626b39aefa9bfe822ac448abc25e225d93de5d34bfba1169a8497
 MISC metadata.xml 365 BLAKE2B 708304c47cade844b320dbdbe71124d0cdbab506b655095ab9ee703f3cc5f44c0bc1561ccd7dfec9d9b2b14edaae90abf323cbd1ea6cdda1fbc6fa5193c15c81 SHA512 dbb15189ec2a5c3cc0afd100dba5c187a2464c8fd12e048f4d65aa39165c7cc093fbca646792768371f5fb2997c3b721d64524e63542693b44562b6f3bf755f5
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild
index 86226db89b6f..46c920cf2f62 100644
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild
+++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild
@@ -1,31 +1,34 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KPart for rendering Markdown content"
-HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.kmarkdownwebviewpart"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="!webkit? ( BSD ) LGPL-2.1+"
+SLOT="5"
 KEYWORDS="amd64"
 IUSE="webkit"
 
 DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
 	!webkit? (
-		$(add_qt_dep qtwebchannel)
-		$(add_qt_dep qtwebengine 'widgets')
+		>=dev-qt/qtwebchannel-${QTMIN}:5
+		>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
 	)
 "
 RDEPEND="${DEPEND}"
@@ -35,5 +38,5 @@ src_configure() {
 		-DUSE_QTWEBKIT=$(usex webkit)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-misc/kolor-manager/Manifest b/kde-misc/kolor-manager/Manifest
index 1c218e9dc60e..ae128dc0d705 100644
--- a/kde-misc/kolor-manager/Manifest
+++ b/kde-misc/kolor-manager/Manifest
@@ -1,4 +1,4 @@
 AUX kolor-manager-1.1.0-deps.patch 1012 BLAKE2B 8ac2811a43fbcabb4a61df44b9029e5ee603c38d191ad8025ad153764d108eae2a43464f7b683f9884d098b584595f457385ce1d936d5e143583715c529786d4 SHA512 fa236ba48c22ede9b774b607fa5cfe413a055571c113466e6b58a8f8a4d47c21e433fabaad324db5a3cefa4404506f0634cff619cff7cf8e2f01bddbd9be1f59
 DIST kolor-manager-1.1.0.tar.gz 37756 BLAKE2B 85aaad99c7c29e6cf58deea19d30aed4b4b09059e4f1681c005a08e6550d68cc171a1f43a775bbbab8f50476642c4956b67a8e600cb590035fedee03617f1249 SHA512 52bfc162d1162f8c75f627beed322d4a79a2fa6bf955ff669e5809975b160f5af3d8174a867fd629f8ae3c8d65a7ea8409b059786d062ff725cf5552348e1893
-EBUILD kolor-manager-1.1.0.ebuild 655 BLAKE2B bbe0f8409ba29f68a9cba97ee0da16983bdb9ebb742c21dc4cf57bde7b76265ab85b72813c9cee842689bda38b5a75e8bba81fd5d57f4d266c6930e94c7a8fd2 SHA512 7cace444c4642963e8381987df155466c0cdfae119e274ae11fa7363e91ac1a37c7c6250c6f6f17eac32ab2ebc921834de24decc4791bf23f7541ab5e33cc352
+EBUILD kolor-manager-1.1.0.ebuild 713 BLAKE2B b7451029898b3535ec29c00b4b8343e86705ab7721097dc409aea54e497e3396c5f1d5cf8f633b7900f968ce3326efc73d5cbee6abefaf1a5a8efd349ef2bffa SHA512 38b14e1de363c5d2cf80220314301b91af612a31e93f2c7b8c8e95b05fd6b0702dd57123411a00ed891aa1147c6473de0410e1f4725cae2c020547032a442d3f
 MISC metadata.xml 249 BLAKE2B d27faa1c4af97c82d07fbf011527c00fb5f78b54db9f25d5a10219cf1535fd3739813e14fc9e22e16bac33ca6de5a3bc278f2646d8c4606b09207c9667b27fc3 SHA512 fa397cf016d93ccf5928803e27e732a4636b84fd7409f88c3a3a81634c15ab67621cda9333393a8ce05d7245a4fe75aa303d9e51dc2d78dff95161c5e887b618
diff --git a/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild b/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
index 0403154bd510..3236f33d98ad 100644
--- a/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
+++ b/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KControl module for Oyranos CMS cross desktop settings"
 HOMEPAGE="https://www.oyranos.org/kolormanager"
 SRC_URI="https://github.com/KDE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
 	media-gfx/synnefo
 	media-libs/libXcm
 	>=media-libs/oyranos-0.9.6
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index afa91c5489f6..61cd7584a3ad 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,4 +1,4 @@
 AUX krename-5.0.0-exiv2-0.27.patch 5106 BLAKE2B 756e29fe3bdc0d83d3612ec9af7fe0936d70eda023c64bafb198c9b0d29bb69e4978fd5c2eaa7606e41b2d730ae1566217983f7fb2dba72c996b11982beaef49 SHA512 98a917db7212f120f1cab3fdf89e9e09d05205da386df2f838b770ac378ec3b71d5a25bd022740569a34c39cb20b3ced0c489b7945c4ed3d85fd4442988b8f4f
 DIST krename-5.0.0.tar.xz 279968 BLAKE2B fefbcb4ba1bac3f505db9392c3407af780ae7669f6bf105dd9faca32b0527e64b0a9a8590ac7df429d2cdbc2fe0028eca1215c056f895038f1c02685e42636a6 SHA512 9a52d921342f81990236aecb260beebca04f65578b34704c338f94214117d0e18d8b39e9832ddb5fed39a8f1d9f58f05a445e7dec3631e7cac062f30fce09597
-EBUILD krename-5.0.0-r1.ebuild 1352 BLAKE2B ee97203bbd6fe8e6995b33c30a7868421294b5c06486523f9333aab082e5a9e645efdc7bd7a11fe27a6961169ae6f6cd16128a7ff35a756e20ab176ac24cfa79 SHA512 21fd5a81d1212a7d183e40de973b03be67f83a1427fb8b0743bf45eb164a5999043d210cd426f0d86d8ea28711a3e8e83c784ea870c6035a541ab0054e28f936
+EBUILD krename-5.0.0-r1.ebuild 1526 BLAKE2B d35757f0d67e585f7d5efdf7eaace87cb899928f6923c116930b343f69030b0b87c4fe30eb16d0d7be503b178563264d74cdf5036805b8d076b1fd9d57f343c4 SHA512 406e806dfc8cc296b99df7ffc8588ebdc81b873921b2e7d2b0a0d1c967c43e713b8aab0d948fc3b49b8bdde6e87930d081740a339f16697b1739174fcc63e68a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krename/krename-5.0.0-r1.ebuild b/kde-misc/krename/krename-5.0.0-r1.ebuild
index 52ccc8806dd3..d1ae0af0e04e 100644
--- a/kde-misc/krename/krename-5.0.0-r1.ebuild
+++ b/kde-misc/krename/krename-5.0.0-r1.ebuild
@@ -3,34 +3,39 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Powerful batch file renamer"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.krename"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.krename
+https://userbase.kde.org/KRename"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="amd64 x86"
 IUSE="exif pdf taglib truetype"
 
+BDEPEND="sys-devel/gettext"
 DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${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/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kjs-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	exif? ( media-gfx/exiv2:= )
 	pdf? ( app-text/podofo:= )
 	taglib? ( media-libs/taglib )
@@ -44,11 +49,11 @@ PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package exif LibExiv2)
-		$(cmake-utils_use_find_package pdf PoDoFo)
-		$(cmake-utils_use_find_package taglib Taglib)
-		$(cmake-utils_use_find_package truetype Freetype)
+		$(cmake_use_find_package exif LibExiv2)
+		$(cmake_use_find_package pdf PoDoFo)
+		$(cmake_use_find_package taglib Taglib)
+		$(cmake_use_find_package truetype Freetype)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest
index 74dea5fba46a..370e31df7710 100644
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@@ -1,6 +1,6 @@
 AUX kshutdown-5.0-cmake-3.15.patch 996 BLAKE2B 9529d6fb2a82e6c3b3d5be901b9aa48c41df7f871733842b37986cfba3e87ca301672fe9cb1623b7e270a4bfb6bae62f4fbab9c2989bf4c430dba408e88c75b9 SHA512 415c53f8554971f448fa869b6e9a8dbbd0ada064cf6c5af45c445a1d2f42dfdc3305fc7a177d79fc9aecbe89b303f90168f5f6e9378c888129f6fd135d4edd09
 DIST kshutdown-source-5.0.zip 454848 BLAKE2B 481cafbf5bd3831088ec9168b6eb82e342106b9b570279b6b8ca1db1f2df8c5640b3942f76032559396b504903b18fe106eb940e81822472a63f235e1a004644 SHA512 7a3920315db142f150227e624fa4a765966ec8367a08686214cb072d94a62d24f3a22fbef8fc84411d385be935102cf85df1b001b2922399455cc320c1e0f0db
-DIST kshutdown-source-5.1-beta.zip 458881 BLAKE2B f07b1c3ab4d8c272eb4a9dd5e09d5606c175590791878663c784fdd457afc8850f7ad90b707edb3294e67418e58798731adc1304f9b8cc5f66251dade8e32186 SHA512 6afb050428e34cdfc25c9f899ecc117a7eee91b6f55ba4bb090b6b7825bad4cee113a155d053d2fc554c4d4846576f28e3d5c43b90c855f5f1884c26c04afaad
+DIST kshutdown-source-5.2.zip 445025 BLAKE2B 161a637ded6fa7ddc11daab5bfa20efe51bee0407339e178668c584cc690dd419bfb1e7e134cbc9ec3274a394d47496423f8b3b561cdd8083470daa4e8d24511 SHA512 ac46164da88815604007e637663c42430212b37231d6116fd31b947b24d2bd69aff0d79fcab570425960420d77168de184ccda99dd685bec96bb353cb578ee04
 EBUILD kshutdown-5.0.ebuild 1105 BLAKE2B 42e92eadbab70f27f41e76ec2ce0d4500976830eb0c333b76315c1dd473687d5e4af7764e5776cadbee74b491991e973f940f6599376aba5e855016dbe709758 SHA512 1c7776029fdbee8bf6775464747db33685c94a5fc964c26363428e0988c6c30b0ea995c15780688e5bd95868c3970b29f5367963e704517403074f74aea202da
-EBUILD kshutdown-5.1_beta.ebuild 1256 BLAKE2B 19a6be87a8dc461addd3e88015aba4beef7298425305602b53a68e7dc67b79b9565571325947896edf830637c4dee47217b1962489550ca5bd1512bebe97b7eb SHA512 8d197451579befdb9c05c9f7a8742fa7e782fb91cacc10a28e05b97f208fadfc598977aaa61a2342834f7d40c75f8727e0e223257b22ac25cc48882fcbf2b1ec
+EBUILD kshutdown-5.2.ebuild 1155 BLAKE2B a845a0a206636b58c05859acd06240ceebd3eb68041928de086ad0eb6634e54a2c5b6825e38d86af284e490e4387e530953b979e4b945c7a5ad862cadc947fca SHA512 3d8c0ad7636364d7b8b91106c2025512b9648f3e3b33bdd845cdb8ccedb726cca400b36265b0f4de3dba5123898893bb6ad1d707abb2a9a815a68e559d519405
 MISC metadata.xml 328 BLAKE2B 7fca7d8d10232412fe198ba6c48e27ff6e1f45574255cd0b386f05264822a8bfe84a77f12b5104682d2188f51c230baf6cc6180b50249634cb5bc7bcc0cfa946 SHA512 b26f71d9d8119e82c3f395850e2309f97edc6c7fbb201387ff0bd03c7241b3262218dd5baea6a438b649ee3c13d4061531b0234471c3d8b4b8349e658d5bd775
diff --git a/kde-misc/kshutdown/kshutdown-5.1_beta.ebuild b/kde-misc/kshutdown/kshutdown-5.2.ebuild
index d5506fd01fd8..26f4fac98beb 100644
--- a/kde-misc/kshutdown/kshutdown-5.1_beta.ebuild
+++ b/kde-misc/kshutdown/kshutdown-5.2.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-inherit cmake-utils kde.org xdg
+inherit cmake kde.org xdg
 
 DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma"
 HOMEPAGE="https://kshutdown.sourceforge.io"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV/_/-}.zip"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.zip"
 
 LICENSE="GPL-2+"
 SLOT="5"
@@ -46,12 +46,8 @@ RDEPEND="${DEPEND}
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.0-cmake-3.15.patch" )
-
-S="${WORKDIR}/${P/_/-}"
-
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -59,5 +55,5 @@ src_configure() {
 		-DKS_PURE_QT=$(usex !kde)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 88a181ade366..d827b663c803 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,7 +1,7 @@
 DIST latte-dock-0.9.2.tar.xz 708436 BLAKE2B a54d11e5d98e4e9238f26ccee8f3ea67822f44f015a93cf0a4e2a202a5569e766ce0dd651f9ddf2f1251dca9d342dbb3fa58c2cf29bec04f7e24574136b46621 SHA512 3537ec6b9503802a7efbbea7ae6ddf864188ba3b73c8121b434efc527f3c3e8d8f5e68447541a867b4422ccc5e3d2af85f491807a597bdb747960e8ab983bebd
 DIST latte-dock-0.9.4.tar.xz 711788 BLAKE2B 0e725da78dd9e243b29bf2721de3e060fe4ee1f7da532c84ba52d582db106257bddc554263575f98324e750b7bcb17ae495eaceebead5ffbd6838311753d9447 SHA512 05b7983db75589e1c2c150167d4aca4b9a4b0025f0de7906441d9a90c69bab9efc716addc53e0262dfaeca89fbaa39d50f938535ce6b8898422e906e9f905687
-DIST latte-dock-0.9.5.tar.xz 715260 BLAKE2B c92f9613851756289bd78a8484490f9237caf02f91c502dd095bfecd10be2ae316fa68430ca9eddbf08bf55ef26b8b4fcb167e07e111727f7b137379465221e8 SHA512 74fc5f53c56ff7c0780089a675aac0714fec46e31b3e32c8ded8e74d77396f3b5959ba2ce60606bfddd930fcb86a45ecd3ee5050e866c1ac334bce191215325f
+DIST latte-dock-0.9.7.tar.xz 716716 BLAKE2B 9ed220be28632d547ed310264f3778dea1dfd1b04c6bd006dd8eea41edee7272384632db33ec3ab16375dcbec92c4f07674df64d72985dbc9a80e71c9ce4cfef SHA512 921e1b49bf802fe1dc57e3c7fa24e115ea12f10eaf4d731cc22c4d4ece6370964b0009f130c1836891a5d866f895814592774af35eb0c76900586e5a98de7bd8
 EBUILD latte-dock-0.9.2.ebuild 1332 BLAKE2B 3224329560a34219555a0eb64f3be2bdf10085ae35db9b0cd8a79a989e8178979c5b31e5e294501eaae384fd5911f167bb6ac10c3cb8cce68083566ecb4dfefb SHA512 c0eb58938332aeb6a88b252af81dc0c5f238fcc73f3f4a372671f587733a202143604216a152e45b2810bfcf46666cd07dd5de5f4b351485dd55e13d358d518f
 EBUILD latte-dock-0.9.4.ebuild 1333 BLAKE2B 43ce1821938d56dc60524cc73d696751a183024d9c7afcf5d4490dd1f1802576c0a4df3260f4342be0576cad2727c0abcca08f36630a6021c3213cd74e584923 SHA512 5da60a28e9ab887d8c2278ee08bd5ed6604fa1e4d9a1efed689620d0d63e20107b5ae248a81ccf0e0216a95faec3d777aa649c6b3820de68a7bd9546f86bfbd0
-EBUILD latte-dock-0.9.5.ebuild 1527 BLAKE2B 9107541c89126e4698bd23782b457ae515a3d22cdd1be1aab575d470242689bec7fd169f311308ee3511c72981ceb557e02f71926f9fd8405193f0ca37e6200f SHA512 38e9649704f2232b4b65cf8f024f431978c13627f8dd57a3110e06471c11c936b04a5a410ec0652b3d9bed6478a3d06f2c89ad2e22d93226daa1078b5ed5dc6a
+EBUILD latte-dock-0.9.7.ebuild 1603 BLAKE2B 7d6d66766a6f25ae6d57f09cf8e5910e7a2a99bd5555f15f636da43f0f975f36be23a7aa39385dd29eb53a79a1ed0a522aa0da8df543301b565877e58087775d SHA512 fad419ac9a2127226a4b9e70e17f0b62f75fef3eadbe81c47817187eb1a0a0aa5676eb08ecc4f57caf1afd6e0ffcad7bdd18dd0c631b7b7ac51a1fc960ee7b5e
 MISC metadata.xml 453 BLAKE2B a49e759f4ce30c2730a4bf082b8f953e0e93f95f2de3b567798d4bea8229558ed72cd774c5d9b1356bd066dc92400d17f05d830746d87386c8c2921fcc484c80 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35
diff --git a/kde-misc/latte-dock/latte-dock-0.9.5.ebuild b/kde-misc/latte-dock/latte-dock-0.9.7.ebuild
index 57fdfa1e2a72..d0653af57474 100644
--- a/kde-misc/latte-dock/latte-dock-0.9.5.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,6 +49,9 @@ DEPEND="
 	x11-libs/libX11
 	x11-libs/libxcb
 "
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
 
 DOCS=( CHANGELOG.md README.md )
diff --git a/kde-misc/plasma-pass/Manifest b/kde-misc/plasma-pass/Manifest
index d0891d55152b..6c49a201f900 100644
--- a/kde-misc/plasma-pass/Manifest
+++ b/kde-misc/plasma-pass/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-pass-1.0.0.tar.xz 26496 BLAKE2B 290e5f326be3bb7d8a2771dd9481da2721a9a7151d64e9bb4a5b5db3d9d8d03dc5202d4c7ee6def32c7c5a7c01eb602cec62c65bfef4a353db46e733281fb5ca SHA512 b67f3e8e18260564873000aa0b07f24dd95334882f3b81685dc1da59c06315b48112c26aed040f625e7240e3776ed29ec927ee79c81458ed01bb8a98cccbfa44
 DIST plasma-pass-1.1.0.tar.xz 28204 BLAKE2B 69aa9d8f5ece8625c0d371ebfb565b2ce60e0a0fa73458ab30eaa9acf1858f0d9b2e30532d7a56dc821533964f09d9b6fced2b965d5fc9b5c1728e1b79f9a2c6 SHA512 402a19d44028117878214140c4eff74f25775aea6492fd751883e56bfe8ae08b330bb93f0a271c55f942f8ce1ee3de00cb6ad1b7fd4629beb59e898650b8166d
-EBUILD plasma-pass-1.0.0.ebuild 719 BLAKE2B 7c154470ac6f8dbce3b06864b302d508b1dc916e7565475cbda9b087a134776c450b015eb8ed50e90edf6f71c46d6cb03eaaa9539492f15a06fbd1ea2f9f5e1c SHA512 e5db4c189de33c518afe471bd5c124f64dcff831b0aadcc24cb9e3e92da99bf265fd560449699ca3b880bda88ec111b8ae748ed91abe3f9c6b5e51749011e06a
-EBUILD plasma-pass-1.1.0.ebuild 816 BLAKE2B c214745e33f4638367551cd0159568950331eb176545ac927ed85fe942ed456c3a8fbb0dcd0375375e9f6c87ec4ca7c02b3bc8375dddcdc1b9bb43e51100de93 SHA512 92cb177dfef7612d23af057ad034560321caaf29ecd473e5ab7cabfe228380f2d771b5e6f22be65edbd4e06d92cf100b757d19e1ccd7bb274ecb70fbe629ab06
+EBUILD plasma-pass-1.1.0.ebuild 815 BLAKE2B a1e7d773246452f32006e0211212113a448905ac2677913d0b1f8f48ddb189b65cdefd5008ada5c17c323218d5acd749f9524872ac3129d4016312d588065955 SHA512 4f0f89a9791bd8bf9a53cbbf1e207ec6120c740ad3c72179be3214baf9950c0c586ee7535f5c4760b1161db67a0d3deede1fd629d2b4b33db917d69de4b250c7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/plasma-pass/plasma-pass-1.0.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.0.0.ebuild
deleted file mode 100644
index e8298ecbc6e8..000000000000
--- a/kde-misc/plasma-pass/plasma-pass-1.0.0.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
-
-inherit kde5
-
-DESCRIPTION="Plasma applet to access password from pass"
-HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://cgit.kde.org/plasma-pass.git/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="LGPL-2.1+"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-"
diff --git a/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
index e3e3a0e453e4..78ddaa09b2c7 100644
--- a/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
+++ b/kde-misc/plasma-pass/plasma-pass-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.dvratil.cz/2018/05/plasma-pass/ https://cgit.kde.org/plasm
 
 if [[ ${KDE_BUILD_TYPE} != live ]] ; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/kde-misc/playbar2/Manifest b/kde-misc/playbar2/Manifest
index bbae46c07f28..bc62d26a524c 100644
--- a/kde-misc/playbar2/Manifest
+++ b/kde-misc/playbar2/Manifest
@@ -1,4 +1,4 @@
 AUX playbar2-2.5-raise_qtquick_to_2_7.patch 12001 BLAKE2B f3188cb6270ecf46da35b641df3f01041178bfb000598bc52247c8b2fa00136f8f800838fe4ec76218b0353b14761f5d8aebf49a3ff979c5e6c3bc570156e7b3 SHA512 85dbcb60f6d705f8eef0a0d1bf48b3d55911f60fc38a0bf61ae2127011a067c853c756b79fc2e89ee798abbec307998bba023a6fac0b0aa27d5eb37a7f9cf5e9
 DIST playbar2-2.5.tar.gz 397576 BLAKE2B 3b14289bb7aa1e89d0de14732c7490cd552d4ca1e6f5311cbf274dd31f64b738e1586c3d7eec864c5c6ca94dacefd264a2b12e0843cb28557a1b8524c3aa4ea8 SHA512 964a29a07d7fab8f02d71224684e572e4fbadbd57fdc74ee6b59477b415306c39b60ec7be392711cfac8ab0325a72e7cee485e9c3af2949f439dbeb3a247605b
-EBUILD playbar2-2.5-r1.ebuild 904 BLAKE2B b9b5e1b9cedcb227b5b475fa2ae1ea55f23fb6b1da2b86551745765d20906c4cea2c3c4b972335148738ad798d008dc6a2b63a3c99820239d48fc11195d5b911 SHA512 fee4f4468324f46d6db65e155775b2ed6d19785a62f8c879d801a062e1234ae25d861498f5267c347441dfab54f253b2e20b95388e414b10a1da193a0850feb5
+EBUILD playbar2-2.5-r1.ebuild 898 BLAKE2B 0d2bbce7cbb6639877c00ef05af0fb86d17551c00f9dc99715e92ef6a1e1a947cda180b141ecc086cd21279428285f022e25d3e47bed8b06b12bca958abf4b28 SHA512 8524854e452919a74bbdcb59440232900151895c98ec22b24677baa417b57206bbf384ac4680297cfcca3332b80728b3e5acee9a037a0745c0f75b002df0155c
 MISC metadata.xml 457 BLAKE2B 7da06d96db2c6414f29454c8eb17a4a272f461cc42edb1764c33960fe841d53a8ef029e9867914765514db67977b529c26d2fd0196d6642fe6d26b08807e66b4 SHA512 82c0ae3f064b101a2da7513c70cd0aecf52310b3be4754b4de70c06afdf31c2575c1a81934f58a297e55858e12986f769e65515786e5ddd5438dd3611a028fbb
diff --git a/kde-misc/playbar2/playbar2-2.5-r1.ebuild b/kde-misc/playbar2/playbar2-2.5-r1.ebuild
index 889812d1ec0e..a7e23bbf2456 100644
--- a/kde-misc/playbar2/playbar2-2.5-r1.ebuild
+++ b/kde-misc/playbar2/playbar2-2.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="MPRIS2 client, written in QML for Plasma 5"
 HOMEPAGE="https://github.com/audoban/PlayBar2"
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index c92623c428b0..e5a9e1338403 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,5 +1,5 @@
 AUX skanlite-2.1.0.1-cmake.patch 2978 BLAKE2B 68d39415f4199b018028b16727f734117a7499be83904e80b9aeb2837a835141363516e0b452d81ddaab8b874de75e869168c9215babb3230c9a02a33b7f33e7 SHA512 7a7ee0f6b7b82a2b8e90ac58d632c92eb7c0992195f104ed794d14c451a21fefb7a3621bc22c14948b83b8e9aa86d9868ebd97d780a8d31f01186485d507d3ce
 AUX skanlite-2.1.0.1-hidpi.patch 2234 BLAKE2B c2867f5d6251b2258097e1682e2cc8a8263631000f32701802940d84d63e657d12a45b326932d3bb087c571928b08529d2e050cf5298addcb9749d38337a3635 SHA512 d5c559a8d057acce73db1252d52299a72788554845dd0a00fb000c15b7d0a4ba8d20f72a24dddd032c2cb8cf84ff6bef9b2d365cbb70e98f7003523d479e9e92
 DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
-EBUILD skanlite-2.1.0.1-r1.ebuild 888 BLAKE2B 03e47e6c5eda524d3c617500ab309613854b628597a2ad00bde4b8b4babb99dd72f25e5e3b55dcec77297f77f3abe06896c2d02108850b90509652ac5a3ce7f6 SHA512 2697e9a4a9e27643c6756280bae80bdfbc59b565e12cc9b6ead48797c4946d4d5f6b492d09b64e2377d5e90d45fd6a6473e9eb1d9aaccdd6318e050a06d68337
+EBUILD skanlite-2.1.0.1-r1.ebuild 1040 BLAKE2B 68f0e4f91e43a3e5b2acd4b9c7d809fcce8d8136fd1cd1ede94f36943b21da2d0339efd6775c4d2cc4b96e2a80f23b8d1511bb2614c2178adb28eb5976dc39e4 SHA512 0066e2f8de64404fac44075e2a9c67d4c77e24f62b2d39039ae42de5cfe310041d1edd8f7c3c5cb1cb3143b91edcef27a6884c2fadefa9612cec7b83c1cf3748
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
index 2435c68972c3..1a7a7c968a19 100644
--- a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
+++ b/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
@@ -3,30 +3,33 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
-DESCRIPTION="KDE image scanning application"
-HOMEPAGE="https://kde.org/applications/graphics/skanlite"
+DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.skanlite"
 SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
+SLOT="5"
 KEYWORDS="amd64 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 kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep libksane)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/libksane-19.04.0: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/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	media-libs/libpng:0=
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 8da56ea8f3bf..da9a5d9ad90e 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,6 +1,3 @@
-AUX tellico-3.2.1-missing-header.patch 1196 BLAKE2B 757bfca5c2edd2fb41903a8ff1961ad200347a97ff589ceed3e4c84a061e527a69f19367ad3111a63a0bd222795bf5d478cacaf9e372fb1b5fb76b0cc66f2b73 SHA512 22ce1aa6d5ab3fcd5e9b427e8950e31afc5ebe02de30ca961c03a79a0bf967b5049cb77d6d3a08e5635c00d10c6d51ac3d02887bbb5fd81fc7adb2f3ec3e303b
-DIST tellico-3.2.1.tar.xz 5604632 BLAKE2B 4e0f156a315eca387b60f254df9824615aca3a917a1a256bfd3612e6babd7495e22d79234bdd92297167c323d5a3aabed253ddc38d757e41b64c289392b6e827 SHA512 ada45c66fce2e73f301e3f7d69acb20caf5ebde85ac77bd6e6f0701f55044f5f1a44f8e6ae5d6d6bd244fd6538fba88591caf70178855b6910ce5132508fba9b
 DIST tellico-3.2.3.tar.xz 5589552 BLAKE2B e22f0344ccd879694976bc00fa6bcb52e3b878d4ef92c05b9b9a62ab74b1e84cd4b649682a55ee4a1b2da4678676abe8f1da5591f57dbd7db156b5e5bd0b9dd1 SHA512 4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7
-EBUILD tellico-3.2.1.ebuild 2516 BLAKE2B 84b1943c2d8fd608642252e75408ae827edda5e273597265982f3422c2994a580a1f6436f8873ddccab46f5719a92e9cd4be22ca254c46bbdf6f66f5b49e2ba3 SHA512 53c16b74327a9c800a817712553be35a1ab11306cb0a0774f403f9b859b99deb9facd5c701998c6d91169a845f0228d62838622b1771a8efc0db1c48ecc349aa
-EBUILD tellico-3.2.3.ebuild 2317 BLAKE2B 7a2671840e53a5cc95ab37414a5a1f4e063333e00f9208a2c94db2a2142a0e894f09252800f065f35ca114e9d6b30bbce533530b4350d2b6a0c50793387137cf SHA512 67c8942dafd3607ff5a36565eadaf3dd03e68188cda457a1af7561cff9a4ad4f157ced04ea108c09c1f08aa24c924ec7593035f0626dd626a01c6473e60b921e
+EBUILD tellico-3.2.3.ebuild 2267 BLAKE2B d2970f9230f76a7743106d14f5623a1865e70b73fd951b8d93b6eb7a613a0af3ef48068fb5702a4045e7676344cb0f998af02f920ab491369e5010d396eb43e4 SHA512 da92f0567c722eb5f1d3041d6541b3454db65376e8db77cee3cc52b294aaaad1260d8414e9b934f986ad3ad516885d29143e8ccf9b4230b1460b099d82e3c56c
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch b/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
deleted file mode 100644
index cff61fcdb614..000000000000
--- a/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 43851a0a655a3a961f289087bdea989aa32cc028 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sun, 21 Jul 2019 09:21:16 +0200
-Subject: Fix build with Qt 5.13
-
-(cherry picked from commit 43e6bbb4721adc83d8b2a77bd51d9efaf7aefd6b)
----
- src/gui/datewidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp
-index 724370e..e6502bb 100644
---- a/src/gui/datewidget.cpp
-+++ b/src/gui/datewidget.cpp
-@@ -35,6 +35,7 @@
- #include <QPushButton>
- #include <QHBoxLayout>
- #include <QFrame>
-+#include <QDate>
- #include <QEvent>
- #include <QMenu>
- #include <QWidgetAction>
--- 
-cgit v1.1
-
-From d3c56eca11cd059d4348ab6696822c23d85af61a Mon Sep 17 00:00:00 2001
-From: Robby Stephenson <robby@periapsis.org>
-Date: Sun, 21 Jul 2019 19:17:35 -0400
-Subject: Fix apparent build problem on Jenkins
-
----
- src/mainwindow.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index d8348e8..8250c56 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -108,6 +108,7 @@
- #include <QMimeType>
- #include <QMenuBar>
- #include <QFileDialog>
-+#include <QMetaMethod>
- 
- #include <unistd.h>
- 
--- 
-cgit v1.1
diff --git a/kde-misc/tellico/tellico-3.2.1.ebuild b/kde-misc/tellico/tellico-3.2.1.ebuild
deleted file mode 100644
index 1cd59e71c253..000000000000
--- a/kde-misc/tellico/tellico-3.2.1.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="Collection manager based on KDE Frameworks"
-HOMEPAGE="http://tellico-project.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-BDEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(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_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-perl/Text-BibTeX-0.780.0-r1
-	cddb? ( $(add_kdeapps_dep libkcddb) )
-	discid? ( dev-libs/libcdio:= )
-	pdf? ( app-text/poppler[qt5] )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	taglib? ( >=media-libs/taglib-1.5 )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xmp? ( >=media-libs/exempi-2 )
-	yaz? ( >=dev-libs/yaz-2:0 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
-
-# tests need network access
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		$(cmake-utils_use_find_package cddb KF5Cddb)
-		$(cmake-utils_use_find_package discid CDIO)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package taglib Taglib)
-		-DENABLE_WEBCAM=$(usex v4l)
-		$(cmake-utils_use_find_package xmp Exempi)
-		$(cmake-utils_use_find_package yaz Yaz)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/tellico/tellico-3.2.3.ebuild b/kde-misc/tellico/tellico-3.2.3.ebuild
index 5070732abf47..238ff1f2d72e 100644
--- a/kde-misc/tellico/tellico-3.2.3.ebuild
+++ b/kde-misc/tellico/tellico-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://tellico-project.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
@@ -74,15 +74,15 @@ RESTRICT+=" test"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		$(cmake-utils_use_find_package cddb KF5Cddb)
-		$(cmake-utils_use_find_package discid CDIO)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package taglib Taglib)
+		$(cmake_use_find_package cddb KF5Cddb)
+		$(cmake_use_find_package discid CDIO)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package scanner KF5Sane)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package taglib Taglib)
 		-DENABLE_WEBCAM=$(usex v4l)
-		$(cmake-utils_use_find_package xmp Exempi)
-		$(cmake-utils_use_find_package yaz Yaz)
+		$(cmake_use_find_package xmp Exempi)
+		$(cmake_use_find_package yaz Yaz)
 	)
 
 	ecm_src_configure
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 224a2a367ebc..e5cacf20cefc 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,3 +1,3 @@
 DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6
-EBUILD wacomtablet-3.2.0.ebuild 1240 BLAKE2B b73a09d09824ad69a3dad83f843c4adcfe39c4890ac48d4a061ebdf85a151b3845a52eda11085430d53971cc1a214bd245b5f3779648bf535c16ab70cfd11223 SHA512 b25b53f9ebd7ddc6da7887d70f6ed13edfe5870610cbbf0e7efcdc10b28a9857067a9733e8cd820a22ffd400dee0fb01a989990f51d72e6b0498719ccb7db56f
+EBUILD wacomtablet-3.2.0.ebuild 1339 BLAKE2B b73d486a75de6417fda6408095f419eee0f7b2dbd0438fcfac01ce0bca62c1d3686c1f8d65e7ce9e21d746c95a98e950a618f348f8802396dc2e13a116108bf1 SHA512 ad3b6adebb96493efda53b27f753fce6af66b72bede23209e0a9bc46906f0356959fe0db3ee87657ca2a6440340825eaf6b697e28778ffb76ade44ef90134907
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
index 74a5f2521ad7..fb00967bfb2e 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
@@ -1,39 +1,41 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="System settings module for Wacom tablets"
-HOMEPAGE="https://userbase.kde.org/Wacomtablet https://store.kde.org/p/1127862"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+HOMEPAGE="https://kde.org/applications/system/org.kde.wacomtablet
+https://userbase.kde.org/Wacomtablet"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 BDEPEND="sys-devel/gettext"
 RDEPEND="
-	$(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 knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
 	>=dev-libs/libwacom-0.30
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
 	>=x11-drivers/xf86-input-wacom-0.20.0
 	x11-libs/libXi
 	x11-libs/libxcb
@@ -49,5 +51,5 @@ src_test() {
 		-E "(Test.KDED.DBusTabletService)"
 	)
 
-	kde5_src_test
+	ecm_src_test
 }
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index 2d4f10a26677..9567280aba02 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,3 +1,3 @@
-DIST zanshin-0.5.71.tar.gz 355173 BLAKE2B 245ccde6b6a68ca0b7093525b2b3d0384b9222efbbb6366060a5061020c565dcd7e6b9b6e4fffadc164bae93783bdcf69e2d02b1df4c9cb382c473dc1a10152b SHA512 c04f280066f97e3984988a86376b6e86b451d0fe5bab31eba4de03f2c2d15e65a3681d3f9f6895bf0750ccac4bf7a4666d742dd9c74028e689d732615cce3e97
-EBUILD zanshin-0.5.71.ebuild 1857 BLAKE2B 88635bfb63e9005946e3c52874efada1219be1ff766e2bf4b16c439d9a62d0192ffa54247e158641a3911c2e92314fa7c756bd0eda8bf0224e865bd4865c804d SHA512 71a99b27ce97820f5a9974d0ca3d5c84a1150f0c94458bfc81f1f9792b66f0f6c7f08003c5e7a6275bfaf1cf4872b8f2e4c611d5ab77fe73d09652f844838fa4
+DIST zanshin-0.5.71.tar.xz 307872 BLAKE2B 3b767af7527348177b7105126acedd47e222859985feb47f89066732293d77d89347ab105b3a8269717c5fc723f1b8bcd1a52e5242bf77828019e55a48e2db6a SHA512 47b4fa8797dd50372dcf176198e1c80348cd1ba604d1ed61cd973956e54ba5551caea33c766d857bc3ad598bd0eae9882ffc315e13e6e3b9c1033d01c8e029d8
+EBUILD zanshin-0.5.71-r1.ebuild 1831 BLAKE2B 8b09c397f7ab81504875be6c6f80aff65f0e1c9d0fbd5038f4b92763b4843c4efbd2276b6e1a7630d303d8eeab47f1feba7ffac1dd639799ec995c9f7ee4fc39 SHA512 36154332e7212d62d2e881c947eb761546e4c63ad0a47185e7a5e1d874ee36bacf1e2d8dbe4a2969fa012bfcaf43da6fb2fbf8bed8497470f2ed589ef1b8b705
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/zanshin/zanshin-0.5.71.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
index b3ccd806876b..7a3ae88bf309 100644
--- a/kde-misc/zanshin/zanshin-0.5.71.ebuild
+++ b/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,8 +13,9 @@ inherit ecm kde.org
 DESCRIPTION="Getting things done application by KDE"
 HOMEPAGE="https://zanshin.kde.org/ https://userbase.kde.org/Zanshin
 https://kde.org/applications/utilities/org.kde.zanshin"
+
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="https://github.com/KDE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /kde-misc
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)