gentoo resync : 18.11.2019

131 files changed, 2141 insertions, 1941 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 76a816f15de3..d41c61f6a8ab 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index d729cabcd93c..4b72d2f82ad9 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,5 @@
 DIST bluedevil-5.16.5.tar.xz 160136 BLAKE2B 19b39ce147a7678d8740a9c209e5af5c80d1affebb349f03b49e48f170fa1323410399c32b56b844b522e75056680e926bb1a432b69567cbede256dfc977b6f9 SHA512 de3c767413ede046ef39bc249c728c50f22db04ce1062956f9462214cf0d9dda0468ea3e463330663da720226a97b3bf935c5c138d282d066181faf0b6e55828
-DIST bluedevil-5.17.2.tar.xz 160580 BLAKE2B 16a2e8e7c5392e2e4874e0ca73366dbd5af0a2e11cd96d1b3cf54d322918a72fe57d7d25613dab60fa51cbb000c74dcdef4046538ecb9e3819efe28c2a4615a5 SHA512 7754f496b0eeb09f37e8d3b703a7a00bf8701ec447027300a4904c22f896cbbf6d603a29b2b866adcbf704be847ccf60658a435833569716477739837c12859f
+DIST bluedevil-5.17.3.tar.xz 160720 BLAKE2B 915a4c65fda931ec2c6a01abd05cef279eecbab66b14b0cb0a44ffe48bf714ae3b487f71d2e5ef756fdd5c3c8d57ea553a79dcadb8ba56af395d457abdd8fa03 SHA512 e41742096f1b56f223c336ae3b667dc0e4fb6c7fa72fdf775f543ffa043e912e367618ecaf9e4beaff0adc342db63149815a0ffb849c6e462d40673c9f5ed89d
 EBUILD bluedevil-5.16.5.ebuild 854 BLAKE2B f8d5f9ab71706527cf2dd6291e53c2d6bee0e7ede681bba227191eb0822e8aecbdbb7c1b32ba02f639b1f54b8c0818d78158cd1c52aa425b35127195d7717c11 SHA512 08f883f38ccc2fbd166ede36864cfbfc8da52eed34b6eb253249bb91c7f1b8b76e01e1490c66e4682db4f94cad8050cf88210a71f72ac876566e5839fd2bb41b
-EBUILD bluedevil-5.17.2.ebuild 857 BLAKE2B 6799750b181547e7a98ad6f3cddc675b40b9ceeb84d2226ffa752cd1c10fd76c14f24245ab5a045c60cca4608a30c3747c41beca311c0a8c6378a49ed6db5602 SHA512 9eb659f90c92b1798c15b81ca801e56da628aa0f1826a0d0477e5528b5cd8f217463a112c9bb3a322cdcb7d9a2fe249d1bfd443368d8111981ee5a07d530d8a0
+EBUILD bluedevil-5.17.3.ebuild 1058 BLAKE2B cfe5a8706656a9a43f420e44ea5814db72b749a568d75aeae3e1b53ca8ce918405c72859e18112d7cf97f88c7c1f40b64b7d00ea3fa9fa72185c0c7bc4fb79f4 SHA512 a46c7380c309361a5655aad336ce976acc598c9f5336c3702b0c71e5122a70f86ccea0a0ed7b6665bd68f74af4542596a8d43a7b8186b8183269ce255ce454c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.17.2.ebuild b/kde-plasma/bluedevil/bluedevil-5.17.2.ebuild
deleted file mode 100644
index 15fef8b7b306..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.17.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
-
-inherit kde5
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep bluez-qt)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(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 qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
diff --git a/kde-plasma/bluedevil/bluedevil-5.17.3.ebuild b/kde-plasma/bluedevil/bluedevil-5.17.3.ebuild
new file mode 100644
index 000000000000..2514f78b89ea
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.17.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://cgit.kde.org/bluedevil.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/bluez-qt-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kded-${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/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/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 6608c471e6e5..0b9a27ac0fab 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-grub-5.16.5.tar.xz 3136380 BLAKE2B 922e97a8f921ee43f163c861a2424f3f4cb290d669dc5fe372eac654cd9ddf2bcbc0f26cf831c4452c463f2f5c768d7f3aef945873e1edea818c6ba332b78318 SHA512 3fb6c8dfde319a62234a7f1dbb6306b159a42c5d7c910fc09ef202f3e3e89500a0bf70664f013059c0e113d2e1ebcf46698acc9909d7b6398fcf3bacba000746
-DIST breeze-grub-5.17.2.tar.xz 3141828 BLAKE2B 6ef820281dbbe3263be426ee31188a4caeae3bacbc0367b83f27712088481e391619c97facfb426c19e74405b7b529e78e5713b8748f147dcb0ab1aa0e08e36c SHA512 2e2907f308a5ecf925c26720f5ab275cff9a1db5cb37286da7a14acbbca155f2da6430043dea6d19b710f5dc65723988a4fc041f3f23e19c5ec6f2ca1da5a53e
+DIST breeze-grub-5.17.3.tar.xz 3139928 BLAKE2B 280355894969c4988c906e3bfbf4b665e37e64f68f6fd1857f6746441199a1b564b5c7d0b5bfef95bbf7d5617b2460a1b7814bcbc4717d8a8a14ae36e3751d97 SHA512 2c1bd2f22c2f1f236e7c456e45dcd6626fb06ac022089fbf4d4c7aa85ebcd161257291f94429e2a7a50a6f01a9ac9017aefb53515299a033804e3258cb061b29
 EBUILD breeze-grub-5.16.5.ebuild 399 BLAKE2B 03712756bec77cdd2ed02d4c1da83cc7c4efb71c492b14b70cad9c4911a8b662877c61692e0ea6ed0e24a1db490d5514c61619d4e47ae765e9670cd6abf28ff7 SHA512 e77a7122822f5805cb76bf40f336b08f3dc6f546cfac45dceff0f85a63d2c81735d07240f83b4ec5ecb26bef63b1a7d2fc9c846d4febfffa3c5ed599216d03f7
-EBUILD breeze-grub-5.17.2.ebuild 402 BLAKE2B 85bf08549b8819e1ba5713657f43d4062bd5b38d8a10acc1bd4b9dedee7b2e94c78cc3efa1305acfe9b38e16382ff8d78b09193cdbbad0b28b23090150ee0717 SHA512 9cad5052c680c5881c9227385adb693a9adca4a69f84db3512b19dc33678b3504d32458757919795fd43ecbd27472a9d418da726b5dea19eabc22173434e79f3
+EBUILD breeze-grub-5.17.3.ebuild 397 BLAKE2B 18d4a536191b7f06f28550dd7382bd3d61b5112887f47026b5a00cd6ed3bcfa1a8b810edab01156b237e992d080a000d63d472b253f2a54014b9c0bda756d8f3 SHA512 8b4e899213c766cd5acfc018abbf67406ee43ccde8ba46c842e1de40dca75925e0607b1ea91923b959731cf0a22bf62b0ee91a1623d750e2fb1eefec191c43fe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.17.2.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.17.3.ebuild
index 5bd1b8ebfeab..7d3e5d9c86d3 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.17.2.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.17.3.ebuild
@@ -3,12 +3,13 @@
 
 EAPI=7
 
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+inherit kde.org
 
 DESCRIPTION="Breeze theme for GRUB"
+
 LICENSE="GPL-3+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index e7c1340ab736..7b6e0cbae017 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,6 +1,6 @@
 AUX breeze-gtk-5.16.5-cmake-pre-3.16.patch 542 BLAKE2B 58af50232fc314cbab7f6d47a54bf87b2be75757354f0ad7fbf65e36822774dc96a3d7928360b1c27c7819e7d55253db73f5f883cddbdaf89ca62e94cf1732c1 SHA512 9065680b040447fa84d4f100bf5ed7fdde2631c53ab777abac238d9a319c33d40ac1f111ec942c9f32721363fd80e71514e405cb0dc429e07b80dbbb4233c0fe
 DIST breeze-gtk-5.16.5.tar.xz 47412 BLAKE2B d995d6b542c517785b33b4c1178d513ac5faa391b1de9f8605b1ad55f392e9eb8b9d2951cdde173854f25fd9d27ea3099f4505b5701a054eb3c350187d1f294a SHA512 deb172423d0e22d20305d1229b0f7c679c8707f56c0fd1e4589a068d295b5a17eeb3342ab174e94d0399fc357f091c9229f126b58bd1e9f4d45deefd0f6c41aa
-DIST breeze-gtk-5.17.2.tar.xz 44304 BLAKE2B d3b056104fc83b4354f870664380312c94cb54cc9d043fb3b94b51643ccef22bf05bbaee0123d1a56b0af8110d01de32bb006382513f33cd539de78dbbb80536 SHA512 7af8a73a9cbc0cb7f09806b5921a840e94726dcf2e3c4ad5f93ab54a900a2656e257b1a90d475a2f734cc80c269fba1bfcf263b3cd0112ac037b369207f6656f
+DIST breeze-gtk-5.17.3.tar.xz 44164 BLAKE2B 5d3959f8c9c568890b1b38c99404be94d7539f32512c9b52348d5740e52b4212b114085e3f629b06e64bfb2b96f505be450cdc2202336efaa37e7042d6f5e981 SHA512 251d7b3722c643048b584665b79d512180396017a5f25b5132e9a5911d9e8fc0556aa56da35a1d71d0ea673c3841d1f6d50d55063c8f868ef6b28f63c7084a74
 EBUILD breeze-gtk-5.16.5.ebuild 963 BLAKE2B e0f3f7601e4de68a01fe80647ff9b4702329ea0a69f41e7589bf16e9c6f3d9369b1cc44c68547c0def595adcfa006f5dbfbdbdb3679a732b0117f36c3b43252a SHA512 8f19454ab609dc18f4c023649aab95a0807d95de6c01a448370c956a2f8160f8a4097e4263325c0a100c133d40487998a122227c61dcd045ded3fd26e78e6d1d
-EBUILD breeze-gtk-5.17.2.ebuild 964 BLAKE2B b548b5d3fd01df3ebfe9e51795104164f7076eaff8436011db0c5ea7b65104754ca466446f8db16967f90e646fd1871f90df70d9905e5d4bd3b73a213741af7b SHA512 9651ccb4ccd58e0ffa2d1d7369d8a2ee4d45b3e6fc6a7e0f3a63bf6dce89f1a9d80461545321561f1ba07da453765757456c6975a7b8a93abf5209bf46af0da1
+EBUILD breeze-gtk-5.17.3.ebuild 1004 BLAKE2B ecc3dd6904d951969e8befb118a43a0ebfbddafac04f846da9895772decbeb910d9cca8926bbc0e1d4587106e0b2dcd594cf328a00a620010db8feca0fa173e4 SHA512 ae7d2f2d1fca40197563bdb51c2288b75a907698681103ade77382183b6f1b8082ccd164997ed5300f0bf65999ec4fa7f438c21a51965e3004590d84eacc0cb6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.17.2.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.17.3.ebuild
index 38c53a1e609a..57771364e9b0 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.17.2.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.17.3.ebuild
@@ -4,16 +4,18 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-any-r1
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
 HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
 LICENSE="LGPL-2.1+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
-	$(add_plasma_dep breeze)
+	>=kde-plasma/breeze-${PVCUT}:5
 	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
 	dev-lang/sassc
 "
@@ -24,11 +26,11 @@ python_check_deps() {
 
 pkg_setup() {
 	python-any-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 	if has_version "<dev-util/cmake-3.16_rc1"; then
 		eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch
 	fi
@@ -41,5 +43,5 @@ src_configure() {
 	if has_version "<dev-util/cmake-3.16_rc1"; then
 		mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
 	fi
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 245923f8a025..068a2f880f3c 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-plymouth-5.16.5.tar.xz 105440 BLAKE2B 9a9e86347d4b683253266831a10b21162c01155e03de3195dd1ece75c97bf6e698c8bfd9876e5a8ccc1c5a6d525fe3d7ae95e689ad2c5d4235f348e2a19cd895 SHA512 2934d43c44b5683964fd14b3a5498c41989c5fb69182b29cef9bc588470c299f16662028e8c2101228a3c3299789ffdc21e33ed49d90965a2add2d9bd79a4ee6
-DIST breeze-plymouth-5.17.2.tar.xz 105628 BLAKE2B 3c3dd35a7452fb7e629e88e2c5d996b3ceb0eac22a8b979d892e6777ce32c8cfe0d717584ad80e525be4e383c0a42d42df56675ef6c787d3d4456944fe78e839 SHA512 3fe34e529d79da0cff53e4f8164fad2e6a4f7d350e06ed0de212895fb96082ca6ac01fa445c708118f9da10d48543d577c2311b996bc987c1361fe1acbe65f77
+DIST breeze-plymouth-5.17.3.tar.xz 105428 BLAKE2B 541c9f84a6e036883dabead8476d34863e5c1c7477e3638083b40f0730999d215dc0ca25f75b24718bbe6fd2b4229434973a5ed1162e8ff9793fad798ca2842e SHA512 a0ddf3ed49dd1413617c2cba1e601c359e3232f5b0c46204da1d00ad305d3e3e0e4d7249a6c7fe9c7b88f40b95059292b35c9708d5707b2ae7b1484d6864b51b
 EBUILD breeze-plymouth-5.16.5.ebuild 496 BLAKE2B 019435f2ff2f1c3fcc1b8cdb4ef9f87e9e92c05ba6076a5a79224b3da19ae33be9ccc4787a7f8e0923ee98cb693bd028f108bb1e04409c7480f3988f762f3204 SHA512 a3348aa5226431aff0e64e3379ec7319ad8a5c05f94ee5ccedc6c63e167e2f09983677673d9fd0d944c129c20d07f0855aafce716e9d7112d500ecb8467d2d54
-EBUILD breeze-plymouth-5.17.2.ebuild 499 BLAKE2B 705edef310ca348127517e40c4e1ca6653187de5c002c9fff8a6cae10769e1c79cb559be63a23232c9852c6d247511f300aa40223f895c457db8820bcbacf6d7 SHA512 e4965983b73483e888c1086fd1669fe8dbb2c6ab644758c3f8d125f9a2e01161b839cd3540bc2e2deff87ab525ddd5dc5a0d4c311020149400243d30feb4ce75
+EBUILD breeze-plymouth-5.17.3.ebuild 523 BLAKE2B 28e1eb0b85fdcef2869d7705d37f0326e3221d0d5c0865f4c5ad9c57c632a2faa706fd3a9a1ac4863b3e01d5e6239ea9aa58918263489f0e9df8c7adcde7d6e0 SHA512 5eb239d97fe9617b5e5ff55a485a0f340d72fa0be4b2e78b9964955cb8ccb32ba1d04894ec29c480d1050815a45a754a1f88262b5117c62f53149731da19cd42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.2.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.3.ebuild
index 54b797803dcd..9918bf0331ee 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.2.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.3.ebuild
@@ -3,16 +3,18 @@
 
 EAPI=7
 
-ECM_KDEINSTALLDIRS="false"
-KDE_AUTODEPS="false"
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+inherit cmake-utils kde.org
 
 DESCRIPTION="Breeze theme for Plymouth"
+
 LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
-BDEPEND="$(add_frameworks_dep extra-cmake-modules)"
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
 DEPEND="sys-boot/plymouth"
 RDEPEND="${DEPEND}"
 
@@ -22,5 +24,5 @@ src_configure() {
 		-DDISTRO_VERSION=
 	)
 
-	kde5_src_configure
+	cmake-utils_src_configure
 }
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 628e4c5c8ba1..182e5465f7cf 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-5.16.5.tar.xz 16588516 BLAKE2B 25956c6d3293d4a8aab96ab2fc8e0ca6c73c5ac5329693ff8e728638ca42f3e07194a4b78d9f39c791ab1e5b0ccf8f2d8c350718d4649480aafccc9fac823d93 SHA512 28c1236078da8a9de21469ff1a01391512afb84bbd8beafb2dbc6dcb1dd955caa758a6dc6869fd11396fd5eed203e9f62b0b6e9e093e47e54d399cd61d52c8d6
-DIST breeze-5.17.2.tar.xz 16578712 BLAKE2B 122cca9be1e89d0700d001cd2888ee3eb2068a49d41539c0cc024444ad7a9fc40f6078c9c0f7c1aeca9ddb880ec7d28e4613b5fac2ff02d1a62fc8869340a6ba SHA512 e133ed86e4a60dc0a7bea2f62018f7289329f1a6fff6b25610dea7d3ef2d4214085f3794d6784d5c9d5621226ac62e2e9453ac0f068cf9a025548805ef2b55bc
+DIST breeze-5.17.3.tar.xz 16579140 BLAKE2B 3245f6179ab32b4f8f718d977624be682f5e66c1737de594baf8103c16afe9b233f518b0d904c0498ac5d021f8640a7df7c563696718cfffe061506db2df6349 SHA512 2331b75afd1f1cc2909bdf79361577a2216a2614d15ea76a8e8f9c9898c0a40ea06f3ea534593fca0d3dbc4023381dc2ec99ecf0163e71c246fbb336c4fffb08
 EBUILD breeze-5.16.5.ebuild 1147 BLAKE2B cb4dd4a77ad2127928d0ccc7d9c68c2157262d00be6dab67a23f69aefbee1e73292f3969841b09a6cc417b3f0b05687d502a882900a9cd4acb92db038016d900 SHA512 d65378322946d4cedcccd1e09b5146667cbb311785845da84936299d45d3187cf0451b5dd18ad4b698f2c1d006963555bcba2c8c27b2fea4275a89a18fd30e0f
-EBUILD breeze-5.17.2.ebuild 1221 BLAKE2B b117830dfdcdf73ff3bfb66f5e7b6abccb94714ccecf011cb62caf5e5da79c4b2f96cb2016546b03392c69aba73585908face06b64854ddaacf89fa1b1465937 SHA512 db6eb7de2c2b3ae22dad5569f247568dfa1a2afbe614ee073ca1c6cd22f74a8f16c09acfed8241a2b22abf73a399c78c422408defba191242a4b86e70d4cdce1
+EBUILD breeze-5.17.3.ebuild 1417 BLAKE2B 3f02cec0faef6bbfc34359f66de31d7aee5c7c5683bbd89ac5ad1c6f77ceaed0475bed288c1e1ba187cba6ce4b64a8cce87aaacda087874606c3030e1d5c1084 SHA512 fde4feccc896bad545c9c897b4044a2dbe1bc681452a2c0f74d5ced2498d6038a2a3c3c6256d7b8302558f1b4ec21e7ae075a26513237b36b99a59b47007cb49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.17.2.ebuild b/kde-plasma/breeze/breeze-5.17.2.ebuild
deleted file mode 100644
index 37c0e017f37e..000000000000
--- a/kde-plasma/breeze/breeze-5.17.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
-
-inherit kde5
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/breeze.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="wayland X"
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.13.0
-RDEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets '' '' '5=')
-	sci-libs/fftw:3.0=
-	wayland? ( $(add_frameworks_dep kwayland) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kpackage)
-"
-PDEPEND="
-	$(add_frameworks_dep breeze-icons)
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-		$(cmake-utils_use_find_package X XCB)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.17.3.ebuild b/kde-plasma/breeze/breeze-5.17.3.ebuild
new file mode 100644
index 000000000000..164e57d32c15
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.17.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/breeze.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="wayland X"
+
+# drop qtwidgets subslot operator when QT_MINIMAL >= 5.13.0
+RDEPEND="
+	>=kde-frameworks/frameworkintegration-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5=
+	sci-libs/fftw:3.0=
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kpackage-${KFMIN}:5
+"
+PDEPEND="
+	>=kde-frameworks/breeze-icons-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+		$(cmake-utils_use_find_package X XCB)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 5a36f2597233..ecf38a2175c8 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,5 @@
 DIST discover-5.16.5.tar.xz 10453308 BLAKE2B 03d497f9dd1685a356081bf43228c5859d80c40f3b45616e9919f6b3a50e193ca608a14e3175168c77d9b5e234e34ab4eb97c2294a366e47328044bdea98b231 SHA512 69fcfc9f8576dc5933f4e0c36ac25c518e2cd41158c5c171f760a4cd883018a6dd01ffa8984c80e5002830d6b9d706abbb7cedf3d2144317e482404bb821055e
-DIST discover-5.17.2.tar.xz 10448116 BLAKE2B 884e37dd77a8b275817edceac5f2eb22b9243c1d836997ca1088c4407123c2bd2359f096096d55ee706f321abb07fcf3932e3557d03f2de67f0a00bee51e9265 SHA512 4526ad1bf17bd24dada6c4f5a9cfc88fcf33fecd1009d1cfd77a281a5c6f132e7b41e464f170a3e1a92a164d9e9027cbe0072966ccf07d637796aa524964af82
+DIST discover-5.17.3.tar.xz 10447620 BLAKE2B 2d9357e40a2ef3a2c5e18c2989502accc4689591c947e15d3dcf4c7c4a1936708fd57b190f3fa02e30d43da7e45c352870294a9f7a8cedcac7fdbf3563d6aa5f SHA512 9a8b59c42d14647cf14ff7a4ec83f719a6122f937f190e32916ae8b89e5d934fb8b4d21dbb3b4d1763718e1d0329d051ccbed529f5e6f61958290ce1ac567833
 EBUILD discover-5.16.5.ebuild 1651 BLAKE2B 4c219c7744eb168fe5579252b91e6fe93cc34baadb5380d0e5c208e32dfa72988b200b6742bc991b880ff9d7c5d71d4e2f62d78b536d8ccfd8fe288e18035f60 SHA512 dfb64f708a743d666754be397b2f682716b4e4c95b70db2cb78749d4370ae75d0e9c9dab034461a14430b507d948a2367f38421275c9429fa5ceebee909cb71f
-EBUILD discover-5.17.2.ebuild 1654 BLAKE2B a654cecba7799c95c1c447863ead8cf6cd3e470bd6a928857252adb71e5e837acf6935e29eaa5aec789ccc3e5af60c5aacaeb8d16a7eb0b3c8391adadc307016 SHA512 1d8c74b715eee55f7e9653e5625bc106a164991c9496b99bf2333299573e3950513619a74a38ab62ca3f00add2b689709d901ce9f90e19fa84724a4ac9d6fd04
+EBUILD discover-5.17.3.ebuild 1886 BLAKE2B e2d7be8a9177131e2b15f6df88eed3be68e17be3fe20aebf9f299bfe77fdb386db6aea054635f5dfa39d75007a17e0552e8455b22ae2733002d6cc3d497887a8 SHA512 24a4a85620cfde0cede8d92f0b2d1d26b7da4dfea7d4a73d1dcceefc13fcd0f92e4ca5a5cd6b2f57b0d2b16e33f7ed4ab1e8664e6bc19e53885ec5db906774fe
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.17.2.ebuild b/kde-plasma/discover/discover-5.17.2.ebuild
deleted file mode 100644
index 3de7eec2f778..000000000000
--- a/kde-plasma/discover/discover-5.17.2.ebuild
+++ /dev/null
@@ -1,70 +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="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+firmware"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	$(add_frameworks_dep attica)
-	$(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 kio)
-	$(add_frameworks_dep kirigami)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	firmware? ( sys-apps/fwupd )
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-"
-
-src_prepare() {
-	kde5_src_prepare
-	# we don't need it with PackageKitBackend off
-	punt_bogus_dep KF5 Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DBUILD_FlatpakBackend=OFF
-		-DBUILD_FwupdBackend=$(usex firmware)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-plasma/discover/discover-5.17.3.ebuild b/kde-plasma/discover/discover-5.17.3.ebuild
new file mode 100644
index 000000000000..4e6efe95f7d5
--- /dev/null
+++ b/kde-plasma/discover/discover-5.17.3.ebuild
@@ -0,0 +1,75 @@
+# 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.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+firmware"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=kde-frameworks/attica-${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/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}: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
+	>=dev-qt/qtxml-${QTMIN}:5
+	firmware? ( sys-apps/fwupd )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_bogus_dep KF5 Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DBUILD_FlatpakBackend=OFF
+		-DBUILD_FwupdBackend=$(usex firmware)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 3ce5ac1bb29e..d76c4f98222e 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,5 @@
 DIST drkonqi-5.16.5.tar.xz 743220 BLAKE2B d878bcde06693b309be7ed9b8f6a9de952f41c00701fe4a4b84df7a557e8b0e996a9f37402c1d8f10363822220deccf71416412895336abee4acc77fef6c5610 SHA512 4d42e69301e4af88c292d6072055384ebf79b91240504c23f393abba9f7def5b15da9f252efa76232535ce6bdfe77238131c88b98f89afdc38a7a107e7dc8c40
-DIST drkonqi-5.17.2.tar.xz 739932 BLAKE2B 7eeb66cc11537e1e6838a69a65f17bebd41782220675d5c1ce598bfcd6297990809f442192877a08c28e5b6e0f4595845049e06e3a12ab0cf8e6f266c9f1bd26 SHA512 56752ea0d73b3db361029206d6baf02f83e34ef84c16582ea43ed329be70638d36393ec79336ad050fcef4d14408ead30a95dd40e5bef1a77413b2d751d8e992
+DIST drkonqi-5.17.3.tar.xz 737440 BLAKE2B 5657cc6bb382dd4d0c99eaef24b145ffb3ada55dc7c4d764468bedf0cc66ca449d7c9d71ef5d4216a89504f63acab2a65aedbd132394ca94a2521ae96fbce988 SHA512 abf346d41352d1ce9bfb460564854811fe19dc1a247b08ecea6c70cf541e47e7bb3e7a8ee3daeae4f1817adf38cce96299aeafb256f9c69b66db503dd2071201
 EBUILD drkonqi-5.16.5.ebuild 1339 BLAKE2B dcbcce6cbf6b138ffe393635fc24d883dfff5372bdc8e7498f51a151d5f29ac3c0f2b8712cc72d128ed07c4e741aa190f280ccc32575710934a6dd2629218465 SHA512 bf96866bde31e85e6f74da029b35980c549cf3fda7d7fa9c32b0896f71bd0fec3aa32288bebe97470b8411c37f27c17bd4b6059db6bda7f8c81c78bda042358d
-EBUILD drkonqi-5.17.2.ebuild 1378 BLAKE2B 142d65a9b3bec536b3c02e0c1d4cec455992b2299c06fef41c37f8662e835e13a12d6d11aae5ede759be122fd2417225595179640fa774f8d5a5993c28a2f2b7 SHA512 d269e1366f9dd3e843bbd661485da4983c1ee03f1b85081e0761cc2f4bcffd6bb5374428ff4d9d7951921e19aeade70951ebc807e9399a80e9f59d55f122ad37
+EBUILD drkonqi-5.17.3.ebuild 1594 BLAKE2B 39d4266c94281c94d431fef5b476c0c76ef48ada54a379c2932686bf44577e5977ec67698f439beb2e8e905e9518012eadd71a0b31cc507a13a584f242c0d66d SHA512 3682e77c3c6bc0cae0bff6f9742e44e3c422a80bf36b8e54e7312224d1501025895ac4348089112c6f40f51bb6f36f371e722a7b22dc4ad9399a721ebea7d572
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.17.2.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.2.ebuild
deleted file mode 100644
index b63004f7af60..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.17.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
-
-inherit kde5
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	$(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 kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlrpcclient)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-	kde5_src_configure
-}
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-
-	kde5_src_test
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.17.3.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.3.ebuild
new file mode 100644
index 000000000000..8408b520df9f
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.17.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 2adc47beb514..dca8e717f875 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
 DIST kactivitymanagerd-5.16.5.tar.xz 84736 BLAKE2B a3a83899abb2042b8d5891f7ad2f894b3242acdbc7bb8d4a0f06b4673ffc9eb68da9b93384e95e093ac519327f03101609a318d7e98ada0fe5440ef0820bc3f9 SHA512 bf305e7b8c095361eab9f621fbe2525f74880385c0ccd664e39588b9774f9ef2f4032e0cbc62017827927086ab98de2c2bf0d54802e7b6ca7ddf05724a16ecf5
-DIST kactivitymanagerd-5.17.2.tar.xz 86580 BLAKE2B 1a405818e8c5e8386261cb9f0983c1daddb801f147340163e5316533bd836289ebd2200ab1f741cc338ed31a4f6f19d339a591116c594533b4cf58dfbf7c8204 SHA512 bb5a854a288aef9b1a8be1ef7469fb56525fcfa9cd21ccf41bf99539dd55903c63c962d6955a8d6810e91c34f28c6f2f674249ae2e21b85a8ab0fcdcec775d9f
+DIST kactivitymanagerd-5.17.3.tar.xz 86468 BLAKE2B c04cc0920f214ea0f867a2697819af15624b1d2d5db6d8936741dfbfba4bd8e039818ca96c83446fbc53acd9e1c36fc1749a42545566d58db2b2035e3b5a7537 SHA512 36a05c2fbffc709971dd4a7f0747145c9168e6941c584e0591e38c780635424b79e856eb7bb9fff65976bb89e86fd6b149bf4ef771df32cb1a9388007e8cf95c
 EBUILD kactivitymanagerd-5.16.5.ebuild 755 BLAKE2B 1b4767aaa26765bf31b9e310de3b95febcf5d091f8d6debde297a924def156231623cf4bb17e8e73d88029781c0901dc6bbc006bae0748193b021a84d4b3c9a1 SHA512 f3734eefef81c292f7a7ec58e0afcbd62de07b018e1cdda67fa57e0eec6ad327fba477764187f1790ae72a09185f0b0b3192bb71fe1ed66b42ae656c78da8030
-EBUILD kactivitymanagerd-5.17.2.ebuild 758 BLAKE2B de633f25fcf5a353d2c4ec71df7189058f7da0e9b45f85c185d53ee39e67b4ac05add8c8380269445b364c48b7f25c9c36b5032a71b3db386a800a934a95b172 SHA512 cfc0dd56d75092faf0b9a3065020ddcf57a5cfeb6765f32ff85741bf7986fa0d7bb037519cda357aac6cf86ddecab09ab6dbdc5b609f10f76b78708bee3170f9
+EBUILD kactivitymanagerd-5.17.3.ebuild 904 BLAKE2B e466da8b46d6f16c4ae2fb9a2613001a822e843f36434c3e18de6c6ed994ce13a9cfa25e47c243050bba0c30bfa8e95147992cf9aa35528d6b1b1f11cf0e4f45 SHA512 4950efa0578bec8a5bc2c8d27ee223bbd3cf1acbba29335b71edd2732d5c099d1d1a2c631b26e028a17eb71674273427b5ef7fa8f8ed915d3fa7328641bfe95b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.2.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.2.ebuild
deleted file mode 100644
index 0532eb4c192a..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.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
-
-inherit kde5
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.3.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.3.ebuild
new file mode 100644
index 000000000000..e35dba437e3b
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-frameworks/kconfig-${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/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index abc5b0221157..5228fa187c3a 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.16.5.tar.xz 587312 BLAKE2B 03b2188eb4ffefdc790c16fe791ec4e1748acae310655510490c8950ec03ef69f565d83d5d645a20f1d0cec2f52a27943dd0617036e99f3ca0e83d714bc085ef SHA512 11b5acd6bb0a6a7e566e8b6e6f24299bf23128ba1ed9cb0ae78c8e344da3c0769791b5543fac2152cae638b90615cf6b8c4b455a95f6d09afa515eb391370406
-DIST kde-cli-tools-5.17.2.tar.xz 591820 BLAKE2B a14a264d9102185f55c02d3339fd372418696832bfdc0b048aeba434b64e2b1cb096f7837a08a745505f416d31ca286c6e049efad0bb52a56bdc186ada9d6d44 SHA512 51cbe94b98e151553fc6752dbc280d95f076cbcd9e26db02f193b8d6a27b5d14c20e3bc5051cbbf44b71b90181ad833da63063ed406c508a686900fbdc8de397
+DIST kde-cli-tools-5.17.3.tar.xz 590648 BLAKE2B 3c001e8ccc72414944c4ddb9ca05d3fcf9756db30d72323353b689eb2e77db337542d14eb08865466f003e75aea118aba0b635f534876a5284aad67e2cdc2e02 SHA512 d7fafdd008799d22631ef14fd040ef690b68d2faafb857313bac5b4d6f7e3a53ef5c242b6ffdb43a5bb2a3e1a9a7daa7647108e6ce9567e1e181c00b25a7e340
 EBUILD kde-cli-tools-5.16.5.ebuild 1511 BLAKE2B 7eae9cd1c20276faaf671d9d0bd5d698d4386f5dc248278d9ff9cb568a693218a00b1cb1b4026a3906728d6f4c5c1faea954874b38f9b00f866d87d8a1a28d9b SHA512 f4f53b9d0bd28fb789ec7be1c12c00d8ee75aff4c148b654250d913a841be1856dde8d12149e0a3026c6101815e26ca726ef7ce74f7786d7d0f454eb9c28c381
-EBUILD kde-cli-tools-5.17.2.ebuild 1514 BLAKE2B 09618b35b7c272a71a932abff94324ea963f23dbb92431e790aa33a154f42a4f616a54dd82bdd20da30b5e95bbe2dfd541bfc483cb038e3432ba3e003adfda0f SHA512 eabdfd68a32c9edf0b41ec6351afc93c9c7e571e25706022a43a3c9f1f3c9cd29787a705dbe86ce8fa5c0473557c97f0b7a501a7229dd590de903ecba41e79d6
+EBUILD kde-cli-tools-5.17.3.ebuild 1725 BLAKE2B e8626ae6f404d93f378dd75ab88faed5e9a94b8a7e1a48677406e0f42e71a8a28faa7f0bb07efeef789be988b6fc9ab8623f2dfcd5f241d436344d4e334fc627 SHA512 04dbab5a76d644558815c4bb43195dbcc9ca5ea12c4e89539618d251699ebc69b2b226221b9e608d35e0e8162f55b466e058bbcc1e3473033ee2fe0116862fe3
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.2.ebuild
deleted file mode 100644
index fe466b4b22c8..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.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="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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 kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	kdesu? ( $(add_frameworks_dep kdesu) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	kdesu? ( sys-apps/dbus[X] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kdesu KF5Su)
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.3.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.3.ebuild
new file mode 100644
index 000000000000..4c7dfc50eb8b
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.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="optional"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
+
+DEPEND="
+	>=kde-frameworks/kactivities-${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/kdeclarative-${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/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	kdesu? ( sys-apps/dbus[X] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
+
+# requires running kde environment
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kdesu KF5Su)
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
+}
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 642bc536cdd1..d20af2573f53 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,5 @@
 DIST kde-gtk-config-5.16.5.tar.xz 154292 BLAKE2B 32dc80f3b77e502c5a5ae55e9b0071282c10b7a2bb47311b89d2a2242d8398cfb74ef18e4c50bdb3c458816fb1508e85f7b2bd90497b7a9d3cc9e92d3ff24e27 SHA512 42f02f1784a428cd7b83a8aa774aaaa57a867c18c7f0b23493639559d93f9410172cfd1d9b87226c6eb112135d9bee346f111023b70c41ced04ebc67891778f3
-DIST kde-gtk-config-5.17.2.tar.xz 154556 BLAKE2B a917e8f7fd673d03ef7c1aea6d5f452444b1af717c6a8e34461e75e8b479e22ca31bdcc4f2883c40ce8c43f5130d0221d269dfa0b3eaaa14e49180af5ed9c691 SHA512 e148c1eed2df8a8559217baf9c4fb146a43650a0ca31bac2cdc6bcc0e6caccc7a7b9a2f3278efabada50f90879719fb5b27327f8a5f4ce05e5613ce1bca13d62
+DIST kde-gtk-config-5.17.3.tar.xz 154332 BLAKE2B b3aac4c31c2eb1c72a924c8e1e38b28cb9f2a7e695a87d9c4355b6f536f02f97efd0f0f89c75c87fda5588fac18ab3d0e0eb8ea4a0a4f5f1bda8b0396196f0e4 SHA512 941c5ea8447948026919149cf1623bea2dcd6bde5832bc125390141e0174065c280e3d8603997928cb40c95aea0ca026fe0bf4a007bf5829131cc5c3e48f165a
 EBUILD kde-gtk-config-5.16.5.ebuild 1245 BLAKE2B 3d1291f02a58851e8f39158a767323d4ae2c8318a4e1eed082c7ce7a4f9525ec08f2b19ae2e9da8db166870f24e35a8b3b352c57295d7439cabb47972b46e01b SHA512 839b86c955d8e5c004bb6fa62eca8fdc757b31f134ffcce8ca27dff70d70acafa263b22b7edc4a75733c9f9909fdcd248dacc7508cde8f93fdc770e997b6fd89
-EBUILD kde-gtk-config-5.17.2.ebuild 1248 BLAKE2B de32fe02e40e091ebbbdf3522f72e67c73327568d7d69c22c71660e399a31b0df151d17d9c6426d4e51712fe4ddafa15cde80a8eb6afe7efc48d075e8a82864e SHA512 24630089d989bed4293e731c40712c01f3cbfe22067b709ff1e7aff2931e11519852cc5b08d896d12ec203ef207334715b4694127c62e3bdbffe6099097b17cf
+EBUILD kde-gtk-config-5.17.3.ebuild 1387 BLAKE2B eb1c2e1e22febe5d3287cc02b0430f089f8b317a510a765d60dc9c2e9d3ed206598b2ab12742807cb0d123f9b98deb009dba678834ddab2b36f37b2684443423 SHA512 3581c450f647939fbd00d9ffb15085efbce94e4d5cf18648e68334eaa08ef51bb0e7418b093e42d1c24d9467a2925f708250f63f929277509a4a6e2a17b5c146
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.2.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.3.ebuild
index 03f067d76fe8..d05a47d6624a 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.2.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.3.ebuild
@@ -3,29 +3,33 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
 HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
 LICENSE="GPL-3"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(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_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	dev-libs/glib:2
 	gnome-base/gsettings-desktop-schemas
 	x11-libs/gtk+:2
@@ -33,7 +37,7 @@ DEPEND="
 	x11-libs/libXcursor
 "
 RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 src_configure() {
@@ -41,11 +45,11 @@ src_configure() {
 		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 	elog "If you notice missing icons in your GTK applications, you may have to install"
 	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
 	elog "for example."
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 4b942b1a5de2..bc17c6363d9a 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
 DIST kdecoration-5.16.5.tar.xz 42780 BLAKE2B 4e96b007550f5913c1c0d08b76a882a4ec8196340fec74c8c626c65f9ef8f84a80503945c506117961431aad18c4fa9e2794e9c111f36befde3292aab379ec1d SHA512 aaf7c24f7f6c77661902bc219ac1448cf2542645fb96fcc18f5751ed775a722c745f6d71c2d6b0285103a99b68446bb3ae59ff9bd8279dcb635dee6927fc000e
-DIST kdecoration-5.17.2.tar.xz 43024 BLAKE2B d6a75b11f907ccddc563fafaaea35b429d87437723b63deae8b6b99e3723241649dd15112877147835f3c8160fae4c274b9f68de1068b412b066f70c29978f51 SHA512 93ab666e0065369c9f75756d067bc5821839749e61baf046ea2bc0542890dca11f8308397e3e89c3557a41ed3a5baddaea3c0935abc300f809eead122a9f0142
+DIST kdecoration-5.17.3.tar.xz 42836 BLAKE2B f3b7c6d67028749fd0877bcc997d938e94129b9c27f655b06fef312e5ff890acc7c874c3242d2ec8d791b9f3044ff278467a065d72cb57cf8d79fa5e9cacf59e SHA512 9fb991c2171779ba4276201bc1d7f97621b4552b536a5da4dc6014a794d41fd04c68c691599b498ddd5701626a4b77da39d98cd7a29c3ba80d803710504a7935
 EBUILD kdecoration-5.16.5.ebuild 396 BLAKE2B def1e5cbd94c4458d72e54b32a30ca73db9e4874796fd410b62847c4127d300ad814172da1e2e11f14197ed186152ee784e89c8986a7ef1216f5eab2f3cdb783 SHA512 577f92c9bf3ac7da92fa8f493a2ad4995c27855b21ec36b1de4cc307fe1972dabbcfa72a60aed125017e4144e67037721860dbb170a3210b8e4b5c545732721b
-EBUILD kdecoration-5.17.2.ebuild 399 BLAKE2B 5c28f9d7bd472162787cee9838c0a54d2b416798fed701d08b9ac414bafa4a0c0b662678fdee46244de13d513295ab9dd53c85f5cbf1066a01a1bd1b36687ba8 SHA512 e9aaed45941f0256229df553e2b11f147f6c07e5985ae738e2c6df879f8d14f6bb8a998a0979b8380147ff91007bed2f2c55ef344e4cde3d2307e5bdd81b3087
+EBUILD kdecoration-5.17.3.ebuild 474 BLAKE2B d72c7ade6c3ec5f192b2d2aebcbc04ddea0540c6e15e79cfac99a96dd3b09e4c046e5a82e24e0823acbe6d328a932cb7129b64dc155f52947f3d3979b96f3b52 SHA512 1d430eaa549f40f78647788821eb0aacaa1bdf293bba4eda5004e4af38e2b204af6e677ef4ce784b8a396dbf7800bc199ebf8b298b5bd1e2ecd2a77c597a17a5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.17.2.ebuild b/kde-plasma/kdecoration/kdecoration-5.17.3.ebuild
index 7b8168624497..4e7e55a40e91 100644
--- a/kde-plasma/kdecoration/kdecoration-5.17.2.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.17.3.ebuild
@@ -3,17 +3,21 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Plugin based library to create window decorations"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 7766636e08b3..7f09380e6022 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,5 @@
 DIST kdeplasma-addons-5.16.5.tar.xz 600480 BLAKE2B 146c7ba77eb4ff973afb5e051d3000baebdea317b9e17482fa07cf575b2d4d8bce69590c66b0b4756cb971109ff701e8786a25108729aa7d65bdcb89cc945a40 SHA512 0bcbff113d71bb33a6542d78a250dacb8eff66c5f8bc84f9ec0055fe74ccb7ad2b5706ef3782e754909c75a95b133f3233b93cd7290d354df1d54dca1401d875
-DIST kdeplasma-addons-5.17.2.tar.xz 606488 BLAKE2B 43fd4fa556abe9cf925556fcf233073bdc4b83bb781a8c627ea65aeb7d54a8b6387733927877750ac472c3c467b641a5a39ac27cc634d37f19a38865f48aaf0f SHA512 a065bdfeca62d1a951e2452343a0d7dd386af8bdf7865b806345f910b8822ee7960edb9a782876edb6120f446d8ab6375313e36d167ac1dce1794a492d7150a6
+DIST kdeplasma-addons-5.17.3.tar.xz 603772 BLAKE2B 1e21698faf5890a8e1da2cc913ffc44aa26dccfcb061be10d542d74ff696dc16d22f5189cb46927fbcf7744e5fbd3e9859de5f930ffbca8f31b9d7a0c74e6f90 SHA512 544718f1de4758ec33019c3a2f92fd0d5a0abf0b298776358663c02295631aedb47d63c61b7107272d508d61bfc17f44edf95da847d81ec2364bbb9d153f4d96
 EBUILD kdeplasma-addons-5.16.5.ebuild 1502 BLAKE2B 76742e80bfe694ba50e6a6939bec9d92343393cd3703e368cbc954dc9015bfe2a1e97117f5afee0420246ce8293431e07c7746ec8362008f9000dc8f10f4e6d2 SHA512 77ce447aff550b73bfbcc83d09f2df741d81d94a54101908f3de22226cb85aef5fa7107da7e0cb8c78056a5b76b0feb32ae55eda179f62d5e8206e90c65ea19a
-EBUILD kdeplasma-addons-5.17.2.ebuild 1505 BLAKE2B 3d3971f25ec03a4a4e9c83f57995a891535bb79c79dbc35554cff926235e4450e2963dd3b2d2db9f2ac01347565429416dde37d8420719fad1854b10801fbaaa SHA512 d3c15de9936142b51903cf1d87d88bba3ac21475a7bf93616776a5212dab5c16fab5828cdc597a83ebe71f329e6bde5a01f6219c83bf6cf882fa692e7d57a944
+EBUILD kdeplasma-addons-5.17.3.ebuild 1759 BLAKE2B 8207eb0cd1542165747ab5ce67a3dfedc10484932f5098357bdcb78da818a1e4800308408948ae2cbfd725222731dae4db6910cadd3d87a1a7fd6e52c251e992 SHA512 9088e0bef6a4e6bf116eb09f701934b0b3499f2ceaadbd355ea062b863c02fa1ce7d8cbe875547857a375217fd8ecc7c4daa116a0576c573edc97dab8ab3973f
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.2.ebuild
deleted file mode 100644
index 0d8ba38af27c..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.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
-
-inherit kde5
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="share webengine"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kholidays)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kross)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	share? ( $(add_frameworks_dep purpose) )
-	webengine? ( $(add_qt_dep qtwebengine) )
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package webengine Qt5WebEngine)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.3.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.3.ebuild
new file mode 100644
index 000000000000..86cddca3d1b8
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Extra Plasma applets and engines"
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="share webengine"
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kholidays-${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/kpackage-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package share KF5Purpose)
+		$(cmake-utils_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 39b9b96a3733..1b2030075015 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
 DIST kgamma5-5.16.5.tar.xz 79436 BLAKE2B 7e07e8d25f16f220c5cbb0dd7615bf46e0f41bbc884f30bf6faa875bfb1aced21f49bbd79d07a3491e098b440dfa46917662989cb18aaf4886ae7ed8d0585c1b SHA512 0cbf4162dec3653710f9e2c8cbeb2e7c6780a3fac75f0abd3c63124ac538d8bec065fbadf0765155e77954be4b7c7375e565c1c834e5bc775fcb8dfad677328a
-DIST kgamma5-5.17.2.tar.xz 80156 BLAKE2B 41280ad38de4e5ace1f9eefbb7ec398799f21dcf443cec602d44cbebecb1ae945f76a08f79742847dd098357c286f8fa1ecf675782bb163832ff5ab9cb598f04 SHA512 e8596edbdd2964ad3e15be808b21912167c9f009e1711c54fc4cf57195753c3abdae485f825149ef984a633f66fba887c1477927c2567e75dbbc6f5313623a63
+DIST kgamma5-5.17.3.tar.xz 80220 BLAKE2B 74a2c304762ca35b1e8b044df6f76b6bd0b513b1aff3351bbaa2c4b1759bfffa9cce3e4eaa97d83dc690cd6f115713e615c9f5fcb8c0bebef60526a4bdb2d443 SHA512 2ca11ef1e6bb128056676a46816130f972bf91457affbd3f3d33ecc6828fbbaf5cc0c237255dfc345d769d7cae4e6d3bb526d65257d55a77d8ae76a159dc8934
 EBUILD kgamma-5.16.5.ebuild 534 BLAKE2B b61bce78381c052fd20126557860beaade74fd4e71fb04ac2afd3d2d39a24d447cdd567fd098c9455f022f2fb7ddf4ae22fbd304d6590f5a4e2f4c4e3bfd0c07 SHA512 ab62a94185bb03aeef4ce999e01e937006b977ec4e2739590d6599b7fb4f775853bb6557db78a257312e5e2e66ebd101af36beb9fc6a9f14ef2dd187923f39a3
-EBUILD kgamma-5.17.2.ebuild 537 BLAKE2B 14670debd45ec35c56d3a1661fb6fe164211928d1c30b97170b1f284cab24e545932744c03f11d1a84f1d927f0e1233aac026b3d48f7ff78d2d3bf128510f8e2 SHA512 d9ea4e53f3e3a01661db05ae4abc408b09e55a1734531173f2035096f3ad97fb120224ce66e2238396fff4ec9561694aba184ddc6dceffac3ec9253ad4254a81
+EBUILD kgamma-5.17.3.ebuild 672 BLAKE2B 3e46d11eb0e5a2e3c4c738cc7e0cb6dfd2257f91d880847256b51bafd4c342412d4f1735bfecfcb333c1bd2025862282e6d7e7212e89ab5ab61fe035369be82f SHA512 c54ab09820c2d202a0dc4676c1b449961c432fce314bb78cf557a5ccae9d6e4623d78de0a8afffb7b80f5ab680386af9fecf01f0c21a2b638a9d004aa984dbc8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.17.2.ebuild b/kde-plasma/kgamma/kgamma-5.17.2.ebuild
deleted file mode 100644
index 63ac5289c98d..000000000000
--- a/kde-plasma/kgamma/kgamma-5.17.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"
-KMNAME="${PN}5"
-inherit kde5
-
-DESCRIPTION="Screen gamma values kcontrol module"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/kgamma/kgamma-5.17.3.ebuild b/kde-plasma/kgamma/kgamma-5.17.3.ebuild
new file mode 100644
index 000000000000..41fa4beff6a6
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.17.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"
+KDE_ORG_NAME="${PN}5"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Screen gamma values kcontrol module"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index fd16f8ae9053..57bc0fec1c33 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
 DIST khotkeys-5.16.5.tar.xz 1846184 BLAKE2B 3eb83840c540e64d9c30616bb366580f4e9c606a9f8ec3fb613019fac3112460a95059526a067af92fa005a175fa5bb72906e087451484a55fcae25b86feedd2 SHA512 f389396c058dc261a16f6a73f88babc24dc1d7226e35d798c77629bd3e15f1dc9bc2923f2eedb601df6517b168c251c8c6341f364ee14facf4d267e9e5358f34
-DIST khotkeys-5.17.2.tar.xz 1854392 BLAKE2B 11e65075dfb2e6b6e97aa2813bbc415c355d12f0b8776784a401ec46f8b6a109db12772d7cd95de0b96aa641e87c3ab7aff2393795e7fc0b44e93a0729f949fe SHA512 b9cc75545ca18b48cf0f5b1b1d3f24bbe11705b66d41b2a27a18aa9d00bc5f0c430b05451b00139ffba70baa74fa86a1348608167e0d90161f2c4803a78acb8d
+DIST khotkeys-5.17.3.tar.xz 1851432 BLAKE2B f9ea4ec505db796b8c2aa023e029aa1a21b0719a29e63aabef7fb5cf62df4a7f2cb0a04c2aa54e3e4c8e6b81a8989024de963f6b2c1844c487f95c0a86349ec2 SHA512 af21e0a48c35f6e0572966760ce1b4aa1ea7dd45ed4d0665a4ccfee2a983bf053519df0ee3b6e89b4eff2ce84eeb55198844eae351576009aadade103fc006c6
 EBUILD khotkeys-5.16.5.ebuild 1118 BLAKE2B 85f6887495e61d2b0fd9febe31963455c8144d9f22b8baa69a7e5e7a7daba6333fb940d8219a94166241949b778f684ab9ce2b0c2ef5cdd5be4f031bf0a379e2 SHA512 aee5200908e2dbdbfecefeb6d4dcb8638d176fbf31771bb8221d409e91065ed117ff91e9e731c4cec3a0cf034330452d8ee5b7ee2d9435a01b98daae84812353
-EBUILD khotkeys-5.17.2.ebuild 1121 BLAKE2B 9e2dbf7571f711170c6671b6c63b638593b66480010c24ecd499e35221d7875917f09144ca6382bd946d925f95cfed565a31fc2d297d098fe0694ff340f85ed1 SHA512 fbcbeb7b6ff60ace5124f594c828fa5f7c86d15fab82cf27fb14e426757ba4a2e6db1778cac8c9f0b72923512f54a25a14fad7e65a2da1fccf570ae3912b3719
+EBUILD khotkeys-5.17.3.ebuild 1341 BLAKE2B 5b928f07b29cab349b3e6ed4b21f098718724d483209ecefa10b2066ba3e8e0c3ffe8375a77df16adbd51d85dacd5ded54067933765f1dccdb258251b6d72f35 SHA512 b4404534f1911c932afa8ab82212ba0ca38dbbad7f10342b5da88f28eb6b76a9a046e9bdda62e582187a83da30cdfb7d44003c26c3a66b8488d3b304e2ad6a56
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.17.2.ebuild b/kde-plasma/khotkeys/khotkeys-5.17.2.ebuild
deleted file mode 100644
index 90c8ca75d47e..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.17.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" # not optional until !kdelibs4support
-inherit kde5
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support X)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_plasma_dep kde-cli-tools)
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.17.3.ebuild b/kde-plasma/khotkeys/khotkeys-5.17.3.ebuild
new file mode 100644
index 000000000000..8a49dd5ad90d
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.17.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" # not optional until !kdelibs4support
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace hotkey module"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=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[X]
+	>=kde-frameworks/kglobalaccel-${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/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index d4c66ce73d02..802f431cf232 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.16.5.tar.xz 1321040 BLAKE2B b8c1e699d23175bc1048233aa589e91c31625f8a93da2b3ade5f71bf410723c853f2b4f0654a78be1f2c7a2350e66a8f932c4c0c7db9bbc2c22ac3ef9ff5b2a6 SHA512 1b98515beac87ff5394c06dd6029a2688db27a900f4c85fd4884d332a20120d553c25b98ae5ccfd7da2e6cbaa866edb84809f49c1c19922f25241acdc9e56832
-DIST kinfocenter-5.17.2.tar.xz 1344056 BLAKE2B e40dc6efc8df24f0c868232fc67e02cdad189d124a3b3460cd1855949306b806c41fe54f8d554ff8da7aa255e7078899641696c1dd6f524b12c1762c81102fb0 SHA512 aeb1b61f2ab198ceeaead3873659df5901740e9bd80f03a34bb955a6c172c0f3f31ba54d51a2b7cc9f827128c4a9161a841eecbb49be2ecde58be62f4319d2d4
-EBUILD kinfocenter-5.16.5.ebuild 2556 BLAKE2B faf8debb2bb55b8d742c620a6daa1dacadf88e1f66b774dfde845bd4a76c52f7130b8ddfd3cf854ca21d1aa8bccc162b0ffca7498fd2995a3becd0901314402d SHA512 bdfb961e33a46ca05cb0530084aa576d92353c676e4726df7ea953545a7b627fb3f65e71d3f64a156a0c7d76541fb1c20f5289d5b7aea0a2df8570f565c4bc92
-EBUILD kinfocenter-5.17.2.ebuild 2559 BLAKE2B 3f11ac44d0cbc64aa532d6da8c500050777a24063bdd6b6aec7e375561d49e85a5884e288acfc9a9a4924acdb8e211332120f3d37b2e99575ccd388f5daad65b SHA512 ed2481b3a29e22a27284a42137ea18f87f9802331956d2de129b66cd0fb2529d5a5a44a141153a61c18a35cd2c78faec038785f1fa4420ca05ddc77b5d9c36f3
+DIST kinfocenter-5.17.3.tar.xz 1340968 BLAKE2B fddd82953d329aa59d4a06a3d98a9cd93cf6e9cf2c74c4b688f1551397e7f8769d15df4536342ad61aad4a6d3d5e663b8fad70a1a4a6d13b52365df8dd3ee5c2 SHA512 92dd4005b995f5e5d88ef7ef796cba8701ac8a2b67b44531686d4a9ed81f4e124c734bf76204d5d869d54a8cd83f510e48e184f3cc78a2a46e1fce1186d935f6
+EBUILD kinfocenter-5.16.5.ebuild 2544 BLAKE2B 004476cf535a5069af198a44f751efb50a64330d272e395326b175ec23f6be920a2bb86f0ff0379901b1829017b735f94530a54d2adc39170944bce61f074ffc SHA512 f2e059b867776864c698591997d5791d935f253633707f88265838587ba56a7075acf11cb680f089f547cf65f16a4d9a7c45ba7989c5c864a2c92a6f987b3e52
+EBUILD kinfocenter-5.17.3.ebuild 2786 BLAKE2B d016eb3a07b6023c200c9c6a1087b8243de0fb0ce7785906da9696b6f26a11a8a256769f0ed85f64ecbb196991845e081d218f585eb9fb0736302cb3df3aca7f SHA512 d43a12f6121632539c586890bf0c6c4b7a7766b3f547e6be61caa3971a942f6bf4388b7494c822adf523453bdc10a59cde404baf7aeb0a19d971d25a5c7d8b91
 MISC metadata.xml 390 BLAKE2B a47af94b17ade0ad2f4b4a44bac8ac1245c29a6551a059c95967ce2d5cd4420a975210bf0e4658c2152aaf5a894f934cac0d35aae015368bf1f8f8b1cbbbb069 SHA512 4ea690f0f5ac41b58d840949297d462e0fa7433bdece54d63b08a913d8a9001bf6d144e28d5e672712abf35e784c2b17faf31f0a879d6109417ce95ccdc0ef3b
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild
index 98ff660fe3a6..7c96628820c9 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://kde.org/applications/system/kinfocenter/"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
 SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
 KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="gles2 ieee1394 +opengl +pci wayland"
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.3.ebuild
index 7bfec63201e8..0d921c3df595 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.17.2.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.17.3.ebuild
@@ -4,57 +4,62 @@
 EAPI=7
 
 CMAKE_MIN_VERSION=3.14.3
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://kde.org/applications/system/kinfocenter/"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
 SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="gles2 ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
 
 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 kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	x11-libs/libX11
 	ieee1394? ( sys-libs/libraw1394 )
 	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
+		>=dev-qt/qtgui-${QTMIN}:5[gles2=]
 		media-libs/mesa[gles2?,X(+)]
 		!gles2? ( media-libs/glu )
 	)
 	pci? ( sys-apps/pciutils )
 	wayland? (
-		$(add_frameworks_dep kwayland)
+		>=kde-frameworks/kwayland-${KFMIN}:5
 		media-libs/mesa[egl]
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
+	>=kde-frameworks/plasma-${KFMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtquickcontrols2)
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
 src_configure() {
@@ -71,11 +76,11 @@ src_configure() {
 		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
 	fi
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
-	kde5_src_install
+	ecm_src_install
 
 	# TODO: Make this fully obsolete by /etc/os-release
 	insinto /etc/xdg
@@ -86,7 +91,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		has_version "net-fs/nfs-utils" || \
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index d56759e315e5..f3c17448bd7a 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
 DIST kmenuedit-5.16.5.tar.xz 810148 BLAKE2B 8fff866e2e98958c1a933b894eb1108f78d4150627e3bce9c3acb40a8bf6cb81ae946b38f8e783c9f37a7ec2c51655df29a26ba21b840db5c18930ee054ab6ba SHA512 a244585f6846ceb5ea4f207bb840effcaec86762e1ce36c30f3324a2bae2cea49f43697d7a7649293879d0e63b71ee5dca5e38c7bb8728e1dc5bff1c3a31e7e6
-DIST kmenuedit-5.17.2.tar.xz 815900 BLAKE2B 7391a9a51780a9604ffe4c25944a8af3aaffe7f6695947e9d6691e1dab53e3655a76b4d0c4f994b79b568b09535048755e1dd87b2bb47c9b3f24d94d9ba68ef8 SHA512 0b8ec4ccd38009e868cf9794836056e0910cd1e9a794f313ca440f0944c2ba7b73c9fd246ea1c558870ad16b6d79ced4686fec757406d9569d48f4fa7bf51294
+DIST kmenuedit-5.17.3.tar.xz 814472 BLAKE2B 9690471bd09443a36b4c9447ac0029ed246ca3bbf7dc790016327d9e62efb10d074491196852baa6ec3f5afa0a3e092dcf5f04953e73dc007d22bc6dfe64c24e SHA512 4795b8ed87b394857bd895f64353804c1acaf90e1b1077b943275750dd6e84751ca843c1f3cf9f9ce1fa472660e7d1b86d0f798f0b908d4eb53af180c1b6baac
 EBUILD kmenuedit-5.16.5.ebuild 1045 BLAKE2B 2b4171b9a7a27c95ac9337cfefcad9fef0ea9a28acb3ef39e4b2ebd16dc858762030b356e1298ff0dc98452d8833a591b214562355070b24acd10d6f0acf44ec SHA512 f1c29537e2356fd1b24f994b018e7cd7401470ea5162f13fde5c26e8ac6ede7f9b44a397d84fc45f410ec0b3aec14268e57c76d7d2f81420387b57ef635ab097
-EBUILD kmenuedit-5.17.2.ebuild 1048 BLAKE2B 33b5773bc483dea75151a025d1fc2079175730d16eb812a973d9d52cb5c3e1a8b32d663c21bf672dd7b1e040d138230f5a08bbc62251c0d59b4f3f08684b3aba SHA512 74443cee4c3d33a3d7da865dd6729983717025557748ce16be8b7943b9670813f64f1a62bcff883811e183c251c5fc4577e1c3637bafc75c1518e19e4c65c329
+EBUILD kmenuedit-5.17.3.ebuild 1254 BLAKE2B 519f846e54cbe59a37c9840689b0b44b3673a5a07e3f033dc8a551ebc0d81211d997e6e50e35a40e7b958ff7a0c74a4222842b101784a225b79f3ca46e671e1d SHA512 751dfa83b0d8aa4f9156f89f1a1c7c59acac6ffc36421a0ece995576068648b6d18a2d0ae2d068377d575645603cbf22404b17f5bdce85553585b8be9c657926
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.17.2.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.17.2.ebuild
deleted file mode 100644
index dd5d4133f0ee..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.17.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="KDE Plasma menu editor"
-HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+hotkeys"
-
-RDEPEND="
-	$(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 kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	hotkeys? ( $(add_plasma_dep khotkeys) )
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kinit)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.17.3.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.17.3.ebuild
new file mode 100644
index 000000000000..f0a4eddd7f96
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.17.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"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+hotkeys"
+
+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/kdelibs4support-${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/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	hotkeys? ( >=kde-plasma/khotkeys-${PVCUT}:5 )
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kinit-${KFMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package hotkeys KHotKeysDBusInterface)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 13f949b44648..5266c19fa828 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
 DIST kscreen-5.16.5.tar.xz 122200 BLAKE2B b404cd9c23004398f19513dbcb941958ef09a8cc28e149a370b297a4d49eccea484da89ed0fbda827c634ac00fa0651fcd9131c4949bb8de644945e0865acbc0 SHA512 4c3307894698ce8e781cf6ce27b0394725d1ada5e46c599ef6c4380a2213a0059004943b795edf9bab7b343576d4dc8e1d18add3b539f40381286d1b7e4ea726
-DIST kscreen-5.17.2.tar.xz 99476 BLAKE2B 7c08d562d30dba90554c24dfba1acfabfa37de8ef1582dbce672c4d7165c88d68fdd7afae08f76603019f0c8f3067f78148fc3963f97cedf5636f9c087e8cd20 SHA512 adff340b04793b7f4c76303977e1bee38e7adaaead4f137b75c0873f03188b13cc9ca4f90ac68e6f139e77ead12ca3e785a20ee5851dcd6b7decccd3f5c87785
+DIST kscreen-5.17.3.tar.xz 99316 BLAKE2B 88d4fbc67a3a992359c3975aa4655491fc33d3068bc9f6cde89fa74072e3d3712f505ec7e96b37e347c01605f7f278e6fd32ab9297849f02351439b6c40076b2 SHA512 b4946abd3f5909d5a34d8053d60cabab996c02089ce710dba0be87bc7fd08351c60dd3deca263136a75c4a1dd14e954197e77164aec0c319bd45ca9d077a5b80
 EBUILD kscreen-5.16.5.ebuild 944 BLAKE2B e3efb10975048d182736edc78a5fb7ed55170a41fbaba70b8ab3e566df19c9e138f5ce60094ce5418e6270ab225eea0dfbd0374fa554038e005a3f0a70ebfb7e SHA512 f81c103d465ee6fb15d791b014b14c311bb63e594314648945f68bcfe691f6308cd78c6eb8bb550461e1bc915d6b14a54a88a2173cd375a495487da5b4e03fe6
-EBUILD kscreen-5.17.2.ebuild 979 BLAKE2B 995d93f85a6eecefc6cd73b86c7ccbab830d0dc7ce8def146976662f31ccbf22ca25ff13e89c5512b12c3e70337166f48ee87237968fb3697aa39a17af855c81 SHA512 0c882b9daec84de227ba00910a41dbe8e1fa7319a61bedda23c87af5db914119d9d53411b9fecc0478c81d70c352580bf8edea24c0eeba4ebcc489427c6ec3c5
+EBUILD kscreen-5.17.3.ebuild 1185 BLAKE2B 4885adefdd330a4767411b1fe5303a912c1123cc6d3ee58bac1ad038f1f78a909f45489523650dad1d956e6efeac6ff2e273f8719673a6474687d3b9b037d0de SHA512 d716879a479744830061b922e8e26aa8c1869c07079729414e9f2871233482f0d4fc167c770198732df03174f34fe1d2b7bb4903314fb4892aa4196f586bed82
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.17.2.ebuild b/kde-plasma/kscreen/kscreen-5.17.2.ebuild
deleted file mode 100644
index 38ea5918e82c..000000000000
--- a/kde-plasma/kscreen/kscreen-5.17.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_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://cgit.kde.org/kscreen.git"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep libkscreen)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtgraphicaleffects)
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreen/kscreen-5.17.3.ebuild b/kde-plasma/kscreen/kscreen-5.17.3.ebuild
new file mode 100644
index 000000000000..abed1c8573d8
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.17.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="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://cgit.kde.org/kscreen.git"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index fa417606bf59..621b2caae6f2 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.16.5.tar.xz 122872 BLAKE2B 0a25fcad963696394de880b2dcf8263cc8d8bfaf9ab7ff70aaae497cb46f47574dcc180568967ae05ee95b9a818f5e66e243f35cfcfe29756632bef12ad56d18 SHA512 ce7cef6ca4bcd94f716b70df26691dc70b7709421d56827ef2e355a3350af71779168cf17c0437e53ef0fc930f20590a7e7ffa5f11ea01d3a4f2f25e1fa00549
-DIST kscreenlocker-5.17.2.tar.xz 123688 BLAKE2B cecfbe899b919a15479a8365a7c4f7a802c8fddefbbcba592f1ef4431cec0801f7aec8124b528953bb5560f8a77cc57a5de3266f9486747862b6755668883931 SHA512 6f7ce4275e674835d03a695a690c8aa9fa0a9f2e99d71a7e48568eb38bc8501f82fb125885fa585f07b0410d9f74bbd89bae43413db694134814aa02c9c7c144
+DIST kscreenlocker-5.17.3.tar.xz 123624 BLAKE2B 416da5d3ec15ff797f2799abac721e28004e8c667d2372d253a2b7d4d9cd31967cf97101aef4e20d6ab3f70b11bf158fe5fa2054ad60fd6b41f6cca569267fc6 SHA512 82b1639c0d0b5e60ec0c7a970813dbe054130f86af48bbad590168e5a292e1d970be76d044a8b663f201c01becefe060c87ee1112390ae12f9ac88f1d81e7c57
 EBUILD kscreenlocker-5.16.5.ebuild 2136 BLAKE2B 10f918df9df18f8607cecebb88f5a4050c3698f8a5d04d482d6c80e7b85c3c54240e87b99aae27fd6c3cb4417611fd4d8fbe6a7044ec80e60c0f4cf1b9a5fc5b SHA512 b34745f4184cc3eb52d7266b5e6fd8d682ef366a43b8230a76fb20d9b5dc89ff6560fde431236a7af79f7af8a669adf49271d28071f27c0c3fe2be5961a7e829
-EBUILD kscreenlocker-5.17.2.ebuild 2139 BLAKE2B ffc243ee7b462661106705e89530c48cca83139bf71df483b6c06ef55ecf7962eff433d152f8664b142ae5201bae3a0e07704ec6b8dd113e1375ad3de4c12de0 SHA512 a165aab61021386c257e41949bd0dbf0198fd3eb84e24e9abdcbf4eddfd9a7ea70ec752c0656a9007f172c0d1ad3cb43632034873fbc69b9de58bb491eb4cafd
+EBUILD kscreenlocker-5.17.3.ebuild 2365 BLAKE2B 66ad257f5360db395b7c7a88d34a1e00ef4fc9b9b486a3ad95d79c856831878d65dfbccf9b04dde90f5b571690d6e6288c9b088e022f8b2ddc55d12baeeb25ed SHA512 93eb9bc2d9109fc6875f4ab77c9da18b5840046bea7965b78e7001ae282b8eb3dec124bbcde09abf6ac3bd530a73f4c7b41d8f0b15c3fc85c0c0c411aa14db7d
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.17.2.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.17.3.ebuild
index 568b2f8fb8ed..3ddffc5bbd02 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.17.2.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.17.3.ebuild
@@ -3,39 +3,44 @@
 
 EAPI=7
 
-KDE_TEST="forceoptional"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5 pam
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org pam
 
 DESCRIPTION="Library and components for secure lock screen architecture"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="consolekit +pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
 
 RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
+	>=kde-frameworks/kcmutils-${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/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	dev-libs/wayland
 	x11-libs/libX11
 	x11-libs/libXi
@@ -49,13 +54,13 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 RESTRICT+=" test"
 
 src_prepare() {
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if ! use test; then
 		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
@@ -68,7 +73,7 @@ src_test() {
 	local myctestargs=(
 		-E x11LockerTest
 	)
-	kde5_src_test
+	ecm_src_test
 }
 
 src_configure() {
@@ -78,11 +83,11 @@ src_configure() {
 		$(cmake-utils_use_find_package pam PAM)
 		$(cmake-utils_use_find_package seccomp Seccomp)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
 
 src_install() {
-	kde5_src_install
+	ecm_src_install
 
 	use pam && newpamd "${FILESDIR}/kde.pam" kde
 	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 2aa002ac2a58..5f669e3f2bcb 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.16.5.tar.xz 21416 BLAKE2B 832f4fcce536feea013ae3b71f1346e6dc6ddddc6036b000979d0860181a40f2eaf016c0ba59ac1fac929eabeed51a494fa55f8da062d58c27bf9cc711787f72 SHA512 b2ca1245ca55fce2fdd722b5b318bf137efffb9d6ee8ece30706cc369b51e1943f738cd95be29a01fd74e184175f4ce0d6fefdc58a2a621d80358dbfe293cfb9
-DIST ksshaskpass-5.17.2.tar.xz 21500 BLAKE2B 964633fa8d75f09a6022c927bc68d8dda7da7b803b97eed8134dde528b7e4e9f9c1c930f8a1ffa37baccae6c796188a3e5204ed3e4b230f3c4ae7f610814182a SHA512 8f3d981a2098426f1e4a23e9caa229eae176bcd236012c8e97a58249970c4ed92496d6d5c65fc95e40e2d9254911fce637710fb317a74613c0b0b0c97f902c1a
+DIST ksshaskpass-5.17.3.tar.xz 21188 BLAKE2B d6c91a88b1030608816aab70597af840a2eb134e953582d03869e2e0d8ea3aa687dc1fd5b09b8bc48f997614ef0c2c4f34948b593314233550a584e1983946d3 SHA512 e9c375d321938c2f04f6338ca2ea4776b4747029ec812dc270b8e17dd20cf2be15d511b12e7330226736089227d400d2ee23a977566b3e732008c1ad7cea4ebf
 EBUILD ksshaskpass-5.16.5.ebuild 1208 BLAKE2B ea2987af04a4d3f03040a66a782090fd7e6be7194b30bb9dadaf2f0bb01e95b12616efa562563f4171ebbb9489828a37dc44416b394b5d242e1c17ec77d4b43b SHA512 a1cddc2234d04f3df3ad15f81c50e2935c752e9913d69da6b0bb6e0c7a1c6319bc63031a33c183d7b66456fc628fd62f166b020db34562aa1ea6ebedb0012306
-EBUILD ksshaskpass-5.17.2.ebuild 1415 BLAKE2B c092c49b675c81660d67406a56f453c2a4bd5418f76fd6f77893f865493f27f98c3af12d7e5e16061eeb1e9cde7db6be069953691efd4645938e77052aa8d2af SHA512 392ee95f8046631f19140e516f0fce5f26fec58905c331efe58753a4af61d7b6d572ed51f38d90408966b13ae7d4167c66d3b5400c9bbf6ab1d397adec03348b
+EBUILD ksshaskpass-5.17.3.ebuild 1536 BLAKE2B b11ed5435dfcc4dd3b2c0ceb7f0bcdfd236111b14b251ff313015ad4a16ff98f8c3e0fe12cb6fc62b47eaf4b87b872163e5aecf9f51579a5732142d787ac8cca SHA512 f984c1dd66899ba18ab40686d574a14b67f5d90e23d30ecfe5fce3440fb4d489b9c5b06ba2ec22f89dffa9777b63a7aea8e0def9e80fd277145dae0b16903b85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.2.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.3.ebuild
index 9e6cbd72bddd..4709b97d6146 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.2.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.3.ebuild
@@ -3,31 +3,36 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
 HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
 src_install() {
-	kde5_src_install
+	ecm_src_install
 
 	insinto /etc/xdg/plasma-workspace/env/
 	doins "${FILESDIR}/05-ksshaskpass.sh"
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	elog "${PN} has been installed as your default askpass application"
 	elog "for Plasma 5 sessions."
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 6b5283d47bc6..1d226bf21d3e 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.16.5.tar.xz 500304 BLAKE2B f2e5cb8dd43df8fc16365a0f263bd769e2b01e071ac8e4e49260aa7de5a6e63c70a95b87831a0b2910f523a37ba64d923a20b8e02866fbe8f0aac0f73d85ed7a SHA512 579175da2cc4d9255b36890b716e1f060106a24c609d4cd92accc38aa2c47bf9723e1a19dfa80678619db811b59b40c853655bf678c187d802e137978c3a970b
-DIST ksysguard-5.17.2.tar.xz 514500 BLAKE2B 2a8ef0b79d1af7645f5447bf105fd295dd1f1f5be9ef122d7ef0a6010cbb2b3b99710fae4dbc44e9ce2a910c87252f81e7eca9d03a79cdf2316743a14c8edc5e SHA512 449b01657843043b02409beed19aa8b287f57e33fd1445a169150d84f856953e3ae0fc6c963b3f50653695be690df3b19abec0153276ac7f31ab991d38076bb2
+DIST ksysguard-5.17.3.tar.xz 514352 BLAKE2B d75a8237922c0ee44ee53f08e1dc0453d06e4ecbfc7081281377e2578966ecaa1c2481c07a7e3ca03d0c33450aa71a2032b4b1e6b5ff7e396e1ea668f69ab87b SHA512 79523a2bd77546c03237991111e706d06fc073c7d1bcdb433c0a24b575e178b466b296bae5d78734c39207b384e1f55e137192c8c7f6bd8a7d1b58cece0164a1
 EBUILD ksysguard-5.16.5.ebuild 1115 BLAKE2B ee7aedd0a34cbbf10ac673fa138f2ca3bc0f2ac31b1be14cbfaa9bec988a62132898e122efae8cf281223b30f315a45811c107decc6a255f4576f27058b08867 SHA512 a7d96fa4181bee1c1f1443ac02e03ac663373229cf9a47703f5c80331f4f38fe67d681c57582332a32a263b10a287cef42b108e8c92abc9a4f5d87f6156b763d
-EBUILD ksysguard-5.17.2.ebuild 1218 BLAKE2B c83b83c8ed5f29184059b0aad5842ae5e317fa9a46f46c0f6975143a15ed753fc0d4208f4737effe2c5d142e7af92aee0771d22f2e3783d4301e6eed9a498437 SHA512 75b6b888929384a1b871892a7cd5ddeff4f9f82e8fceef358103bb17e3f921cac31b32bbd62ff7c262895a22285fbb6265a63b120be5f513c4fc5a9e98bc4bb8
+EBUILD ksysguard-5.17.3.ebuild 1401 BLAKE2B 3fc65c73a7d6ce202e95629c2fdfbb80b61f6d0dec8508337a5564a37ce9dab28a0d32832382ba2b6d84b8eecb5d5d08a93f09fc285c48bf972353be711242ac SHA512 fd0b984e15bead23e9feb2a245f4fd5e9bbf99790de470032456a8f7bef33b98d852a40f3afc2db50577ada5d22b9a79212e021fd321ddf72ea6f4fb4b35a522
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.17.2.ebuild b/kde-plasma/ksysguard/ksysguard-5.17.2.ebuild
deleted file mode 100644
index 2f567178087a..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.17.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="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="caps lm-sensors"
-
-DEPEND="
-	$(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 kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libksysguard '-minimal(-)')
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	caps? (
-		net-libs/libpcap
-		sys-libs/libcap
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-		$(cmake-utils_use_find_package lm-sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.17.3.ebuild b/kde-plasma/ksysguard/ksysguard-5.17.3.ebuild
new file mode 100644
index 000000000000..695e1710ee9e
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.17.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_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Network-enabled task manager and system monitor"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="caps lm-sensors"
+
+DEPEND="
+	>=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/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${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-plasma/libksysguard-${PVCUT}:5[-minimal(-)]
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	caps? (
+		net-libs/libpcap
+		sys-libs/libcap
+	)
+	lm-sensors? ( sys-apps/lm-sensors:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps libpcap)
+		$(cmake-utils_use_find_package lm-sensors Sensors)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 0d2fa9e9f93b..f3691c272fbe 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-pam-5.16.5.tar.xz 19512 BLAKE2B dc053b8b02d44a3b94fe16d50b03bf91718392bdce60e69b956e5a84406012b567f4216b08b4d05c215cfa0e9e16c7537b60420a80bf501402a7cf302b853d9b SHA512 6a3c09b645a193bd5164525c6ca0c807a0adc141566db7436101784fef8def79e121c599a837dac32393f8e5ab2c33a9473a29013d07bd64e6a8eab32308d3d1
-DIST kwallet-pam-5.17.2.tar.xz 19712 BLAKE2B 24da5b28399a9e7a98c5ea9077e019610075b7df3934651e1f3237fcd514ae76eab7f7a7a00080529d410b0eb9b2acb53481ad92668691b1099c66c5d17245b3 SHA512 5f3d8408488f6ae1e9b8f1a2e1975ccad3b8ca6bd9ff9a721f7ff83f50259d7a459a66bd48963702669c3751abe467917e0a7ebed5a05ed789a504c5ced29ffc
+DIST kwallet-pam-5.17.3.tar.xz 19596 BLAKE2B 414cccee3f6bf46844423adbfb8f43cacc77949f60fcd4c9e28338fffcffd37b0ace2042bfe96d50a99e27537968bede13180573fb7d5abb6ba2123b88e08c11 SHA512 80498877afcedcf3a65acf4cb4412d6edb59089428b87692aa1d8b76ecae6c999aa8a59a1b4c5c1df4380f048e3d2611274b47fb487d40f3a5f277f60aea40a7
 EBUILD kwallet-pam-5.16.5.ebuild 657 BLAKE2B 3e7808f3098d000d8ab4670dccc6a3c15e6bdbea4c4201dc5e95ecdc9d9785fa5af4c721e3976f31987e0f074233dcb874aa461174101da3be7a8ee0e3c26680 SHA512 a1a06693a8ceb902aa8652ec95624b7c8850cc60731b43e71b61d4655399db7a25934c7c5be809cf395dc5c810c1ce13cef2212968d7d38248a0cf8dd8733341
-EBUILD kwallet-pam-5.17.2.ebuild 660 BLAKE2B ad810d69ef1c9ed9aa377bcd986716a47c53f1a573b059c558aa0ec4dcfb884492037915864d604032ddbec1367d6f488b2a3bab8c3baec75423359fe39d8c40 SHA512 f14d3cb8c696ac1a77afc8f2905038697dd2a9b8a3e96646f5e687fce7856c0d5f397717b257d85ed5fca6cea2ac5e33a52a31256b8f2791ce36af765b4df6d3
+EBUILD kwallet-pam-5.17.3.ebuild 714 BLAKE2B b065c23a3174a9070e2b41ca87855addfd8e74c0e3d1ecdadf74cd7648abf6649765a89a331b7d5640070af14f77be741379af7678d429080eab7de68a0914df SHA512 d892a989043dccdfd02cd37fd02ddc5ba89324e5b73345315ef1ee9d32ef36237fced317f459025e5e14b13bb55d82edf2b42663620987af131999b6ce185a5b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.17.2.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.17.3.ebuild
index 3b8009a01722..2bbe2356d0d4 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.17.2.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.17.3.ebuild
@@ -3,15 +3,18 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kwallet)
+	>=kde-frameworks/kwallet-${KFMIN}:5
 	dev-libs/libgcrypt:0=
 	sys-libs/pam
 "
@@ -23,11 +26,11 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
 	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
 }
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index f57606766eb3..3e9affaf5012 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-integration-5.16.5.tar.xz 19320 BLAKE2B 8c803397cf1bb0f94332c768911e0d5f91841bcd8491acb0169ac738550ac1bfae3990cb6d7966b9067cba9f86fc1e838b4b9732fbfd06e2bc040a4e170d3009 SHA512 c37faf39de7712c59ca1bb3c3df737bb660e7457cb66e60ff505d0484f2d0c1376306c822b63e19c5f5e578f44deea69739baea5c19039e562bd50aac47c9156
-DIST kwayland-integration-5.17.2.tar.xz 20172 BLAKE2B 1a1388e6f146b0f899b7fd4ce4cbe060467d5d092f1e5d5a3c24522e9d9b6e7bd24e8342f99a1ecc0ea710a96401681821c8244b075e9cb788f04a721c5d924b SHA512 d10c2973ec6eae1283be31a15ab977948430a458f535d3ce9760f6d73f2254e96a743a7e59185782a99d39e37099edd33a319402f1dd17aa18ef98f5fbb0e9a5
+DIST kwayland-integration-5.17.3.tar.xz 20108 BLAKE2B 68c8b7150ec414fd1d9f01057c624d32167047387aac3ae89ace6555c611920e76c06e357dd3ebd71d823efc5556b67bbd13a5a6418eb15113e89227326f77b0 SHA512 2f3fc450d513bb26cbc9d2c3904fdc3822df54be2e15a16f402efa9b945eed0825ed45012612d70335163f41e213e63136b11bf82dbac543d195eeffd9cb1fb1
 EBUILD kwayland-integration-5.16.5.ebuild 554 BLAKE2B d28247ea10e8f9f971e66720bf70d7ffb84f0707d8c8a301ec5b80b3944c1b58850f2ee4863f3525104f1fbe6504ab661711bed51e306e958dd39f8bbf82854e SHA512 d27d7657ffa91e210bcb979a02223146041c1b98dc8e67cb62db28de28d368203a0af2316cdda2d8c1d70c9feb6a4b21c07e0d4448551831d4942b4460f46a59
-EBUILD kwayland-integration-5.17.2.ebuild 591 BLAKE2B b0526ad1c6fe60cb2efa59a0cbfa1ab1881a8e6162be270edfa9b0947524cc7decb3c6e1b2e1647c51b725f5372b0033e213ab9c0514aa2351514b8ced07c8c1 SHA512 c9ae4f0d8014cfa5c012f29e4f105bffbb92c56e5bb4f3f1f513ffb0bb8b6e9de92f4d8bd5d960fee913f95e41ea9725dd25910f88dd99f740ebc62c0dba3bb2
+EBUILD kwayland-integration-5.17.3.ebuild 690 BLAKE2B fdc20f4997a8c17ad002273981d2bc619f4f334035365df3fbc41f0722de7e88c9db58159547fe9d159f8f79f52efb9ff76d8059d450c5ba1b9e0ca368d7e000 SHA512 cb92b5d9d48853783cf93751375c8a8f0671658588fa5c8c1080f46f08a601b8157f9144ddd3d0c31a3eb00c9c00f01544a8802e608482bd0bcd5c9100babc1a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.17.2.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.17.3.ebuild
index f6c7a9d24233..6874a1a4a047 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.17.2.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.17.3.ebuild
@@ -3,23 +3,27 @@
 
 EAPI=7
 
-KDE_TEST="true"
-inherit kde5
+ECM_TEST="true"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
 HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
 
 LICENSE="LGPL-2.1"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 0887a7f101e2..14801be43c83 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,7 @@
 AUX kwin-5.15.80-gstreamer-optional.patch 469 BLAKE2B a231355b487c290d69100212ff14a420c48dc68395bbf4cefe7e166c03ebd529e3ad4eb366cb05188759416ef09e180d92ee3aa4d47feb37b58b5f266d370dbd SHA512 c27fd413a279e46ebf6392b138a8916588a51747aa452dc1affa80aa261bd117e05c28029cc7dc57c5ca19fc4f2ed162ef25a527c89491b2ba22a73082335333
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
 DIST kwin-5.16.5.tar.xz 6250592 BLAKE2B 3bb7e18f993ddc405d1d6ba20e6e8c1770206f7adeec34f60e3f015a7ddf01c7e28d0908e3c590e7a98fca526fe4698b30d116132f668924e58618efb7e32a92 SHA512 26792c58dbdb6d4c452c7953f16ebd67a0115547e5cd537f4e0facf94e461845df8261a106260c30ea6a2ab9b4b98c748ddbe35ecd6de78ba3a87a1d62e05a93
-DIST kwin-5.17.2.tar.xz 6254516 BLAKE2B 0b877b0707a177f3dcab434aceef8cd1a9a9e04d6d340dd313e0f08ea7bd230234237b079ff8960ad4d1acb30870026ddfc95c71337357574f62eab6e266d3bb SHA512 c10a7e0832064046a67a490f429720a56658872d4de05b92dbea50114946601af36cfe546eb332bb659f07343f39d0a258c8dc316df11bf117cb875136f72b8f
+DIST kwin-5.17.3.tar.xz 6241292 BLAKE2B fdc0e28d120193262ae4cdd106724c6fad753397381939618d1730cb1c8cdefaacb03f324fdb1bfd20b1462500cb81cda7b276fca292ee8f6a23c4ec4fdaa791 SHA512 0e9ff53cdee8089496be62a6a48d008231c56c603850318f16fdb5b72a7f018eb53d84293b2bb664a2da7fa9f685be0e8eb9eedc457ddc038014718ef2752020
 EBUILD kwin-5.16.5.ebuild 2673 BLAKE2B ee6f3e356ecaa04597be2d9d7e20122201132a4c7bffd133ad729e1aee13354da0fe3e884f8d4939e53cf41eb712033687deac34158ba742318d495cbc0c89fd SHA512 c82d623a7b1e1d356be740d34756e17c73284a54c01f494bc5b18cdbdb58a944de8f73b05bee46be60675e9f9d27bf63c7f266d4640f26112ebec83792c9c928
-EBUILD kwin-5.17.2.ebuild 2676 BLAKE2B d2778e4aee2b949c07aeda7c2a40385ca28ef6a667113e13ab7a866862570a3f3979dd1e46308cfeca5d7bd1167c5d5f14ec4aef6ae0ff1de2ba6af109b960dd SHA512 82b32fc782499a6ce1f7af0e8de67e9abd85533f2789dfee7d1684bf06e425e37d7763410e041546c12f6fd12586cd1858fe4dbcb6d689f24cf501d050dc770e
+EBUILD kwin-5.17.3.ebuild 2967 BLAKE2B f164d9118100ed6fa28c836d9610d448e99851758398bf86b683c35ee19f769543cf1606fdb04c63359279dbcb6ddbc74468fe9154491c5ed6a9a6b43ca29081 SHA512 f35f80717a91b982a87ac33655d7246b456cb81f6deeb16396e0b83322139e029979ac51bc0bbd6d6ba15da6631783ad7abc79be678656fd38459cbd7524c2a7
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/kwin-5.17.2.ebuild b/kde-plasma/kwin/kwin-5.17.2.ebuild
deleted file mode 100644
index d3e20b0940d7..000000000000
--- a/kde-plasma/kwin/kwin-5.17.2.ebuild
+++ /dev/null
@@ -1,105 +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="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="caps gles2 multimedia"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(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 kdeclarative)
-	$(add_frameworks_dep kglobalaccel '' '' '5=')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime '' '' '5=')
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem X)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kdecoration)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=' '' '5=')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsensors)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=dev-libs/libinput-1.9
-	>=dev-libs/wayland-1.2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	caps? ( sys-libs/libcap )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtvirtualkeyboard)
-	multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep qtconcurrent)
-	x11-base/xorg-proto
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.17.3.ebuild b/kde-plasma/kwin/kwin-5.17.3.ebuild
new file mode 100644
index 000000000000..d8bfb6303451
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.17.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="caps gles2 multimedia"
+
+COMMON_DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${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/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-libs/libinput-1.9
+	>=dev-libs/wayland-1.2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libepoxy
+	media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
+	virtual/libudev:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.7.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	caps? ( sys-libs/libcap )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+
+	# Access violations, bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package caps Libcap)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 40555c81f6dc..f273cdfbfa16 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
 DIST kwrited-5.16.5.tar.xz 20032 BLAKE2B 0647833467e49bc9ef0d94d6750f6d8a73149a7afb6271d5c06cb08217231a59fba5c2557b71d76f12c0f54ceb1d635ac8967a9bff64a264d51be987ab6e474f SHA512 fdd3d148b3467392c6475a6d86735e7a10114e700b50badf572fb378c0ee20e280421fb43944cfe33d164ff7c94e11e5c8bf67d484ebffabc5a8cba21a4ef96e
-DIST kwrited-5.17.2.tar.xz 20032 BLAKE2B fe0b6e26655845792ad445128720bb66a5bb79db530e8f7c2a3c71ca14021983fe80d3d99c418a507c85c142c15ad8d7b9ad72e052896b905fef29eaedc9b342 SHA512 63e4325d945fefebf77cf13dadf5b1ed34368d3baaadfd085d88f04bf8bdec9b34b07061998528cdb7e67e8c46aa4b118ec6ccdb9619f3b96fd662175327336a
+DIST kwrited-5.17.3.tar.xz 20040 BLAKE2B db17c282458e77951b7b5cadc7944cf442bc206f7d8075c62359a11a2ae8ea433b9b1f2be0db7dc0ca8a56799ab2ea568185a2b21cd16ddac1168dff0ed0c886 SHA512 dd49b86367948410e7514eafb6d78f2ced4aa075e529e92595bb1aa61d7ef5d5549660240811126dd9711d92a1243f8105b5062a2697e5f72c4b31926a4ad6db
 EBUILD kwrited-5.16.5.ebuild 480 BLAKE2B a6dbe8ff13271f2749d8be7b30edb1b95df36671f12a75886e10c11070d5886e6680a7387a9b3d484fab03eb88abf9c9dede01b0e66a945f5e5cccf5c981c277 SHA512 afa3ce11dc93eea3e08af463ff22af8f37350e774f1c967f4e80cc36cf4e0a5d9538834e9b455f131ba3c74471383ab286099b58334fb7e6100cfdb8ccfbb14c
-EBUILD kwrited-5.17.2.ebuild 483 BLAKE2B 08e0c850fae43382431b7d5bb3f913e2be9f51cbec877230144233807ef03af2a5bbdf4448779c9326416b6f6456c5e3e935130b450acc3b6e543478a927bc21 SHA512 6bdb6d91af25c404bdd7ca370b277d3a51f832ea8ab8ab42c7afa651513daefff89db63d19cedb134a62c0ed5bd3f227d286ca7486187e46c6379ea2a4dd560e
+EBUILD kwrited-5.17.3.ebuild 618 BLAKE2B 836aa5420248f8717c8974bc9b7d9c84cf8d58c8d9e9de422d28b54cf9e62202c8fd1ececf421c7497b124fe30d236316806ba1255dfac9c31aca43563c5628e SHA512 68cb4d06ec87d565e47ce34158373e989e7ad15ae84dba87a74d3fce4865ee1599bfd109be7e36ac96eaed8ebf3512c3fef5a8a859a015a9c104016caad77592
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.17.2.ebuild b/kde-plasma/kwrited/kwrited-5.17.2.ebuild
deleted file mode 100644
index f94eff2f3ae3..000000000000
--- a/kde-plasma/kwrited/kwrited-5.17.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="KDE Plasma daemon listening for wall and write messages"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpty)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwrited/kwrited-5.17.3.ebuild b/kde-plasma/kwrited/kwrited-5.17.3.ebuild
new file mode 100644
index 000000000000..bca843b587d5
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.17.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.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 1a72c7390ef2..36fc3bad566b 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.16.5.tar.xz 81028 BLAKE2B 9afeb4f96c39ce7bf4771ec704da7d8f639af478ce04a0e761b29a13b6cadf010a88a06d9becfec76873b2c7c23c9419605914088b72fe86fbb946d73f8cadef SHA512 f9dd46052cb5b45d896c6c366383d912e659ec617a0214c0c887d4f78951f620c5d368fc55ea615f9999920b010bbbda4a34f7fabc2fcf6fa106cc3561f9e007
-DIST libkscreen-5.17.2.tar.xz 82852 BLAKE2B f94a510a5cf29d526b768c2874cc2373d194467f2a952d33a7de128da47adaedb2a7e9886c75ce3c808b6294898c180d6db59604164e1986d6014073e61c0941 SHA512 0437ba5e150d66caaff80d3fe7e00c1572a02bd825f084a1d538d044a2a383b7e7ce47a2a0b08da40303b6f79b382dea7cb9c23d09033ca097813b7cf2418869
+DIST libkscreen-5.17.3.tar.xz 82748 BLAKE2B 4eaec1236a0a0a0c4cb6d2884ef1178d28b455a4b148d0e70849d27ded252617780ad81ab7e9e4a5bae7f17c05bc24b75ac7b94e898402d4192b52585d951a96 SHA512 47526a15594ea615b37d2cde807b604a1309425462993e4ba14d8797d359a8c40ae06eb7a2b44ed2e045bba4e9738b78b0370d1a861bc52d34045ff61c08f2cb
 EBUILD libkscreen-5.16.5.ebuild 497 BLAKE2B 3493ea5e47086d6fc6d6297b43f40548101fec90c4b465c999156039cc9154a197f1d3f9563846068433e65d4f9e9f49458ce07156f48157301ecba7367734c1 SHA512 1d32970d8fba6b8eba2cab971fbc4214f8e4ed6ff96b5184e7d29dc1bce3042824143820752e076e552fd4aac66e0d98e758046999a4c890542fe051e6f87892
-EBUILD libkscreen-5.17.2.ebuild 500 BLAKE2B 5ae439d1a20a9fec5a316f07d17831cff1dee10f809c070964f3be767db52a1ba1d1db8211108687514766edde4768920b52371d20b3bbe8ffbe68c8af523974 SHA512 cf13e31770edfcaa4261a2b86ae5075b0773f1496529f63537440052712317ea2e5f6cbae5e3f17c92eac795dd41386cf671c933750f969266d28d184c2a7700
+EBUILD libkscreen-5.17.3.ebuild 608 BLAKE2B 42450f2ca153df6f1b850bbce4d09048891af2a42812203527009c6ad0af798f7e7eb47f8ff1e6ba8e546b3fe1313be1136b9c594116946fe9b2f11e6a9e8a5c SHA512 c5259d120acff2fa8b8b36d3d3892309f5813ea47b5f8fb1392e8da135d6a47e6f49b5fb892aa1ea32465f81f45fca910cfb6c01ff10d005dc118524700a4fc9
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.17.2.ebuild b/kde-plasma/libkscreen/libkscreen-5.17.3.ebuild
index b4ee895edd18..88df6421a869 100644
--- a/kde-plasma/libkscreen/libkscreen-5.17.2.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.17.3.ebuild
@@ -3,21 +3,25 @@
 
 EAPI=7
 
-KDE_QTHELP="true"
-KDE_TEST="forceoptional"
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Plasma screen management library"
+LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	x11-libs/libxcb
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index d6f38ada3a92..ed803b4d3aad 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,6 +1,6 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 DIST libksysguard-5.16.5.tar.xz 579572 BLAKE2B b2236c7d2e8c3886852ef9fe09465cc000863691b68245697a7424983dc82b3cd50dc47c0fb8d69bd37f4ddb2c3a07ec0de77619ffd87d3631867223ae9ab1ee SHA512 be6d4806108b26613686ff06d9d9ea10610c87c556a90c0c8a233e0190de00d9b3d87489ffbb378d64ee7fd29eb9c58faeb2a9269d8f4963f8c5866b19388cd5
-DIST libksysguard-5.17.2.tar.xz 606348 BLAKE2B d7c3d584c6c6392a4142f12a4b07f030f4dfbd1cbdc9ec68fc5582a9a1963acfb6d4fe00b60e8fc7571eca8093bdeda8da60c365bb0eacc67b50d420f7f568e9 SHA512 353fdfcb86cb72bf919152dfd59d6fa092382f78dcb6505067738e907c756ab91a7c62acfddea7b61e260272e826d232508d8926627e62c11236dec8f785253c
+DIST libksysguard-5.17.3.tar.xz 603052 BLAKE2B dcba2514323e6de50be759545ee6a9b2c2eb4df6138ea557ba1ce1e6232652deb08fd97f15dcb31016fbd1391ee7e85a5596fb6e6e4875e3f646c2623184bb3d SHA512 03837ddf746c224567a65ea813dedb939c53db76d3b0fddb6ef3fb10b87b615eba56e972d9806b5c14fed243bbc5e30e6819dcdb6d47efa17f5e6114279ce9e4
 EBUILD libksysguard-5.16.5.ebuild 1235 BLAKE2B 0b06e922ab8dfe55237d1827c8f12ab0014a7107aa5de8e7b57e8a558dc1c39d15c272f3095a7ecb5e1621421da2e1b59a2c18170bc8e46b08ebcac3e1e9e89e SHA512 8a5969e2867f364b21ca7d31abbe4cfe8f414035a77ee241e279953c9f277942c603f61e97e742e99bcbf707feccc59cb8d8570dc630f01dbb82473c82527f22
-EBUILD libksysguard-5.17.2.ebuild 1238 BLAKE2B 0ee2706a766e4981ae4cb11c2c841f5d3dbb6724a78954d345bf5f4f1c7d67dacc4450679da4de10b020124b3cdcd1c1ddbaa25e03ae11d87f576826a219c6cf SHA512 a0c8e27d7924bc5ad3a77462a69f65f83629913abc8d82d2c80fce3d3f21af6255906223253c4cbc41a8aa5a7eba43e78462291cc2735a0238aa0a1ab4e25345
+EBUILD libksysguard-5.17.3.ebuild 1396 BLAKE2B 119887517bfbd436c31fa4a2f112d401e27c4108a01aefed216d99c10154b9c46bf0ef19fcfb42a30d1120c007671c03fb43fdd479f50199bc4f57f7656ce395 SHA512 6833d2a6efd3706e29e0e151114d5124b3c8395f020c221a6623a240321557c1ff73db8755e9384b52fd519810982db81da9d958d82a25bf3a251b2235f5da5e
 MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86
diff --git a/kde-plasma/libksysguard/libksysguard-5.17.2.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.2.ebuild
deleted file mode 100644
index 4256bfb8e1a2..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.17.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_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="minimal webengine X"
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(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_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	webengine? ( $(add_qt_dep qtwebengine) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kiconthemes)
-	!minimal? ( $(add_frameworks_dep plasma) )
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.17.3.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.3.ebuild
new file mode 100644
index 000000000000..de3ac71dd329
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.17.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_TEST="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="minimal webengine X"
+
+RDEPEND="
+	>=kde-frameworks/kauth-${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/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	sys-libs/zlib
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	!minimal? ( >=kde-frameworks/plasma-${KFMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package !minimal KF5Plasma)
+		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 62e3bf20ed3d..ac0dc72a2ce6 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,7 @@
 AUX libkworkspace-5.14.90-standalone.patch 3376 BLAKE2B c76206c19939ebe7209dba4172ada0d0aab01f2520cc5ab465c40173d3e6c92cbb7ad9b0bc73e2e229d33792ee6313872fcab73994818e9100e0efdea64b78ae SHA512 6c6ddeca6e2178189b3d63ae77f7bee1b900842a72392fba812bd9231ac6f701fd1655d1212a286d914202c7182223742bb1cc93916f373db99925fb9a9411b2
 AUX libkworkspace-5.16.80-standalone.patch 4815 BLAKE2B 8269cba2d49020e643ae7aca211d9ecf2c38a8abf5c87cdb2185c80cb67824be1a3b79da67cd267e917c8d9ee3b67eef37b58b2845a6383d98c322b3ca90e4e9 SHA512 20bc3f75521e548311b2126ce40e59ce61e0beb85a0ce643e2b31e3a82ce3deb578e2b4049f5524d81129c4872661303bff9011623f0d8436358b3790115efa5
 DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369
-DIST plasma-workspace-5.17.2.tar.xz 4962148 BLAKE2B b1966e0db9fe9aa75bb934f7bb0f7b0cf7f6134cbb75926dbe86ff77bfb00888116c05aad070305e36498d7346bbc394cf42d9272ca8da79634a04bc008f949f SHA512 2c10f78de83d65e03a611f0928b28f723c71e2e9b02401c7e6b226bc7f5002119602d6344dca7c85a23ba3826e5f6f0b96057252a518bc9f8c0fa2931ac5f85d
+DIST plasma-workspace-5.17.3.tar.xz 4958180 BLAKE2B c61d919389c13cc281c4a48679c6fba615399732c4ea562a2499504d5bde0add33b6827fac9744322bcb06358346de2cfde974261cf540da892b524972c18b03 SHA512 8ae809e40cec33b5fa6e49986e234c5cfd0ddb964b62dec242b763475cab6f02dd089cf69d5e89a1f8e447108958ea13097df8eda0885199c71f67e6d5c10ea3
 EBUILD libkworkspace-5.16.5.ebuild 1269 BLAKE2B ea0f0ead80950429ff9a2ff46fa5c65974b36c04287278cde657420259f3b182fe5fdb7775db38eb02e2535b175b5ac5936266688e362ff621ec011c72584887 SHA512 f137931810e653df1b8d3d7cebec3c4ddb819df4c91fc999aba19a597b35b8be183dd5c488315a03fcf48f395b9fb219c0f19ec24f8be5526ce077852c05dcf3
-EBUILD libkworkspace-5.17.2.ebuild 1305 BLAKE2B b2ea7d64fb71e6c2e4e6637d31d0748f3b2246017973ecb754f9cbe79b07f3be6d48944b697498555d38b24f2b0f3bac586244dd35df2e7484fded1a144f4f5b SHA512 39a77a9a87e1aca110732da680c1c70b4aafc2a00284f2a41465a7ae5a818ff88dd81e4b6dbc3afba17063824198888eb0fc201d71f913961d4025ff482a8522
+EBUILD libkworkspace-5.17.3.ebuild 1450 BLAKE2B 766115ad987df10c52aa71a38f39230370c71206a633271fd88a271a7791a79f35159aaf448ec321d6012aa2ee39a55795592f6041d92b7f47da3cdda514d850 SHA512 be9eee5ee3264afb1b3e49a1be41bcf21e2a3bb12812cfd93604457e23f4ce1cdbe45ca9ca70d6fc0310f2cdde4a6f73d75a11532bd0dba6cf52b95c117b4c5f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.17.2.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.17.3.ebuild
index 25022518d06f..623419ba9675 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.17.2.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.17.3.ebuild
@@ -3,30 +3,35 @@
 
 EAPI=7
 
-KDE_TEST="true"
-KMNAME="plasma-workspace"
-inherit kde5
+ECM_TEST="true"
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep plasma)
-	$(add_plasma_dep kscreenlocker)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtx11extras)
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXau
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kwin)
+	>=kde-plasma/kwin-${PVCUT}:5
 "
 RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/plasma-workspace-5.14.2:5
@@ -37,13 +42,13 @@ S="${S}/${PN}"
 PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" )
 
 src_prepare() {
-	# delete colliding libkworkspace translations, let kde5_src_prepare do its magic
+	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then
 		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
 		rm -rf po/*/docs || die
 		cp -a ../po ./ || die
 	fi
-	kde5_src_prepare
+	ecm_src_prepare
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then
 		cat >> CMakeLists.txt <<- _EOF_ || die
 			ki18n_install(po)
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 471549171071..ecaedc7e787f 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,5 @@
 DIST milou-5.16.5.tar.xz 57700 BLAKE2B b813af1c1e0082c1a077464eb9db51fc4e526a63915a86d4b6c8b351c23590012ba12d6cbcf38e6c580346aa1b1eca7e6ab29a203035a2568833705cd28ee84d SHA512 70f8ab1c7dc1d3724e385cc959f3ad4b80efbd200c0dd9028cb123a07304b0c866c3a8a474cb5dcd0d2358a6b0ed888c85f0f6b8f43d8e057b16152406ea8ead
-DIST milou-5.17.2.tar.xz 63376 BLAKE2B c0a1a359f0063676962a268571280ee9d1a0908200946a5a07e049c3bae19d8379f4705cec9c0f32798950bf6393739a06f4b07091900dba77d28b7f40efc46f SHA512 6591ba372722d102d4c6fca2e539513f3c8b507f4701067f16f8a0399de8a67d7885f75b99c700c64b4052418ecacc9c9c7ba51c854b375ede88894bdc709590
+DIST milou-5.17.3.tar.xz 63120 BLAKE2B a2baa846ae662b1685fb72919771b809d655cdc4a3fa688e720a3be52a6032181ee9da366dc85153ffbdce3d7c63042057780a27919929eb9141a34634ea2a32 SHA512 4351bbaa524a09651f329da0eedc87c12ad32f26d55465f5b0cfb7265bf600375a60e902ae27b3fedfb1cbe1b73a6b2b02f309cc1f74fd49293cd66e6586b21b
 EBUILD milou-5.16.5.ebuild 666 BLAKE2B 351ffaa6d72f89053cf4a167462f08ad39ac9064f9c1b93d2f09f0d402f9b0a6ae0c5a277e36ddbb2b2d0df52c7b202e536c79885d9db5496a8337a7fb2e16e8 SHA512 02413ffc787a664d9a23f07561942ed26943fd050967b7f51566bab98bb341b19811b24bc09332b53a5d7549e9f32c4d476d1ed61efc0cdbb4bbf3e9c6847360
-EBUILD milou-5.17.2.ebuild 704 BLAKE2B cb6d616d3601e1f9488c2f0512cb489ce303bdb7af012cde571d558b8c64a3d9dc0b97aef2b365ea615aafd7902bb473f58f0d8b469975497714cd0ede4115df SHA512 d7af0d34ddd08c0bb7711cdfffbc36a94f768ff4576eaf4a6b340037cd703dbd33c57a24a7d433403abac3f15a4fe8e89176deea69499dd6ecfe0f0fdab7786d
+EBUILD milou-5.17.3.ebuild 833 BLAKE2B b6059dfc6fc4064bae942b028afd930c5366cb4d82e4dd16dc25444886857cc1b87e2a17fb913fb6d27a9fe808fc89f903fc77e56106d1cb3c4b0ff9fd49c460 SHA512 920a815bfdbba6fa3fb8a21d2b5473b5d908f1ba5bd2cf79b3e873ea53c408f6487b6fb40c4036ce4522a2e307ce892b81f5670d75bd43f349a633ee5c0ff1fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.17.2.ebuild b/kde-plasma/milou/milou-5.17.2.ebuild
deleted file mode 100644
index c54dc97d556f..000000000000
--- a/kde-plasma/milou/milou-5.17.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_TEST="forceoptional-recursive"
-inherit kde5
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://cgit.kde.org/milou.git"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/milou/milou-5.17.3.ebuild b/kde-plasma/milou/milou-5.17.3.ebuild
new file mode 100644
index 000000000000..57c0f1e814e5
--- /dev/null
+++ b/kde-plasma/milou/milou-5.17.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_TEST="forceoptional-recursive"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://cgit.kde.org/milou.git"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index dcc9223b3419..67e4f9407295 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-5.16.5.tar.xz 4466432 BLAKE2B 99ffbf358ebe687402d2ad08b01f0043c4c2510762a4eed9556d97727000d9a6144c712775c206cc4b98f4c247ed6d4fa96aceda0af6e82c2e75b69250ce8490 SHA512 6ed14b6fc454e22e837525efa7298245d62cd7c86a0f8b608960141f8820722fa9996214848309cb89d4212d9a8ad1384ce82e7917b62114aea8d65247b68951
-DIST oxygen-5.17.2.tar.xz 4465224 BLAKE2B ccf8af1b232af8e9f8fc51764a55f9ce71608dd9897bed39a798829b9afca8347b363a0e31f96cd3c101fe9b4f63252099e4f92c1c135f7da4947ad4262738c9 SHA512 dde70ee1e99e8ce0be9734a7165616c219b8550bb5700004661bebdcd1f9a886215046b90a19fc52a86d4abec351c13f47c96bbfbb11dd437a8279e3eef4e14a
+DIST oxygen-5.17.3.tar.xz 4466848 BLAKE2B 17e3cf98b29f88cb9053691ce9bdbb3922cb3251f9e374ca6f1afa2c9dec54b30d0952ccd53b6c0a090a6a0c80f26aa9bb8b3b560b8fd05989bfe1fe135c3e07 SHA512 bfb98035fdd541b9d35438774d722de6852d0ea3423c3b4f22ab1533f60824e062419e8fa339f434f921abd1166b3820e3d22bbdbd38e820947faba5129b7610
 EBUILD oxygen-5.16.5.ebuild 1073 BLAKE2B faad900e7ec0be9d415095aecfd9c11fe83453779ef573e1fefe590dd2a6785e4702e8c5d7df833496f687ed3ff0a25d154eb48708114e5999630b2109ab44f0 SHA512 27d0986cd09174ab2aa82754e63d77bfac2ef61f86f66a9755e70fc52178f304d40e4612d322864d25c96921ffebfa9303421b14bbb4871a66076121f5337d6f
-EBUILD oxygen-5.17.2.ebuild 1153 BLAKE2B cbd7c7c3550f96ece6c9a028393ca4c8e049ecf41fb67386bdf24d0661823b9fca46e740e645dcf997f49a352d53c4a19e4792f75d3fab9a6a06d8bca8d029ec SHA512 6ddb458316adcee639ad7bd811bccb6e4ae82d5ab8353c1978244264ab74ffd6930561f52e08f54d6a8a8363021d3ecf6f85d76ec2e01b29ae2c8463835da938
+EBUILD oxygen-5.17.3.ebuild 1359 BLAKE2B b311247c6855e74b75fbde02085a9057d5cf974a7a8610249997fa65150a5258c5d7a402e60b0b5692c904fbc3c7b41bec9abbfac75aaec550929dc1a3655a41 SHA512 61098e4d78a025a8a563c2b99c027691f303761968c13937c5753bc7170999887ae5f53571e7b85c99a824a0a15a6a44c8cbf61458ae12cab2414cf508da480e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.17.2.ebuild b/kde-plasma/oxygen/oxygen-5.17.2.ebuild
deleted file mode 100644
index be7ec3f5e9c0..000000000000
--- a/kde-plasma/oxygen/oxygen-5.17.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
-
-inherit kde5
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep frameworkintegration)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_plasma_dep kdecoration)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libxcb
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kservice)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-desktop-5.16.80
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.17.3.ebuild b/kde-plasma/oxygen/oxygen-5.17.3.ebuild
new file mode 100644
index 000000000000..0a841ef1bd7a
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.17.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://cgit.kde.org/oxygen.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="wayland"
+
+COMMON_DEPEND="
+	>=kde-frameworks/frameworkintegration-${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/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=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
+	x11-libs/libxcb
+	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kservice-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/plasma-desktop-5.16.80
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package wayland KF5Wayland)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 6148560a87eb..fdf298793042 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-browser-integration-5.16.5.tar.xz 123784 BLAKE2B dedcc770ea524e5a10ae7c231ea800ae69ffe707dec135aabec3acad36c6270e0dd45ec82e8c0e4f0ca7bea758fbc63b0f380b718077b52dba9eec042fa5803a SHA512 667c5ef2dd0529e6c567e9d3e34e8e6df73e0101605ccc4a6712e7f47b6824407495102ddc9b800e411f53a1fdf0132caebf6d955c39e7a80b7ab6569d02d1b4
-DIST plasma-browser-integration-5.17.2.tar.xz 146080 BLAKE2B 1f49dd9723a729f3f11fd7ea117e410d0e54644ef3879bf43b33e0aa0e9d4dabc1934121082f4a3744ebe21a3700a4b59f7785a3512d7751627c0171aaa788b8 SHA512 982373c4aed2ed725caba360087c1d014c2382653fe81eedf76c6588c8bd731a083a0b1f9e587a1a6ad72a232ca54b2057208c9ffa48a0eef499dab51df0d58a
+DIST plasma-browser-integration-5.17.3.tar.xz 146204 BLAKE2B f0d21135e5a1106981deaeec13eb89043b6551b7119c442fd135ab8cf596eb10d5b99a24b5af72a37868013283b54d70b7734663c16b642c677bfbbcbebd200e SHA512 da5f80e8bedced33244151a17cb3b3d513cee1d60b781e6e548659256620cf0205d256cce24c72ad7ccac7fef8bb51aeaa3100e19db7c524a21fa2cf9bf5edd5
 EBUILD plasma-browser-integration-5.16.5.ebuild 752 BLAKE2B 2edd3e8ce295c837867cabe0954521d6e0c0fa49977c604d5f7946086253f6b6c75e55f7deddb3406b4a68905ab23ea5df49306389c92f1a23afde39c14bbfb1 SHA512 1f570b9bbca202d241b251f29f103a9e8829206dd880a012aee3353fc3807b2b8bd8c0a7f223e3a94951dc815f2aec8fa2d6e956a290a6cbee7d93fec5363fbb
-EBUILD plasma-browser-integration-5.17.2.ebuild 823 BLAKE2B d0e34336443d4cd428df5fe7877306fa436fd22cf4fd19fa354af19fe371fdc66282c7893ad6b2357df25efbb4ab57d690b20dc3f308ba4c8c2e3fe4c061e263 SHA512 7106a457702fc0c8169c795b8870fac43fc5519ea369e77a955cfcc169f68993010d23044713179cab30376ddaa97d4940051e260823fc56fa16cd2c5df68ed6
+EBUILD plasma-browser-integration-5.17.3.ebuild 963 BLAKE2B a8549cbb36daeca4dc4bf48013e9e3799e28634c56f9dbd80eab04583aca13b8af35fd724199210eb6fb99e30f83747b3ec6c3b4d76461d2f1666f5eca661f1e SHA512 0287f4f531604bf091dac066bf24b6c7a559886ded3bac8291a84f87725c0498f15627ff2484369c11d406505263605842c3fe75a384d926bd94986c68e1f477
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.2.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.2.ebuild
deleted file mode 100644
index fadf22c24f21..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.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
-
-inherit kde5
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-
-LICENSE="GPL-3+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep purpose)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.3.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.3.ebuild
new file mode 100644
index 000000000000..aa837c81e606
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/purpose-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index e99b8f9d5d4a..9af3f0e77a06 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-desktop-5.16.5.tar.xz 9556104 BLAKE2B 8e825692dc09897daa9eb6977991ae9d559284b066a662b4bd40faae575068866c6f82a7fab899e5b06312ae3910aea7ccd50ce895ea0371b2346f2fd69c4786 SHA512 7a4678928ccfd511746ceea53a4c31d15dfddafdeef3d9b169088a186ea1f5787eb3589ad5dbd3892b4669a7a833311da41795562fc94a58ac7aa2f02a741192
-DIST plasma-desktop-5.17.2.tar.xz 9451928 BLAKE2B 2150f4e3ee356f9461bb9226e567347b7d8dc4d285e7108005193d773162ac4704d1c3470f7c181332e247f6fc0291ef1b31707de93467753a6a21aff68febce SHA512 f9afca8786cfd9e0cc1a47c68b26634f8f139b91f42f77ebb33ebd962210b7c697ba7209f8d1950c0d80750f70c71c2b65661477e7bbb9473ba9045cf4b6a6fe
+DIST plasma-desktop-5.17.3.tar.xz 9445392 BLAKE2B 263b662a6b50321aa247efe2b10488ee9eb4d816e192528044b4c7a344f0f9a225c5cce5b475c3e7bfdffd517097ff4b4394ac1651d2043d0fab75ebbf27978e SHA512 c61dbbfba73e594b50e8da648629eebf0fae22793976d98372244a408d382b68212a2bcc976107c043d144c24ed3c6da18dfb0a8891284b7946fcbd720a43c27
 EBUILD plasma-desktop-5.16.5.ebuild 3730 BLAKE2B b2a889089af1ea98341e34d4a538d992b5461d539daf99e06abe429900217b99ba4e345c8f00d4258bab1c67dfe3dc613723e225a7d1c5050aea042a31fed031 SHA512 81daca50d1874014535d0b618c30e445c8ef154a6c06ca20a00754ee303df77f1911b7383c49f6038ade105e163beb272331cd9974a5437bf4398981da5ec9cb
-EBUILD plasma-desktop-5.17.2.ebuild 3592 BLAKE2B 89347bdd8022340d5ac4d068204041a85f8182a36bb8be48019b5d0ea24bfcf990617f5ac30739da770d4748b7ef9e05c5e74089340be6b5e86ba97bb371f085 SHA512 a9b7a81167bbf65c1811307aa2e9427a4e275eacf5856f3025aefc69f78228a49574c81c1fe3a0ac7f9a46bce3c3ccf8fd23b08419d18f182458dd2a9140ea89
+EBUILD plasma-desktop-5.17.3.ebuild 4043 BLAKE2B 9e1dc56d31332a4da173518813b13dfec6157d767c4e69e7b4e596454b924aa8c1ad7a8c0ef50bb4b0a1872bd9b8435067f8793739fff4ad81b4e4684dd82393 SHA512 0c2ea83de7a6584a3ac5363308e1c94564933d7e50ba89bbedf51930e08497cd08bd358c7acfe906a30c6a85bf78c29cfa23921346e34dc81ede761a1d33deb4
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.2.ebuild
deleted file mode 100644
index 9b1ed3e032ae..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.2.ebuild
+++ /dev/null
@@ -1,136 +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="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(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 kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(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 knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(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 qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		$(add_qt_dep qtx11extras)
-		app-i18n/ibus
-		dev-libs/glib:2
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_frameworks_dep qqc2-desktop-style)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols2)
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package mouse XorgLibinput)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.3.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.3.ebuild
new file mode 100644
index 000000000000..bec49dc77e1b
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.3.ebuild
@@ -0,0 +1,141 @@
+# 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.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${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/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${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/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${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
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${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/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbfile
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+	mouse? (
+		x11-drivers/xf86-input-evdev
+		x11-drivers/xf86-input-libinput
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/oxygen-${PVCUT}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	!<kde-plasma/kdeplasma-addons-5.15.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package fontconfig Fontconfig)
+		$(cmake-utils_use_find_package ibus IBus)
+		$(cmake-utils_use_find_package mouse Evdev)
+		$(cmake-utils_use_find_package mouse XorgLibinput)
+		$(cmake-utils_use_find_package scim SCIM)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+		$(cmake-utils_use_find_package touchpad Synaptics)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 6cc745353218..3e8a26e0e6e9 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-integration-5.16.5.tar.xz 55672 BLAKE2B a953d06cb13cb6c248124fbdeb8ed7e52d82bb8411e53a7c86b95c8e3fe90464f9e9fdc0a271a697bd95df0865ee7939f8a71d973b82bf5016b64c369a95ba70 SHA512 f974db9c85fb22e7dfeb8154d5c51c7106f2b95aeb783843701234a4b7186fd6b4be6298809d73b1a776399420a0e451908e5466aca622fd69800f0cfa2e3a91
-DIST plasma-integration-5.17.2.tar.xz 56292 BLAKE2B 42b543c0d7722d1434ec4ba89244b7bfc97b7bf367c1b47b259c050a23513dccee751bd0ac97e47fb297320eb50263d419ac294edc87d46cf37a66fb59d2cbd8 SHA512 dc0f636ab7799ca383e71c6d464ce01ce353c072c16bedc77a68970652cdef36b12ceb10f85287f22976ce47661442419f89a458ddc57110e3b8e253fad1f834
+DIST plasma-integration-5.17.3.tar.xz 56308 BLAKE2B bcc822de4a05279bf578c42e2201496a749fe2271517339ef896da2aa9f59f1d5ad6853f05b107d94f6b900aaf73f6520ebbb48daca9f066584896ee01cd08d7 SHA512 63d11f7f8d263eda6ab0e44d80a149711c2e5f3bcec9ed91ab808b70449bf8800ca9e6fc9bf46c058d9b0e295dcc55b47a33bb471c2fbec98d591ff686529fe3
 EBUILD plasma-integration-5.16.5.ebuild 1058 BLAKE2B d1d62b1350c810f7aac2f1d4666656b566f3e752e771a37f8edfafdc507dcd6249a2fe21fa90fe89fe61aa4b3506afd6a99ac5ec0fea843cf3c0859ae21b1322 SHA512 6762712e8391d4eb0d9812b14caa2009d5d9976820e417150ad363be69f04a19cca3cfe5fca4922b2c4763ed26f48635fac0f746f1cb25d5a4dafa864fec78ad
-EBUILD plasma-integration-5.17.2.ebuild 1061 BLAKE2B de6dba39b5478dfc17cfc75db01423227c38493b7121db0bc60eadbb32ef618ed4e465ad373b86e5e418db261e53f9b634e7b56c6e2e2ac3b8ea99f6fa6ff831 SHA512 acae6a3285cfb9813155eea32abb7593fcf80b547405de1e4603c7509df0078877df4e00c4d7aaceb74bcaba6b6df073214591e99328fc3cabcbb36714fa5bf2
+EBUILD plasma-integration-5.17.3.ebuild 1230 BLAKE2B 8b6e84e66d6bd77cde773056c266ec0c447690f3410f1c5512dabe562f6626f5693bf534dc22096fe5f1267a520e4f01ed69ed5a7d5e27ef679eda75314581d3 SHA512 ac992ff9ba749aa0bd08c6ac031c2c9b79211223f10371c4adc79be1cb3efdb23121b24ab91048a4787c6fa9dd6398e245483532e59c7f93838b59b993076f31
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.17.2.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.17.2.ebuild
deleted file mode 100644
index b28163426a43..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.17.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
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~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 kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep breeze)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui 'dbus' '' '5=')
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.17.3.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.17.3.ebuild
new file mode 100644
index 000000000000..157d1a7e3035
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.17.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~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/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 71ca226f6e37..41d14d3ea83b 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
 EBUILD plasma-meta-5.16.5.ebuild 3832 BLAKE2B 19e6f30fca31b3a3c77b13628497ff1ef48e5048c7b3bb59a4fb77d0dfd777d28bf792886ac34ceb3750113880a618c43e4459b24d63dce2a7b4437c2ee7d369 SHA512 c98d716c46660212508f411bc13c747363f06112338c981d98bf014c802689136ad2395984a1e2141154832cbc0d803898c709c5c2a064ce7e868f2fd7316b10
-EBUILD plasma-meta-5.17.2.ebuild 3960 BLAKE2B 73207243d312d2a90068f8035811018f7245e393675360bfe3b4a4cdc586e772236773b3f13998f9ed8b07cee48950ab18d18bfafc378316197bedb95e12bdaa SHA512 3888f71fb45319e2e22775b30433a12e0380e908fd800e15a9d7762dafa7b8151c78383d9a5e4b68af904a372d5b5b15135b3936eb76104129cb40e70da3a0c2
+EBUILD plasma-meta-5.17.3.ebuild 3959 BLAKE2B 3b66f061d9b277be401e521c9e7fa6fce8aaa528b207ece501753a7f79d3b6e178eddea63add9d3310588c0d1e580e98192d1d759b72c76e9b7d65cccd6f4ac1 SHA512 daeaa5129680707e358d9000b024adf10f5e426c11919b7636b6149db1b6c0c69b2a1104ef3d19ea3c28052cb3838acea3b8a3f79cdfaef5fe1e91a6397d6e5f
 MISC metadata.xml 2177 BLAKE2B 1d0ff2de7c1ab2df3ba81c26488c9304c9e36b660f7842e96e156772e5e54ea22b0c5c17c1fecf65ad6ab936b4c85d8686d8b902a828aa38b13b7e18fcdc8037 SHA512 44a71cd2ae64e007201eeb0bf9f4d6fe5d3b8eb623ba2413bee5ce1c6cbfe252de074fd86d6af213455f32f1e093a7d67cc612f49f09a4330033bc080c3b7c40
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.17.2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.17.3.ebuild
index 4ef623483cd1..fd2333e96884 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.17.2.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.17.3.ebuild
@@ -11,7 +11,7 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover
 +display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam
-plymouth +pm-utils pulseaudio qrcode +sddm sdk systemd +thunderbolt +wallpapers"
+plymouth +pm-utils pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
 
 REQUIRED_USE="?? ( consolekit elogind systemd )"
 
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 5a63cd213390..e6ce54581506 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-nm-5.16.5-missing-headers.patch 1515 BLAKE2B 96f424e990d6fb294693ddbf61c097ccfe6d94f96d59a1df2507b253b7a05547760bf83ea885fc101c1da484499e78a360758389fa897d5a2380bcef2a5e2281 SHA512 180cdc4eee90d2162bb651b5838fd212a33d8b9bb7d500647aa0fd0bc8f75f085939cc7eeadf1077a2bd43fd9cd44923b41c736b996ad440d8e3647b488ccb6d
 DIST plasma-nm-5.16.5.tar.xz 787892 BLAKE2B 030840885c35ad9a2d370fddb4cad6b593512b68a958d4f94677c42506ed5c6c184d8b391bd0a47a8bb9cc6ede246163035099abe0629e437b4906cbc5de08d1 SHA512 cc52ed0b1933d0c8c86bd3188ee77d155adc2392dadbc311daf222c4e0c4c4a484b6748e1f5d52b643cc7fc55db947aff0f0a4c5ef14742d4211969e65b85d3f
-DIST plasma-nm-5.17.2.tar.xz 813408 BLAKE2B dd5f14157bfa8af3bf14b3852304c1e03c2240a9d14c808465b8a719c86b5cb3a311ea35afed6b41035e4af09f16492a49d70acae96a891a3f67a2b3a031c3aa SHA512 5d43a214629929f0971f7340aeea3133d89e2809a257f751a23128b7447364040faae997eda4c7667ea77ad024e47bcf323d761dd32714a2715bcf16e69af91b
+DIST plasma-nm-5.17.3.tar.xz 810888 BLAKE2B 05db4c88928d5dbf15d91d4c2d54770c2b1e05f71597e03e0480be8dceed08412d50b50b10d6ba9d01728bd01fc77a19964ab3245d679bcc97fcb627032a321d SHA512 fe539f319a71a5df5c9ff7b319c781a94e2a41cb3393924d97933a9a9c1909c95862a6f8a5654527a70946f6b2796897f6388dcf9eb9f272121e56efc0e2f17c
 EBUILD plasma-nm-5.16.5.ebuild 2036 BLAKE2B 91a06b9fb2c589b874924c27254c81087ccf599e4f262b9933cd8298b6343aff33f9bce75b2e7d80dc788b80d7ba407b24914f43b823f8e5fb225b1a787170ff SHA512 b28fe576a529df8e26a428bea146c176d1588f46df51d17d6c30f8bef0cd343cb00ec582c41526caa9e18ec60a86c095c193189e72456de80aca877dbafd9fe3
-EBUILD plasma-nm-5.17.2.ebuild 1995 BLAKE2B d3295ac1ae08573f123eee4dd0508b9ddcfb52ea658b5df363c9de6ddbed8768f7ef86a46ab5e3ecf87d568adb504889a947dae649b4dfb248d66f541c80d70d SHA512 59ee47b72cc902835ee291114c179ac4e5e3f582f0b93405ceace28682e0f92f9ecff65de0badf10c0decc9b3000f79aa654ee2b0ad20c9edd9e0e84980979e0
+EBUILD plasma-nm-5.17.3.ebuild 2222 BLAKE2B 7bef9e3a628465793349de91495f54e53cd9f51c2abe7c067af5908af8d297836a558a2a23fca3a52c76373ca13cb891fbddb70bec43b2ba6c6d4a8e4a4d23df SHA512 a7db9bda1098c004b85b2416256382413ce98bcac819e6a9b5895ea7076fec15e009e8e8c57c47785dfbf5f4fb345c6c4206cf709fa801b01b70a4baea0e58b3
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.17.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.2.ebuild
deleted file mode 100644
index 2833ce552fc0..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.17.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		$(add_qt_dep qtxml)
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		$(add_qt_dep qtxml)
-		net-vpn/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.17.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.3.ebuild
new file mode 100644
index 000000000000..615d0f983c01
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.17.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	>=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/kdeclarative-${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/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=app-crypt/qca-2.1.1:2[qt5(+)]
+	net-misc/networkmanager[teamd=]
+	modemmanager? (
+		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
+		>=dev-qt/qtxml-${QTMIN}:5
+		net-misc/mobile-broadband-provider-info
+	)
+	openconnect? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		net-vpn/networkmanager-openconnect
+		net-vpn/openconnect:=
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake-utils_use_find_package openconnect OpenConnect)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if ! has_version "kde-plasma/plasma-workspace:5"; then
+		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+		elog "However, the networkmanagement KCM can be called from either systemsettings"
+		elog "or manually: $ kcmshell5 kcm_networkmanagement"
+	fi
+}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 89dbabd8e3ca..84d12c4b00bf 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-pa-5.16.5.tar.xz 101100 BLAKE2B ca09d7974638d6a730dd79794d167e5223ef13d5efdb63f9c0aacb288a873f9a769aaa00bc8253ea6cda293be2f6f0f84751528f426207d0a3d45f98637772d4 SHA512 393cc05b8999b10213fd608863d16f14c3d38fe8d82b01a1869bb37a4c8ce4d023deaac11a12a087f79bea5ffca9ff4e3dd846fd2ba195df8513e9ea8d3a8618
-DIST plasma-pa-5.17.2.tar.xz 103952 BLAKE2B 5da83dc6b03de9d46fc844febb1100a7242fc4663563d1975e01796b74f8bbf29705df51c620874be78fbfcc2fd91d1f103cee5f3be886c6b93caeef291cbfab SHA512 7c451b52678dc1977898503f55536d734856797ae9b5808dc19608dbef4102874f2895dfdf7a881ae0e6fb12628550f3fc2590ae98e024cab4c6ae1375bfb665
+DIST plasma-pa-5.17.3.tar.xz 103716 BLAKE2B 2652061afcf167f8555b36d12ba73ca00881d51e28ea2770f396349eae76000a49c7b68b4cd54ef2eefbbb80259d00489bf4eb8b41688e70986cfdf14d774277 SHA512 e7170a1260382d60a3a2554cdb3a5309f3eee20f23789585ded41a39ee778faf740cdff8cd46914c4fd7272da13b88469353c146790a027668042fa452c048ff
 EBUILD plasma-pa-5.16.5.ebuild 754 BLAKE2B f12dbdece99d0cfa597e9cbbd5b96f9ba0a199f2a51e14bd69ce2c5959c541a91e90eaa451bd616fdf6badef30b689f849b901c0a774a4bd92bee2933988d73f SHA512 53c8e2d9de5ae95ce06ece3b33b5f3d61680d8e639f4e082942d6cae99dbf203823fad641ffaba14848d9c44f470ff2155c4050b3ceb1d5045a5ec050ee4811b
-EBUILD plasma-pa-5.17.2.ebuild 757 BLAKE2B bb3539b4d519d0766c2f8dcf0e57893f9a1cfe23a752da06dd5bfb0e8f3527562c7db799bd6af6038089dc53af63cbf941e724ae969b057f9b34cc3a30b52fa3 SHA512 0496e13cdecfb82f7da72c0b44b16510f81166c8fa3ea23914fb1e2cd20b33f1881b5cf3a5ed1dd754c5b15d6086f65817e59838bb2ea9015466508d30dc5aed
+EBUILD plasma-pa-5.17.3.ebuild 916 BLAKE2B 7b4d30f362fbcd0c4c41861356c9c3cf8c34daa7846d9b58de4d4fa99b78702ef0614d782a125ee29c55b4d26022be1fc9e17350923137d3e2dabbcdb5d0782c SHA512 b2a9c271c70a8cb9a5d8078fcb7c5b4baa636c2cb27684d98519ac79fb505055f284ac15fdcc4f04b4ebef3171723994e9913f5b73ec3ec008cb3bf4dd839c22
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.17.2.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.17.2.ebuild
deleted file mode 100644
index 4da0d3e26d87..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.17.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="Plasma applet for audio volume management using PulseAudio"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-libs/glib:2
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-	$(add_qt_dep qtquickcontrols2)
-	media-libs/libcanberra
-	x11-themes/sound-theme-freedesktop
-"
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.17.3.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.17.3.ebuild
new file mode 100644
index 000000000000..ad02fe12f0a1
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.17.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.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}: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/libcanberra
+	media-sound/pulseaudio
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	media-libs/libcanberra
+	x11-themes/sound-theme-freedesktop
+"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index d4a885bfc0dd..1b9ea1248eb6 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-sdk-5.16.5.tar.xz 250148 BLAKE2B 29fad7533515756df87865cfd55b1531ba30de77eb52115475fe352ee9df12b144dff2e9bebe44b76f742e903f75edd7e91ee2b7a53ce1154f1b8143748a855f SHA512 95ed00eebe787ec36d68f47e01f717cb5929c7c15c89b33be5b8edac7c9c4d700af6b81c6353e1b5bc783360f542b8284b78706f4c4de398d10db1bcaf23e4fe
-DIST plasma-sdk-5.17.2.tar.xz 257992 BLAKE2B e080ab9050a674669befda1b113f225f140ac67a4ae95eb02e1fb422fc8fb5bf65e7c92f824387f2b6fd618597ccb397cfa242100699c8870c4c5b8364f00291 SHA512 c431f7736c04228a8bca398ee7e17bbf2d77c9824784aa6ccdc7d2bc07bcd5cef439dfd099da4db5296a83c455790abd8f783f68676ad8a378868c1fc41025b0
+DIST plasma-sdk-5.17.3.tar.xz 258560 BLAKE2B cad7095fb6076eee58b366bc452efa8fd46115253b8251ba638b9e59e1bf06d1507b80364768a20ec852fce945087fcc05587ebce073087096997a0be24d417b SHA512 1702c230bab00b8b68810371e6a2ff9c9b3bb99c304fc5e1c316e73404c67ec26450c8e0a87294ace5d7794020e330431f8d8cc172a41a2190886743786679ef
 EBUILD plasma-sdk-5.16.5.ebuild 952 BLAKE2B dc3bbcc3dde15d2dd670d560e1f528db474c979c79bbbdc4482d2e0a195f99eedfd99424249466181c837b231bacdccbc2630847c04cc097b7bad7b167790fda SHA512 572378e3210c1fd8793745e5dacafd8ae0df0dbd56c583334f27d58d53e889b735404cc6d023433d5a3d622a7868f7e32b3529cdc5b82a2956956e2dcfb50f97
-EBUILD plasma-sdk-5.17.2.ebuild 955 BLAKE2B 416777a1f2e77a4362238ebeb4fc6e19b74d23c777aec1440c23609500c808bf3c6ca837214d20b58278115e47db9438d700bd160bfd1726848dc993070f7bf7 SHA512 64b78163e0d3508fb7855b947b85cb02752619467e8c1b3d9de1f68f089f8311e2a11208b17f20106eebfa621b32d4dd9af2d95c5b6e38de8853f4e4f0a8a144
+EBUILD plasma-sdk-5.17.3.ebuild 1174 BLAKE2B 7d34a64dfa9b375ed9f57088851cf970ad3a19d0d3e64828c4696f50fef132e3b4cf4c161f8752160baa221ff8b3dfe6c05887f95ca4d4093dd23090958310ac SHA512 eba9813ec4f784563402043b0c1a60292f3b08954625fbc0c9bb6f15cbca0a80009e45e9cbf5c3192a3543d687c4328caf7baee2b918840885b46ab9aba4e903
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.17.2.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.17.2.ebuild
deleted file mode 100644
index 370965cfc720..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.17.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="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Useful applications for Plasma development"
-KEYWORDS="~amd64 ~arm ~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 kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep plasma)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}
-	$(add_frameworks_dep kirigami)
-"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.17.3.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.17.3.ebuild
new file mode 100644
index 000000000000..9ceb21c00c3d
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.17.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="optional"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Useful applications for Plasma development"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~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/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/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 7266dc661351..efbbaaef819b 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,3 +1,3 @@
-DIST plasma-thunderbolt-5.17.2.tar.xz 47024 BLAKE2B c6c6f22a15e969fdda0e0984157b931ad4eaf51ada04d956ee9b9c6742aee293a547f1918650efb5a9c5d33e3c3d14d53f4f984c3454b475521a3a948d5bedc2 SHA512 05c8cbf794dd202e6325391f835de48484301b841c9b8dfe9b1d37b1ae15268039dab64487ad823e32033c33dac772388586ad10f2925bad8d1efb2b639badc4
-EBUILD plasma-thunderbolt-5.17.2.ebuild 649 BLAKE2B 89d006ced36fbab6d1227d48ef9f39ee2a1beddcd36bb418f2b602320c4b5ca8760f78a008c80bec7cb6939507ab2eae9a22b9fae080bf3309e9a4b45c73928f SHA512 8f01d7182f8e267859d9f834f110cb89f316af700ec7e7874ea3a6dec800c1aeecb88171ef817dcfa258aaf4329cb2267c04561b49a83f21212ca3d59d35563d
+DIST plasma-thunderbolt-5.17.3.tar.xz 46736 BLAKE2B 317c5f355c4b0ead9b98a2947838f991ed9d80b196925489b10e9bcb55b9bf35b8b862e5efaffd1166ce65875b7f3ad8b7c71d7bf9d46599278b952bbafa3c81 SHA512 448afd8e8e4f26114872b1a1e09c5d093063c5f937b898ce41893a32e371689d111b66d6dc359f79bb4cea6d570c3d18bcbbf44d46ffa9d2ce30224f1b193a29
+EBUILD plasma-thunderbolt-5.17.3.ebuild 766 BLAKE2B d186169163238acad59af9827f53a3cddce633fdc377dbb8f9d4657d260fa74494afa2705e2ee79bddae23b1d1deca103bed274b0475fe7b9b7b745b70df6583 SHA512 0265b09d88b84d6b6577a2a3f4248f3ba95290d01e1740463e1152daae862bb0ad72abea966789f25a94785330450524768159d989e83529f3ce1876b3e22b57
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.2.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.2.ebuild
deleted file mode 100644
index b2bd661947e8..000000000000
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.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_TEST="true"
-inherit kde5
-
-DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
-HOMEPAGE="https://cgit.kde.org/plasma-thunderbolt.git"
-
-LICENSE="|| ( GPL-2 GPL-3+ )"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep knotifications)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-"
-RDEPEND="${DEPEND}
-	sys-apps/bolt
-"
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.3.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.3.ebuild
new file mode 100644
index 000000000000..b88fd3c29a25
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.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_TEST="true"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
+HOMEPAGE="https://cgit.kde.org/plasma-thunderbolt.git"
+
+LICENSE="|| ( GPL-2 GPL-3+ )"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	sys-apps/bolt
+"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 27d2ec992a36..8abced2a2a16 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-vault-5.16.5.tar.xz 127376 BLAKE2B 94f6360ab8bbff5210a516d020250f4fffe1c61bcaa579d4f9d4fad1caa15a2dcaf749e04919a0e36fa08acb28fcb614820408008bee8249397410e81cae847e SHA512 bb5d06af090b9659cf9d253b8469e3b7264d7a820c6bbdce7db414d3a8e5aef5dc1122d11285194afa0b2d1aff2a0a2dd8a74036674541abd7938d38521afbd5
-DIST plasma-vault-5.17.2.tar.xz 129312 BLAKE2B 5081ce01b61781e381c3a6aeba02b2f7d4a808a9ad9537d6ffbfefee43a87fc96597e3d260eb98d674ab53618a090d5805445ffcb3e677407280285c292b2295 SHA512 873ae2baba86a1a433c48973777926cef70cb436e04202f0fb5f3c132daa850c84e34c93477e17bed205a2eb8417091a05d3434df38652872729bda293d5cae3
+DIST plasma-vault-5.17.3.tar.xz 129208 BLAKE2B ae09487410c27a1b407b26febbb36346a00936ded2689a757e009bb7458708cfe796ef33686e069a10fd713ce4a793eba70ed06b6f1ba0370a7a451c3f7188ca SHA512 fcfdb37ab49c1b63d26efec0570a4f3f2162318206c3771824ba67b18461a1f96af0d94f54b4c53f308af081a8787c0c7b78a728be49e502d6168299eb8cbebd
 EBUILD plasma-vault-5.16.5.ebuild 1077 BLAKE2B b1438da912bef60253a671afd9121d7b78f7541645600730477bf1df40cf3b91923b7e873b6afb1590c363cadd06c6328e7e8f9d222743b92deb25bc13ec28d7 SHA512 192b5ef7ed418b69c4f687d3489a4cd51c5de7432211aceabe122992afe445f606b5eb7b3131d2900590c842fed7041b3da11ae6d8050e9e7ea20f6b44dd2e94
-EBUILD plasma-vault-5.17.2.ebuild 1080 BLAKE2B 3e12c53bf5ce48478cf6d3b88643de735e87bab5c385a2f09ebb40eb6385fd67e54216fd33ee14052ac8b1f821a10dd4de359b44f0921f0da10eaec8fd501c63 SHA512 43c76110fc2fd3b201ea3569621acfa0b0f3db82717be3fd8bae27d67b3336d0e1023b827313e693341a04385818f78c1844850d741e448132650d196fb84217
+EBUILD plasma-vault-5.17.3.ebuild 1238 BLAKE2B 8ac64e9eb9a923796d53e66a675c69a0397ec1628edae4babcdd050f39b83cfd1d15004200f11368337e6cc8c7b881a45b3b8754c56fdc9a73c151e01cef2709 SHA512 63b6cc585bfbe82940dc21e7d94eb917d7639944aa2518f8694b22491f5f8cf29a53375e7e2e25bc119d26b2d9abc4dda49f6aab092a905d05d8295657b24948
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.17.2.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.17.2.ebuild
deleted file mode 100644
index 2399168d9896..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.17.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
-
-inherit kde5
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="networkmanager"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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 kio)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_plasma_dep libksysguard)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
-"
-RDEPEND="${DEPEND}
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.17.3.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.17.3.ebuild
new file mode 100644
index 000000000000..923384509911
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.17.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Plasma applet and services for creating encrypted vaults"
+HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
+
+LICENSE="LGPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	>=kde-frameworks/kactivities-${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/kio-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index fe466a3a5526..fa62dba5a91c 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-workspace-wallpapers-5.16.5.tar.xz 34172180 BLAKE2B 8fe56bba584ed4c64035a81d6431d4c71a869f97fbd1b9ca9df0b53481653af475bab6d093e68c1b7ce6e4e6b5e40825caf6f1b0e2558497774aa7cb7bbc9be8 SHA512 88cda8d89371d0b8e689432656047fba1a83a15356b6007999bcbacfc4f12ad4f5d4323c89026ae50cd71298fd4d52ac52ac7c39a27d5f1109f51cf07b6f2648
-DIST plasma-workspace-wallpapers-5.17.2.tar.xz 34173080 BLAKE2B 66355c0620936b2ec7e23ab070db7ece599e8b695d47998f2f596360f73030b526a6d498269ffc8ae69b6b1da522ea845309a4cc2eb267e9f2dfabae55d4534f SHA512 b5051cf910092e8ba0d8e7757d7aced2509f2e7d490893134b4773d857f702e8288db537da23e9b2f48a7ce4de89740c57c3e2911ff5bfb29e80178bb1986fe6
+DIST plasma-workspace-wallpapers-5.17.3.tar.xz 34172244 BLAKE2B 6d1a9208b76ed4113ae4a4eb4cbfeafab6f685b1ff6e85861754b9bf962995fb39f7902c6ba85b8416034e089e3163bade55314401ab05c9feeec611de83cbce SHA512 528988795af8aeba7e5bc1aa5d361fe4efb053fe5d7f0ef65878135a77644bcaddd833092377739bddee74730e2b375b20fd2c8db3e6443252afc616c9f91af3
 EBUILD plasma-workspace-wallpapers-5.16.5.ebuild 352 BLAKE2B fc2880c1709d2536cd641f0834546470636e8939323eac5ac19e75dd9603e91129b82293912a06f695e08f3ec84d2eee79c5d49a594fe3a077b37395a32bbd51 SHA512 312a12f19ff9c33022f081630768e442a0f8d4440c7eb6b029d493003f0a18e8021030f930033a76f500ce2dfbf5d5c4d9b0020e86719ae2819dada1e12e224c
-EBUILD plasma-workspace-wallpapers-5.17.2.ebuild 344 BLAKE2B b62d00f61784d784f8de793203f235e7eb82d22730e4ed711283b5645bb2e9728d53acf2681e80a84ed4a763eb214ebe90093ca961f34bc0055cce7a735ba1e8 SHA512 a072d361bd6328af155991ea6bde4fdf3a2fe178ba858dbf261833428e2bf1a4da0890568d95cad70f9f307288bc986c402c9c20d341d53d1d2e777b1e0347a4
+EBUILD plasma-workspace-wallpapers-5.17.3-r1.ebuild 357 BLAKE2B d2222766224dda5591e6eadca3982d7c328f65da3de653f89447ac655ae85f13fc1cc53c830be743637ab1db151c6ddb6396aa4e57aeee65e36b4cd0708cb79f SHA512 cdbbc2dd80a73b5cd5f972efb21ee8e01742353a764349096f2ae7d1c9e76d70d5776e9c8db0e5a9c6e906c3af5ebbe7e34608657353e728f45ce0895c29a7a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.2.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.3-r1.ebuild
index 49be6cf39183..f57a44c91be5 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.2.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.3-r1.ebuild
@@ -3,15 +3,17 @@
 
 EAPI=7
 
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
+PVCUT=$(ver_cut 1-3)
+inherit cmake-utils kde.org
 
 DESCRIPTION="Wallpapers for the Plasma workspace"
+
+LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
+	dev-qt/qtcore:5
+	kde-frameworks/extra-cmake-modules:5
 "
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 8e8e719fd545..72e7bb29de5a 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -7,7 +7,7 @@ AUX plasma-workspace-5.16.3-x11sessionrename.patch 2435 BLAKE2B 3ec4c08af77f24dd
 AUX plasma-workspace-5.16.4-no-share-dataengine.patch 904 BLAKE2B ea9c8b6505e3bfd9b35a0ef02f4e6fcb4ba5ad011872bf3803ac12dd07115bceed58fce5d9a7b8042c0bd7c26a592561dc120e8f4f908cd352c46ff6f9d86db3 SHA512 bc79f69a50119d11035c0644a6d05281ea23ae29e662808a0a3384f3ec63049121b73bc1bb8c06b58c5b3f42fec8d5d45c9139e50466c628aa1261edb45b877a
 AUX plasma-workspace-5.17.2-waylandsessionrename.patch 2568 BLAKE2B 45be5b7221f60e6e1f2d449887f348f0462458ea25cc0559b4a48ca9e3726cd241ea6d32d23f61cc0ee755e1e7d42bda1ac8dfd454bf55bb69b53f3d60c6df7e SHA512 f36882781987e85b76bc2d2ebabae355f26d9579fe194fa32c3425c0fb8d4cabb6f7f34e8596026e0cedba5f65fc0036f432d91f6a20bf689938717db1e4f235
 DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369
-DIST plasma-workspace-5.17.2.tar.xz 4962148 BLAKE2B b1966e0db9fe9aa75bb934f7bb0f7b0cf7f6134cbb75926dbe86ff77bfb00888116c05aad070305e36498d7346bbc394cf42d9272ca8da79634a04bc008f949f SHA512 2c10f78de83d65e03a611f0928b28f723c71e2e9b02401c7e6b226bc7f5002119602d6344dca7c85a23ba3826e5f6f0b96057252a518bc9f8c0fa2931ac5f85d
+DIST plasma-workspace-5.17.3.tar.xz 4958180 BLAKE2B c61d919389c13cc281c4a48679c6fba615399732c4ea562a2499504d5bde0add33b6827fac9744322bcb06358346de2cfde974261cf540da892b524972c18b03 SHA512 8ae809e40cec33b5fa6e49986e234c5cfd0ddb964b62dec242b763475cab6f02dd089cf69d5e89a1f8e447108958ea13097df8eda0885199c71f67e6d5c10ea3
 EBUILD plasma-workspace-5.16.5.ebuild 4696 BLAKE2B 3701c3d0721a0ed497c7f5bf749be05c5b3071cb90b98df0bad2f0b2de0b7042b392ef7fb7ed4ffe60e4a2c08c206bee51e9f1fa49841110b78a655436acc93b SHA512 8a4ac267c2cb2207d1e44e970f88b7d33ee76282c94a2868584d836261021644b934be8ea592ec29aa5e4a0f144991b3545bfa0aebd7dc7cf3ba28bf4a20f663
-EBUILD plasma-workspace-5.17.2.ebuild 5024 BLAKE2B 2ddb46c48776a63741be3ab1dd0fe130f78b71b1aa19eab105e33c33d8f704d26fa65473c373fb044a90c7bdb676be7d677b4be391f2aa8d8702b8d2faa3537a SHA512 4e17b09a74e4b75ac80d4ac0369439fa367cbd8367fbca80fac828eb5d64fdd5a47a19a89373afa08a9c062d814472f53e3ecca93068791a3051a2ec6584b63d
+EBUILD plasma-workspace-5.17.3.ebuild 5516 BLAKE2B c2797c8ed2bae62a96e745ba810793561c8251785dcdc2f51486d6273783c1e505afcafc7404f2104fde1db84bfcfc870d611667c9397fabaef959b1288e4bc9 SHA512 795527ded7383d26a26caa8b2e22040a1219646e890b0b839ba67cec79537baedce4662d038dfc45aa732d26a869a2629ab21d525015b67169c1c343a11d882d
 MISC metadata.xml 643 BLAKE2B 28c9374aff890daac8a279eee05792f453a1e15b81d4e8182c3ff1bfb352e00859ede5792580b171615bc0af866fd8f5060486fb2fc3013d408a36343f78c2ba SHA512 eb5d1e325403d3f22422642b6d32a250f4450b06bf0f1275bc88b5dcae004ccb0f12bab318d36a24991bf2bffc590fcf7d43419d58e3d2bf9a396ed7e3f8778c
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild
deleted file mode 100644
index 1e58c5789d8f..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.2.ebuild
+++ /dev/null
@@ -1,173 +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 Plasma workspace"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kauth)
-	$(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 kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(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 knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( $(add_frameworks_dep kholidays) )
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	qalculate? ( sci-libs/libqalculate:= )
-	qrcode? ( $(add_frameworks_dep prison) )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kirigami)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols 'widgets')
-	$(add_qt_dep qtquickcontrols2)
-	app-text/iso-codes
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.16.80:5
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-	"${FILESDIR}/${P}-waylandsessionrename.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package qrcode KF5Prison)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions, do the following:"
-	elog " * Copy the necessary files to your home directory:"
-	elog "   - cp /etc/plasma/startup/10-agent-startup.sh ~/.config/plasma-workspace/env/"
-	elog "   - cp /etc/plasma/shutdown/10-agent-shutdown.sh ~/.config/plasma-workspace/shutdown/"
-	elog " * Edit 10-agent-startup.sh and uncomment the lines enabling ssh-agent."
-	elog " * In 10-agent-shutdown.sh uncomment the respective lines to properly kill"
-	elog "   the agent when the session ends."
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.3.ebuild
new file mode 100644
index 000000000000..617b12bc63c8
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.3.ebuild
@@ -0,0 +1,179 @@
+# 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.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma workspace"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd"
+
+REQUIRED_USE="gps? ( geolocation )"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+COMMON_DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/kauth-${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/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${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/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kpeople-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${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
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5=[jpeg]
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	appstream? ( dev-libs/appstream[qt5] )
+	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	qalculate? ( sci-libs/libqalculate:= )
+	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-apps/kio-extras-19.04.3:5
+	>=kde-plasma/ksysguard-${PVCUT}:5
+	>=kde-plasma/milou-${PVCUT}:5
+	>=kde-plasma/plasma-integration-${PVCUT}:5
+	>=dev-qt/qdbus-${QTMIN}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtpaths-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	app-text/iso-codes
+	x11-apps/xmessage
+	x11-apps/xprop
+	x11-apps/xrdb
+	x11-apps/xsetroot
+	systemd? ( sys-apps/dbus[user-session] )
+	!systemd? ( sys-apps/dbus )
+	!<kde-plasma/plasma-desktop-5.16.80:5
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
+	"${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch"
+)
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_xembed-sni-proxy=OFF
+		$(cmake-utils_use_find_package appstream AppStreamQt)
+		$(cmake-utils_use_find_package calendar KF5Holidays)
+		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+		$(cmake-utils_use_find_package qrcode KF5Prison)
+		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# startup and shutdown scripts
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/10-agent-startup.sh"
+
+	insinto /etc/plasma/shutdown
+	doins "${FILESDIR}/10-agent-shutdown.sh"
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions, do the following:"
+	elog " * Copy the necessary files to your home directory:"
+	elog "   - cp /etc/plasma/startup/10-agent-startup.sh ~/.config/plasma-workspace/env/"
+	elog "   - cp /etc/plasma/shutdown/10-agent-shutdown.sh ~/.config/plasma-workspace/shutdown/"
+	elog " * Edit 10-agent-startup.sh and uncomment the lines enabling ssh-agent."
+	elog " * In 10-agent-shutdown.sh uncomment the respective lines to properly kill"
+	elog "   the agent when the session ends."
+}
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 791645aa6b3e..69ba1f7ffd8e 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST plymouth-kcm-5.16.5.tar.xz 40180 BLAKE2B e30bc3b3ce93ff6338470de3121bcbbbf499b3f353c7f6295d4c8aa142eedf0541c0a84970d630074008c8fa859ed8754d320c137220687796d31f4413339083 SHA512 9544cd44cddb5736b38be649e61bf0ed0c7553ac0fa8e7de978e297cfa3d0046339832937ee8ca2e83f610b5516b90c512ebaeb20a9c66c7ea47fb93c1d3fd36
-DIST plymouth-kcm-5.17.2.tar.xz 39700 BLAKE2B dc24549e0198273b98a30cf9c828539cd2a828c657bd6141723434b93407675bc75cadb0b2619b1e4ea9d6bcfae246ff8b97416ec314c69254dcd1dbdbfe1b79 SHA512 ab949b498ae035cdbbaa030d7aa95621b17f2208fed93248730b6a9fc711951f793eac73aca64ec19ce6b4e583d9f5b76ef5bb47ce735614d185110457366a62
+DIST plymouth-kcm-5.17.3.tar.xz 39632 BLAKE2B 52f9f6d801d9cf32ffb1cd3a745b13a8f12170dea6ae7ecb1c3fdde81d3b1f8d773c241d3e23d54c3bc7082bcfc5cb9a3d6e7057deff0962b4000580d58f3fac SHA512 39b746625c6451ffa225f5a1e0c19331cfe60422fb8193798ffd6dbcb77f5a0269f6a978daa63611760b2220124f4264a2c13f402067e55f9c4db339cda41638
 EBUILD plymouth-kcm-5.16.5.ebuild 799 BLAKE2B 9860b4921f67b4fceff4fdee47b6f1e056cc567ff545de71c2e41f979e291a702db009705cd2f26f6c25263200cb350def1fd1f0f2e8838b28b8a25ccbe40835 SHA512 c53bc03e8707855afbeab7a4f73e0df4a43e553fba3c9e438ca33b7c4429166e0520ba9ff3e76cef2777dc17bc3874c825ef710277b44de1d57f883bd9e52524
-EBUILD plymouth-kcm-5.17.2.ebuild 802 BLAKE2B 4562d806b1e4922fc795bd504b96fa7c1cb478821f7beaca2480366a953783c084162671a6038de9ca019ce9e5b63fdb6e1f4e5c34118a8fac3ef533e03ba53e SHA512 4b67c4ae1e598a0e14d53a9be383af2d2aeeffbb73a8eccb993471aef07efda8540497b4469b817f105e6b39a9323266b062fa43a00efd7357994787461bbf77
+EBUILD plymouth-kcm-5.17.3.ebuild 949 BLAKE2B 6e16f1a763ada41a5212555fa66d33a5aa2297f573747889a6cd4f9de94ac959d86cbe494923f95680eb03e647b3482bcfca632f8e73fb3ea951dcfebe85a098 SHA512 f0eb68ba3290191d608eeb1edd917659843cd2662f808a40244b8afa7c30ac6fd86257502ecc633673e195ecbb34ccb1b9a886ae7c78bcd3e07809e5a8f262c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.2.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.2.ebuild
deleted file mode 100644
index f22846300564..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.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
-
-BOGUS=1
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtwidgets)
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.3.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.3.ebuild
new file mode 100644
index 000000000000..d390caeb19d5
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BOGUS=1
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${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
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	sys-boot/plymouth
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 5874520a98a7..91823b481e7e 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-kde-agent-1-5.16.5.tar.xz 43152 BLAKE2B 689a070fd1758a52b97d8865fca3c87603653c6029d90631c5be7a81df652333bc1ef13b80bad220de73030c5bc23d4109335e2609b535df2f9e6054fc0f02d1 SHA512 cf5ba2318ce69127af031abe16ec4b61f69ce0075ef05d6b68b9bf21b9c911a687393d6844cc1a755a0a859a2fcfe8390f6d58e468240a8d1d909bc027692dab
-DIST polkit-kde-agent-1-5.17.2.tar.xz 43268 BLAKE2B a161a8ef27fd77572fb8f461264a11ade983bc1ee9b9224c544f86125ae96dd68b670deb8bbb280b3be0857e5c3e2b0e176b41a5609d2ed3276c57f204abc618 SHA512 092bf345de3c3e64fd74dfd099751eac7726e927f42975fc1b5f18bea16f248a06c505f221afaa40d9e7b7d25df1dfdfce8a0a359bcb71613148cd6cf31bec9b
+DIST polkit-kde-agent-1-5.17.3.tar.xz 43076 BLAKE2B b7803811eb59b2a338845cf6c758ae911e2b3eb1c76898669a25563bcd2b1c589d373c1f52ab3d5d1838d1c6c36b2d05def2a4a2cc109c15b51e45e7f8e020d8 SHA512 0a83919817a74c85e5acd1f765e1162207fbec1e2728d124790f5fdeae8c01b9eba708fc898afc13e7e8597ec544812fb73174015874d2ee0c08d035fac591ad
 EBUILD polkit-kde-agent-5.16.5.ebuild 638 BLAKE2B 1419ae15608a79c9cf0b6f9f57636f199b7038869fd3638102280c214966c76c1588c898f88040346854f73f8ebbb8dda40caee1f373f0279701873cbe09c7f6 SHA512 c359e8a9db5e8611ad2f1fbfe9cb9d42da2bd13b8422f0759af7af5e7a285e0aa2d1b473d06c41fa11ca555f77aa0966ec83d8d325cf6d062a801119ba3b09d3
-EBUILD polkit-kde-agent-5.17.2.ebuild 641 BLAKE2B 0c9cf84ffd74210e0cae963299a907aeac85d3720f60e0c07a0f1fda52363762df1ae5e5206997f5790f823567581e00e0315bf0ca8df515b7661c5021bd6cba SHA512 09be8a6b2a2fdff05387237c80ff23382000d1a92a431de89293d89df4f8765b1ce7553c1bc9024935b0dae1104b4e2cabde404bcd831ef320854fbeb58f98fb
+EBUILD polkit-kde-agent-5.17.3.ebuild 800 BLAKE2B d5f58270f6c348488ea7671fde882feffc57081a2261ab60660c9426e62a54e84fc96647585c82a9a42d8512ab8bef7c387b713eb02a8bb35a9d4981cc9bab5d SHA512 66d7bea3c884520308dbd051d38b6b5a1ff4a8a0e33f19d0769c771e6cfbfa17a2d758c825f9d9abfb49f14a7a7d5672eecbf7d8b070d851f59bbfb374f0ed8a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.2.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.2.ebuild
deleted file mode 100644
index 3a7ae6ac0aba..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.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
-
-KMNAME="${PN}-1"
-inherit kde5
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://kde.org/"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(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 kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.3.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.3.ebuild
new file mode 100644
index 000000000000..aa768daaf33e
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-1"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="PolKit agent module for KDE Plasma"
+HOMEPAGE="https://kde.org/"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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/kwindowsystem-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 62afb2447d9b..580177f5a399 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,5 @@
 DIST powerdevil-5.16.5.tar.xz 590400 BLAKE2B 8c6286d9b3f59b0a66cbe6955848bce2b4bd288cd88ef564dccf3fc20a57399e2758d5c2c497155032c6af90ace0faa23f47fad62b0283462c6b0e84a5773423 SHA512 26e08324d25f099636309cd9bbabf4a5b7f8eb3a86bc0db8a9973169c00687063c031117aef5e75959b319eaf4d0c60688ec8acead936eec8a6653b242a82db1
-DIST powerdevil-5.17.2.tar.xz 594556 BLAKE2B af3da638094f2b146bd082f2fe86622a298134758cf52d394b90b638fa158349193305f26f31ebe64eb541ceda65999a23b1461025d38597916736ed73b38cbf SHA512 c6e243cd1372ea60ced72ba8c061e997977ca6d17ec39116ed9643fdb8b3fb488cd5594fefcb06f17543c2e0258018863d4c765558cb9479ec1f108051925ad7
+DIST powerdevil-5.17.3.tar.xz 594324 BLAKE2B 850a6cf162fa974e294c3790065f50d74db05937618d35c84c8f742537462a99db368d3ab36bb596e699dfea976b4f8fbbef6f837b43fd61c54f0988ec10a3f9 SHA512 830a49fc3846101d1338a03a5d58a5add76ce3df9115f2c3564799b0705721bad533fd9eb64ba14c6b4a5fbc3de928d86c2b7479c4cf6b94d3b9af70392bff1e
 EBUILD powerdevil-5.16.5-r1.ebuild 1610 BLAKE2B 717de4ec5ce099cde256e3b0b5ae006ff7785376272288164472db755933da5ea348fbebce56d6113c09462185888e2d1c41039a8dd37bf402552779ce403a70 SHA512 9e08c8dfe31b9fbfea1d0e6b11f33ca43b1fe5fa0d2b3b0bfccfb67cf4c077a6013439a0f8aeca962bd7e572dc91c90081cb5ae008bef806716a15ca11928bf8
-EBUILD powerdevil-5.17.2.ebuild 1613 BLAKE2B c67510ad6fd43ebea3626663533a77b5e1ea3cbac8e919cc954a8ebbdef9444579e9e2f5553234dfbdf6161bddfb60b83fd1d4dd1bb75d950bc5662830c7e887 SHA512 7b820a179578f987a8b4d41d76cf0946e26e42bd04728edbc9e945cfd9b4bf9573cff79b4e58bed96f806484307b4c3c832e80cf9fd65cad9126d5d275fab326
+EBUILD powerdevil-5.17.3.ebuild 1874 BLAKE2B 6945fa1763426aac938cfe7a085a0e85fda5ba63dbb178148121fe9807d72ed63b71f8beb504bfd6290b32500db77270f3920b910bd42b600632b23d3dc228bf SHA512 41fd0982913470dde605b91abf852f8f763ebb0fc87dbb67c22f87d31584061fb347120db4915bd0a2f4fc631a903027ead00a6e376806b66e12d095fa24e880
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.17.2.ebuild b/kde-plasma/powerdevil/powerdevil-5.17.2.ebuild
deleted file mode 100644
index 2179318d27f1..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.17.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"
-inherit kde5
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://cgit.kde.org/powerdevil.git"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth policykit)
-	$(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 kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep libkscreen)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	wireless? (
-		$(add_frameworks_dep bluez-qt)
-		$(add_frameworks_dep networkmanager-qt)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	>=sys-power/upower-0.9.23
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake-utils_use_find_package wireless KF5BluezQt)
-		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.17.3.ebuild b/kde-plasma/powerdevil/powerdevil-5.17.3.ebuild
new file mode 100644
index 000000000000..ff2c50996e51
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.17.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"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://cgit.kde.org/powerdevil.git"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="brightness-control +wireless"
+
+DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
+	>=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/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libkscreen-${PVCUT}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	wireless? (
+		>=kde-frameworks/bluez-qt-${KFMIN}:5
+		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=sys-power/upower-0.9.23
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_DDCUTIL=$(usex brightness-control)
+		$(cmake-utils_use_find_package wireless KF5BluezQt)
+		$(cmake-utils_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 0d5e873886d0..cfabe93dd81f 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
 DIST sddm-kcm-5.16.5.tar.xz 62164 BLAKE2B 67e404f8c111f5bd70dfea6f495d94bd63cc702a8c3cbe76c129c21ce320383bdd07d2c137dc6c85e02744f2d1659083914829390d73cff19d72db21cb9dbaee SHA512 98178c96ccf2405b1811a896053ed1ae371f4e52f0a5c7db6016a506498be1a0eff9c4c6030350aaafe4d9daeacb9386be8bd79f2b80abe1114d098bb6eddbfd
-DIST sddm-kcm-5.17.2.tar.xz 58824 BLAKE2B 419aec411e97f2ff46f22a6f78194e40a468ad9cef72bda40bcded8557018051b0fe0d708899520277e661b0d481b965a51f18dd82929dca34414bf94bd99f74 SHA512 c31c5cff36477fcf1ed8707ef1c214b61c7c42452b6c470205ca49a0fbe7d9a3cb8c1d9ff6e2dae8b1de6e27f94aacaa705c363823ea56ad8116b5e8a0212f14
+DIST sddm-kcm-5.17.3.tar.xz 58680 BLAKE2B 94d029265fdf986cfde4311a4d644c5a9b279d0ce06dcf63a479d809826464e0a1be25825ff203625fc951edc0479ab50bbf57d2a3eb340d2416c59282602b80 SHA512 4bca36de732bab67520478472cc1779ff428fade780dcf20ce93a51cb3ff3334f316a5f68bc2c16340bc7fadf45fa74561d9bab2f2c6eef228ecf34a1fdbf07d
 EBUILD sddm-kcm-5.16.5.ebuild 886 BLAKE2B e23150a39b9958ed42d574d19bcf2e7bd6be18425d4fdde741b4c9b4eed8ab7373bb816c6d028e2e21fa2a9d539560324785538f4ec881b668e42682a098fb2b SHA512 f1dc68580e781468ba23e3bc69d6a4fd885b0d5380faf073a57a5c17cdef696aea8569afa5eecf1fef51dceb4b62156dabfb2fe492cf72b5729833f0111ceee9
-EBUILD sddm-kcm-5.17.2.ebuild 763 BLAKE2B 04c87c509122ff73971fcf88acd5ae66b0fd1ed85b9c5b3eaf5b63fe51090b7c49e6add3cd3b8ab9ba13fbbb747d562811cd00ff47790dccb7ad3e04280bab42 SHA512 e617471aa585f125d7d4f29c754886fce663a220f2e115c681de664cd9e4bdc658c36fbade99a2042503cc729772f53502e4aef9eec09449f127531ab56c0572
+EBUILD sddm-kcm-5.17.3.ebuild 903 BLAKE2B 08bbc176b60fd7b2f1e24592348d3c92c81ced13932a3657cfdf5baea7585a4e2064cbae71a2722eac256bc496d81e2a1ac32e186c1a6b8439abc779340ce4c6 SHA512 e6c2886993bf9ae8ca0c4f3321f568c503ad6e74198109a9c092ed835818bd72f3d7a189027ea80da1d54dde105322dbf0e4fa0d852f149bbab4692481bad2f9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.17.2.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.17.2.ebuild
deleted file mode 100644
index e2fcade9fd19..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.17.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
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	x11-misc/sddm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.17.3.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.17.3.ebuild
new file mode 100644
index 000000000000..81512ea852ef
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.17.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	x11-misc/sddm
+"
+
+DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index b720a866ade8..11eb62396e69 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.16.5.tar.xz 180252 BLAKE2B 75860a6aad43dc2804cdb4eaa649dedeaba9fbb3d5a78bb4c49309e2e452cbb08b29040426643d5a07ff904041787d72ec0e924b4e0b81b5ad17aa0599139e8e SHA512 b9899ff13a16fcc59d3daf47d327e2711ec544c672e61ac875a4cfb02716849d735b8aaed20e4e38ac5f8f9f926ee01065d2d2d6db76f74e72ad5333c96cfb0e
-DIST systemsettings-5.17.2.tar.xz 172696 BLAKE2B 9b51ad230ba82a9191c96f1df91947b3928f0f7ef81c01609712dd6c62f4709a4e298c74593b6b5a60fb2a4a1f66add67476d3c9f7a9f08216ea6a18e5024d8e SHA512 5986be8af85472c1c197e09238d36d91b13e2e2c48330f6ebc951f718d51d524fee0c8c2bf1f73268fdba0e1819e4c8756a8b957e94b15be0211f40a8b4d34a0
+DIST systemsettings-5.17.3.tar.xz 172544 BLAKE2B e9789d4e53a949c34661b9ee8f5334061de7b8dca1c7919392679658ad3d4d92c169d01f058b8f0e9ceff27605cedbc0b4105657f024e394e425fb83c69cc458 SHA512 0f4b4c9f27d9df72c4c35dbe1e22ebcd495a7cac796e8a9f0892445df14b45cf819633bfcb448c409493629bda849b2203439b7639b76d9ae566fab158a1222b
 EBUILD systemsettings-5.16.5.ebuild 1411 BLAKE2B f7bf5ba22264ec03c07bf296dc0ec0d75cc2261aabde796fbaaf400b24177194b56251c9124b6c560e2a3a5d20007a86f07a16d72c0d6853aababb084bc449b3 SHA512 3c161149e19a792559b360a7b5863df3b87c5c30795c035fe94e36fddb633ae11453ea3f93545440d7966654269fe3add7e38b51dd8411793630c2614e089d39
-EBUILD systemsettings-5.17.2.ebuild 1533 BLAKE2B 7eea00cbcb2bfe2488a3c0df4442dc87a4bf6b3a8a8fbe35ca54b7e18b8ebf7a0adb810a546b0ef5b855d18ebdb84c9b102df0e511ad4dcc0045c9fec3ef7872 SHA512 80d4843e7c91b0413765dba45ea5ea49ca68117fa2ef9ad748087816c8b672f0b514d46920569e3100ea76b32be7d58264ff90e13cb6303742142a98b899486e
+EBUILD systemsettings-5.17.3.ebuild 1779 BLAKE2B 310e7d380a701dfc76cadd300a53f0ab725368a5aa36560d38bdab9ebada84cd79eb48fdcd9976630d043f40d421740230b6b897a8213296c2841b503010f261 SHA512 70eadb859f82d134504e848425a8f9cc8009f6811f89e6d115d7c397dfb5b792242a1f70b5668c50547aa079ebaa0e393c6984247df8ffd4da0f3d4ac0c02d36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.2.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.2.ebuild
deleted file mode 100644
index 322169a1d4f0..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.17.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="forceoptional"
-inherit kde5
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep kauth)
-	$(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 kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/systemd-kcm
-	$(add_frameworks_dep kirigami)
-"
-
-src_prepare() {
-	kde5_src_prepare
-
-	# FIXME: hangs in chroot; similar to bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
-		-i CMakeLists.txt || die
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version kde-plasma/kde-gtk-config || \
-			elog "Install kde-plasma/kde-gtk-config to configure looks for GTK+."
-	fi
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.3.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.3.ebuild
new file mode 100644
index 000000000000..54ffd396b902
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.17.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/kauth-${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/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/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/libkworkspace-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	!kde-misc/systemd-kcm
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+
+	# FIXME: hangs in chroot; similar to bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
+		-i CMakeLists.txt || die
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		has_version kde-plasma/kde-gtk-config || \
+			elog "Install kde-plasma/kde-gtk-config to configure looks for GTK+."
+	fi
+}
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 528bf5de73a2..64592a477ecf 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,5 @@
 DIST user-manager-5.16.5.tar.xz 547036 BLAKE2B a7fa24996e5e2f30c85f70301238359736ad1b98db00dccc96c669afd61512805ea81f0a015e47d1292dc053fd0ec0b8928a65f09cf646bd330521e9cc1868a2 SHA512 4a99446165ec06606752a388979caac367addc2e5f5e899a1d91665c632db04d073d91d353317bf5fcb5684966e65ca614f4e9582b11b7641e774dd6d49c57d1
-DIST user-manager-5.17.2.tar.xz 2163752 BLAKE2B 77e99c1879f017341bbe987091203d2f337a90c5b190313895385593d2b6195e659edd6068fef111d5f958fbd902c2399ef3b830c71042423ae9484c3a1c9e30 SHA512 50d00e70ad1a222c73b9a035bdd48506e75825875d8ac7be848da3ebf66a972b5ed0bbfda2c727f1970f4d2ee17b581259b94ff0a6ab726ac33772c8b6aa991e
+DIST user-manager-5.17.3.tar.xz 2163632 BLAKE2B 7d8207854648d0457525fd1f326c908bef33df0433f8cb95d5d957a926075b17aa3959c3105591241bfdac8002b48ace3d34de3e824b53ecc8df6629964ea879 SHA512 5d9f124266f4e72f8114c613bc122cc08deade610be39f95548d43b6f568354aac40daa540b43ea674dd01c2bebb0ad777007246a6f4570b0ce76c87937b44b8
 EBUILD user-manager-5.16.5.ebuild 698 BLAKE2B 47ff0768c259489898cfb2c38dc9597f0fa98c058c6daf70fce8ad4b033e2d230df2af6ec317770a60585fac97f3003bcff051c182380f876f6bb5c95478a5f6 SHA512 0de5e8cb97e348b07195f1e6780d688fcd51521a47a810dfcae8eb87ed2a07d8778963b6eaffd692c2168139f33660b0591e12c7f6feef6b90d2ad66e6435191
-EBUILD user-manager-5.17.2.ebuild 701 BLAKE2B defe57c9c19dec67b10a08ec033c69da01a059227fb8e6a2ad67c1b5e7eb1629bf1ad2cd85d4ffd6e4ff8ed71ae3ae28b65d8c8bae6c5d5c82dcb62ee0447d08 SHA512 9c7ac4d55f49829bca31a7f82a416dad2a9d1744bd35401637624a783c3c63184be551ff8f5ab619411ea670539f80b89439f59af17b52a67e094f4202e5df97
+EBUILD user-manager-5.17.3.ebuild 866 BLAKE2B 803c08f7780890922b3ff21143406481deb1172367e355e92a50c66df57d1d743377f7b96b7cade7a857d305f20b8e0665240269bd92b6602a74f8a668116f40 SHA512 9d1027f6d77a9c29a24a39b5f329b673a529b650481aa8a26e5fffa77021149ca1a9e8b009349b956ecfd9fcd7043ef75cb9d348385f4792a5335daa4342bbd0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.17.2.ebuild b/kde-plasma/user-manager/user-manager-5.17.2.ebuild
deleted file mode 100644
index 20a0bceeb947..000000000000
--- a/kde-plasma/user-manager/user-manager-5.17.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="Simple system settings module to manage the users of your system"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(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 kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}
-	sys-apps/accountsservice
-"
diff --git a/kde-plasma/user-manager/user-manager-5.17.3.ebuild b/kde-plasma/user-manager/user-manager-5.17.3.ebuild
new file mode 100644
index 000000000000..ca0484843177
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.17.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Simple system settings module to manage the users of your system"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=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/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-libs/libpwquality-1.3.0
+"
+RDEPEND="${DEPEND}
+	sys-apps/accountsservice
+"
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 96775be24643..266cc06b53bb 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-kde-5.16.5.tar.xz 61576 BLAKE2B b9d186e3269aae6c079bae8abf01e790300da5ba255ecaa37ca2b139bb5c017f0cc118adbaca8d4f846cfbf5d563d574cddca4703e9d917f7001468b27734db6 SHA512 381298cc001795902343512f8bb08c363acfb6e3ef398e0f170f305572ca9a5caaf458e85b6f48ac84bcd963a34e535c666b0ddc1bb910a894a8b8de8801467e
-DIST xdg-desktop-portal-kde-5.17.2.tar.xz 62924 BLAKE2B 20fc2265a162c420d99b82dfa8f170af4ad57442a30b60408a5d5dfd65742bb9fb76012afc55b6aba742cf7454fe381a25714991001963d5e4aa1da602f36f84 SHA512 45578698500bb67f3437380bba960204808b257b819c7579e7a0e8ad3d9eefb1244b5709a142b472fa8b0061032137968700d2f9bff5cdf74a97e977c4baa09f
-EBUILD xdg-desktop-portal-kde-5.16.5.ebuild 1197 BLAKE2B 8e3e1bc58993f65e68c12eb322d6836b9c9a72ef39169fdb19485ccec9dde8318de54c1a39ad769e27fb157f0fd915b67088b42904e635ecc5128112f0096f69 SHA512 96f8b405ebddad130141e7ef0329911f2d910559b30e13c963d0c89b20e5b4ab8d15b7d325bc9a92f77d1a824a6300fecd006e6ec27700e610fa8930251a170e
-EBUILD xdg-desktop-portal-kde-5.17.2.ebuild 1070 BLAKE2B 7ce44e5998e78c3c8229bf6d518ad5efc00c13b9000a4be6b1522f13d1e865bb27c917426153ad0ab705637d6453a627856d0f98cfcdc3d3274079458648ad99 SHA512 b2a4c1040abfc88e2b57c4d91ca3a3d01577e278753ced74bc02e4cfded5ad6ed9701baf1b1b5fed41afa2bbf4f5f5252d7cbe78a2aec3fef61f27e9a72a8640
+DIST xdg-desktop-portal-kde-5.17.3.tar.xz 62468 BLAKE2B f165693149556945ad56f24a543cea0fc7180fe4e308948d94bf3425a06481ce406da0949d1ee9cf5a6e9807659182d144a3d3cd384353bdc2ebac020cba9efd SHA512 25ee62fdf24d52384b9ca9e3dca11bde9da019f4bc175d95e881e79338b5f1fb15d7e814e0b355e1cc30c4eed0dbcbd02a551566a37e4dd9311449fb591f439f
+EBUILD xdg-desktop-portal-kde-5.16.5.ebuild 1172 BLAKE2B 94b41e6e577a19f43b3316f92ab6061ee94fa37685236d5a2712ccec8f695e9b858828c8f3ec5a5adf013bb6d0a112584cc9d1a5fffbb248732dff23b3b26e0d SHA512 823b7e52915a5f2125339773f8734d13ac3a3c914eef07f153dec4752e63af50540856a3269dc653c812e031303912abd9850bbd5e0ef200f10900ad9de34b65
+EBUILD xdg-desktop-portal-kde-5.17.3.ebuild 1172 BLAKE2B c8cedc3ae0ca27e1c291f41ec0680df4b575de6a8a6b55053552a7abfab3ab4f655d7a101eb014ad18621349a46a5d5131154a1428382d9e94137b631f437425 SHA512 545d213cc106a499b0ffd04f3987462668016c88c9d882782a1492c28f60f278fa2c4c99bd8949d6dec4bc92617c3ca5d7cb94e8af3368d5bddebec2c11522be
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.5.ebuild
index fdeaee1e2136..f728d449e5a4 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.5.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.2.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.3.ebuild
index c388b6f4f5b6..8e1ee48ce2f6 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.2.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.3.ebuild
@@ -3,24 +3,27 @@
 
 EAPI=7
 
-VIRTUALX_REQUIRED="test"
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
 LICENSE="LGPL-2+"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="screencast"
 
 COMMON_DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport 'cups')
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	screencast? (
 		media-libs/libepoxy
 		media-libs/mesa[gbm]
@@ -28,8 +31,8 @@ COMMON_DEPEND="
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtconcurrent)
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/xdg-desktop-portal[screencast?]
@@ -41,5 +44,5 @@ src_configure() {
 		$(cmake-utils_use_find_package screencast GBM)
 		$(cmake-utils_use_find_package screencast Epoxy)
 	)
-	kde5_src_configure
+	ecm_src_configure
 }
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 0337086e55ac..0dcf71897059 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
 DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369
-DIST plasma-workspace-5.17.2.tar.xz 4962148 BLAKE2B b1966e0db9fe9aa75bb934f7bb0f7b0cf7f6134cbb75926dbe86ff77bfb00888116c05aad070305e36498d7346bbc394cf42d9272ca8da79634a04bc008f949f SHA512 2c10f78de83d65e03a611f0928b28f723c71e2e9b02401c7e6b226bc7f5002119602d6344dca7c85a23ba3826e5f6f0b96057252a518bc9f8c0fa2931ac5f85d
+DIST plasma-workspace-5.17.3.tar.xz 4958180 BLAKE2B c61d919389c13cc281c4a48679c6fba615399732c4ea562a2499504d5bde0add33b6827fac9744322bcb06358346de2cfde974261cf540da892b524972c18b03 SHA512 8ae809e40cec33b5fa6e49986e234c5cfd0ddb964b62dec242b763475cab6f02dd089cf69d5e89a1f8e447108958ea13097df8eda0885199c71f67e6d5c10ea3
 EBUILD xembed-sni-proxy-5.16.5.ebuild 937 BLAKE2B 6473e8e3eab0f3bd10a1d074ef32929e1f4a5f9e01ea48182df4afc3f1b1350a5631fbf275e934696b2237588a3559a429261d1cf1392b3c354846560be0ce08 SHA512 28b2489919c5487c64eea3f31c94e4d0b1b90072e7ce0d6f77e8b1403b997d95c86cc07634628b049dde96f42f4e9df984e49a7eef529b06ec55fd245f8182c3
-EBUILD xembed-sni-proxy-5.17.2.ebuild 940 BLAKE2B 225160f7ba08e33c4153cd2e431d1ad89d731ca85eb128355268838c1516d142316335d65b1fab6782e653780a1a43f884caf3dda1f3b330c57689208029f571 SHA512 eb25848f0110495fcc2da70a3d0af063bbd764a513540976cf0f3a7e2a9e7a5a15c10535024ae6fb53db902e78106740f2a504149c8a516aaf7cd6243eb71892
+EBUILD xembed-sni-proxy-5.17.3.ebuild 1039 BLAKE2B c97e58c743eadef1f5ce5e1b7ac91b256768961d187ad7f1ea9d813c439c1f9b896ca6dd5ccdd90e5412e0f8e2b6f65a50aaf426ddfa264e1f3083caed9b1913 SHA512 81851dafac7087f5e15d24222cc09cffe1624c42ebc77e20d1a7e6431d39db5fa93cb1d4f37c8edba2119c6f54505f4a23fdcbb790b6053739e25039fc9aadb3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.2.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.3.ebuild
index 54a97db0e7e7..f0e14f08c6f9 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.2.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.3.ebuild
@@ -3,23 +3,26 @@
 
 EAPI=7
 
-KDE_AUTODEPS="false"
-KMNAME="plasma-workspace"
-inherit kde5
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit cmake-utils kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
 HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
 
 LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtx11extras)
+	>=dev-qt/qtcore-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	x11-libs/libxcb
 	x11-libs/libXtst
 	x11-libs/xcb-util-image
@@ -34,7 +37,7 @@ S="${S}/${PN}"
 PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
 
 src_prepare() {
-	kde5_src_prepare
+	cmake-utils_src_prepare
 
 	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
 		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"