gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /kde-plasma
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
196 files changed, 2963 insertions, 2703 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 75479002c028..233ce94a88b0 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index cee3e85d4c09..bdfea2a13879 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.4.tar.xz 160528 BLAKE2B 88f5e5c28221fdd2e07c407daf857c4b02e45fe6f178042519a2acb9ffb2a1367ffdd89b58c00fafd81f649ac46e297876179daa610d716f986beeb3d10814a1 SHA512 d3f64f340c4cbe29791407ceca28cc70176d0d8d888296d557c01400065d8c05dfd647bb22c104bfc58dc4288bd9e2ef0da1433aece5c8d82c71910d4c9873c9
-EBUILD bluedevil-5.16.5.ebuild 854 BLAKE2B f8d5f9ab71706527cf2dd6291e53c2d6bee0e7ede681bba227191eb0822e8aecbdbb7c1b32ba02f639b1f54b8c0818d78158cd1c52aa425b35127195d7717c11 SHA512 08f883f38ccc2fbd166ede36864cfbfc8da52eed34b6eb253249bb91c7f1b8b76e01e1490c66e4682db4f94cad8050cf88210a71f72ac876566e5839fd2bb41b
-EBUILD bluedevil-5.17.4.ebuild 1058 BLAKE2B cfe5a8706656a9a43f420e44ea5814db72b749a568d75aeae3e1b53ca8ce918405c72859e18112d7cf97f88c7c1f40b64b7d00ea3fa9fa72185c0c7bc4fb79f4 SHA512 a46c7380c309361a5655aad336ce976acc598c9f5336c3702b0c71e5122a70f86ccea0a0ed7b6665bd68f74af4542596a8d43a7b8186b8183269ce255ce454c6
+DIST bluedevil-5.17.5.tar.xz 160996 BLAKE2B 57ad3e69ed6addeb96bc4969bb8d37f738c03960b43921421f35af5c4f6d230f92160875c1b0f2ca201d2d3ad5227df1e5d6626b251cbec4659845847c93ce7c SHA512 b20616e4e9fbbe144b7ce0b3c4e1a72d543deaa018ab3fc4ed93d04d613102a29743b33060140d648ca756f87094f682768142752ac9ffe9d2ec6ed08a7e9b1a
+EBUILD bluedevil-5.17.4.ebuild 1055 BLAKE2B 13753ea1de8cc3174bd15fcd035fcad28cbe8e7a85126be5a645f2fcd0f133794cb82cbd6619c77eeda1e173a19cf11010afc2705b3a3f81405636db682978d5 SHA512 d1a98c960db3043872b78e9f787c6122065b3626d25d641f8b955dc5a648d266ee7a00c3e462ffc48118e3abce56908877a667315cb77940a2186f9cddeb42e5
+EBUILD bluedevil-5.17.5.ebuild 1058 BLAKE2B 7c87302c040b085a37ff5939c0f7e86d1249df6f5e2d97bfaa298a96559cb6f0787782725cbc90ee751457b92f1c185b180da22bd7aa1f0b32dd34107a4a7d85 SHA512 4643cffe833e43bf66e13720dbd4cba1550b18eadb26fe49eae1a174935c86b8129a91734778edc3b723229efd192ef2396c0b0d7f8f31c8f2f3c5b436b54c9e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.16.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.16.5.ebuild
deleted file mode 100644
index 0712de35aeb2..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.16.5.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.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild
index 2514f78b89ea..58a8699bc828 100644
--- a/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.17.4.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/bluedevil/bluedevil-5.17.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.17.5.ebuild
new file mode 100644
index 000000000000..817372a780a0
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.17.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 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 92ae657bb502..3e18940eeeed 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.4.tar.xz 3143732 BLAKE2B ab9fbb6f8160dad86bc9aac3bb9f9a5a94ae8205d69c7ece2b9f82c76875f9a38a65fac0e0e9b5ff7de8be0032e1448ef523977b39e22f18c720f41b4c84e989 SHA512 d5ee26d5ad14eef0877da3ea18cc644734cade4866d983ea0db140d7ef7d549b5655218c11cf059c1e3e1e858fb6ad763d216420dc4ca403c2dc57be12ed082b
-EBUILD breeze-grub-5.16.5.ebuild 399 BLAKE2B 03712756bec77cdd2ed02d4c1da83cc7c4efb71c492b14b70cad9c4911a8b662877c61692e0ea6ed0e24a1db490d5514c61619d4e47ae765e9670cd6abf28ff7 SHA512 e77a7122822f5805cb76bf40f336b08f3dc6f546cfac45dceff0f85a63d2c81735d07240f83b4ec5ecb26bef63b1a7d2fc9c846d4febfffa3c5ed599216d03f7
-EBUILD breeze-grub-5.17.4.ebuild 397 BLAKE2B 18d4a536191b7f06f28550dd7382bd3d61b5112887f47026b5a00cd6ed3bcfa1a8b810edab01156b237e992d080a000d63d472b253f2a54014b9c0bda756d8f3 SHA512 8b4e899213c766cd5acfc018abbf67406ee43ccde8ba46c842e1de40dca75925e0607b1ea91923b959731cf0a22bf62b0ee91a1623d750e2fb1eefec191c43fe
+DIST breeze-grub-5.17.5.tar.xz 3140888 BLAKE2B 628d01a6eeb3844f5251906e9c99fdf83bd03cfce03cee16a77e4b1ba1dcb9d80bea4c785b2406cdb241119dcad5f4534c452221d01927b2427fa0fb25915584 SHA512 27de91fb3c645c8a4a041bcf9be70887b430aaa5972ce550ae4624f3d1ae738e7e8f9fed074f2073e1c399aee3dcce1b5ff611f683b2fcf7ade60c37b0f6f633
+EBUILD breeze-grub-5.17.4.ebuild 394 BLAKE2B 413075930849d2695fbf1bb9046ec2d5e57658c63908d72d35c4697ee255078e454ae55eb74460fef5666880b8755cb243bcccb70c7c5b1cb2b5946ff3b0a1b4 SHA512 8ca78f2577c2b271769c8ea82a849da1b44618d44b2ae0486109bfbd4341f1d35a8b914403e120c99428c60370e6dc782d37803b9799fcd23571beec30c9b46f
+EBUILD breeze-grub-5.17.5.ebuild 397 BLAKE2B 457e916a401ab04e7d83e2aa4fad8eb2e947a8ca5ff9c3efac8e96ea2d441589b2c83d7db34bc0b96f491679dc32bbf472eed8264b2eafb3414cfa55276d9880 SHA512 62d683491030bc7b7cdc03a19fee75dc48d1d14204b4b6a81e13ea5326fb5061ceb4fceba1d0266b257712c04bcf4c3e187334dbf451335b70e3b5c4e74c9186
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.17.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.17.4.ebuild
index 7d3e5d9c86d3..e8f7fc312913 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.17.4.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.17.4.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.16.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.17.5.ebuild
index 931934c8b2c3..da6c9507e46c 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.16.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.17.5.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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+"
-KEYWORDS="amd64 ~arm arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 7d6745e2558a..abd6a34d2119 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.4.tar.xz 44324 BLAKE2B 6dec4aafc548fbe75b96acaffd93e16679f385433012386efe7f1c2d96f27c885fbe1276aa6c1f5c4b65956f88b2094520a5fea1fb773c384c4c870c8a15809b SHA512 b6d7d736d5ac1f236df8a4b227d12891922036af3d71495abc1375c252d64ab21a829d7df327211dcc0854302a679babd66cc837e1aa248af2c90c8ae34c9f46
-EBUILD breeze-gtk-5.16.5.ebuild 963 BLAKE2B e0f3f7601e4de68a01fe80647ff9b4702329ea0a69f41e7589bf16e9c6f3d9369b1cc44c68547c0def595adcfa006f5dbfbdbdb3679a732b0117f36c3b43252a SHA512 8f19454ab609dc18f4c023649aab95a0807d95de6c01a448370c956a2f8160f8a4097e4263325c0a100c133d40487998a122227c61dcd045ded3fd26e78e6d1d
-EBUILD breeze-gtk-5.17.4.ebuild 1006 BLAKE2B 3ed7e95d94e7c5de77407fbf3ccd60f1ce60e473225c7f8acf8e5abc3a13414c60771656fa2d511f27992727ff0364dffc34f0a20947dbdc034a75485e2958a5 SHA512 37db6c27a49be2ddf7ee3494a7d3223a22f7e27eab02721555f648f084040888ae9f2ac8f3522976468e8d8501254775d7fe76e5bb70a08401e7a2e367dd57a5
+DIST breeze-gtk-5.17.5.tar.xz 44424 BLAKE2B be93a92d77fbf42ac1ae9af0c40d77d32194c07906b008e5196181c78c37fd92788ce8020bb6a5c69a5391fb82c8e84394852287a1392f3f24f048891f272a23 SHA512 022ffc78ccb0e60819fb92444ce3396c5367e2557290980d67da27aedf10102f80ed4a6a61ca962e873a5ce053c8529be49179a811fab88202f5be118311dd31
+EBUILD breeze-gtk-5.17.4.ebuild 1003 BLAKE2B c04ca03efa9d209bc5b27f9ed5fd3638e16420194d0e2c3da51470f2806a6ba881407b729b0cc7bd5e16d0314723228267b3b4fb24a4e64d00b32173cffc0ae1 SHA512 73b9c2dd4b69e1ab74cc1ccedf5d42c60185f382484abd319c7103aa3f490f111e19ec4bd633171c743cd1a49c15c5387e94eef8fd5304c0f825c73eece35114
+EBUILD breeze-gtk-5.17.5.ebuild 1006 BLAKE2B 24e4c6b7d3fc35f0dd0316bddbd680392319cbdbc63d6aa5e55319d59183101b69c2a3cc142ac630e938cd0f5bbb0d407f2746d7de10f80579e0631f09f2365c SHA512 3b3676be434e5a0741821fa2fbcba5bfa31d4c9d1cdc30cc435bb574c7c51d341fae279bd916d165de79971578aaaad989b8ea60d1e1bc187020c17abd9b62c8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.17.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.17.4.ebuild
index 48251401a142..a73440b7cf30 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.17.4.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.17.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.17.5.ebuild
index f1f464f67c1c..8c27b5b0b01c 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.16.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.17.5.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-any-r1
+PYTHON_COMPAT=( python3_{6,7,8} )
+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+"
-KEYWORDS="amd64 ~arm arm64 x86"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
-	$(add_plasma_dep breeze)
-	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
 	dev-lang/sassc
+	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	>=kde-plasma/breeze-${PVCUT}:5
 "
 
 python_check_deps() {
@@ -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 5677fbd95f6b..4afd4f9ec340 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.4.tar.xz 105656 BLAKE2B 89278e97dfa1cf3e76b25bdf2f92184c01ba44d65e466b7692a2605ebd6b337fcce729258d09464528109de9440e498c185ce559bc3c69afdfdfcae7fdfa7257 SHA512 e1c55df51187a89ddfbb3dc0c015da3414366487db3c931774d5690401114b82acf9c115a3a008f5c8a81af6d6f4b2281136afd2254e849cbfb79ac4d831394d
-EBUILD breeze-plymouth-5.16.5.ebuild 496 BLAKE2B 019435f2ff2f1c3fcc1b8cdb4ef9f87e9e92c05ba6076a5a79224b3da19ae33be9ccc4787a7f8e0923ee98cb693bd028f108bb1e04409c7480f3988f762f3204 SHA512 a3348aa5226431aff0e64e3379ec7319ad8a5c05f94ee5ccedc6c63e167e2f09983677673d9fd0d944c129c20d07f0855aafce716e9d7112d500ecb8467d2d54
-EBUILD breeze-plymouth-5.17.4.ebuild 523 BLAKE2B 28e1eb0b85fdcef2869d7705d37f0326e3221d0d5c0865f4c5ad9c57c632a2faa706fd3a9a1ac4863b3e01d5e6239ea9aa58918263489f0e9df8c7adcde7d6e0 SHA512 5eb239d97fe9617b5e5ff55a485a0f340d72fa0be4b2e78b9964955cb8ccb32ba1d04894ec29c480d1050815a45a754a1f88262b5117c62f53149731da19cd42
+DIST breeze-plymouth-5.17.5.tar.xz 105628 BLAKE2B bb0999dd5f2829d41708912c97d4ac4ab1d4954d80e1a7d89b5cacee705c2545de6a9903c015857687c8d69841471667bbc806d1630fed0a3e53724ee240a404 SHA512 85a028f9c248a80c1cd78646006197db6308633cacbc26fa931f525019b4a978c50c15355a8de0ec824a806be3af02d7edbaaad8288348c6a146d2cbbdc5970a
+EBUILD breeze-plymouth-5.17.4.ebuild 508 BLAKE2B f25a640d9b0a946b85de81491214fb2118940c8b13ca358a671464a5f6e553ff3a531adf2e2bf34a883cb10a12e000957a793ef81d11220cfff9f688dd4c20a9 SHA512 9756b402dfc2ee6cc46938b0a4a7bc9dfc2a7b6ac28bea1791dc5b9275d4f82df923d8c74e528c912d2d4eefbbb4aa557270cd9363240afd6d22b9db22d58e0a
+EBUILD breeze-plymouth-5.17.5.ebuild 511 BLAKE2B d93f825973c64cd117ffeb5d1f8a123a4a180b2b904ed9913ae0c59568bb67a6e0ff9f9f5c3fde87ac32464ffa7ecab1310acb2d920a74bd9dfd78744641b273 SHA512 2a150d6a210f350985d714d3a8a04b8f2259ad18370ee085bb06d3bf315bbf6b75289e56d4e0e25bb1583d8e8718dbbf3a574ed001876579eca98b2968711f9e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
index 9918bf0331ee..488078f2e1c1 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
@@ -24,5 +24,5 @@ src_configure() {
 		-DDISTRO_VERSION=
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.16.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.5.ebuild
index 3ebe007bd070..2e27a55cd6e9 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.16.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.5.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ECM_KDEINSTALLDIRS="false"
-KDE_AUTODEPS="false"
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
 
 DESCRIPTION="Breeze theme for Plymouth"
+
 LICENSE="GPL-2+ GPL-3+"
-KEYWORDS="amd64 ~arm arm64 x86"
+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_src_configure
 }
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 5d2b9eae3c22..5ddf3934a949 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.4.tar.xz 16578572 BLAKE2B 60c178abd08a4c954f433e6c4eaca3a447055dda73b39e6739d807b2d694dcbde65412681b3a37dc45bb9c9634d6050571f60085d6617b09fc5c3bcbb0cc07c4 SHA512 835623114cfa78c04fdb3bd9ca214d5841fe5227102e6a156a45e4ebcaa612cd49344893adf5069a97266139eb1c9548539928cb7ac03a7c124362c337673bef
-EBUILD breeze-5.16.5.ebuild 1147 BLAKE2B cb4dd4a77ad2127928d0ccc7d9c68c2157262d00be6dab67a23f69aefbee1e73292f3969841b09a6cc417b3f0b05687d502a882900a9cd4acb92db038016d900 SHA512 d65378322946d4cedcccd1e09b5146667cbb311785845da84936299d45d3187cf0451b5dd18ad4b698f2c1d006963555bcba2c8c27b2fea4275a89a18fd30e0f
-EBUILD breeze-5.17.4.ebuild 1405 BLAKE2B a9f2662eae5e93ec7571fd0254ddef9d3587c5952f9b0c1f744124fb6d86a2d9f3280ded00c489d2ff40e118d92fe06b52270f981123222d5703be433c893924 SHA512 42ec232a4873deba03e7a4b38d2a2fe7303921767ffd26bb40ed27403ba4d5d59b1dbf936f557f09ca69ebe28b4ac1c657ab5b96a0df84706591cc25c7e2581e
+DIST breeze-5.17.5.tar.xz 16582504 BLAKE2B 2f1bce5eaf2a2fff3d2eef2162c393f49db27b9636f21caa581b523a6128bfa33985398242230ea33d61b2291bc9aedaa36705f94869a8a50d8523c54e7e22f9 SHA512 b31032d6a2722b108d3571cb283af1aeca214661bb74c9435f6333a9ca5b19e5ff69c1e43dc00e9aced936d1fe87177a0dc19cdf6b29ffc7886225510b467df3
+EBUILD breeze-5.17.4.ebuild 1402 BLAKE2B e21d9e859df2a18cf5a9c7256c21f8af8a881577a367b551607b5d8833ff7424fe515f002c2ef8ba1e1e7d27de86e88fdcdfce9dbc07ace58daf6ab809462345 SHA512 d8122a80dacc2f7112ba738247ba0d6b18d85d5947a1c64edf765e9ffb27218813c734a0fe6634ade8463b9999fe514a39629dd1b5086be20dc2c4f854750e06
+EBUILD breeze-5.17.5.ebuild 1405 BLAKE2B 73d375898fdd3b01e0ef057ffc8f75cd7fc1fe47a655a3e7c0b93e7c7f60fd914c7983dcd9090da0cc64a7a8627daa2e8e4ec5ac702b44c09c084958229948f7 SHA512 3edc21eae64831ba978463508480b9c94cbf335f383c81f86f4d862304849b8d209935cff82967c2100d69679a957efe616bf63e4a0bdb848b8e86044d85f28f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.16.5.ebuild b/kde-plasma/breeze/breeze-5.16.5.ebuild
deleted file mode 100644
index 2504dba5e701..000000000000
--- a/kde-plasma/breeze/breeze-5.16.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-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)
-	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.4.ebuild b/kde-plasma/breeze/breeze-5.17.4.ebuild
index 9f66845b542f..a7a95482c50b 100644
--- a/kde-plasma/breeze/breeze-5.17.4.ebuild
+++ b/kde-plasma/breeze/breeze-5.17.4.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="wayland X"
 
 # drop qtwidgets subslot operator when QT_MINIMAL >= 5.13.0
diff --git a/kde-plasma/breeze/breeze-5.17.5.ebuild b/kde-plasma/breeze/breeze-5.17.5.ebuild
new file mode 100644
index 000000000000..c378e6dcf579
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.17.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 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_use_find_package wayland KF5Wayland)
+		$(cmake_use_find_package X XCB)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index c1d5d069321f..dd7632ac5fcc 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.4.tar.xz 10449080 BLAKE2B 3e1163316f24bc3943d599c7e7f52537d54f5a1df252de5bffba0f709626c78025dd3dd56885c885a910ea7f7689de98e597e41a7d84b3cc600ff6ac57390b73 SHA512 a31df976ce053c898e22c9f3b9c8f06e461a785c6fa6048cbca51ee0d08597f7e300dfde8132c5d1d326d32476abe09d5637ae9b0e358c03d310d939bae19736
-EBUILD discover-5.16.5.ebuild 1651 BLAKE2B 4c219c7744eb168fe5579252b91e6fe93cc34baadb5380d0e5c208e32dfa72988b200b6742bc991b880ff9d7c5d71d4e2f62d78b536d8ccfd8fe288e18035f60 SHA512 dfb64f708a743d666754be397b2f682716b4e4c95b70db2cb78749d4370ae75d0e9c9dab034461a14430b507d948a2367f38421275c9429fa5ceebee909cb71f
-EBUILD discover-5.17.4.ebuild 1886 BLAKE2B e2d7be8a9177131e2b15f6df88eed3be68e17be3fe20aebf9f299bfe77fdb386db6aea054635f5dfa39d75007a17e0552e8455b22ae2733002d6cc3d497887a8 SHA512 24a4a85620cfde0cede8d92f0b2d1d26b7da4dfea7d4a73d1dcceefc13fcd0f92e4ca5a5cd6b2f57b0d2b16e33f7ed4ab1e8664e6bc19e53885ec5db906774fe
+DIST discover-5.17.5.tar.xz 10449596 BLAKE2B 473a93fb66183253c814932e86be7d5a5f454a6146cd202cb2b43d60223f8e15370622b3eb572c27ce041c8fbd9f095ce9733ffa5464d386bdd419cd80db2e75 SHA512 8d8d6675a894f1f50094021f93d38b7bc6d2927fb8434c002e816c1c322ca25134cd73a1b9fce22bb07ae091ccfb156c22399896f47ef1223b8233febb45f866
+EBUILD discover-5.17.4.ebuild 1883 BLAKE2B dd3f66ad19a5c9a7650953fcde74cadbffec46769e18f229e136e3600188db26ea1fa422e0857f0ae6d6fd0eeb737c95964b4a478f0a393f0da1ea6381f6d229 SHA512 92bb09c3ccbb43497c6736b8ebc202c8af8b6c4e9146ae3defb1e7c6a8ba87a8d69a8ff09217b6c3ba5860bda2febf4d05a82f5f061f8319ca1dfb4cc2031020
+EBUILD discover-5.17.5.ebuild 1886 BLAKE2B b9fc9249564b858d8bdcb120022393d90bbd9985598c43cb6d43631b01fcc7bdb548ad7ca3be8fc98df657ee557eef3daa5156d8bac582010b8e391a5ec845fe SHA512 f21f7cd0db8d8528785f6d2f528a389f211e28428901af16558f70ceb77a0510c137876478831349b3d1c94203c3b873d75d3fb945b858998e946830d7825308
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.16.5.ebuild b/kde-plasma/discover/discover-5.16.5.ebuild
deleted file mode 100644
index 5cc9732e0482..000000000000
--- a/kde-plasma/discover/discover-5.16.5.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.4.ebuild b/kde-plasma/discover/discover-5.17.4.ebuild
index 4e6efe95f7d5..ad9b9eebf7b2 100644
--- a/kde-plasma/discover/discover-5.17.4.ebuild
+++ b/kde-plasma/discover/discover-5.17.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="KDE Plasma resources management GUI"
 HOMEPAGE="https://userbase.kde.org/Discover"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+firmware"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/discover/discover-5.17.5.ebuild b/kde-plasma/discover/discover-5.17.5.ebuild
new file mode 100644
index 000000000000..3e920f4241e1
--- /dev/null
+++ b/kde-plasma/discover/discover-5.17.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 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 1260053bc6db..86cae68fb7c3 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.4.tar.xz 740416 BLAKE2B d5440f1c753f32a8b14670b5ec67d246973f86273240ff912ced4a978812eb5362029e4e0e68e6ae24aad9bb21520b9a8a5cfe84ae244bdeecbbe4ad92a930d9 SHA512 27eda23213dccd4f46f344cc423ec47eb3f414acaf13a669bc2732ce685dfe2ece0b741bfc33fecb02cf546bd8c883b849da3d6b808a3d27db9201374040e62d
-EBUILD drkonqi-5.16.5.ebuild 1339 BLAKE2B dcbcce6cbf6b138ffe393635fc24d883dfff5372bdc8e7498f51a151d5f29ac3c0f2b8712cc72d128ed07c4e741aa190f280ccc32575710934a6dd2629218465 SHA512 bf96866bde31e85e6f74da029b35980c549cf3fda7d7fa9c32b0896f71bd0fec3aa32288bebe97470b8411c37f27c17bd4b6059db6bda7f8c81c78bda042358d
-EBUILD drkonqi-5.17.4.ebuild 1588 BLAKE2B 241991e52b02ab8470f6593b7ad6451313ab3e3db10a64d135d3edde5a69eb4a78f6ed415746c444cd615df6d574b5eab6a9ed76967eb351e5c86ce1a3da23cc SHA512 0602ed919a7b814b00ac62c09e45b5f11819da746238f5d349d0eadb1cc973f7d1e4ff1be80cdc47e6b94c36605a632582e3fc1daa6d5879a46db355784977bb
+DIST drkonqi-5.17.5.tar.xz 740416 BLAKE2B 01b22252e5d9c3d88fb960387f681f38480dddaa79ec319074aefdb95867fd9a71efb1ef2bf9278de15e876265db4aca5f530de1968ea849be60c64e68a4346d SHA512 73ba55c8f5223580c2638c3ad5d12be86703a02639ed5a34b077205f1cbc927efb13cb88ee84ea23e58b8d5bc87b368bbcfb702fb0e8f76722dca39981b30ff0
+EBUILD drkonqi-5.17.4.ebuild 1585 BLAKE2B fac1f09cd75763559fa33312674563ad676f4be643a47ae62f8a3df903efd25cdad99332f074431f900fa8f27da6f7ab6a8be67cbc73607c8f89821be2d33c03 SHA512 c6dcb9c06f954a3ee7b19ccee340d0a81dc867dcf32d7867be25dc7cedb84054d9be5226c2be43ab4368df7b24e46ee7d4133acc381c631c398f18d3b63d5039
+EBUILD drkonqi-5.17.5.ebuild 1588 BLAKE2B 152bf9cc35bb5d792b14cd9a0adf71a0a893f2e6a775888c4c26631141e0698eacba14278c260b70388dd32ce9392644dfcefdd0593cc4eb9e995d63f07ad769 SHA512 0100095913727cb5ed5bac8c97def845e5d68c6792029936927f17b6329d049a9d5801e1acee85a335b846e52366415574d686ebc3bd6c4664df8c69dc3dac1d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.16.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.16.5.ebuild
deleted file mode 100644
index 310e0085fc93..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.16.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep 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="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-workspace-5.10.95:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-	kde5_src_configure
-}
-
-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.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild
index 7ce8e1352926..38cf5f71bef5 100644
--- a/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild
new file mode 100644
index 000000000000..1fbd5da27c9b
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 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_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 63b690936f8d..7ba9ac190598 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.4.tar.xz 86564 BLAKE2B e1951c5cf61405ddb43aed3eadd6458278d3b45e4f23ba9eb5b460ccf993b43cf0976691fbfa75ce8b07f95b38cff722c82c762be80fbf711b9c3e0853630e42 SHA512 ebf30a972e3e8225817642dd35103a531e0c3a52b5053a4404d4759543817144903ae322cf9ca805e3239a6803810120802959f4c06bce92c1cef7c39cb41f5e
-EBUILD kactivitymanagerd-5.16.5.ebuild 755 BLAKE2B 1b4767aaa26765bf31b9e310de3b95febcf5d091f8d6debde297a924def156231623cf4bb17e8e73d88029781c0901dc6bbc006bae0748193b021a84d4b3c9a1 SHA512 f3734eefef81c292f7a7ec58e0afcbd62de07b018e1cdda67fa57e0eec6ad327fba477764187f1790ae72a09185f0b0b3192bb71fe1ed66b42ae656c78da8030
-EBUILD kactivitymanagerd-5.17.4.ebuild 904 BLAKE2B e466da8b46d6f16c4ae2fb9a2613001a822e843f36434c3e18de6c6ed994ce13a9cfa25e47c243050bba0c30bfa8e95147992cf9aa35528d6b1b1f11cf0e4f45 SHA512 4950efa0578bec8a5bc2c8d27ee223bbd3cf1acbba29335b71edd2732d5c099d1d1a2c631b26e028a17eb71674273427b5ef7fa8f8ed915d3fa7328641bfe95b
+DIST kactivitymanagerd-5.17.5.tar.xz 86660 BLAKE2B dfa615796556aeade9206c98180072348e587c72930de2f1cc6c12101879dedaa46485251a136c5a85dfd9a92c96b899edf6c0fef263cdc46a047bd7a3e1bff0 SHA512 584094f45abb922f15dc9b4db2da3cc624087b1524e3e161a4f4cc91425c534c37281d2a46e642320519baa389b69d7843a19b0720788b9795df9a24d0478ccf
+EBUILD kactivitymanagerd-5.17.4.ebuild 901 BLAKE2B 34afe0f537898de81eb49eb675d329a4ec4987b0a0fcd2258c14d957fbc74445da963d8139e5af97ce2b5b7d97c24edbe7bf5c978ab86ae9824d1c04bfee2450 SHA512 c022fd65b5e8740b392b2b7d0d633fda4a17432e323966ede93d46d72d221ffc86079b87935a32647c84f4ecbee4997215e3908d7413e56c14a50e01a5e83e76
+EBUILD kactivitymanagerd-5.17.5.ebuild 904 BLAKE2B 62d5f896d96bbcfe3eb351fcc249ed45f2659b75b69a18b8904f56989adda1892e28bdc272fa4b39ec07960dd3f2552ee485184d100d89c5c6ca917d2a9c582a SHA512 fb3fe34ccd6e7fdc730f624362794636f5dc895cab8d2f76d0d4aa0c559aa45957eac879d0a8888595922e580c7a0a526c0c6addacad97f589c012f2184a58d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.5.ebuild
deleted file mode 100644
index cae45c99bc8c..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.16.5.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.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.4.ebuild
index e35dba437e3b..1259495df284 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.4.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.5.ebuild
new file mode 100644
index 000000000000..9b583fdb3a05
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 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 95ac48be5d6d..1f42cd41be7f 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.4.tar.xz 592128 BLAKE2B c858c637572584e54d99eb2facd0b2bf16ee15a6d9c259032ad01185e5016732e47c5e127b1fad38080b89701aee7c5fbdf9499ae027b6d37a2141196458afab SHA512 bafd8386813dbdf4c5c8a34705938925c34ffd531befa1e5a92dc764a46c4de0a78344de6c76d6c64ee6f7bed0b6328cd1f2c1cc1afe6df490901755f1e0da48
-EBUILD kde-cli-tools-5.16.5.ebuild 1511 BLAKE2B 7eae9cd1c20276faaf671d9d0bd5d698d4386f5dc248278d9ff9cb568a693218a00b1cb1b4026a3906728d6f4c5c1faea954874b38f9b00f866d87d8a1a28d9b SHA512 f4f53b9d0bd28fb789ec7be1c12c00d8ee75aff4c148b654250d913a841be1856dde8d12149e0a3026c6101815e26ca726ef7ce74f7786d7d0f454eb9c28c381
-EBUILD kde-cli-tools-5.17.4.ebuild 1713 BLAKE2B dcc61d35040c785d7e50a4a15a822ccdc36feac3d01c6225938f0a17cf23b4647568a377772c01d8ebcb33f8577074eca9f55f4c8a1cb9ea8441315b724f9e44 SHA512 f72138d4d9d6d93fd494bcd23e778ce8ba9fdfa28bcfc65eba337f71432e8dac2b8c64a1b48622fd7023b5264c00924d891a9062bb2075595db9a619ec5f36a8
+DIST kde-cli-tools-5.17.5.tar.xz 590264 BLAKE2B 6758b9e153a5f87fe903fdae4587e16f5c61eaae043a7ff370bae5b1f596afbaa63bcddbd1439eac8776f20356b96589a86d87ffe7311cb54973035fda17e517 SHA512 65c1fb474abc193eb1ca3cf230865edc795e5df85d9daac7ca594a507e729db6dddb50dcfe4b7caad19f87b4a752d793c8ca590101b59a2a16ec7b079cf524e8
+EBUILD kde-cli-tools-5.17.4.ebuild 1710 BLAKE2B 204a6165b99995964239f882a1f50e0b8125b239c0f6140e1272f95bc25e9e7aef9e93e4c3d1d485a5d9e60f90f45d25259599727cb7cb846e240dc0f6f210a0 SHA512 673a719338281fda9c277a8e4586761ff6fd38a62453f03fc809fd1e8e3f29d62c84a12ca0b1c6449ce9d303d3de97d7ab5531e5e8d2c6a71d1883eb51d3e557
+EBUILD kde-cli-tools-5.17.5.ebuild 1713 BLAKE2B 2e203f09a07ef3eee69bcf03810f682e645c40d118d02eabcc6d24078008c38a1f4338ca3b1b30fafd0caab592eabe89b27f844175c1c20a84261ba559c1c1ab SHA512 6e708f2b1f0780786d8f12bea641d02d89b2d20fa4f889c0ee53b6691dff37e369b256e8ae6f16a1cda43c7769071630c3b3c6fe7309f027382a67fdc7a82ab6
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.5.ebuild
deleted file mode 100644
index b770a42ebb07..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.16.5.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.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild
index 65f153aa12be..0177a644d52f 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.4.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.5.ebuild
new file mode 100644
index 000000000000..2162b94c23b5
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 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_use_find_package kdesu KF5Su)
+		$(cmake_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 1d96e4f60dc1..a5fd1b621ae4 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.4.tar.xz 154744 BLAKE2B 79af7643b2f8cbf813d1ca8d4a3da61fb9efb3d6410012faf3d5e390dbda67b817a7c92f65a6cc5d919372647785a8449920172fdfcc65d2ad912a994fdb1d4a SHA512 1c4cdeb6b39eea56e18ed368839eb943e65061818256074780965d284abf5c3f967ad50a6c273d79f980369b26310ba8942b0ab3cde31da13a8a4f7c42d3dcaf
-EBUILD kde-gtk-config-5.16.5.ebuild 1245 BLAKE2B 3d1291f02a58851e8f39158a767323d4ae2c8318a4e1eed082c7ce7a4f9525ec08f2b19ae2e9da8db166870f24e35a8b3b352c57295d7439cabb47972b46e01b SHA512 839b86c955d8e5c004bb6fa62eca8fdc757b31f134ffcce8ca27dff70d70acafa263b22b7edc4a75733c9f9909fdcd248dacc7508cde8f93fdc770e997b6fd89
-EBUILD kde-gtk-config-5.17.4.ebuild 1387 BLAKE2B eb1c2e1e22febe5d3287cc02b0430f089f8b317a510a765d60dc9c2e9d3ed206598b2ab12742807cb0d123f9b98deb009dba678834ddab2b36f37b2684443423 SHA512 3581c450f647939fbd00d9ffb15085efbce94e4d5cf18648e68334eaa08ef51bb0e7418b093e42d1c24d9467a2925f708250f63f929277509a4a6e2a17b5c146
+DIST kde-gtk-config-5.17.5.tar.xz 155340 BLAKE2B 10363865751489a16dfc62924694b0b47aa05c7e097a512822ae54026bacd4cf167cdff0e7c7d29e7a7aba8dffb757fa176f60fec62df8aedb0d51f9da7b9fcb SHA512 29cea96d6f7471717ecb2f48df5e19a96c7730c9f47157dc01c236d11253547aba57f5cb30cbb08659af53dba81160ff1982f9ed2908aaec91940365eb625201
+EBUILD kde-gtk-config-5.17.4.ebuild 1384 BLAKE2B 8c438469184b361e72019bbc0c04873bc491c34b33665b1a271a84ad61821b113e6d425b0a2ba8493528a3f05737f6383140a6154473cd8e494bfb3c043dd056 SHA512 7cde192f483d6ce81d74073718efd25e7d5808ea10f89aa1ae0ab4fd9480d3510d4ec633d8a030e16676c28869b2912464a2e46f9e248a54e81e06fc032836fe
+EBUILD kde-gtk-config-5.17.5.ebuild 1387 BLAKE2B b6db22f3d5fb4f5b3d579c7814329036728bdeffed7fe958ee1db24c4a730ac97666935552558558a54efdb9cd85adbd05052c61c8afb2e57adccab62e86df3b SHA512 03d508d7b5b4fad1f4c97a2cd42ca524d6ab5d796d366a465979791f2f1e5e1a79ebd76593a994a94ece4c9524e8952d4c39f86848d476cc0b2fb9de88710e94
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild
index d05a47d6624a..871b2cc9b8a0 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.4.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.5.ebuild
index 035a36f90661..a074c2ded7cd 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.16.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.5.ebuild
@@ -1,31 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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"
-KEYWORDS="amd64 ~arm arm64 x86"
+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 125cf17691c7..1f696be975fe 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.4.tar.xz 43052 BLAKE2B 1db2205bd8486b7da5049cf9357f0c5c1308d8168a7a678596dfc3e7584ee967145169cfa8d1ffbf9991e27fbd252f8c0a13a555a37b0d2bd61ac8f22be4afc8 SHA512 ec3c5a53711b320934a2fe16347ea9f96acf1deab6b15716bf3f3b8c59e9c4cff05f5e980a13e42d357a1ce3bace7d9ed5878a9eadb982ff04fd8399b2a78d86
-EBUILD kdecoration-5.16.5.ebuild 396 BLAKE2B def1e5cbd94c4458d72e54b32a30ca73db9e4874796fd410b62847c4127d300ad814172da1e2e11f14197ed186152ee784e89c8986a7ef1216f5eab2f3cdb783 SHA512 577f92c9bf3ac7da92fa8f493a2ad4995c27855b21ec36b1de4cc307fe1972dabbcfa72a60aed125017e4144e67037721860dbb170a3210b8e4b5c545732721b
-EBUILD kdecoration-5.17.4.ebuild 474 BLAKE2B d72c7ade6c3ec5f192b2d2aebcbc04ddea0540c6e15e79cfac99a96dd3b09e4c046e5a82e24e0823acbe6d328a932cb7129b64dc155f52947f3d3979b96f3b52 SHA512 1d430eaa549f40f78647788821eb0aacaa1bdf293bba4eda5004e4af38e2b204af6e677ef4ce784b8a396dbf7800bc199ebf8b298b5bd1e2ecd2a77c597a17a5
+DIST kdecoration-5.17.5.tar.xz 43256 BLAKE2B 6ae568d7f0e2ce70ac119e61a25c599da91702bdd5bbcf5f54f2d045c3ffe4b55ff7554bd65378d9209c7464001e88308598ba47eb1ec272be80793265ec4e07 SHA512 16a46ec6b4db366f501dc72a70c1867f7acc77bae68a13db406cd72d3587a851504eed8bcf8f6c3f908598c1d6d0061ad61e4226b98ad95f4871f828626f332b
+EBUILD kdecoration-5.17.4.ebuild 471 BLAKE2B 87af636bae1fd472f5b39049c381c1013fc4e5a7df658256dede9f3a99f9dc7da7914622ddc3ae289fcf342b279ef5fd35647ab50f5da94341716aad9873cb3e SHA512 8457826822226766819c352521ec2c0eb7ff04e8dd43a249fd721ece6dbe465c0b1488dd56a66a76e922bb971783adfd98902d05ed97dd00033a86dba497ca82
+EBUILD kdecoration-5.17.5.ebuild 474 BLAKE2B 3e9040b272bebb1ef3128475ab74bd1c3a40e86f42fe501ecc08ad1c6c0d7c02e4e24a0b6f4f5fc26bb23c07fece73792442b720c246492b75b7e8893dbf684e SHA512 6af31939e529a20a754f4c035125577b8f5fad2149ea1711485e40f18559e90516ec71c36b6ee88f395fe5b75b8b48960dd1a3cbe26ab793b3968707f902c08c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.17.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.17.4.ebuild
index 4e7e55a40e91..0d80a8f2171c 100644
--- a/kde-plasma/kdecoration/kdecoration-5.17.4.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.17.4.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/kdecoration-5.16.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.17.5.ebuild
index 72892131a52e..324d1d059f0d 100644
--- a/kde-plasma/kdecoration/kdecoration-5.16.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.17.5.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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 )"
-KEYWORDS="amd64 ~arm arm64 x86"
+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 5aebb7538112..7c780a07f43c 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,6 @@
-DIST kdeplasma-addons-5.16.5.tar.xz 600480 BLAKE2B 146c7ba77eb4ff973afb5e051d3000baebdea317b9e17482fa07cf575b2d4d8bce69590c66b0b4756cb971109ff701e8786a25108729aa7d65bdcb89cc945a40 SHA512 0bcbff113d71bb33a6542d78a250dacb8eff66c5f8bc84f9ec0055fe74ccb7ad2b5706ef3782e754909c75a95b133f3233b93cd7290d354df1d54dca1401d875
+AUX kdeplasma-addons-5.17.4-weather-applet-size-regression.patch 1634 BLAKE2B b6eccabcb397f77878876eebf7869539ca98c1c9d3a8e66cbbbc9c068cad0bc84cf366d020b67177a0786df94e24f664451826a6b87a68114dfa021329c9b5fd SHA512 ec43213fd4a484e73d60aef76117c90e4b8c83b6c7debbc8630f0802b62e294d4cba85a646e7780d0ac77d40647dba875bc9363787af407113d2be838dcacaad
 DIST kdeplasma-addons-5.17.4.tar.xz 606816 BLAKE2B 4b304a157f91068778d8a45c3f8b2dfa4790270509d4828201f287d6679f50ded5bdb2129f49105324ff5959a615bd78bec8e73b487ff585fffc987e33116fca SHA512 ae73ec8be325580742bf28f3479e3e27efe8fe9d01ea06c97b731c983e5fd5cf3c98307923f218748df0ac30ad2547804466a01df71eead4fed9bbcee16b0ef6
-EBUILD kdeplasma-addons-5.16.5.ebuild 1502 BLAKE2B 76742e80bfe694ba50e6a6939bec9d92343393cd3703e368cbc954dc9015bfe2a1e97117f5afee0420246ce8293431e07c7746ec8362008f9000dc8f10f4e6d2 SHA512 77ce447aff550b73bfbcc83d09f2df741d81d94a54101908f3de22226cb85aef5fa7107da7e0cb8c78056a5b76b0feb32ae55eda179f62d5e8206e90c65ea19a
-EBUILD kdeplasma-addons-5.17.4.ebuild 1747 BLAKE2B 964874e10a1bcc2228b42887cd31f6be5a59c8522daeff2bcb2381efa5bad704e761a20ad8319ba0f33850be55a44217487a9524560e45d1e0e33f1dd53fc924 SHA512 29f7ebd3bb45539f80cd4120f14ca4a890149a78f860f36b65a50baf094bb50b10767d46bc3494b43bca6c5b91967e98c89bf933cebbc843985728884ce7ac9b
+DIST kdeplasma-addons-5.17.5.tar.xz 605648 BLAKE2B b6792d6723fc71564f9e583b3a0af8a45e06480150e7369e35dae0168a4eb254d91c268e1cd73064658b53373fd4933c7c7fe9473b904bc291fac4021e93d50c SHA512 ea836cdc99f583448d4b272b6d6b1e98c4926127307ac966dff779236ec10401af627958994dbc22959a13db9b67bf1b4ae05e911491eea874a2ce210c37b2d5
+EBUILD kdeplasma-addons-5.17.4-r1.ebuild 1813 BLAKE2B c92dba1e4dfbe13dbf9b9acbd1383f86172dcfa794215b09e15dcaa1ee9d0dd029707ab8b395c00774fb9a72b2bffe8be5e7b4b907e03c12c41217e294528cc9 SHA512 a41a15305907d71a14549822243044f7f51d90d6faadc00eb019ccc1e483910999b29a93bb283fa6e7f759d5338f98737f5fd8c66c86a0be090b97062e2d2544
+EBUILD kdeplasma-addons-5.17.5.ebuild 1747 BLAKE2B 10099d2469e1f250df29143432356a6cb371b10ec662b571d7b37b4b25e91dffaab7ee4faf23912e33fe0d9eb16500d0992f79ba0762f93b547929e447a66e28 SHA512 aff4f99f495a4e2124f83c0420364d57971e7dd1ae7fc7e213100ede6cb8b03f796ac3b1f70002ee358bb08f638afbde0f1790f388576b2370b1eb52d503f863
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch
new file mode 100644
index 000000000000..58a1316171e1
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.17.4-weather-applet-size-regression.patch
@@ -0,0 +1,37 @@
+From 865ae05e8fe280a177fcd6dcf5f847327de36a00 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 15 Dec 2019 14:04:29 +0100
+Subject: [applets/weather] Fix regression in temperature size with short
+ panels
+
+BUG: 415187
+FIXED-IN: 5.17.5
+---
+ applets/weather/package/contents/ui/IconAndTextItem.qml | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/applets/weather/package/contents/ui/IconAndTextItem.qml b/applets/weather/package/contents/ui/IconAndTextItem.qml
+index 7042bf8..dc270e4 100644
+--- a/applets/weather/package/contents/ui/IconAndTextItem.qml
++++ b/applets/weather/package/contents/ui/IconAndTextItem.qml
+@@ -86,9 +86,15 @@ GridLayout {
+                 leftMargin: units.smallSpacing
+                 rightMargin: units.smallSpacing
+             }
+-            // This magic value of 0.7 is taken from the digital clock, so that the
+-            // text sizes are identical
+-            height: Math.min (parent.height * 0.7, 3 * theme.defaultFont.pixelSize)
++            // These magic values are taken from the digital clock, so that the
++            // text sizes here are identical with various clock text sizes
++            height: {
++                var textHeightScaleFactor = 0.7;
++                if (parent.height <= 26) {
++                    textHeightScaleFactor = 0.9;
++                }
++                return Math.min (parent.height * textHeightScaleFactor, 3 * theme.defaultFont.pixelSize);
++            }
+             visible: false
+ 
+             // pattern to reserve some constant space TODO: improve and take formatting/i18n into account
+-- 
+cgit v1.1
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.5.ebuild
deleted file mode 100644
index 6c4bbbb1a6c5..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.16.5.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.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild
new file mode 100644
index 000000000000..3f793af92091
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4-r1.ebuild
@@ -0,0 +1,63 @@
+# 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
+"
+
+PATCHES=( "${FILESDIR}"/${P}-weather-applet-size-regression.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild
index 5d6cf315bc28..de0742d88a6a 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 0f9943d90789..7145ce95b8e7 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.4.tar.xz 80156 BLAKE2B 80c1caccad1f49e82a8f6df5b3ae52968a1b24f9d7ce4a2c12f6ea58f56018b4db6707d0ac6c21e4db8ab16646d4a9247b2a50200c11b77f74308f1d14c605e8 SHA512 781fa2dd3532f625320f4edbfe6dc0af9cd340bc9098ee9b8a20c1f9e523c752f5d60088445a7bb7404e82a3d5a0bed624a5a585a8fda61fcd609e65ddec01da
-EBUILD kgamma-5.16.5.ebuild 534 BLAKE2B b61bce78381c052fd20126557860beaade74fd4e71fb04ac2afd3d2d39a24d447cdd567fd098c9455f022f2fb7ddf4ae22fbd304d6590f5a4e2f4c4e3bfd0c07 SHA512 ab62a94185bb03aeef4ce999e01e937006b977ec4e2739590d6599b7fb4f775853bb6557db78a257312e5e2e66ebd101af36beb9fc6a9f14ef2dd187923f39a3
-EBUILD kgamma-5.17.4.ebuild 672 BLAKE2B 3e46d11eb0e5a2e3c4c738cc7e0cb6dfd2257f91d880847256b51bafd4c342412d4f1735bfecfcb333c1bd2025862282e6d7e7212e89ab5ab61fe035369be82f SHA512 c54ab09820c2d202a0dc4676c1b449961c432fce314bb78cf557a5ccae9d6e4623d78de0a8afffb7b80f5ab680386af9fecf01f0c21a2b638a9d004aa984dbc8
+DIST kgamma5-5.17.5.tar.xz 80304 BLAKE2B 7e2b66c84e0589740d329ea9c8d575f071b60ef25fe8bfe9ce90256a999a461d2c21faecb78a612895fbfdc4ba8486baf7e3260982d1c16f0752c03cd83c20d7 SHA512 cf89d538b4b74c8121f9ff15fcf01cdcc09a3a9e9fca7750e831aec5206c0ed31e917da787bf313d03860b86de2d2715cb96b5ef00bf68043121a6e7d0e7a290
+EBUILD kgamma-5.17.4.ebuild 669 BLAKE2B 9c82aefbc467dc227ea788996cc8f17b3c2bccda7f58383241c8f009a925a1f706836904ab90f4465cad99aae9b7274c6cdefec660bb12f78b2bd16581d7de6e SHA512 30b03badeffaeb0f615cbb851c834dea667ef3e838e85533648029625c4a95c1668be0e3d659bad0bab4986f8e679f1187e009228b0745ecca372b859b5f0c28
+EBUILD kgamma-5.17.5.ebuild 672 BLAKE2B fa06cfb34f74e3462ba219ded4982df3b8337c89bd576292e619709e6428017597b93f758f64c6ffb8540f63e7efefff10f96e88d00b8499a5ab69ac12533997 SHA512 975fc1d9e8885a57e730f6400fa9dfde8b91080b771fa479261152a4db6cc51a782a90a7c1f2f83556f5a71dbffe0a802498b134d51155067d97e6c603ad37fd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.16.5.ebuild b/kde-plasma/kgamma/kgamma-5.16.5.ebuild
deleted file mode 100644
index 9bf58f5a84fe..000000000000
--- a/kde-plasma/kgamma/kgamma-5.16.5.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.4.ebuild b/kde-plasma/kgamma/kgamma-5.17.4.ebuild
index 41fa4beff6a6..200a03300656 100644
--- a/kde-plasma/kgamma/kgamma-5.17.4.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.17.4.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Screen gamma values kcontrol module"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kgamma/kgamma-5.17.5.ebuild b/kde-plasma/kgamma/kgamma-5.17.5.ebuild
new file mode 100644
index 000000000000..58e921fbd607
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.17.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 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 02372c05d155..d798ee291dc6 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.4.tar.xz 1854756 BLAKE2B 7c8bb163d1ca8703ac7c78d38744889792205cd8286b3d2e88f841df42b68a4cd0d86e5c7cb1af5797857e329c3b6974b883772ec730f1c0325dae2981faecde SHA512 81cde2c4d9e06954d7203fedf47a0b08599795d94446eeb954de6b62b17882313bec5f325374acd662e7e77fbe2817151bc7944b6b7c1040b78ff8e0cc69ee7b
-EBUILD khotkeys-5.16.5.ebuild 1118 BLAKE2B 85f6887495e61d2b0fd9febe31963455c8144d9f22b8baa69a7e5e7a7daba6333fb940d8219a94166241949b778f684ab9ce2b0c2ef5cdd5be4f031bf0a379e2 SHA512 aee5200908e2dbdbfecefeb6d4dcb8638d176fbf31771bb8221d409e91065ed117ff91e9e731c4cec3a0cf034330452d8ee5b7ee2d9435a01b98daae84812353
-EBUILD khotkeys-5.17.4.ebuild 1341 BLAKE2B 5b928f07b29cab349b3e6ed4b21f098718724d483209ecefa10b2066ba3e8e0c3ffe8375a77df16adbd51d85dacd5ded54067933765f1dccdb258251b6d72f35 SHA512 b4404534f1911c932afa8ab82212ba0ca38dbbad7f10342b5da88f28eb6b76a9a046e9bdda62e582187a83da30cdfb7d44003c26c3a66b8488d3b304e2ad6a56
+DIST khotkeys-5.17.5.tar.xz 1853632 BLAKE2B dea94dd9c53a0c6d9f6b08a258a69b8e7dc3e64207ecc32429bcaab494dc99ac6d11428ab3886bc47f54444a54731cf784765be6dbaa19220fa6b1da31348697 SHA512 772e743860db25fcd9953de987d86f2eb1d463fa8f517add7f67426ff868c6b943dc515c23936bd803a680884e73a081e3226037b5f02080244b401b1c1211c1
+EBUILD khotkeys-5.17.4.ebuild 1338 BLAKE2B f688317d66319d8989e33d2013f280be0998e4308587f80302087575506fa4c0af4c19220f9e6127508e1813d672e10b3ee1bdffce46d2b2948bf0cda35f1afa SHA512 6fa6cecd0c2a352098cd0df680bfd64a3152b8139695973b023fa6ca3a655de1ba9fec1ad05912389fb7ab6bbbceec6d38d8ce43fee5a3af339aa58ebecc7192
+EBUILD khotkeys-5.17.5.ebuild 1341 BLAKE2B d005c7e2c99b99d414e121f05fb689b6743c461fea3b251520e9c2e49d4e0fcd9390f238f1b23f84a7154c1c16e125247def4739f9987203f20fe32e050a85ea SHA512 e2d628d322caf1990458599836b383558b3c188af4179864352d935f407c2e2899a71bb9653d6fad7fa0699def42ad3d507f62a127fc8c2ecb9dc6182d902e81
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.16.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.16.5.ebuild
deleted file mode 100644
index bfede84a5c01..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.16.5.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.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild
index 8a49dd5ad90d..6d02928bacf4 100644
--- a/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE Plasma workspace hotkey module"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/khotkeys/khotkeys-5.17.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.17.5.ebuild
new file mode 100644
index 000000000000..e805f20f9987
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.17.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+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 e736cea5ff7c..512d1945ba4f 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.4.tar.xz 1344288 BLAKE2B 8f57b1c3b30f26de384739bdd8e63e085704d419f3c891446f6ecada19963763be0c4c83faca23271c5c3f65bf87aebb750b23e1bde73bc59f187d411164ae20 SHA512 93013206a97ed61001f824ccabc934e6684adfba55c3f0effc64425e0e95d4fb850d614db598059e970b7ee5e70160e06c7664b9b9915db66319b3332ec9689c
-EBUILD kinfocenter-5.16.5.ebuild 2544 BLAKE2B 004476cf535a5069af198a44f751efb50a64330d272e395326b175ec23f6be920a2bb86f0ff0379901b1829017b735f94530a54d2adc39170944bce61f074ffc SHA512 f2e059b867776864c698591997d5791d935f253633707f88265838587ba56a7075acf11cb680f089f547cf65f16a4d9a7c45ba7989c5c864a2c92a6f987b3e52
-EBUILD kinfocenter-5.17.4.ebuild 2750 BLAKE2B a522631fd924163810dd572298bfe45d708cfa2734c2e4bbf79979ad06fcadaab921a24efe293ce6ff42643b5cde7fd9767a2f5dcf3c7d01c1d014827d470d89 SHA512 4d5f3bec0c03a54c7c7e6db12fe4344febdd2d05f09ec3b53010bc9bd4845af48a719923ca080a1265fdafdcfa02f45c083cae6e58c4810ca1846b38f2e7207f
+DIST kinfocenter-5.17.5.tar.xz 1343896 BLAKE2B 0db47b3ed5f937c7701b52b194be71c6ccf474d5a1ede18864f32b1e374972cbd2e15f26b99f30fe4feba6adb153d87a05c5ccc5feb2bdd36ccc4086eda6f688 SHA512 4f759cc614061e128d57dbbcaa3253fdcda3ab96f3149085c320a0fe826f93b19a35c4b642e5ae9726c0e049ea7a4f8b6490575aeefb22b57b2c4ad8c0f1cbf7
+EBUILD kinfocenter-5.17.4.ebuild 2756 BLAKE2B ff8f23ba325e77e38a4e6046ec174369aebdc1e8b07934ecac5964038a8b2befa85f7c3ccbe62d739c314ba0d72b75efef42c7c9c39e57348d573c17d266f8ab SHA512 ac2212b139dbde06f8a05c92c1811c24edd67b4047a0b7d9ad0749a90d055dac881fc471c5b1fd7fcd75e562b4315d090acd412db3f515aac2e6b4e25d14e623
+EBUILD kinfocenter-5.17.5.ebuild 2759 BLAKE2B f34f8012dd048dc1678bef115afa132583df11d009df6aa2a0be40ebfde36ea5f50394a7cfcc31c88c8817cc8fd8dc6335bba2e99d947cdb9dd04a3486711615 SHA512 6b45219b02571a6e09bba8a50bee40260c87112edf0bb25418ee25c37bc523f7cf45e2c5fbeec90d8b66c312011d8d025ef227c03ba36d6825c4422a8150dcc3
 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
deleted file mode 100644
index 7c96628820c9..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.16.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MIN_VERSION=3.14.3
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Utility providing information about the computer hardware"
-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"
-
-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)
-	x11-libs/libX11
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		$(add_qt_dep qtgui 'gles2=')
-		media-libs/mesa[gles2?,X(+)]
-		!gles2? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		$(add_frameworks_dep kwayland)
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep plasma)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	$(add_qt_dep qtquickcontrols2)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package ieee1394 RAW1394)
-		$(cmake-utils_use_find_package pci PCIUTILS)
-		$(cmake-utils_use_find_package wayland EGL)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2]"; then
-		mycmakeargs+=( $(cmake-utils_use_find_package gles2 OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake-utils_use_find_package opengl OpenGL) )
-	fi
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# TODO: Make this fully obsolete by /etc/os-release
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "net-fs/nfs-utils" || \
-			elog "Installing net-fs/nfs-utils will enable the NFS information module."
-
-		has_version "net-fs/samba" || \
-			elog "Installing net-fs/samba will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
index 623f1de3c619..dbfeb6dfa533 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_MIN_VERSION=3.14.3
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
@@ -15,11 +14,12 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="gles2 ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
 
+BDEPEND=">=dev-util/cmake-3.14.3"
 COMMON_DEPEND="
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.5.ebuild
new file mode 100644
index 000000000000..896bec472fbf
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.17.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 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="Utility providing information about the computer hardware"
+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 ) )"
+
+BDEPEND=">=dev-util/cmake-3.14.3"
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}: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/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	x11-libs/libX11
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		>=dev-qt/qtgui-${QTMIN}:5[gles2=]
+		media-libs/mesa[gles2?,X(+)]
+		!gles2? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		>=kde-frameworks/kwayland-${KFMIN}:5
+		media-libs/mesa[egl]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ieee1394 RAW1394)
+		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+	)
+
+	if has_version "dev-qt/qtgui[gles2]"; then
+		mycmakeargs+=( $(cmake_use_find_package gles2 OpenGLES) )
+	else
+		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
+	fi
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# TODO: Make this fully obsolete by /etc/os-release
+	insinto /etc/xdg
+	doins "${FILESDIR}"/kcm-about-distrorc
+
+	insinto /usr/share/${PN}
+	doins "${DISTDIR}"/glogo-small.png
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		has_version "net-fs/nfs-utils" || \
+			elog "Installing net-fs/nfs-utils will enable the NFS information module."
+
+		has_version "net-fs/samba" || \
+			elog "Installing net-fs/samba will enable the Samba status information module."
+	fi
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 6b9262f15896..ddbbc2fbde61 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.4.tar.xz 815840 BLAKE2B 8159680c6f10cb8e82c15b39762ff409ff7c84fa7b9853b88af88dc073688e299a864fe7e3ce93de3e3d5e8a1014c5de2f8ad54df1b0ede43f1e1d7e56c05ac3 SHA512 c2fceff829b32b3342a032e665715029a60d88440661c9d03042657aab8415ebb15e11ae109a55284388c591ebc2953c9c46268b6b1a275936c462a87ce5ddf5
-EBUILD kmenuedit-5.16.5.ebuild 1045 BLAKE2B 2b4171b9a7a27c95ac9337cfefcad9fef0ea9a28acb3ef39e4b2ebd16dc858762030b356e1298ff0dc98452d8833a591b214562355070b24acd10d6f0acf44ec SHA512 f1c29537e2356fd1b24f994b018e7cd7401470ea5162f13fde5c26e8ac6ede7f9b44a397d84fc45f410ec0b3aec14268e57c76d7d2f81420387b57ef635ab097
-EBUILD kmenuedit-5.17.4.ebuild 1248 BLAKE2B fe91f6262144961bd7076b7d069750db58a9c2c71e49edaf17c5b9390d75afd0dbbff37e9f1312daf32f95595eb428102fc06071a72a6556a5062ad002a77464 SHA512 a2193164c7741069eef1898dad6f60c0b8977fa22c363c38fc5cb6ed4db62d954dc9ea52c3f2c26d67e1f216d1881440ddfda802c8717ebd6197543e29b7567b
+DIST kmenuedit-5.17.5.tar.xz 815568 BLAKE2B 07c667dab13b6ee6af5beb10fca4aad9485b815e4ce4a06b19a4851085bf074d38c4c4ccd36a928c06f753f541e76040be18b301ad95cf8d6358fb5c363ab7c4 SHA512 a48652b234834b004c3ecbc8706ee8c3594896d4e5fa29407aeaab10c37575f29539e37117b2765fdf9a9d93db2b062b88b71466ca7b3a1b7e10eb1b2c96b0e4
+EBUILD kmenuedit-5.17.4.ebuild 1245 BLAKE2B 39b370a1f7f36d76fc26fc099ea60e8fc881612c525edc3f7910114e5e0fbc70ac370cc60fd2bb32d4f65c971bd4073d34d0ceb14311a61e36e899076308463b SHA512 cf85ad9edcdf8675abbb08ea2f07878452974b30446dbbeb4a9de5c2f372baad648f32e3db19dc87935584b00f477b91741620987fea75bd2fd7345e5e0bc7e7
+EBUILD kmenuedit-5.17.5.ebuild 1248 BLAKE2B a0c44ba526d50e106a74e68ddd14fe2f7f4ce6bf5ab2a46e4b7fdc1a178075801e6d476da4e030d5288368d91adae7cbc3f5e4b51fbb2f3dc2faaaf8335f52c3 SHA512 130879bf5b6e724e0f6aa50c1c105ba9079b4099fe2d162560948e9c427eb65829a4f959fc76abc6e677943ce3089a5b07fb80da7163f6ce43d34e2175a7d98a
 MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.16.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.16.5.ebuild
deleted file mode 100644
index 6670ea3994f9..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.16.5.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.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.17.4.ebuild
index 2bbfbb01aacc..19e68cbc55fb 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.17.4.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.17.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma menu editor"
 HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="+hotkeys"
 
 RDEPEND="
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.17.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.17.5.ebuild
new file mode 100644
index 000000000000..2be0784b7b22
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.17.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 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="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/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
+	hotkeys? ( >=kde-plasma/khotkeys-${PVCUT}:5 )
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kinit-${KFMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package hotkeys KHotKeysDBusInterface)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 5d6c5d9136b4..90eaeb55bd0c 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.4.tar.xz 100032 BLAKE2B b87e97c9cc16eee6f9f0ec2522b3a96eadaa40e55b3ea7b3a5cd4b24fd32a79fafbb9b710d262e5399a2af9363c43f71dd1962269638a41b08314f57e4c80ce5 SHA512 f8927c0aca28107a8c19a230831ddf7a7e3b1bc87f7865bc74b76aabed9b8f512ed09fa24436691bca9bb833bf3515aaf734962845c1f085a32da21e00e7bad8
-EBUILD kscreen-5.16.5.ebuild 944 BLAKE2B e3efb10975048d182736edc78a5fb7ed55170a41fbaba70b8ab3e566df19c9e138f5ce60094ce5418e6270ab225eea0dfbd0374fa554038e005a3f0a70ebfb7e SHA512 f81c103d465ee6fb15d791b014b14c311bb63e594314648945f68bcfe691f6308cd78c6eb8bb550461e1bc915d6b14a54a88a2173cd375a495487da5b4e03fe6
-EBUILD kscreen-5.17.4.ebuild 1185 BLAKE2B 4885adefdd330a4767411b1fe5303a912c1123cc6d3ee58bac1ad038f1f78a909f45489523650dad1d956e6efeac6ff2e273f8719673a6474687d3b9b037d0de SHA512 d716879a479744830061b922e8e26aa8c1869c07079729414e9f2871233482f0d4fc167c770198732df03174f34fe1d2b7bb4903314fb4892aa4196f586bed82
+DIST kscreen-5.17.5.tar.xz 100672 BLAKE2B 02c3f52d6cd457ee7e9343790aaf6ba87227e4b8499b3c5fd1920c5140b59a60b81a9202ebbde05db4705d25b2ae949e44247b63e32a645616ad2bffe7b2c6c2 SHA512 3a0abdeb8aa4ffde8a3aefee71292916ea1331ff91292976cb94b6def068d012ead4fe1aae3c6ad9353423a701cfaaa051f0455897fd80693a3281a33fe3d332
+EBUILD kscreen-5.17.4.ebuild 1182 BLAKE2B dce52d6d61d27c64b27907d0c33ab49c956940ec1646c3a4d039a70e99ee2d55719186f6134cf2c9f383b7e95ba2f75ad7dd9c31a21b2fcd4389d1998d02cde1 SHA512 7dde8ea40b406d441c6c55c980c521ade5af7c9ae7cd25ff1732ecd098553dbadc3acf7e4c4a520dc03474e5d7ed58f0735e7f2b7d9c7a7efe5a5fc5a8db49ed
+EBUILD kscreen-5.17.5.ebuild 1185 BLAKE2B b16a9ebc87e6e36e0fa1d10b83bcd299975707dcabc3b4fc855e644e9b11eed6f44b625eb9d91f44f7105decc58583ac1049759bd72f496a29912ef32f6620ff SHA512 70ee19befb7dcefebefb420ae0d5e4a3c47a5799e2fa705ef43d88a8e61f4071d3a8f9d6af377a0e29268a992a96a23bd1ad57f1c7f5d2868324428300b72696
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.16.5.ebuild b/kde-plasma/kscreen/kscreen-5.16.5.ebuild
deleted file mode 100644
index ff19cf5b12ed..000000000000
--- a/kde-plasma/kscreen/kscreen-5.16.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="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 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.4.ebuild b/kde-plasma/kscreen/kscreen-5.17.4.ebuild
index abed1c8573d8..cdfc562821ae 100644
--- a/kde-plasma/kscreen/kscreen-5.17.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/kscreen.git"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kscreen/kscreen-5.17.5.ebuild b/kde-plasma/kscreen/kscreen-5.17.5.ebuild
new file mode 100644
index 000000000000..277c8cf09347
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.17.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 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 9f08e13f213a..4c171dfe532b 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.4.tar.xz 123716 BLAKE2B 244d15c43f23f189eee818536b105df8f69d82315b897d04fe44a0adc05260be259c7832a466a88bcd2eee536e4a092be55c99261ecf93d9468019095a4456b1 SHA512 28e08368e4dbab9225be0896b69145814a19de60b2648fb8039bf9e1e052eaa931942118c58625c292afd08afb2ad164b7fc28c95b9a00df6f56395af88fb51c
-EBUILD kscreenlocker-5.16.5.ebuild 2136 BLAKE2B 10f918df9df18f8607cecebb88f5a4050c3698f8a5d04d482d6c80e7b85c3c54240e87b99aae27fd6c3cb4417611fd4d8fbe6a7044ec80e60c0f4cf1b9a5fc5b SHA512 b34745f4184cc3eb52d7266b5e6fd8d682ef366a43b8230a76fb20d9b5dc89ff6560fde431236a7af79f7af8a669adf49271d28071f27c0c3fe2be5961a7e829
-EBUILD kscreenlocker-5.17.4.ebuild 2347 BLAKE2B 5dc7e70ef0aba586266a580c2df0f427e17765b1531c9bc923a70d915aa4f070c1bbf82308664bdb5c5236946d364cc60b9f03b20ad2fe3b9a17fa3a3a71b83d SHA512 26fd1af9cbede5ebddf95f9ec7aaf442cbfca8c4e552fbfeb141a98c59d2bb514bcff1fe9f9d4adf5e30891f4b236e41b4f297a0ec10fd718d008d1d5bd68d21
+DIST kscreenlocker-5.17.5.tar.xz 123744 BLAKE2B 2b2472d5cd99402930a3003e1a8daa07cd40b7501648e4007c947e55b9e130f8336d267409c5c60d2d4d2544ec4b8aa6e1acca287296407781d44c5c22ff8519 SHA512 152a310d8e3256da1b08b7b0d0a9e2be826a18d3c9ede61bfc764efed02e66e11f209edf953c9098a378e1566d3a7ee1013f733f205f66543174ec0994750248
+EBUILD kscreenlocker-5.17.4.ebuild 2344 BLAKE2B 87a09fac628beacd98810ee60ddfa138c9e9818bac50e47dc4d90a1b8ac41aeae7d49d9ee51883fee097c36e536c2d93e1b4713c3f8b95a4c8dcea72cfb7f014 SHA512 3b6ac8a675862c158a87c45b739ff0ee0c8def8a203a082b93161978d48a11f740689336d09a307125c2d327509c5883cfe227dfdec2795f9c584a23cecbc6f2
+EBUILD kscreenlocker-5.17.5.ebuild 2347 BLAKE2B 136d46d2317e036655a6bf2fded19ce3af60a6d7e2e0e7b4b4938e7c12e460247ee53f96d8e4a496b53a8f580c54f16b3ce9752cd7e7dde2458db065df8f3ba4 SHA512 fd4063ad81e6baf645f2df3f1a6025db09480808a240dbe8eb4ff4cddf0bbbc9ae406459d82eccd1491e9969fea177f95524e5d8208af34b82a6869fcdd1fe4a
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.16.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.16.5.ebuild
deleted file mode 100644
index 380d1385adf5..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.16.5.ebuild
+++ /dev/null
@@ -1,94 +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 pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-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)
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	consolekit? ( sys-auth/consolekit )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
-			-i greeter/CMakeLists.txt || die
-	fi
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	kde5_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package consolekit loginctl)
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake-utils_use_find_package pam PAM)
-		$(cmake-utils_use_find_package seccomp Seccomp)
-	)
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
-		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.17.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.17.4.ebuild
index 036f9d065d8b..dd40dfbd9a5b 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.17.4.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.17.4.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="consolekit +pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.17.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.17.5.ebuild
new file mode 100644
index 000000000000..44281d3cb903
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.17.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 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 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="
+	>=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
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	consolekit? ( sys-auth/consolekit )
+	pam? ( sys-libs/pam )
+	seccomp? ( sys-libs/libseccomp )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
+			-i greeter/CMakeLists.txt || die
+	fi
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	ecm_src_test
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package consolekit loginctl)
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake_use_find_package pam PAM)
+		$(cmake_use_find_package seccomp Seccomp)
+	)
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	use pam && newpamd "${FILESDIR}/kde.pam" kde
+	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
+
+	if ! use pam; then
+		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
+	fi
+}
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index b5cacbdc5cc0..27bf7f83b8ab 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.4.tar.xz 21468 BLAKE2B 29dae019ed6d4ee4806540b4e0ca2d3513faa0c9fea6f566172fa3f07745e354dc8821b41e3a282aa8a038efc80ca830d94af0669cd270d625ede355a27b1736 SHA512 fbb1031fd7541f37c4ad1119ad41ea7df6ca783cc6f1b53d40f7a11635fff1f7f60f6bc6d4860ec5e99caa3f293346cd71d7ddd6e05a28d60e71341eaff40121
-EBUILD ksshaskpass-5.16.5.ebuild 1208 BLAKE2B ea2987af04a4d3f03040a66a782090fd7e6be7194b30bb9dadaf2f0bb01e95b12616efa562563f4171ebbb9489828a37dc44416b394b5d242e1c17ec77d4b43b SHA512 a1cddc2234d04f3df3ad15f81c50e2935c752e9913d69da6b0bb6e0c7a1c6319bc63031a33c183d7b66456fc628fd62f166b020db34562aa1ea6ebedb0012306
-EBUILD ksshaskpass-5.17.4.ebuild 1536 BLAKE2B b11ed5435dfcc4dd3b2c0ceb7f0bcdfd236111b14b251ff313015ad4a16ff98f8c3e0fe12cb6fc62b47eaf4b87b872163e5aecf9f51579a5732142d787ac8cca SHA512 f984c1dd66899ba18ab40686d574a14b67f5d90e23d30ecfe5fce3440fb4d489b9c5b06ba2ec22f89dffa9777b63a7aea8e0def9e80fd277145dae0b16903b85
+DIST ksshaskpass-5.17.5.tar.xz 21372 BLAKE2B 134a533570b75d66cff195819d41b782b67e0f308d6b36efdd7ca223cfb8994baf29506e3cfc34c6786d35eedf792ed6519b40b0f39360468465c76a197c8362 SHA512 c3a6d5b914c13cdd2ca94a237168702729755ba51e036bef1fb5f09f9e7d1c01c176ba14f225c5ae3781434e8fcc047dd250f9da8d3704da09e9712819a5948a
+EBUILD ksshaskpass-5.17.4.ebuild 2188 BLAKE2B 38cbcc30ebe8dfe95c8cbe4e383b8c37f54bf0d695afd49f463536234c8ebcf56232868b8b17b6d7d8592ffea9ad25707fdbfe1c9cc85311791cdd8b6e17c28d SHA512 357c980db7c372d8e4fc8f2bbd9fd77392e66f3fb82c49a9d2bb7b55fff1ecdd86dc2d1e09ff89ebdd1b21b385f7f0ce3b44c6f29d5d78c4a37d730554b335c3
+EBUILD ksshaskpass-5.17.5.ebuild 2191 BLAKE2B 1769fa2f03d1e902dcce4334dbaddba73999e3279bda59855b6768fd2ea7a093b494a5359c563ad2f30493da4c793ea2b195054ee964b36455f1967dc348b083 SHA512 6027e74a2b09979f8248ce06e37627b882c4f1f5261d11591b232885a18533506d9355d0b402d70f667cf669a5630304e0549cc0e17dadbc3cba6afc74ee3a66
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild
deleted file mode 100644
index bebd3ba15c05..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.16.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
-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)
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	kde5_src_install
-
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	elog ""
-	elog "In order to have ssh-agent start at kde startup,"
-	elog "edit /etc/plasma/startup/10-agent-startup.sh and uncomment"
-	elog "the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/plasma/shutdown/10-agent-shutdown.sh to"
-	elog "properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/plasma/startup/05-ksshaskpass.sh"
-	elog ""
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild
index 4709b97d6146..e9ba62d4e34c 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild
@@ -10,20 +10,43 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=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}"
 
+pkg_setup() {
+	ecm_pkg_setup
+
+	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
+	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
+	if [[ -f "${EROOT}"${srcfile} ]]; then
+		local md5=$(md5sum "${EROOT}"${srcfile})
+		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
+			elog "Existing modified "${EPREFIX}"${srcfile} detected."
+			elog "Copying to "${EPREFIX}"${newfile}..."
+			cp -v "${EROOT}"${srcfile} "${T}"/ || die
+		fi
+	fi
+}
+
+src_prepare() {
+	ecm_src_prepare
+	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
+		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
+	fi
+}
+
 src_install() {
 	ecm_src_install
 
@@ -34,17 +57,22 @@ src_install() {
 pkg_postinst() {
 	ecm_pkg_postinst
 
+	elog "In order to have ssh-agent start with Plasma 5,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
 	elog "${PN} has been installed as your default askpass application"
 	elog "for Plasma 5 sessions."
 	elog "If that's not desired, select the one you want to use in"
-	elog
-	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh (ATTN: Path moved!)"
-	elog
-	elog "In order to have ssh-agent start with Plasma 5, 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."
+	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+
+	# Clean up pre-5.17.4 script
+	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
+		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
+	fi
 }
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild
new file mode 100644
index 000000000000..2eb06335f07a
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 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 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="
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	ecm_pkg_setup
+
+	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
+	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
+	if [[ -f "${EROOT}"${srcfile} ]]; then
+		local md5=$(md5sum "${EROOT}"${srcfile})
+		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
+			elog "Existing modified "${EPREFIX}"${srcfile} detected."
+			elog "Copying to "${EPREFIX}"${newfile}..."
+			cp -v "${EROOT}"${srcfile} "${T}"/ || die
+		fi
+	fi
+}
+
+src_prepare() {
+	ecm_src_prepare
+	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
+		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
+	fi
+}
+
+src_install() {
+	ecm_src_install
+
+	insinto /etc/xdg/plasma-workspace/env/
+	doins "${FILESDIR}/05-ksshaskpass.sh"
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "In order to have ssh-agent start with Plasma 5,"
+	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and uncomment the lines enabling ssh-agent."
+	elog
+	elog "If you do so, do not forget to uncomment the respective"
+	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+	elog "to properly kill the agent when the session ends."
+	elog
+	elog "${PN} has been installed as your default askpass application"
+	elog "for Plasma 5 sessions."
+	elog "If that's not desired, select the one you want to use in"
+	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
+
+	# Clean up pre-5.17.4 script
+	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
+		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
+	fi
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 5b9e1a095860..8c8baf26446b 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.4.tar.xz 514576 BLAKE2B e918577341e8c1f1a476d1530f1d5311f10fbf6c0d7238a54de7f660a94babce80f17f9d7a8c6ca676e918a5a29b259ed01540e9b93ad64c8df6e44521abfab2 SHA512 90e34f7d93b0e5c03c77eeccbf5a19b5c1d5af71e9cbb7e77d5e5a802af76d10d9d832b1d71f088b74d8bc5a6e5612229a9710d874589fa69824843dd5b73bea
-EBUILD ksysguard-5.16.5.ebuild 1115 BLAKE2B ee7aedd0a34cbbf10ac673fa138f2ca3bc0f2ac31b1be14cbfaa9bec988a62132898e122efae8cf281223b30f315a45811c107decc6a255f4576f27058b08867 SHA512 a7d96fa4181bee1c1f1443ac02e03ac663373229cf9a47703f5c80331f4f38fe67d681c57582332a32a263b10a287cef42b108e8c92abc9a4f5d87f6156b763d
-EBUILD ksysguard-5.17.4.ebuild 1389 BLAKE2B 8d406562a2a99cec034076c16a894f21a14196c80dae79bce2e46498c5a6725fe118193762613a9995c9add838ef6df2a741aeb91af594da80d2e369b5956208 SHA512 732e2c5ef9ed7b987076b060f6f8f3fe6335e6e86b12fdd6e1131f568cfc23b06a615be3aca9a317d0339eaf965b67648e3945312809a0880c378b9c96b66579
+DIST ksysguard-5.17.5.tar.xz 515292 BLAKE2B 216a52db86ea02b0c2e6a4e291ba41e5bfd4833732fc1d027ffdba45e20f688ecc9299646be8b81e010abe3602467f48a33f75278646c6a33359c55216e0b482 SHA512 65c66d469487fafec4eec80ab9fb55e48520d87742b64819eeadd659d7ad43b87f647ef3031aa73f348d5716aa416089012bfb125d44fed01f3fec836d5ef549
+EBUILD ksysguard-5.17.4.ebuild 1386 BLAKE2B ba4cf40fafead5fb922f286154657704a80dd7a53451faacc02491dfd3e62d114bf67ae212a2fcd125d5c103e243f85798e759cb1e58d47df67057c221b29a71 SHA512 e40008933dfb924e7ba25e1684063327a42e98bafbec7397de2dea3493828372029ff1391258c846d2fd7286e78d7a77ca6b06f2bcc3860c7f87ce6d746e7954
+EBUILD ksysguard-5.17.5.ebuild 1389 BLAKE2B 465eedde1ba11f17b8e967f29355a11b143edab8b03178ecf0cf55a78e9f318c37e0df9e401479474faa582ea7378787cb065153e291e98d96500e414656f4b0 SHA512 754f58ee86413fdc0929a15de064813e9b1d05ebb049bad77c6023c99fe688cb25c39589f4eb43fa50533d5a7a98d6f830cca0894f066ad68fd21654926b0f6e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
deleted file mode 100644
index 0a4f54edf90f..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="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)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm-sensors Sensors)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild
index 0783b56da640..2fd49af949f0 100644
--- a/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.17.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Network-enabled task manager and system monitor"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="caps lm-sensors"
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild
new file mode 100644
index 000000000000..204a0a39d6c5
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 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_use_find_package caps libpcap)
+		$(cmake_use_find_package lm-sensors Sensors)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index e7ccfca14c48..a571aa8bf236 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.4.tar.xz 19716 BLAKE2B 624ca8f786f109413c754df5afd6ca0de54c8337057b9f67f46c3514c0e0ec58e9e52c20abf6aba7d959975a91285a2f89ee773cd5b1b56166a026409e0e4c5f SHA512 b75263a8c08a9410f542430d063e3323bb8070af6d4d113ae181e75942d4176829d1081a4fb7c2d5a88f6a12696415ef007fc135860e882cdc1244d84bf77cf4
-EBUILD kwallet-pam-5.16.5.ebuild 657 BLAKE2B 3e7808f3098d000d8ab4670dccc6a3c15e6bdbea4c4201dc5e95ecdc9d9785fa5af4c721e3976f31987e0f074233dcb874aa461174101da3be7a8ee0e3c26680 SHA512 a1a06693a8ceb902aa8652ec95624b7c8850cc60731b43e71b61d4655399db7a25934c7c5be809cf395dc5c810c1ce13cef2212968d7d38248a0cf8dd8733341
-EBUILD kwallet-pam-5.17.4.ebuild 714 BLAKE2B b065c23a3174a9070e2b41ca87855addfd8e74c0e3d1ecdadf74cd7648abf6649765a89a331b7d5640070af14f77be741379af7678d429080eab7de68a0914df SHA512 d892a989043dccdfd02cd37fd02ddc5ba89324e5b73345315ef1ee9d32ef36237fced317f459025e5e14b13bb55d82edf2b42663620987af131999b6ce185a5b
+DIST kwallet-pam-5.17.5.tar.xz 19712 BLAKE2B 2166498cddaabf55ea77312b96e863fe666afffe976507aa4f1c1421f7182c8db195d55b7462d3355acadb4cf2008792983712ec286811d22348ccdcc6cbfbbc SHA512 3a15ad62cb59aca1165c3159572669e5a44a2f1bb6aee51937b4d970a4eb901f7fbee74ed874ad20d65e3adb4009e143954dda1ee31ccd223c3a1b3208da6436
+EBUILD kwallet-pam-5.17.4.ebuild 711 BLAKE2B a0154ad5c2233a0ce5387e0d50e816cbe369f461df7d6ce72f984672efdb5628da49e78f220bbce45318bd56d390425fb09eafc3233bc38763f1b451a7715b87 SHA512 c6d131d4d3e84f4a0e00f027642afcff224cb8c1adcf4627c63ae530f53df4ee9071c663a6a9c9ab762d6a8a083cdb326002fc07183b1033402de3d01d08c92d
+EBUILD kwallet-pam-5.17.5.ebuild 714 BLAKE2B bec2360a8e9a454b82ec4beb8ac69d195add87ad70a20f7456d9700fd4f13633263606ac0ca97dca8b3ad2bd944ed42f70415077214aaf7996958f171c115c70 SHA512 7e7cce828624198d457769ecbb3cca7abac7c636ce4b4aa8dd6a80262993b80c8142bf1816ce69630337ed656b35ec1ca039aff9852ef67ffadfed1463db4473
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.17.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.17.4.ebuild
index 2bbe2356d0d4..9ca8be7204d5 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.17.4.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.17.4.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.16.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.17.5.ebuild
index f4803c0ed16b..21bb7f174c49 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.16.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.17.5.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
 
 DESCRIPTION="KWallet PAM module to not enter password again"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 x86"
+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 0e426abe1e9b..90d5c27e1a66 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.4.tar.xz 20236 BLAKE2B bca1462d6c84844aa32a803afcf73eebce2bd1dcaad1fa2a3c86630ae2d711a7b8434b755aff2381ddd107c7e3ba25b3ca8521f33859086f4d165392230b8900 SHA512 ca165b5b76dd035b4ffdf0d31f2532f7609a476bd53f36d567a3f618a7993c746f40165f439b49f5b6c75f8140902254d3c22523730d4a2c1073570be1c9f226
-EBUILD kwayland-integration-5.16.5.ebuild 554 BLAKE2B d28247ea10e8f9f971e66720bf70d7ffb84f0707d8c8a301ec5b80b3944c1b58850f2ee4863f3525104f1fbe6504ab661711bed51e306e958dd39f8bbf82854e SHA512 d27d7657ffa91e210bcb979a02223146041c1b98dc8e67cb62db28de28d368203a0af2316cdda2d8c1d70c9feb6a4b21c07e0d4448551831d4942b4460f46a59
-EBUILD kwayland-integration-5.17.4.ebuild 690 BLAKE2B fdc20f4997a8c17ad002273981d2bc619f4f334035365df3fbc41f0722de7e88c9db58159547fe9d159f8f79f52efb9ff76d8059d450c5ba1b9e0ca368d7e000 SHA512 cb92b5d9d48853783cf93751375c8a8f0671658588fa5c8c1080f46f08a601b8157f9144ddd3d0c31a3eb00c9c00f01544a8802e608482bd0bcd5c9100babc1a
+DIST kwayland-integration-5.17.5.tar.xz 20184 BLAKE2B 4597ae60ddc805745d519cfe7959c9d423a01ff41d3c3565600d807943950cb1008265d8cb685ee038be0950af7a2237e4de78d4574aad3aba816cb09419a21e SHA512 50ac96f4ed957ed264e8f700dc9bdb71ce04cb4a6385c2316890171943c4b7a23ebba08eb7047eebd99ad7c6d485f440c8ae7375c040088ddfffbf7f5824634c
+EBUILD kwayland-integration-5.17.4.ebuild 687 BLAKE2B 9903b6c78555f8350db887c6bbd0e260fdb792e8c681d62ceb3d3b016e51e56f46a845eb2ec671fae8231e34d25b8010cc7e1303382828715d2a09a99434cbab SHA512 8fd1dd6bbcc88715cc56c55bdc864a77528398f553ef5c8e4fb73593f2b60a385804bcad9859c63d12ae05285aaf284e05bf1348c5c27b332e31c8f9b486366b
+EBUILD kwayland-integration-5.17.5.ebuild 690 BLAKE2B b5c0db093be366a893dae7e761761d42391530ed971f87a13a03d18b48b91b3c0c32cf5a00763259d0b6da2209d13beaffd3ccaea168124e9953346817bf4865 SHA512 df45f5cb746eca09d71db5e94e43b8607187de2c1c40905e180ee49486059e5f886aec947a06d56bcceb801f4d3271a704a628a12c8c8a6346a8ea1ada52bee7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.16.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.16.5.ebuild
deleted file mode 100644
index 4e0858fa7924..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.16.5.ebuild
+++ /dev/null
@@ -1,25 +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="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.17.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.17.4.ebuild
index 6874a1a4a047..616a4e7f8d0e 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.17.4.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.17.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.17.5.ebuild
new file mode 100644
index 000000000000..997911544218
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.17.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 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="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="
+	>=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}"
+
+RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 51141311f8b6..2f12d41916b2 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
+AUX kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch 2003 BLAKE2B 91c564200d51de231faaa5c7a9ce205f4bbbd88fec880094ac73a84e83e68650d7640b130f1211e9f5e979b9bee671ea4fdb218e195b0eb5f6cf7db1ad3b9a14 SHA512 7f1094f5b1e35d148361edbe15ecd38304bcc614ae7a2a9d8c8eb0888424404a14ea810e9a4b0543fa2ecf4ff6bc0596db0bd0e541a791cb5c87afe0d39c628b
 DIST kwin-5.17.4.tar.xz 6253952 BLAKE2B 57ba5997ed3d22900c8e71ee7d1afb79064a5aa7e613b5d7797f8a73d3451747199046605e0f7936e74ccc55ead001f0a2f43ff4d53341f32290a11670c3352f SHA512 457dd5a0d89ed75b10edcbdbfda909bae03c9ab2e2fc617bcfc96f8c5f2729f01d866ee5b7384da6eb785292aabee64b55f7f0f38e9952062e219924ca045def
-EBUILD kwin-5.16.5.ebuild 2673 BLAKE2B ee6f3e356ecaa04597be2d9d7e20122201132a4c7bffd133ad729e1aee13354da0fe3e884f8d4939e53cf41eb712033687deac34158ba742318d495cbc0c89fd SHA512 c82d623a7b1e1d356be740d34756e17c73284a54c01f494bc5b18cdbdb58a944de8f73b05bee46be60675e9f9d27bf63c7f266d4640f26112ebec83792c9c928
-EBUILD kwin-5.17.4.ebuild 2961 BLAKE2B 93fa24a3ca1239a6b38efbd0687ffec513cd4fdeb54a77801a0da0b7da17781895f169c59df7b05eed7b1ec062987df71fd543a42aedfde902e384e0530e8df6 SHA512 b5618ff2423ec414b22d5abd1899a6a4a1ede3fd3e8ed0a0bf261e668b058723458570f9ea699bd69d79ec9678d1461957887e5f8d9d3196bf7770fd15830df1
+DIST kwin-5.17.5.tar.xz 6251468 BLAKE2B 52e2c11e6164d0c1da49f818e842fdbfdea599460204ada2fdd5f1f09cb230d4c1fe96e8c00a85d8c9518af7cfcbefc584d0223701448b5afc009af5cf01e0cd SHA512 67e1f7044579b7c1ef7feacf92910f449c7eb5f6ca3ada3e1ff5820f811c1b4a168690b74a163659c84c9daf0094144b5584f287fefeaff8effab48bab7258f7
+EBUILD kwin-5.17.4-r1.ebuild 3041 BLAKE2B 0c1480fa89c907ac14d573c60e731ab7adfb6c413ed7a20941cbc1ebf6e4ace8d9bd05efb8ca73ecb8719ad2309ad61c1c65118304c1d5e44c553e503b81a890 SHA512 d5b53b4541aa5673a2aefca02ab0a5861005e94e3b210a0346f909d25f218fddb2916f52cc7f572713efd01a3ff5fdce13a47271531ee4db8220f0c2b7a46eb1
+EBUILD kwin-5.17.5.ebuild 2961 BLAKE2B 8f20469d8d244a5d84ac06b60c378ae6daba226dbdf79024111426fc9f4c400397199684ccc2d6ca05d6b309286244b2a04620d0e6a17365d6b8ee9b0ab5c150 SHA512 1713f604c51c10de7ae6c2cdd6aa73502b490d04815b344d8397adbef7168725c41f8d447641f8004dc93630af9ce8c72f993956cf9f126c4e5ec4e905bd53cd
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch
deleted file mode 100644
index 81db399f6b5b..000000000000
--- a/kde-plasma/kwin/files/kwin-5.15.80-gstreamer-optional.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Disable the effect video button if gstreamer is missing.
-
---- a/kcmkwin/kwineffects/package/contents/ui/Effect.qml	2019-03-22 23:06:45.172699544 +0100
-+++ b/kcmkwin/kwineffects/package/contents/ui/Effect.qml	2019-03-22 23:07:30.435043637 +0100
-@@ -111,7 +111,7 @@
- 
-         QtControls.Button {
-             icon.name: "video"
--            visible: model.VideoRole.toString() !== ""
-+            visible: false
- 
-             onClicked: videoItem.showHide()
-         }
diff --git a/kde-plasma/kwin/files/kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch b/kde-plasma/kwin/files/kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch
new file mode 100644
index 000000000000..b738fd7b013f
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.17.4-possible-kdecoration-crash-in-systemsettings.patch
@@ -0,0 +1,58 @@
+From 1a13015d2d1de3ffb9450143480e729057992c45 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sat, 14 Dec 2019 16:08:16 +0100
+Subject: Possible fix for KDecoration crash in systemsettings
+
+Summary:
+I could never reproduce the crash, but we know from gdb that it's from
+the decorationSettings object
+
+We are setting the same QObject instance as a context property in
+multiple contexts at once. This is already slightly odd especially from the POV of
+Qt's internal property cache.
+
+Given we want one object to be exposed to all contexts, we can expose it
+to the parent context only once and achieve the same result in a simpler
+way.
+
+BUG: 411166
+
+Test Plan:
+Verified opening and closing system settings still worked for me.
+I could never reproduce the original crash.
+
+Reviewers: #kwin, ngraham
+
+Reviewed By: ngraham
+
+Subscribers: ngraham, apol, kwin
+
+Tags: #kwin
+
+Differential Revision: https://phabricator.kde.org/D25913
+---
+ plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
+index f3ad059..c37f00e 100644
+--- a/plugins/kdecorations/aurorae/src/aurorae.cpp
++++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
+@@ -262,6 +262,7 @@ Decoration::Decoration(QObject *parent, const QVariantList &args)
+ {
+     m_themeName = findTheme(args);
+     Helper::instance().ref();
++    Helper::instance().rootContext()->setContextProperty(QStringLiteral("decorationSettings"), settings().data());
+ }
+ 
+ Decoration::~Decoration()
+@@ -289,7 +290,6 @@ void Decoration::init()
+ 
+     m_qmlContext = new QQmlContext(Helper::instance().rootContext(), this);
+     m_qmlContext->setContextProperty(QStringLiteral("decoration"), this);
+-    m_qmlContext->setContextProperty(QStringLiteral("decorationSettings"), s.data());
+     auto component = Helper::instance().component(m_themeName);
+     if (!component) {
+         return;
+-- 
+cgit v1.1
diff --git a/kde-plasma/kwin/kwin-5.16.5.ebuild b/kde-plasma/kwin/kwin-5.16.5.ebuild
deleted file mode 100644
index 7f3fb98e6d26..000000000000
--- a/kde-plasma/kwin/kwin-5.16.5.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.15.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.4-r1.ebuild b/kde-plasma/kwin/kwin-5.17.4-r1.ebuild
new file mode 100644
index 000000000000..8ab59a2c9557
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.17.4-r1.ebuild
@@ -0,0 +1,111 @@
+# 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"
+
+PATCHES=( "${FILESDIR}"/${P}-possible-kdecoration-crash-in-systemsettings.patch )
+
+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_use_find_package caps Libcap)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwin/kwin-5.17.4.ebuild b/kde-plasma/kwin/kwin-5.17.5.ebuild
index 00d2247339c1..2d2c1536ab97 100644
--- a/kde-plasma/kwin/kwin-5.17.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.17.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 33dfeb243ddf..bef0ed6c1fd6 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.4.tar.xz 20040 BLAKE2B e31e74a49c7fe9d929092e78ff3af9206a0ecc85940590b36fb9b5a9dda6e27282241ece34c082a16edd0678c749bff5b9ded1b33cddb423747838a331da79f6 SHA512 e8c3e7f787350850c9b10e2b5d69b92c7b68a9bce2a90df590b16a8209848d08d53602b527d7f5166a032c156d6b7432229e736a1fb8f11637eb5e3d8b59fbd5
-EBUILD kwrited-5.16.5.ebuild 480 BLAKE2B a6dbe8ff13271f2749d8be7b30edb1b95df36671f12a75886e10c11070d5886e6680a7387a9b3d484fab03eb88abf9c9dede01b0e66a945f5e5cccf5c981c277 SHA512 afa3ce11dc93eea3e08af463ff22af8f37350e774f1c967f4e80cc36cf4e0a5d9538834e9b455f131ba3c74471383ab286099b58334fb7e6100cfdb8ccfbb14c
-EBUILD kwrited-5.17.4.ebuild 618 BLAKE2B 836aa5420248f8717c8974bc9b7d9c84cf8d58c8d9e9de422d28b54cf9e62202c8fd1ececf421c7497b124fe30d236316806ba1255dfac9c31aca43563c5628e SHA512 68cb4d06ec87d565e47ce34158373e989e7ad15ae84dba87a74d3fce4865ee1599bfd109be7e36ac96eaed8ebf3512c3fef5a8a859a015a9c104016caad77592
+DIST kwrited-5.17.5.tar.xz 20080 BLAKE2B f9947b9d9c3350b7c08037a30c14b35e5f5d53339f99df5ef53703fc7c53b739a2e168e1581a2ae1007606590edde56d20adf07c711f2680e3dd045f6838f682 SHA512 b317860d6a9307ef9e24e48a538b7f1c8834133f03d306592bb5bdd855149f31195a4de7e46db2edeb3f26b5b608c7b16fbb46a5eeaf6b482eca14073f89b32c
+EBUILD kwrited-5.17.4.ebuild 615 BLAKE2B 75677c8299359c04d2d1b0d115d77732c28103ca66e52c0f6f61c822d34b6f62a7223945527ac6170fd6697cf3f1ca733599e10477c181c74f627789084f2e4f SHA512 a1a847587df6c1ada21348901016dfab10933e946db55ea7948ce5b0c3dbc4ed5e27ff1406dd1b2f3447c1783092d3691875a9d8ee0859358b5f757b94127a1a
+EBUILD kwrited-5.17.5.ebuild 618 BLAKE2B f5663a40f355444afaaa3f0adfd61149b8a548c96a66e56fc8cc0657a5e51894a09ce66afd7b881cbe9bc8d76404c53f144a1033b281d420708e8084f0d72537 SHA512 c822e0df083435afd7cf33ff3e01d7240b3c0592f25bfd0f66d806356e2f89371e80b8e0ee6eb9a81103e00dae3ca82701f451607492554aa98c50ced135af1a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.16.5.ebuild b/kde-plasma/kwrited/kwrited-5.16.5.ebuild
deleted file mode 100644
index c53490533113..000000000000
--- a/kde-plasma/kwrited/kwrited-5.16.5.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.4.ebuild b/kde-plasma/kwrited/kwrited-5.17.4.ebuild
index bca843b587d5..d77ed34883de 100644
--- a/kde-plasma/kwrited/kwrited-5.17.4.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.17.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwrited/kwrited-5.17.5.ebuild b/kde-plasma/kwrited/kwrited-5.17.5.ebuild
new file mode 100644
index 000000000000..a11b3fa769ce
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.17.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 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 67b13ac4a282..b8fb2932be1c 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.4.tar.xz 82852 BLAKE2B 63d495019289087a465b54f282583edc74974180ce4d206ccf5c7b8c7decbfdf85d2f285d13a7733336cf2cc68168670d6dbfa45e6580d8a46e42bf7918f48ec SHA512 3c99df80adb47de3dc91f389e70013dc8f188e4fd272bc125a0d0192566963a6868c94dad055df57e061666335ebe683e521738ac912fafebc2f4da9c8ac03e4
-EBUILD libkscreen-5.16.5.ebuild 497 BLAKE2B 3493ea5e47086d6fc6d6297b43f40548101fec90c4b465c999156039cc9154a197f1d3f9563846068433e65d4f9e9f49458ce07156f48157301ecba7367734c1 SHA512 1d32970d8fba6b8eba2cab971fbc4214f8e4ed6ff96b5184e7d29dc1bce3042824143820752e076e552fd4aac66e0d98e758046999a4c890542fe051e6f87892
-EBUILD libkscreen-5.17.4.ebuild 608 BLAKE2B 42450f2ca153df6f1b850bbce4d09048891af2a42812203527009c6ad0af798f7e7eb47f8ff1e6ba8e546b3fe1313be1136b9c594116946fe9b2f11e6a9e8a5c SHA512 c5259d120acff2fa8b8b36d3d3892309f5813ea47b5f8fb1392e8da135d6a47e6f49b5fb892aa1ea32465f81f45fca910cfb6c01ff10d005dc118524700a4fc9
+DIST libkscreen-5.17.5.tar.xz 83028 BLAKE2B a224c25d51e705b7f08dd3fa7c96d77680dc9289d35d696f00396e9b9ae1aaa3aa737d026a5dc9f6e54601562d21c79d09b6cb7d0f4694b303ddf1ef5fd758be SHA512 6ddc96e7213097513de955fc1c1b53ca947c325102079d83ce110dcd21c95c6e9e5b0be9c9a2f95f03e0eabf965d42e83a278806d11dc46e5915d906adc9a96b
+EBUILD libkscreen-5.17.4.ebuild 605 BLAKE2B c5e1452dd88ab15179086679fdade14eb727cd0030e36566f8caae7d22ecd0a2ae6337309be530ecbaebed8e1e43565756c7d93cc2908f1885918dd628d77d74 SHA512 e48268108d077d6931c3f7a0371f6ff513cea04c17c41d7a4f1fff4154667ed569f926e61d2fb36b885fac5424f223a896338ebd8f1cb833736c23860378b42d
+EBUILD libkscreen-5.17.5.ebuild 608 BLAKE2B 67e25273fed90fadf36f4d255be8dd3653c5e34a08f9fc6ee0da51d660d7acaf58e13a8503b971db902eebdabe68ffe5080b12b3a6c228e36cb8c69992ee99fe SHA512 b229b891b74516d6a53d23c6fce8781d758ed35fd96b6acdf9739ac127065b9364626a75ad74d7155618016c8a8f80bcb04c9e387a401dd54321ea24d99d0a6f
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild
deleted file mode 100644
index 619e0d10796c..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.16.5.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_QTHELP="true"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma screen management library"
-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)
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libkscreen/libkscreen-5.17.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.17.4.ebuild
index 88df6421a869..15bfef5050ae 100644
--- a/kde-plasma/libkscreen/libkscreen-5.17.4.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.17.4.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Plasma screen management library"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libkscreen/libkscreen-5.17.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.17.5.ebuild
new file mode 100644
index 000000000000..83e1d9803541
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.17.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+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="
+	>=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}"
+
+# requires running session
+RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b18528694a69..bf15bb143690 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.4.tar.xz 606328 BLAKE2B 9a852c919cfa62977837343e3cd5d138e170662367cfc8e5d7c120bd35fe5f7d69716e3a9c5cd597e5aecfe9006d9caf65c74067fb82c1fc528eca6da7ce0dfe SHA512 8338a294dcc3766262c565494f99da7dd2d3e3db1e4290611985897bc0a5db8e6aaeda6b96b840fba7c95b59af410a042839942e82a95291714712b360ad3f7f
-EBUILD libksysguard-5.16.5.ebuild 1235 BLAKE2B 0b06e922ab8dfe55237d1827c8f12ab0014a7107aa5de8e7b57e8a558dc1c39d15c272f3095a7ecb5e1621421da2e1b59a2c18170bc8e46b08ebcac3e1e9e89e SHA512 8a5969e2867f364b21ca7d31abbe4cfe8f414035a77ee241e279953c9f277942c603f61e97e742e99bcbf707feccc59cb8d8570dc630f01dbb82473c82527f22
-EBUILD libksysguard-5.17.4.ebuild 1412 BLAKE2B ba5f93c863b69fb29abe0de39c5e9435ebedb3d0fdf85feb0eb100eecd64e18bbb1c3de65e44dbd01949b7d598e6f03deb0c325ae9a7cd9b36602f9cd224ef7d SHA512 68653bb13671371c4ac0250157601c97b31a0716483d9cf0f29599bae9dc2a50c6d13efda01017a69cc6b97f14407f1f6eeca46c8de77c59a3217479cc78d3cd
+DIST libksysguard-5.17.5.tar.xz 605628 BLAKE2B 6c10b1299a1408f508a183a869468580ab705f35b20d6086118641e57c0ea87706e3d2c6812e9829c920fc03d472ce33df9c863c0b3359db7266506b142b7220 SHA512 15e12044bca64b5019c30e3e009a4533b03a19627e2ca8ce6e0fffe3c6554f57ae7b86d82be18d92edd7c6abfff9d123462915f44ec33f796f7e6b8b3e2491ba
+EBUILD libksysguard-5.17.4.ebuild 1467 BLAKE2B 6fa555279c50d2ef8c3b48a4da10b59c4a843e09b473f52cf15c89aa6d8445635e3f5a2400a549664204ae778cfe9934ad8897d2ceabfe5f3d678439e4840f6e SHA512 a750538ed700737e1f3cab62205fb77f6dd87e5b499c19b1eae10d4f0f668ed0af7401b0a7f0dbbd7560174058df911b247171be6ab452f23a97b57040854c5b
+EBUILD libksysguard-5.17.5.ebuild 1470 BLAKE2B 931dcf0308cd77072719a6ea5aa5aaf3c8c360de9cb392ebebed6289935b720b859e80b699c5d8485e16b0795743405fefafe855541c579450f62e349472756b SHA512 baf19eb15e06b8594d3732f27043108e2978ff1777ba68898919e3ab949525229ff72e0a6a7da4d65fdd42fbdfa46aca3fe3044b65f4910c5c697b843bfe856e
 MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86
diff --git a/kde-plasma/libksysguard/libksysguard-5.16.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.16.5.ebuild
deleted file mode 100644
index 4c837759c771..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.16.5.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.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild
index 84405639255f..cfb3af8ead83 100644
--- a/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="minimal webengine X"
 
 RDEPEND="
@@ -55,3 +55,7 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild
new file mode 100644
index 000000000000..798184e546a7
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 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="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebchannel-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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
+	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_use_find_package !minimal KF5Plasma)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 25807dc8587e..2e988e75cad1 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,6 @@
-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.4.tar.xz 4962200 BLAKE2B 2050dbf77dbdf144017e0ddf4b827b9dbe27b8f475eedaed969a442e036f162cabad5d6b47fd650491ed5989cade48ebafbd5f599dbc790c14515ce01ebfd626 SHA512 3f5aa07ccd19604bc399bb1d30dd16ac82e1405613c1f4a939e3c2cba3b4a478213095617052440dda222f1712608533e5806939117752d31b0616a6009cf45b
-EBUILD libkworkspace-5.16.5.ebuild 1269 BLAKE2B ea0f0ead80950429ff9a2ff46fa5c65974b36c04287278cde657420259f3b182fe5fdb7775db38eb02e2535b175b5ac5936266688e362ff621ec011c72584887 SHA512 f137931810e653df1b8d3d7cebec3c4ddb819df4c91fc999aba19a597b35b8be183dd5c488315a03fcf48f395b9fb219c0f19ec24f8be5526ce077852c05dcf3
-EBUILD libkworkspace-5.17.4.ebuild 1450 BLAKE2B 766115ad987df10c52aa71a38f39230370c71206a633271fd88a271a7791a79f35159aaf448ec321d6012aa2ee39a55795592f6041d92b7f47da3cdda514d850 SHA512 be9eee5ee3264afb1b3e49a1be41bcf21e2a3bb12812cfd93604457e23f4ce1cdbe45ca9ca70d6fc0310f2cdde4a6f73d75a11532bd0dba6cf52b95c117b4c5f
+DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
+EBUILD libkworkspace-5.17.4.ebuild 1447 BLAKE2B a66fdaa59ab5a7716eae6b5922f28ebbb26eb3dcd9dcc5fc7a3b7499e408177c287355ceb423544fa90fdc14eb39db4d407f52d46bf552d6007328adeb0e1771 SHA512 f34e912429dd42333448e226758de94564f12ed1de44d81953556e2c7caddcf3c593ddb3d49465624065e0f83e1072634ba30110608a66c31297c6c803899fd9
+EBUILD libkworkspace-5.17.5.ebuild 1450 BLAKE2B b868fe9d8729dd893d6fb5b5f9641b434aa9fc4f362ea97232348d1e00e1fbc68e16adfe31fde3f9c00ce1f46027e64a56fec9224dcc923f86152e4ec9bcf2c4 SHA512 313037235e8a82ac700364ddd4cf26c4d77f3bd80cea83e3320fb82e53f52a422592a7acc8dafc10a84e03639122cb90f1a41eec46916ab360ec7967a07c315a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
deleted file mode 100644
index 78042c5d16b2..000000000000
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.14.90-standalone.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 2e0a1d8f524d3bb645248787eed4532a250540fc Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 22 Oct 2018 10:35:10 +0200
-Subject: [PATCH] libkworkspace: Allow standalone build
-
----
- libkworkspace/CMakeLists.txt | 64 +++++++++++++++++++++++++++++++++---
- 1 file changed, 60 insertions(+), 4 deletions(-)
-
-diff --git a/libkworkspace/CMakeLists.txt b/libkworkspace/CMakeLists.txt
-index f66013f9..4e58bd60 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,3 +1,59 @@
-+project(libkworkspace)
-+
-+if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
-+    set(PROJECT_VERSION "GENTOO_PV")
-+    set(PROJECT_VERSION_MAJOR 5)
-+
-+    cmake_minimum_required(VERSION 3.0)
-+
-+    set(QT_MIN_VERSION "5.11.0")
-+    set(KF5_MIN_VERSION "5.54.0")
-+    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
-+    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
-+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+
-+    include(KDEInstallDirs)
-+    include(KDECMakeSettings)
-+    include(KDECompilerSettings NO_POLICY_SCOPE)
-+    include(ECMMarkNonGuiExecutable)
-+    include(CMakePackageConfigHelpers)
-+    include(WriteBasicConfigVersionFile)
-+    include(CheckIncludeFiles)
-+    include(FeatureSummary)
-+    include(ECMQtDeclareLoggingCategory)
-+    include(KDEPackageAppTemplates)
-+    include(ECMMarkAsTest)
-+    include(GenerateExportHeader)
-+
-+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem)
-+
-+    find_package(KWinDBusInterface CONFIG REQUIRED)
-+
-+    find_package(X11)
-+    set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
-+                URL "http://www.x.org"
-+                TYPE OPTIONAL
-+                PURPOSE "Required for X11 support")
-+
-+    if(X11_FOUND)
-+        find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
-+        set(HAVE_X11 1)
-+    endif()
-+
-+    if(BUILD_TESTING)
-+        find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+    endif()
-+
-+    check_include_files(unistd.h HAVE_UNISTD_H)
-+
-+    configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
-+    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-+
-+    set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
-+else()
-+    set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
-+    set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
-+endif()
- 
- set(kworkspace_LIB_SRCS kdisplaymanager.cpp
-                         kworkspace.cpp
-@@ -9,11 +65,7 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
- remove_definitions(-DQT_NO_CAST_TO_ASCII)
- 
- 
--set(ksmserver_xml  ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
--
--set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
--
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
- 
- 
-@@ -77,3 +129,7 @@ install(EXPORT libkworkspaceLibraryTargets
- if(BUILD_TESTING)
-     add_subdirectory(autotests)
- endif()
-+
-+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-+    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+endif()
--- 
-2.19.1
-
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild
index 623419ba9675..123fca5f9095 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.17.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.16.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.17.5.ebuild
index a02f4ae52f21..5812223a6e1d 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.16.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.17.5.ebuild
@@ -1,31 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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"
 
-KEYWORDS="amd64 ~arm arm64 x86"
+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_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
@@ -33,16 +39,16 @@ RDEPEND="${COMMON_DEPEND}
 
 S="${S}/${PN}"
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
+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 f4a786132a13..f58f708ba436 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.4.tar.xz 63376 BLAKE2B 5c0905444b39a0152cb5c1901e5d78953e9f77910097513c7ec8d2e39c91273dded3e7930d65e2f3cd9cd1cd4123b24de980bf921323b1292cf443a3bca7d5bb SHA512 41040ac9400eb5823232a12d19f6938bb0928e8a895d4f5255c48d8ebf0ca760fc9c83898e658d4cec2535b087f95d04376f91fadbe3ced7e8f1b831c27f7883
-EBUILD milou-5.16.5.ebuild 666 BLAKE2B 351ffaa6d72f89053cf4a167462f08ad39ac9064f9c1b93d2f09f0d402f9b0a6ae0c5a277e36ddbb2b2d0df52c7b202e536c79885d9db5496a8337a7fb2e16e8 SHA512 02413ffc787a664d9a23f07561942ed26943fd050967b7f51566bab98bb341b19811b24bc09332b53a5d7549e9f32c4d476d1ed61efc0cdbb4bbf3e9c6847360
-EBUILD milou-5.17.4.ebuild 833 BLAKE2B b6059dfc6fc4064bae942b028afd930c5366cb4d82e4dd16dc25444886857cc1b87e2a17fb913fb6d27a9fe808fc89f903fc77e56106d1cb3c4b0ff9fd49c460 SHA512 920a815bfdbba6fa3fb8a21d2b5473b5d908f1ba5bd2cf79b3e873ea53c408f6487b6fb40c4036ce4522a2e307ce892b81f5670d75bd43f349a633ee5c0ff1fd
+DIST milou-5.17.5.tar.xz 63276 BLAKE2B e3d32791c5f2d8e74d00cd9cb6be1d2f4512253117cb15c935524f531465a1834faf3e58ef864abcdfbea0e3271d2289094073643729e43749789c68d9e8cad6 SHA512 f8be011264ea7a49c2ee899d57e42555382846f4ff448214b520264ddc9609da779421b8a74f6974de26fc0bc0357c5ee4d5344dadeeec9522d952e6dbceb579
+EBUILD milou-5.17.4.ebuild 830 BLAKE2B dd1adcde7abe04872e0202cd252f8456151c8c4e7204df9c9731f7139c7aeec1a9ade70a866749de91665d5f58c3f88baa605401ba90d1112c5850cb6d2a3675 SHA512 67ce8525bdfc0b6d0ba8009293fcd21b57a74724cfb3ba1973d143589c79b7e9349fcfa98927b75ca78a78274425853f71245c7cebf46dc24cd2a3787fd088bb
+EBUILD milou-5.17.5.ebuild 833 BLAKE2B b0eed76c483007567909663d69027c84a35d6caf6808e8ea2fbaafacc772e10fb6187a119c96ceb579f03084bcbfef801b9da66057f985a7d420b4c852895079 SHA512 d2d4c2147b8933143aed634d1e3549a06c74c77173e331ff7d106d2443927ab14826f388b71dd00a7fbae829d51942ea0b50cf5fc9633b161883a8cdd8d4d2e9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.16.5.ebuild b/kde-plasma/milou/milou-5.16.5.ebuild
deleted file mode 100644
index aab591c79a3d..000000000000
--- a/kde-plasma/milou/milou-5.16.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_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 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.4.ebuild b/kde-plasma/milou/milou-5.17.4.ebuild
index 57c0f1e814e5..a3e8619af643 100644
--- a/kde-plasma/milou/milou-5.17.4.ebuild
+++ b/kde-plasma/milou/milou-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/milou.git"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/milou/milou-5.17.5.ebuild b/kde-plasma/milou/milou-5.17.5.ebuild
new file mode 100644
index 000000000000..65ca0831c471
--- /dev/null
+++ b/kde-plasma/milou/milou-5.17.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 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 5694c65d4cd6..b43918a50da4 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.4.tar.xz 4465640 BLAKE2B f8d5e0bb416c6ecde41f83ad14dcc964bdbff292b29d81d4ff39cadcc9845f047c09fd1985caae015fe34df12be9bc20808a1737494ea6cf8399d4f67997028c SHA512 3e1a93cad36bab1ec10591207d168d22caa7e53689a30468d302327b5e3907cec83ee4e5979c97588ec47973ed1391a06e864499ac2a879d233ac7dfc2e117f6
-EBUILD oxygen-5.16.5.ebuild 1073 BLAKE2B faad900e7ec0be9d415095aecfd9c11fe83453779ef573e1fefe590dd2a6785e4702e8c5d7df833496f687ed3ff0a25d154eb48708114e5999630b2109ab44f0 SHA512 27d0986cd09174ab2aa82754e63d77bfac2ef61f86f66a9755e70fc52178f304d40e4612d322864d25c96921ffebfa9303421b14bbb4871a66076121f5337d6f
-EBUILD oxygen-5.17.4.ebuild 1353 BLAKE2B 2203f2e865b3221d1ac6a20c44055c8db86d38a9d0c08e39fb83ef3fb463cba1f3f283e1d9f7cd1da77b52f5e2e92643757ac72e5c9daa7ba80a2eab636eb133 SHA512 a312520253292f978d9d18bb90de9c2033b6387355297cb1f8d92635cc2f24d5874885af1351cdaba9df4251c8f76efe62f954e8f970a606651137f5a2562ba2
+DIST oxygen-5.17.5.tar.xz 4470600 BLAKE2B 7dfcc26a05c479c30e10223a5af063fd5580fee375d62e3261cf79cfb41fffc63af299af0690b48a2417f4562f1526f84cdd1debf53193085062f719b944d1bc SHA512 59a49c3718d7332640ff5f8ffee6afe665dfedb8504728d80a7672859429739a7926296b462e457f2fac5b98a892d51b32202db8f0ea75dcea61138449f79ab3
+EBUILD oxygen-5.17.4.ebuild 1350 BLAKE2B 375260098fdf5e3ab6001f1ee2fef6c1b0567fd681107a2db8dbbc74321cbaa5497dc7d65a0f93ca7fabff668bd1e261fb5b2694f618a7c9eb6b30a8ab59140d SHA512 9e2752b4625af081edc707b082a6fb14711d0aa5ef94ba721cce9e78dc5ff55e37a747b2b8cdd54516f0dfe8899981e693f11d15f6b3507b58e1ee6dfe5353bb
+EBUILD oxygen-5.17.5.ebuild 1353 BLAKE2B 57e0ccbebffa1430e16b61870680a1ddea377d29783fb73619347289da624aa0c707ddfc12d92679d325315b8e79026a28778b6b90154e7608b805c6769ac272 SHA512 5a12b03d35eeeed1e9915d4921f598f53948e3f3213354ea0e3edbbb79979e53728232cb37b9c4ee9b019a2d340666e7eac093967c35ac40c0d57f3ce6a0ee87
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.16.5.ebuild b/kde-plasma/oxygen/oxygen-5.16.5.ebuild
deleted file mode 100644
index 203ea9251d30..000000000000
--- a/kde-plasma/oxygen/oxygen-5.16.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/oxygen.git"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="wayland"
-
-RDEPEND="
-	$(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="${RDEPEND}
-	$(add_frameworks_dep kservice)
-"
-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.4.ebuild b/kde-plasma/oxygen/oxygen-5.17.4.ebuild
index 9191bcf82348..637b1bedbac0 100644
--- a/kde-plasma/oxygen/oxygen-5.17.4.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.17.4.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/oxygen/oxygen-5.17.5.ebuild b/kde-plasma/oxygen/oxygen-5.17.5.ebuild
new file mode 100644
index 000000000000..abe6a62a685d
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.17.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 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_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 e4a9b6b6b8be..dba97714eb1f 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.4.tar.xz 146496 BLAKE2B a5ba1f679803b9f1ba7341c9cc054a5a7e4f53b3683e962546b237269423be1ce961c0e24a4cefc7e189b635db652248ba39035e307857d68f094d4a5ab9a510 SHA512 8e7d9c6128b7c28c55b5c6a1bcb1b72bd6b2b0e919a1c4a432b882da1de72a294172273ba06173eb2680622e504cb84ee14252b8cf9d74731a34bc1999c96f1a
-EBUILD plasma-browser-integration-5.16.5.ebuild 752 BLAKE2B 2edd3e8ce295c837867cabe0954521d6e0c0fa49977c604d5f7946086253f6b6c75e55f7deddb3406b4a68905ab23ea5df49306389c92f1a23afde39c14bbfb1 SHA512 1f570b9bbca202d241b251f29f103a9e8829206dd880a012aee3353fc3807b2b8bd8c0a7f223e3a94951dc815f2aec8fa2d6e956a290a6cbee7d93fec5363fbb
-EBUILD plasma-browser-integration-5.17.4.ebuild 963 BLAKE2B a8549cbb36daeca4dc4bf48013e9e3799e28634c56f9dbd80eab04583aca13b8af35fd724199210eb6fb99e30f83747b3ec6c3b4d76461d2f1666f5eca661f1e SHA512 0287f4f531604bf091dac066bf24b6c7a559886ded3bac8291a84f87725c0498f15627ff2484369c11d406505263605842c3fe75a384d926bd94986c68e1f477
+DIST plasma-browser-integration-5.17.5.tar.xz 147220 BLAKE2B e995dfdefdfc4ec8decc5d957e900b02ad756458623824d4c81a375540f5956765118cd85cd4814783596f7573dfbd357db0c75085cdbd4db6d9a8384d540620 SHA512 5387838cc22dd78a21da5c9d0ab3529878e107b5f06d21252bf2a93119171d20180920cda28cd5e1c5b780db1cdd0d63b206e3d988f088c8e5d1d14c08ddb5f0
+EBUILD plasma-browser-integration-5.17.4.ebuild 960 BLAKE2B 2d21814fc5fbcc14187877fb2c85ee58f480c3563aa4fee5cd2673682705d60ba4073f717bee89967a829b32b431ef78e14b4910ec76a56d39a15295a06c67f2 SHA512 ccad7c98a34a5e52124b9e134650c5ca9c3cb05503fd2f87d939a12571f4a10dc1c592b455f3cab89ce9574ed92e90af5ac44d5950727946b74b3ea7579ac3c8
+EBUILD plasma-browser-integration-5.17.5.ebuild 963 BLAKE2B e003276d9991bb75dce49808a810ebefc8cfafca93664747452489cb61c0d221e940d15f5830ec5b30370aa1016cbc9465eeadfc804bc9f609aac28c0b75a5ca SHA512 482dcb31de701b88facbb75814abc813ea46f2abb7140783ce47d4d3cab8a1630e58d919bfbab7bca08846b850c1d8cb0e218c91e5704c21652995a559134214
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.5.ebuild
deleted file mode 100644
index 3f175d10e5ff..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.16.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="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 ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep krunner)
-	$(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.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.4.ebuild
index aa837c81e606..9bd8801df422 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.4.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.4.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensi
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.5.ebuild
new file mode 100644
index 000000000000..4f62b4b9da9f
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 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 d7914152f8a0..78b27aee3fcf 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,7 @@
-DIST plasma-desktop-5.16.5.tar.xz 9556104 BLAKE2B 8e825692dc09897daa9eb6977991ae9d559284b066a662b4bd40faae575068866c6f82a7fab899e5b06312ae3910aea7ccd50ce895ea0371b2346f2fd69c4786 SHA512 7a4678928ccfd511746ceea53a4c31d15dfddafdeef3d9b169088a186ea1f5787eb3589ad5dbd3892b4669a7a833311da41795562fc94a58ac7aa2f02a741192
+AUX plasma-desktop-5.17.4-pager-regression.patch 1062 BLAKE2B 6c5a321cfff23f48c79e8c5d0d72fc71d6cfafc8b76441789dcf1b377c3cd54b48b6050e4649d88bdd747ff5de72337bb0f048ac4be1757748e78c57159f03e0 SHA512 e0919291ae335f717ca029460f78337ed72ae4a88c8c3c0185b3f0fb74544681d446463c21b6a8337c72ae4dce58b5581a6b7faa04d95c4eed9481a8bac61898
+AUX plasma-desktop-5.17.5-revert-activities-jagginess.patch 1214 BLAKE2B 3d6517a6020639a5f0f7720d22e45c985a95553bb62a2d365d219ff05d18eed5c105c17c54b21eb114e85b2012dead46f1e928d1082b7b1387d813e75144f775 SHA512 c7910def604e6a6cf23d11d50c33f585d67a7e539cdfc2d4a81449e46eb4e823fe63e484f5cdb535f4fdec0fcc6be805ede703b74b22b88f4dc941593b6f4fa3
 DIST plasma-desktop-5.17.4.tar.xz 9452532 BLAKE2B 1e93c30194d1a745a45eae6eaae515f83b5ae97c40c3ce5fabbedb6f00c0228085983767711a5537358bca0fd394fc8d82666092a394692b56683ff447107b9c SHA512 b3d4ad7ccffb911dd0bea9c33d1e814ffb8ddb53379cc26a543ed19a61d9d0cb36ae856151e187354e2af50c47c330fd54bea06602afe5336b885b611d70962c
-EBUILD plasma-desktop-5.16.5.ebuild 3730 BLAKE2B b2a889089af1ea98341e34d4a538d992b5461d539daf99e06abe429900217b99ba4e345c8f00d4258bab1c67dfe3dc613723e225a7d1c5050aea042a31fed031 SHA512 81daca50d1874014535d0b618c30e445c8ef154a6c06ca20a00754ee303df77f1911b7383c49f6038ade105e163beb272331cd9974a5437bf4398981da5ec9cb
-EBUILD plasma-desktop-5.17.4.ebuild 4001 BLAKE2B f518504a30087d13d074076a43b03027bbc889a5815ade5a4290faa1736df14b2c75347f37ce7fc7c0a6bcdcaad59cf117f95aafd522a78daf64a47aea54e3c7 SHA512 40151cb48e5f43c041c5d3bc4dfb6fecb49c99e8c90fdcda3b1b42d39d14a73eef3b760c38cfc1daa84d609a7400e58c6f57ae13b253526797bea8245b04844d
-MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
+DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4
+EBUILD plasma-desktop-5.17.4-r2.ebuild 4053 BLAKE2B 92d7a1c6707fc4bdd96f61282273220820a0465af58135793a9cf625e2d988211126ccb64019055cd422b44ecd308cac5e9420d6aadad72d2082a99870a434a4 SHA512 d988d4f7a542cbe1ad40323bb91c615c0244587b738f45b513f1ae5af014c33d05f3ac1028a159dfead0d0fa99abd7c93b6febc7575518d88c6ff1ae28ce92d9
+EBUILD plasma-desktop-5.17.5-r1.ebuild 4067 BLAKE2B 70ec5527acd10dc445960a1e3414795f931188aee281725da63de0b605a91cb9183ef8bbc9bd6b4b8e06dcb6ed071b1c997b0194f0d7d48f6c3929176f8bf648 SHA512 f9dc0711cb707b7b95eccce6b38135a72e0c937d6f5197651225baf1e8c4abd75650a78b7a4fef8b5bc94426c53088c5832b05dace2149ce00fec539fbb622bd
+MISC metadata.xml 514 BLAKE2B 31b846e6675005788e3041e22365385edcb4ac253db87f15a048b7d3a0cbe61494ce7a3e495444ef9c9bd3455e566d7a89664a8969041b22a3474eb4e99d1397 SHA512 a14dbd159795a2982ba81c0856f2f058664b807a3c26afe9371e4be3ccb5bb0b8a48c086fd580549c35006821304df4c22ad3a1c7e43d5fda4a37688044fb99d
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch
new file mode 100644
index 000000000000..d8057f22a4c2
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.4-pager-regression.patch
@@ -0,0 +1,25 @@
+From 2b5e86323f180f0c51ef9af898a69a522bc379ad Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sat, 14 Dec 2019 00:29:32 +0100
+Subject: Fix regression in "Port the pager applet away from QtWidgets"
+
+BUG: 414849
+---
+ applets/pager/plugin/windowmodel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/pager/plugin/windowmodel.cpp b/applets/pager/plugin/windowmodel.cpp
+index 93273bb..bcda333 100644
+--- a/applets/pager/plugin/windowmodel.cpp
++++ b/applets/pager/plugin/windowmodel.cpp
+@@ -77,7 +77,7 @@ QVariant WindowModel::data(const QModelIndex &index, int role) const
+     if (role == AbstractTasksModel::Geometry) {
+         QRect windowGeo = TaskFilterProxyModel::data(index, role).toRect();
+         QList<QScreen *> screens = QGuiApplication::screens();
+-        const QRect desktopGeo = screens.at(0)->geometry();
++        const QRect desktopGeo = screens.at(0)->virtualGeometry();
+ 
+         if (KWindowSystem::mapViewport()) {
+             int x = windowGeo.center().x() % desktopGeo.width();
+-- 
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch
new file mode 100644
index 000000000000..fac8bab91b6b
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch
@@ -0,0 +1,32 @@
+From 1db4d07bb78858da7676720d13ee7c4f3bd8e6e0 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 12 Jan 2020 08:39:29 -0700
+Subject: Revert "[KCMs/Activities] Fix jagginess for activities list icons on
+ high DPI systems"
+
+This reverts commit 567f71714faac305947573e307f486a9960cf1d1.
+
+The commit in question was pushed without review and should not have
+been. It worked fine for me in local testing but somehow was broken
+anyway. Sorry. :(
+
+BUG: 416158
+---
+ kcms/activities/qml/activitiesTab/ActivitiesView.qml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/kcms/activities/qml/activitiesTab/ActivitiesView.qml b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
+index 531ef9f..aac13a2 100644
+--- a/kcms/activities/qml/activitiesTab/ActivitiesView.qml
++++ b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
+@@ -52,8 +52,6 @@ ColumnLayout {
+                         height: Kirigami.Units.iconSizes.medium
+                         width: height
+                         source: model.icon
+-                        sourceSize.width: model.icon.width
+-                        sourceSize.height: model.icon.height
+                     }
+ 
+                     QQC2.Label {
+-- 
+cgit v1.1
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 65b6478522ce..cf13ed12c3b9 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="appstream">Enable AppStream software metadata support</flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="mouse">Enable mouse KCM</flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.16.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.16.5.ebuild
deleted file mode 100644
index a05cd5ec7d32..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.16.5.ebuild
+++ /dev/null
@@ -1,139 +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="appstream +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 kpeople)
-	$(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
-	x11-libs/libxkbfile
-	appstream? ( >=dev-libs/appstream-0.12.2[qt5] )
-	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 appstream AppStreamQt)
-		$(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.4-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild
new file mode 100644
index 000000000000..eb00ab2ef8ab
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.4-r2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 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
+"
+
+PATCHES=( "${FILESDIR}"/${P}-pager-regression.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package ibus IBus)
+		$(cmake_use_find_package mouse Evdev)
+		$(cmake_use_find_package mouse XorgLibinput)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_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-desktop/plasma-desktop-5.17.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild
index 5b462420fb94..7ca44857dd80 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -115,6 +115,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/kdeplasma-addons-5.15.80
 "
 
+PATCHES=( "${FILESDIR}"/${P}-revert-activities-jagginess.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package fontconfig Fontconfig)
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 1bc113883b75..75f618d705b7 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,6 @@
-DIST plasma-integration-5.16.5.tar.xz 55672 BLAKE2B a953d06cb13cb6c248124fbdeb8ed7e52d82bb8411e53a7c86b95c8e3fe90464f9e9fdc0a271a697bd95df0865ee7939f8a71d973b82bf5016b64c369a95ba70 SHA512 f974db9c85fb22e7dfeb8154d5c51c7106f2b95aeb783843701234a4b7186fd6b4be6298809d73b1a776399420a0e451908e5466aca622fd69800f0cfa2e3a91
+AUX plasma-integration-5.17.4-fix-filedialog-size.patch 1791 BLAKE2B 12e510a9cded2df70c3380a6162e3db874468613acb37249501060402628b4a42755d684fcdf542bdb1a9d5f72db049ed05b5038e827c65eb7f5fec51c715098 SHA512 ff17e527bafa72f6165136d4d588af7861296fcc12c60f70163a6f76eaacfec8b34b803fb3c8f3c1540f9deb57a6512a77fdec875c9b8cb77feb67a94b16cadd
 DIST plasma-integration-5.17.4.tar.xz 56724 BLAKE2B 74a86033ac9f00effdac120f237e06cd96789711c06007f716c5eb33bccae0b38125731ff4f5735faa13d1969c884a54f7d5358f82c714c3c786e62a210989e5 SHA512 301fb2faa42cf2c579070a2136c3e39db495b35e715abcd336a5fc1044a5134b5006e022ad9d69b530e7f308e2ad2486ee44317f3436d9c42412bf61a3047ebd
-EBUILD plasma-integration-5.16.5.ebuild 1058 BLAKE2B d1d62b1350c810f7aac2f1d4666656b566f3e752e771a37f8edfafdc507dcd6249a2fe21fa90fe89fe61aa4b3506afd6a99ac5ec0fea843cf3c0859ae21b1322 SHA512 6762712e8391d4eb0d9812b14caa2009d5d9976820e417150ad363be69f04a19cca3cfe5fca4922b2c4763ed26f48635fac0f746f1cb25d5a4dafa864fec78ad
-EBUILD plasma-integration-5.17.4.ebuild 1230 BLAKE2B 8b6e84e66d6bd77cde773056c266ec0c447690f3410f1c5512dabe562f6626f5693bf534dc22096fe5f1267a520e4f01ed69ed5a7d5e27ef679eda75314581d3 SHA512 ac992ff9ba749aa0bd08c6ac031c2c9b79211223f10371c4adc79be1cb3efdb23121b24ab91048a4787c6fa9dd6398e245483532e59c7f93838b59b993076f31
+DIST plasma-integration-5.17.5.tar.xz 56836 BLAKE2B aa22d2f362f07e33ca75ada88b05a93ee9bc6f2bb6e136d9a08526e54a1e68a5c7947e617085f068363f40d5748b9fdcb7a93ad57016dd6844718d843c01897f SHA512 9341ca525e1c02b0ee00d01221a68f683717f89c19408f5b94004fa13fb63fa7983609756ce64fd0b21301fb2a51a3e531c0b2bc1c46ca656dc41b08076baca2
+EBUILD plasma-integration-5.17.4-r1.ebuild 1285 BLAKE2B 8c991bc0e598fb5c2900950cbb9e7fb521010158e1f857ec21d7e5ebcdf180b75d7fe154903c98df05ca3befbf159662ebefa7da9a779968bdeec01c6861f8bf SHA512 51f0c7f3690d1f2819d19e6084ba1e03d1ce889b7cce5ab51f2516cee717a5bac610e1b8348016805719944e6469eb96c33dd792dcbc0622491a66cee6ec5a02
+EBUILD plasma-integration-5.17.5.ebuild 1230 BLAKE2B a926e850ae09b91be0f8b6e24f254427331cad0514a87e2702bef36154c6bdcada9675b187d9cdacb60590e28bd0edec95d52dc64fe98a8136b95b6e86de0f74 SHA512 1a5606f3831c429164362d8bd0119a8b649708d97d460ef2468bbd5bd1391729d0cf811be18f98e35719617b95cb435bac091821b32608075237940c13287d60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch b/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch
new file mode 100644
index 000000000000..b49006bcde99
--- /dev/null
+++ b/kde-plasma/plasma-integration/files/plasma-integration-5.17.4-fix-filedialog-size.patch
@@ -0,0 +1,52 @@
+From 2e9f96847432c707a9dfbfe0748f0524a128abb7 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Sat, 14 Dec 2019 14:03:30 +0100
+Subject: Resize file dialog window before size restore
+
+Summary:
+KDEPlatformDialogHelper explicitly resizes the window contents to the
+window as part of a bug fix. This means we lose the common path where
+the window resizes to the content's size hints that happens later.
+
+If we resize the window to the size hint in advance we keep our size
+hint.
+
+(alternatively it seems to be me we can remove that old hack...but it
+needs testing by people with Qt5.12)
+
+Test Plan:
+KWrite -> open
+
+Size is 900x600, the size hint
+not 640x480 the QPA default
+
+Reviewers: #plasma, ngraham
+
+Reviewed By: ngraham
+
+Subscribers: ngraham, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D25986
+---
+ src/platformtheme/kdeplatformfiledialoghelper.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/platformtheme/kdeplatformfiledialoghelper.cpp b/src/platformtheme/kdeplatformfiledialoghelper.cpp
+index efb7b60..4c67547 100644
+--- a/src/platformtheme/kdeplatformfiledialoghelper.cpp
++++ b/src/platformtheme/kdeplatformfiledialoghelper.cpp
+@@ -370,6 +370,10 @@ void KDEPlatformFileDialogHelper::restoreSize()
+ {
+     m_dialog->winId(); // ensure there's a window created
+     KSharedConfig::Ptr conf = KSharedConfig::openConfig();
++
++    // see the note below
++    m_dialog->windowHandle()->resize(m_dialog->sizeHint());
++
+     KWindowConfig::restoreWindowSize(m_dialog->windowHandle(), conf->group("FileDialogSize"));
+     // NOTICE: QWindow::setGeometry() does NOT impact the backing QWidget geometry even if the platform
+     // window was created -> QTBUG-40584. We therefore copy the size here.
+-- 
+cgit v1.1
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.16.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.16.5.ebuild
deleted file mode 100644
index 4e17077befa6..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.16.5.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.4-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild
new file mode 100644
index 000000000000..0cb03091d71d
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.17.4-r1.ebuild
@@ -0,0 +1,49 @@
+# 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"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-filedialog-size.patch )
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.17.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.17.5.ebuild
index 157d1a7e3035..d5bc880005f1 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.17.4.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.17.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 82393a99e85a..6fea4bd1ad87 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.4.ebuild 3959 BLAKE2B 3b66f061d9b277be401e521c9e7fa6fce8aaa528b207ece501753a7f79d3b6e178eddea63add9d3310588c0d1e580e98192d1d759b72c76e9b7d65cccd6f4ac1 SHA512 daeaa5129680707e358d9000b024adf10f5e426c11919b7636b6149db1b6c0c69b2a1104ef3d19ea3c28052cb3838acea3b8a3f79cdfaef5fe1e91a6397d6e5f
+EBUILD plasma-meta-5.17.4.ebuild 3956 BLAKE2B 46fd791e3136e41103f5edd5a67dd83b18cab1cdac0448857df99b7b9f7894e6f02731b47c93f77aa4b674852f738cc6384ca6bda00567460c3a6f3842c47e0b SHA512 73e2183dec52714441c520365f14de4e0a30b4a3e6c8dd6a531ff0d5af9ac973d5dd5ddce4380cf673bfce7cb23eb42302e7016b70335a4c35c271ded300bfc0
+EBUILD plasma-meta-5.17.5.ebuild 3959 BLAKE2B 0c500e6455e3a642762dcad664601340474d0994238e9adf9153a4f6425e2eecf87000e721dae80b468401800a9558f23e9e9e4ef021c9f3d08922c9ce431e92 SHA512 d8ec5621b3f0e68c0a2019fb900e1182a015944fc5385310506057131ed57c86519bcfcbc6bb18ae0d8425230a954bc5fb78760f64ee37ef8756f38a99525de7
 MISC metadata.xml 2177 BLAKE2B 1d0ff2de7c1ab2df3ba81c26488c9304c9e36b660f7842e96e156772e5e54ea22b0c5c17c1fecf65ad6ab936b4c85d8686d8b902a828aa38b13b7e18fcdc8037 SHA512 44a71cd2ae64e007201eeb0bf9f4d6fe5d3b8eb623ba2413bee5ce1c6cbfe252de074fd86d6af213455f32f1e093a7d67cc612f49f09a4330033bc080c3b7c40
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.17.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.17.4.ebuild
index fd2333e96884..28283de5f1fd 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.17.4.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.17.4.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+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"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.16.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.17.5.ebuild
index 119b8179c207..3b5fad38c216 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.16.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.17.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,10 +8,10 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
+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 +sddm sdk systemd +wallpapers"
+plymouth +pm-utils pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
 
 REQUIRED_USE="?? ( consolekit elogind systemd )"
 
@@ -73,6 +73,7 @@ RDEPEND="
 	networkmanager? (
 		>=kde-plasma/plasma-nm-${PV}:${SLOT}
 		net-misc/networkmanager[consolekit?,elogind?,systemd?]
+		qrcode? ( kde-frameworks/prison[qml] )
 	)
 	pam? (
 		>=kde-plasma/kwallet-pam-${PV}:${SLOT}
@@ -84,6 +85,7 @@ RDEPEND="
 	)
 	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
 	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
 	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
 "
 
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index b87f7011c67a..0d9080cb8f3d 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,5 @@
-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.4.tar.xz 813536 BLAKE2B 1bd376375d6a0632012f44fbe619bbcf768da82708c5447f818af7e45558d4c3adc0bb3455d4c41da68106ccfd7e5a99d24660cba2d6a1aec950baf09ff2710f SHA512 cc16ab698373885b67feef279b59c7760b7fa2dc099b2e0250344faf0aecae1e0514a0d92100f3eb28c37fd582a6fb69dac670eb988d2c1bafa4fa1fb92db06d
-EBUILD plasma-nm-5.16.5.ebuild 2036 BLAKE2B 91a06b9fb2c589b874924c27254c81087ccf599e4f262b9933cd8298b6343aff33f9bce75b2e7d80dc788b80d7ba407b24914f43b823f8e5fb225b1a787170ff SHA512 b28fe576a529df8e26a428bea146c176d1588f46df51d17d6c30f8bef0cd343cb00ec582c41526caa9e18ec60a86c095c193189e72456de80aca877dbafd9fe3
-EBUILD plasma-nm-5.17.4.ebuild 2285 BLAKE2B c2fc0d515fa0138f949ac5fe7a1138d742e501e7eeead6fdd15a1c812c467bfa5425559ef21ab8b1766063c0a0bbb3fcfa24a17a788082629fb22d871ae2a130 SHA512 94b2c74117a844a134e00f97aebbb3074e16e58bb47e05929a56fed5c99f53cfa094137893b6635219b094f806ba663a8a0e7bcde56383a67eb8c80efed481dd
+DIST plasma-nm-5.17.5.tar.xz 814376 BLAKE2B 757ac2a1ed3eb1263a0034f950d688194ad1a11e6b842208f12d8abbfabcc75461510312b3e63a166d691b538c276ed74c367eeb2122774d669915366e82695e SHA512 45792671afd3ae9b8cebcaed7588524f04234394c178055211a1896a8a3e5ffcf48229f65ec7815f1ef51076860bc4388d37de6b058c24e54f0772eb1c3111a3
+EBUILD plasma-nm-5.17.4.ebuild 2282 BLAKE2B 3d9270030fb25498ba13f6a6ff80011c4709c421fadc2a69b8465d59a705754f31467ee3d33bcf44a2b058d103108e94a5dbb62419e37813ba85e810d6961a5c SHA512 222321886d8d9f8e32b25c540d4d770c06dcfffa936501cbcb62cf0964e1794bfaeeed6d8678661ce667270330884c9adcaa290f468777c00482424130be6ad9
+EBUILD plasma-nm-5.17.5.ebuild 2285 BLAKE2B 6a4dc1f35e977f60e98c66a415694ce7c725a5cb03aa0c59d6ae5f1869e0547a2624e5e6accce98b8164ed0056a1cc6366515cc7574fa92c9ad8f969242d304d SHA512 68c0fdfdb0c3ae2237b38edfee1d8d747019a3b6d60f22b6f781b68d993864c87ec53fa8079bfe7cd6365f1b789face2f0da028cb0b063dd828eeaed87cd1d35
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch
deleted file mode 100644
index 676087e89ac6..000000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a7eb3cb599fbb1d66c6980d53550822cbbfd1520 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 14 Aug 2019 11:25:49 +0200
-Subject: Add missing headers with DISABLE_MODEMMANAGER_SUPPORT=ON
-
-Reviewers: jgrulich
-
-Reviewed By: jgrulich
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D23148
----
- libs/declarative/networkstatus.cpp | 2 ++
- libs/handler.cpp                   | 1 +
- libs/handler.h                     | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/libs/declarative/networkstatus.cpp b/libs/declarative/networkstatus.cpp
-index b9db376..e94b7ea 100644
---- a/libs/declarative/networkstatus.cpp
-+++ b/libs/declarative/networkstatus.cpp
-@@ -20,7 +20,9 @@
- 
- #include "networkstatus.h"
- #include "uiutils.h"
-+
- #include <QDBusConnection>
-+#include <QDBusConnectionInterface>
- 
- #include <NetworkManagerQt/ActiveConnection>
- #include <NetworkManagerQt/Connection>
-diff --git a/libs/handler.cpp b/libs/handler.cpp
-index 40b4b43..0095aa7 100644
---- a/libs/handler.cpp
-+++ b/libs/handler.cpp
-@@ -46,6 +46,7 @@
- #endif
- 
- #include <QDBusError>
-+#include <QDBusMetaType>
- #include <QDBusPendingReply>
- #include <QIcon>
- 
-diff --git a/libs/handler.h b/libs/handler.h
-index f8b7941..4c72699 100644
---- a/libs/handler.h
-+++ b/libs/handler.h
-@@ -22,6 +22,7 @@
- #define PLASMA_NM_HANDLER_H
- 
- #include <QDBusInterface>
-+#include <QTimer>
- 
- #include <NetworkManagerQt/Connection>
- #include <NetworkManagerQt/Settings>
--- 
-cgit v1.1
-
-
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild
deleted file mode 100644
index 145f930727bc..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_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)
-	$(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)
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-headers.patch" )
-
-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.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild
index 5c93da84cba4..77b94c3f843c 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE Plasma applet for NetworkManager"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.17.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.5.ebuild
new file mode 100644
index 000000000000..2e62fd1ab99d
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.17.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 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="
+	>=app-crypt/qca-2.1.1:2[qt5(+)]
+	>=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
+	>=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
+	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}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake_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 73a94d539075..9225fdb91277 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.4.tar.xz 103976 BLAKE2B 787f6622e8663fee7f3cc350fe7d92eeee914599a25b0c299befb9846c8ab6cbc74ddc8ecd40a85c97832b920d800dc664eaf6a7c4fec23c8453412e0f15b7ab SHA512 0eb78065471dc4055a6eb092c0083a1381682b90dd219fe6f7ab4489702419812e59f3017f41f0bf5b10bfcff42188985b044474271c20b7e68f9932a2fa73f2
-EBUILD plasma-pa-5.16.5.ebuild 754 BLAKE2B f12dbdece99d0cfa597e9cbbd5b96f9ba0a199f2a51e14bd69ce2c5959c541a91e90eaa451bd616fdf6badef30b689f849b901c0a774a4bd92bee2933988d73f SHA512 53c8e2d9de5ae95ce06ece3b33b5f3d61680d8e639f4e082942d6cae99dbf203823fad641ffaba14848d9c44f470ff2155c4050b3ceb1d5045a5ec050ee4811b
-EBUILD plasma-pa-5.17.4.ebuild 916 BLAKE2B 7b4d30f362fbcd0c4c41861356c9c3cf8c34daa7846d9b58de4d4fa99b78702ef0614d782a125ee29c55b4d26022be1fc9e17350923137d3e2dabbcdb5d0782c SHA512 b2a9c271c70a8cb9a5d8078fcb7c5b4baa636c2cb27684d98519ac79fb505055f284ac15fdcc4f04b4ebef3171723994e9913f5b73ec3ec008cb3bf4dd839c22
+DIST plasma-pa-5.17.5.tar.xz 104280 BLAKE2B 3f6c8679c1136ac6dcef6aa608f01846e8b3f5e1826aec14d808e5c7d87c899992912fb9b72730d6f1de146acfc171e3105015126d26ef3be6f9e0d818d913ef SHA512 6ccc5aff0a95e816ca517e39412fdfcecf39958e606695820684d1dfaf654f161ef256c45e31b0f41cb5ecc7a9d4c362c29716b532db375218dd0f994c0f0ca6
+EBUILD plasma-pa-5.17.4.ebuild 913 BLAKE2B b2729781b0e4eb93bbed5479ebfe19c19d69ee99be7008a0db6310eb82f064e3d0cdbaad16ce2e7d5994e4f7520e852a4d1d112389ca5ae05bb3d516b53f1a35 SHA512 eff82022bb9d5ec95759aff606f037f1e3c992831078924550d4f54a9dd8bad52bcc85b7768429180ce46a4e9475b06dc69b77e724581261f50bb5facf253c16
+EBUILD plasma-pa-5.17.5.ebuild 916 BLAKE2B e33a83d931b5acb73c799a21d9a6767bd1269d9301473113e50e7464714dc54a2e3d9147a8e7ab51737abccc089ed92864c9da8b40fe8dda4a65dc9180fa5284 SHA512 e850591274e0525700f6fa5b4f2dd74596901139cced9ae1a4b5abedde24545fb3b218fe6a0574d75fbf74589b548b0069b558eb7a4d23e3b8ec6b60deef61a5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.16.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.16.5.ebuild
deleted file mode 100644
index 2ecd88bc859d..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.16.5.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.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.17.4.ebuild
index ad02fe12f0a1..d92c2fa8fd86 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.17.4.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.17.4.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.17.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.17.5.ebuild
new file mode 100644
index 000000000000..214f7e77f834
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.17.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 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 e8a1927eaf09..f3b1673057d0 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.4.tar.xz 258456 BLAKE2B be34140c768ef580861eb0fb36a10e7eefc43bd67ffe80b4f618446d8599c6faae2731677103a720ea6ddfeed7631da30d181f52b2c7e2081369de0255adb023 SHA512 384ecc41889f18b4d28d201d05de37cd6a41b75e41db8c45e401f76f6e89a8b0c0fb60e14b82bcf1cf3c4ef0900e89302b8cba2609a99ff8b3237d7299c9df79
-EBUILD plasma-sdk-5.16.5.ebuild 952 BLAKE2B dc3bbcc3dde15d2dd670d560e1f528db474c979c79bbbdc4482d2e0a195f99eedfd99424249466181c837b231bacdccbc2630847c04cc097b7bad7b167790fda SHA512 572378e3210c1fd8793745e5dacafd8ae0df0dbd56c583334f27d58d53e889b735404cc6d023433d5a3d622a7868f7e32b3529cdc5b82a2956956e2dcfb50f97
-EBUILD plasma-sdk-5.17.4.ebuild 1174 BLAKE2B 7d34a64dfa9b375ed9f57088851cf970ad3a19d0d3e64828c4696f50fef132e3b4cf4c161f8752160baa221ff8b3dfe6c05887f95ca4d4093dd23090958310ac SHA512 eba9813ec4f784563402043b0c1a60292f3b08954625fbc0c9bb6f15cbca0a80009e45e9cbf5c3192a3543d687c4328caf7baee2b918840885b46ab9aba4e903
+DIST plasma-sdk-5.17.5.tar.xz 260124 BLAKE2B 51e0155a59c75af6e06d96a949c0fab5baae87c839ecc2cf4e9be448eb281126a3b4fd316f154aaece123815f59dd4957548611f8af5371955fd718913337074 SHA512 aa1f949daaeabc78c2ffffe78cf5a1bcdceada360b4c2f9ce37e4ada73ce849fae9bccca9ba944c33de9d0686428079c486089e99bbf70665e9dde2a038ee2ce
+EBUILD plasma-sdk-5.17.4-r1.ebuild 1247 BLAKE2B 9455e52432234e77ee527e1ea7c7da4f110e233b43ef92d75175afc66c7dc3b0c78f15681043cd688c42a35f7ee0784484ff2e70d3ad757c0da8acea18095c93 SHA512 87b55af5d2b3bc40b82b45ce6ca78508752237e3446d1df42c4825bd571bf5ce1807e79d8ce21e79892bec3e07a7b11ccf28ba82fcb717575166cdcec05c6669
+EBUILD plasma-sdk-5.17.5.ebuild 1250 BLAKE2B d31972b44e59a7894f6dc9275c53b5ebd38ca162e0754916cbd65832285d742f5d27dacfffbc4ebe4be2bbcef71f20eeb2cbd3b9f1b5d3de34701cd993c6e764 SHA512 8879f9c19884f00abebd173e0c7e077da2c4d54595fa34ee95b8a2c1390b72bc78ef059d62a16f52bee9b526f6a73c1f1b2163a4e06f2c454a8e63bf6fea10cc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.16.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.16.5.ebuild
deleted file mode 100644
index 60a91ed842b9..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.16.5.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.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.17.4-r1.ebuild
index 9ceb21c00c3d..edd4cbfeb890 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.17.4.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.17.4-r1.ebuild
@@ -4,19 +4,25 @@
 EAPI=7
 
 ECM_TEST="optional"
-VIRTUALX_REQUIRED="test"
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Useful applications for Plasma development"
+
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
+	>=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
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -32,12 +38,9 @@ DEPEND="
 	>=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}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.17.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.17.5.ebuild
new file mode 100644
index 000000000000..5de29c2e5e26
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.17.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="optional"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Useful applications for Plasma development"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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
+	>=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
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index b6dde00b37eb..7e1e22213b5e 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-thunderbolt-5.17.4.tar.xz 47368 BLAKE2B 69b74a5631bb0789621ab7aeb5475b8abe21a2b2c3fbf8331b1f4d0587649e05bd0a8e52cf381b9b3c8185f142e11dde28449798fa56ee72e0e5cf2d70f2d39b SHA512 1746ad45181f089bef35574a1e604443ff0a9abb025d5fddda16a109fc4041c522cc3c972272549304a3cbcea0f3fb2d75f81468f61f86826e18f03fcbef62a6
+DIST plasma-thunderbolt-5.17.5.tar.xz 48356 BLAKE2B 18579420fcd3d99b2c948ee48391914ae33001ac95e6ec8a83d6f04d6343d25c6682e954b7c5fd1978d48b32ae200c1ce08c5a6465a037320358246a7cdb9de8 SHA512 8287e20963a31af60dff75a659af455518d72813b7e04dfd5407de4bbcda422551a000fd3ff03b67d4a052dc0421058c8ae8c31c1a92d174277d6a02819f6f70
 EBUILD plasma-thunderbolt-5.17.4.ebuild 771 BLAKE2B a817f27676fbcd81df8b20542823bfeb0cb0632f7539b2f587383beedbb35497e4e42003133282c29109f225ad42c8e9ddc3f36b057d070c54d9348c5a1d513b SHA512 5089e31e69a477c6ef9eeead61bc2f96c12b2e4bcfea49e342ba029a0fa51fb39f5823b6543725731975bae495c8ff901fa390bd3db42ea57e3189ce12009504
+EBUILD plasma-thunderbolt-5.17.5.ebuild 771 BLAKE2B 2b9449ca11f2c946f6de69dfe4c0432237cb9e31b4d748bbf75906ed0eb0be9a23f317208a2498daaddfe54198bb5d131deabb685d44e2b40f6b49b559f14abc SHA512 4a02282641059e52570f176ba3812f12d218e35db037f4f67c3c034cc6f7ef551e29a783a4aa63c4f5f5a95b15280d1e6fab6a5816097d52e2139cc23bc2613d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.5.ebuild
new file mode 100644
index 000000000000..b7005f618469
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 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 ~x86"
+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 f77063678f5b..3f599e7124e3 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.4.tar.xz 129308 BLAKE2B 665994f13af2c621537a05e2495fdaa277cf80b1e7a764fa26fd953c14c1c34437a7939dd61d1abae781a49778916490405672225bd34ba4ae9dfdba0be26868 SHA512 f266027758128cff45dd2ed8c06a9c4c56dfbd734b00a55abeca2219752a53831c20fbaef68942ddcaddc6de15fdfba9ac3305ed3dc4ce71ac4dff6f6f57a9f1
-EBUILD plasma-vault-5.16.5.ebuild 1077 BLAKE2B b1438da912bef60253a671afd9121d7b78f7541645600730477bf1df40cf3b91923b7e873b6afb1590c363cadd06c6328e7e8f9d222743b92deb25bc13ec28d7 SHA512 192b5ef7ed418b69c4f687d3489a4cd51c5de7432211aceabe122992afe445f606b5eb7b3131d2900590c842fed7041b3da11ae6d8050e9e7ea20f6b44dd2e94
-EBUILD plasma-vault-5.17.4.ebuild 1232 BLAKE2B f3cdd2b04db1594b25cfbc2cd5fe8263010d9ec6f2628c06f056df19ccb4070129f1e6c16181b450f8450dd1a5fe8896e83387b730e007a6c4e77fbd6c517459 SHA512 e8c04a36f249dcdba62c675c83030fb1121e5b5d1b55a072793427fec6a909212d2a8ae571924d5b9684d963aceea7041e9a7aadbcf537b93d45c5ea15a5da24
+DIST plasma-vault-5.17.5.tar.xz 129144 BLAKE2B 87cf670facbbea5808be8fe220a9218e02ddf3355459782977b098551ebfe18dd34c029243d666f9bb9c2262094808bdc71e77891c6b9f2907fb830e67603f2f SHA512 fe130942a31f815400f7bf61c5d822f272e32f0291bd94dfcb6b3c8317a33dd8cbf4e23724a6d670d1975511b5b9a22a75c08e918849c4910bac3a5197964383
+EBUILD plasma-vault-5.17.4.ebuild 1229 BLAKE2B 323f580765eb483e2cc29648a01f6af3300920f13a2b897009f27fd2770c68bde02eccc14b0e4cdba174927ede98892f994d0ce1186e9c58083350a23ad76d7d SHA512 497d2d322a5a98271a344f73957f4684e36908840e31c308dc3d8da4d46f97da7d6937efce203298fe3a3be928ab5cb6a2a52ece419c45702fb93c89c33c6c51
+EBUILD plasma-vault-5.17.5.ebuild 1232 BLAKE2B 7ecb811756485026343dc3fe48ca58c3dec0e050b7ba5a7aacf482181cee10400c4177474b9225747a95d11480ff653c8754c9954c00d979eb27e4a1502570b4 SHA512 bf5977c4d3359a53a5538d0fe54b40c4187e0ad307f608edb9c3f7061bcd6d41e8fa2256429202d700ec4b1cc6a0d2f2d85e3369512119255451ce7324cf92d2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.16.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.16.5.ebuild
deleted file mode 100644
index f70c37f54ade..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.16.5.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.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild
index 179fc24cbc8c..7c086a8ba5c6 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.17.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.17.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.17.5.ebuild
new file mode 100644
index 000000000000..5042b0659f52
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.17.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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_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 8badbcbfad0a..feb0ae03f3a9 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.4.tar.xz 34172960 BLAKE2B dc7ea99a0ff3fc3ee564d4da835dd8ee58fc7f582d6c405290fc00c6981bfc8b01d96a50c16ff164e60e7ef5049e0cdd38206fc7d808becf3473e1e772db6e20 SHA512 0aa2c28721a88ae3e6f841b751a2f3f1488106bc25ddaf591f8146fbdb310a12c8c5046b4be84787f4c08320b819e5a829531b8f0b07291ee5243c8581c3e9e4
-EBUILD plasma-workspace-wallpapers-5.16.5.ebuild 352 BLAKE2B fc2880c1709d2536cd641f0834546470636e8939323eac5ac19e75dd9603e91129b82293912a06f695e08f3ec84d2eee79c5d49a594fe3a077b37395a32bbd51 SHA512 312a12f19ff9c33022f081630768e442a0f8d4440c7eb6b029d493003f0a18e8021030f930033a76f500ce2dfbf5d5c4d9b0020e86719ae2819dada1e12e224c
-EBUILD plasma-workspace-wallpapers-5.17.4.ebuild 357 BLAKE2B d2222766224dda5591e6eadca3982d7c328f65da3de653f89447ac655ae85f13fc1cc53c830be743637ab1db151c6ddb6396aa4e57aeee65e36b4cd0708cb79f SHA512 cdbbc2dd80a73b5cd5f972efb21ee8e01742353a764349096f2ae7d1c9e76d70d5776e9c8db0e5a9c6e906c3af5ebbe7e34608657353e728f45ce0895c29a7a8
+DIST plasma-workspace-wallpapers-5.17.5.tar.xz 34173344 BLAKE2B dce8cc422523c55b1b9fd33c139dd8597b0130ce1d7dcef9065421d1e5da24c5f2ef3ca176154aa21c39d81f3c5d53170a3e22697cbb84c3306de0271dcb134e SHA512 d1fbdd52632009a77d31e89105323d26edaad20e2083dca27acb0f7c796f534a7a3e4223659b7ccc522513eb7f7d3e4e200251626bda60475d53f9a095ce9fe6
+EBUILD plasma-workspace-wallpapers-5.17.4.ebuild 348 BLAKE2B 60c17c5c165b3115d2e881a8cff31a6a6ea2319b7cf269c791ace7d4052bcb287eff0c6f1d58195dffad392fff274c598831e45db9c21cd4f6da4d5acf2e5b76 SHA512 c7b414eeb2d61910feca63fd3ee943b7153582d11038a46efc011ea1304dc41cd5a9b359432360515aa1f5ba9ee555260fbf1afb741f7f7038ad66cdec4b5651
+EBUILD plasma-workspace-wallpapers-5.17.5.ebuild 351 BLAKE2B ebcadb1a2f7539dd43ee5132dfd359b39f2d2004b6b513c8f51f25480f65f626b2eded11361bcf1d9dec3d2607ae17e7e4b074c0efac898f2fba6c5c3514ae9e SHA512 4ccb55e72e0b523a380f4d4c1aa94c36d10b7487705987d5677308208d33732f7b3a4029f62400dad65a185eeff0b39e65be6d33fcac9c5a3ec0273cea4c8f1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.5.ebuild
deleted file mode 100644
index 9ccd512332fa..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.16.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5
-
-DESCRIPTION="Additional wallpapers for the Plasma workspace"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-"
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
index f57a44c91be5..58eff74a1328 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
@@ -4,13 +4,13 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.5.ebuild
new file mode 100644
index 000000000000..0fe9c7985bde
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.5.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
+
+DESCRIPTION="Wallpapers for the Plasma workspace"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	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 d2c0648906b5..0815802aa462 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,13 +1,10 @@
 AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
-AUX plasma-workspace-5.10-startplasmacompositor-script.patch 1213 BLAKE2B 2558a43db9cc65706fe2c3382918e47552ad702e9ac6a5071ae3c620bc05097306046e0cd3f74de68985d787120013ce76697cbe107bc3b0c5ace5d5d03a05c1 SHA512 eb7126ec8a7991c59c1c056c81d9b8d6934cf9c702cc70534a97b585eaf1ea3e33499e5525e821ce4e8682573a09538ed1d59db561c58a7464a144e9a24c5275
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
-AUX plasma-workspace-5.14.80-startkde-script.patch 1207 BLAKE2B ee59b775f3ffb3d876d1c4c27f8221c9854af155fc4c0dc0c6cb591fc944f07c3196d64438011db6c2833b4030d0ef76e6a49752dcd1267a94e7686af06e5bda SHA512 e8de504db8b4f23ef6c09aae9d9fe88f88ed3623b6b5766e5cf57ccf72d5d31778f8f8ba5483ca200ad6d6fbae1346655f73ca1ef880d3eb1a5775f258501938
-AUX plasma-workspace-5.16.3-x11sessionrename.patch 2435 BLAKE2B 3ec4c08af77f24dd264e547ed1f33e2dcd21a501fe83638c56c51e3ea17502b7622b1d6829927cd1396f01356957f686fb76a825de272541afc7e67436d20a46 SHA512 69eaa3393b3e0dd0251df4a577002e4bcef4604b4293f08e5ad9a5ef98367a5ce67d2238e3f84acb8845e4fdd80d570a651ff5f475e43439763ad3dbc994241e
-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
+AUX plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch 1136 BLAKE2B 8e10813738c6018e60d33566172fb23be4f4ae198633aeb8b5d596724d30a30c98ec491a967880b0146ce39c06af9640e711ea0fdfae4d6a67cf351f798d66e7 SHA512 024b9c7c82547890401142691669068455141145d77032830b713d2b8cf839b30fb200c0935d1c42e91cdf3cf51743a4219751ccad618f51043acd80e882191d
 DIST plasma-workspace-5.17.4.tar.xz 4962200 BLAKE2B 2050dbf77dbdf144017e0ddf4b827b9dbe27b8f475eedaed969a442e036f162cabad5d6b47fd650491ed5989cade48ebafbd5f599dbc790c14515ce01ebfd626 SHA512 3f5aa07ccd19604bc399bb1d30dd16ac82e1405613c1f4a939e3c2cba3b4a478213095617052440dda222f1712608533e5806939117752d31b0616a6009cf45b
-EBUILD plasma-workspace-5.16.5.ebuild 4696 BLAKE2B 3701c3d0721a0ed497c7f5bf749be05c5b3071cb90b98df0bad2f0b2de0b7042b392ef7fb7ed4ffe60e4a2c08c206bee51e9f1fa49841110b78a655436acc93b SHA512 8a4ac267c2cb2207d1e44e970f88b7d33ee76282c94a2868584d836261021644b934be8ea592ec29aa5e4a0f144991b3545bfa0aebd7dc7cf3ba28bf4a20f663
-EBUILD plasma-workspace-5.17.4.ebuild 6444 BLAKE2B dd08a383c63f41091833291ef860bee4b66d43a1a53ec7064bdec985d64d083d6863eebc73862059bb08189d66b6c1d1b358fb5b8b8239ab38193dbe07a6df7b SHA512 dd384dc39ee547001d53b9f545badc0f98465763c0418acc381bc5fc3159cc3f55059968c6473cd9d7e2a8b6e6d188fdbff10d6c5b9f8264ad22d269426e66ac
+DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
+EBUILD plasma-workspace-5.17.4-r1.ebuild 6844 BLAKE2B 86929dad901ee5d5b8d8e965b463f9ae3352f6ba9e24742969e011f48e5d5aa4738fc478aa28f185f7dd7205b45a5e1f2706d7b06c17e7a5a10b187579fd5a3e SHA512 99c6ed1d9b66e1a1ae0d6813c316306dae4cfda6e491a9d61d04196e87f391ea888f2711f20591dea0c419645c97416da96c7192e26f3f67c4b603f0ed4c6752
+EBUILD plasma-workspace-5.17.5.ebuild 6790 BLAKE2B c7bbbe3436c7f7f317ec5bd4f88a4f1842df931188afeac79fb03ab17a9c6613918ad9f69152ca8d92df6276030d00837c5546537cf136413c4f9a80430b1b40 SHA512 4103bae272daa63ca0d41a39c3dab4ae1388e7585e9754ab44745e9053702dec23069e8cf717a22ce2375a38d13fcd85a763ec9350f6e7daea8dc27aeeb65af1
 MISC metadata.xml 643 BLAKE2B 28c9374aff890daac8a279eee05792f453a1e15b81d4e8182c3ff1bfb352e00859ede5792580b171615bc0af866fd8f5060486fb2fc3013d408a36343f78c2ba SHA512 eb5d1e325403d3f22422642b6d32a250f4450b06bf0f1275bc88b5dcae004ccb0f12bab318d36a24991bf2bffc590fcf7d43419d58e3d2bf9a396ed7e3f8778c
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
deleted file mode 100644
index de56ffe236c7..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.10-startplasmacompositor-script.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a9b685f0dab7f21dfa3ed55011c035bab1c972d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <koalinux@gmail.com>
-Date: Tue, 1 Aug 2017 23:09:24 +0300
-Subject: [PATCH] Source files in /etc/plasma/{startup,shutdown}
-
----
- startkde/startplasmacompositor.cmake | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
-index 5bcf26a..e965f19 100644
---- a/startkde/startplasmacompositor.cmake
-+++ b/startkde/startplasmacompositor.cmake
-@@ -157,6 +157,11 @@ for prefix in `echo $scriptpath`; do
-   done
- done
-
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- echo 'startplasmacompositor: Starting up...'  1>&2
-
- # Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
-@@ -232,6 +237,11 @@ fi
-
- echo 'startplasmacompositor: Shutting down...'  1>&2
-
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
---
-2.13.0
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
deleted file mode 100644
index 44e86a0169c3..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.80-startkde-script.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bf569560bf195ac4e79d65d4103a7161a6a2f2ac Mon Sep 17 00:00:00 2001
-From: Elias Probst <mail@eliasprobst.eu>
-Date: Sat, 4 Jul 2015 11:33:01 +0200
-Subject: [PATCH] [startkde] Gentoo FHS script support
-
----
- startkde/startkde.cmake | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 2585600..9350158 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -210,6 +210,11 @@ for prefix in `echo $scriptpath`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
- # from some users that they're confused and don't know what to do. This is
- # especially necessary on slow machines, where starting KDE takes one or two
-@@ -417,6 +422,11 @@ for prefix in `echo "$scriptpath"`; do
-   done
- done
- 
-+# Gentoo part for FHS installs
-+for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
-+  test -r "${file}" && . "${file}"
-+done
-+
- unset KDE_FULL_SESSION
- xprop -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
--- 
-2.3.6
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
deleted file mode 100644
index a851f5f54b82..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.3-x11sessionrename.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From bcabb38b1f07a52847752fb54eb61696a1312a61 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 2 Jul 2019 10:13:54 +0200
-Subject: [PATCH] Fix Name conflict between plasma.desktop and
- plasmawayland.desktop
-
-Summary:
-SDDM as of 0.18.1 appends " (Wayland)" to the Name of any session file it
-finds in wayland-sessions dir, and Plasma is relying on that behaviour to
-distinguish between its X11 and Wayland sessions. This leads to duplicate
-"Plasma" entries on any other DM not applying the same hack, e.g. lightdm,
-and users are lost without downstream patching.
-
-Instead of waiting for which of (SDDM, Plasma) is doing something about
-it first, renaming X11 session to "Plasma on Xorg" appears to be the most
-elegant solution out of the deadlock. SDDM can be fixed any time later.
-
-CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
-See also: https://github.com/sddm/sddm/pull/997
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D22210
----
- plasma.desktop.cmake | 46 +----------------------------
- 1 file changed, 1 insertion(+), 45 deletions(-)
-
-diff --git a/plasma.desktop.cmake b/plasma.desktop.cmake
-index 4d361606d..099de2908 100644
---- a/plasma.desktop.cmake
-+++ b/plasma.desktop.cmake
-@@ -3,51 +3,7 @@ Type=XSession
- Exec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
- TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-x11
- DesktopNames=KDE
--Name=Plasma
--Name[ar]=بلازما
--Name[bs]=Plazma
--Name[ca]=Plasma
--Name[ca@valencia]=Plasma
--Name[cs]=Plasma
--Name[da]=Plasma
--Name[de]=Plasma
--Name[el]=Plasma
--Name[en_GB]=Plasma
--Name[es]=Plasma
--Name[et]=Plasma
--Name[eu]=Plasma
--Name[fi]=Plasma
--Name[fr]=Plasma
--Name[gl]=Plasma
--Name[he]=פלזמה
--Name[hu]=Plasma
--Name[id]=Plasma
--Name[is]=Plasma
--Name[it]=Plasma
--Name[ja]=プラズマ
--Name[ko]=Plasma
--Name[lt]=Plasma
--Name[nb]=Plasma
--Name[nds]=Plasma
--Name[nl]=Plasma
--Name[nn]=Plasma
--Name[pa]=ਪਲਾਜ਼ਮਾ
--Name[pl]=Plazma
--Name[pt]=Plasma
--Name[pt_BR]=Plasma
--Name[ru]=Plasma
--Name[sk]=Plasma
--Name[sl]=Plasma
--Name[sr]=Плазма
--Name[sr@ijekavian]=Плазма
--Name[sr@ijekavianlatin]=Plasma
--Name[sr@latin]=Plasma
--Name[sv]=Plasma
--Name[tr]=Plama
--Name[uk]=Плазма
--Name[x-test]=xxPlasmaxx
--Name[zh_CN]=Plasma
--Name[zh_TW]=Plasma
-+Name=Plasma on Xorg
- Comment=Plasma by KDE
- Comment[ar]=بلازما كدي
- Comment[bs]=Plazma od strane KDe
--- 
-2.22.0
-
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
deleted file mode 100644
index dc5214b30361..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.16.4-no-share-dataengine.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-See also: https://phabricator.kde.org/D22691
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,7 @@
- include(KDEPackageAppTemplates)
- 
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
--                    Plasma DocTools Runner JsEmbed NotifyConfig Su NewStuff Wallet
-+                    Plasma DocTools Runner NotifyConfig Su NewStuff Wallet
-                     IdleTime Declarative I18n KCMUtils TextWidgets KDELibs4Support Crash GlobalAccel
-                     DBusAddons Wayland CoreAddons)
- find_package(KDED CONFIG REQUIRED)
-diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
---- a/dataengines/CMakeLists.txt
-+++ b/dataengines/CMakeLists.txt
-@@ -24,7 +24,6 @@
- add_subdirectory(time)
- add_subdirectory(weather)
- add_subdirectory(statusnotifieritem)
--add_subdirectory(share)
- 
- if(NOT WIN32)
-   add_subdirectory(mouse)
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch
new file mode 100644
index 000000000000..c6d2f4425dad
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.4-fix-disable-mime-based-actions.patch
@@ -0,0 +1,38 @@
+From 895e31d6946b63ddba923e58eb08d1ece7de85df Mon Sep 17 00:00:00 2001
+From: Tranter Madi <trmdi@yandex.com>
+Date: Wed, 4 Dec 2019 20:34:49 -0700
+Subject: Use the right value of EnableMagicMimeActions
+
+Summary: BUG: 409801
+
+Test Plan: The bug is fixed.
+
+Reviewers: #plasma, ngraham, apol
+
+Reviewed By: ngraham
+
+Subscribers: davidedmundson, ngraham, plasma-devel, #plasma
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D25310
+---
+ klipper/urlgrabber.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
+index 28d8ce0..eef9784 100644
+--- a/klipper/urlgrabber.cpp
++++ b/klipper/urlgrabber.cpp
+@@ -102,8 +102,7 @@ void URLGrabber::setActionList( const ActionList& list )
+ void URLGrabber::matchingMimeActions(const QString& clipData)
+ {
+     QUrl url(clipData);
+-    KConfigGroup cg(KSharedConfig::openConfig(), "Actions");
+-    if(!cg.readEntry("EnableMagicMimeActions",true)) {
++    if(!KlipperSettings::enableMagicMimeActions()) {
+         //qCDebug(KLIPPER_LOG) << "skipping mime magic due to configuration";
+         return;
+     }
+-- 
+cgit v1.1
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild
deleted file mode 100644
index ee469f3edd9b..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild
+++ /dev/null
@@ -1,168 +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 qmake-utils
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(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 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 libksysguard)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(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.14.80:5
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.80-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-	"${FILESDIR}/${PN}-5.16.3-x11sessionrename.patch"
-	"${FILESDIR}/${PN}-5.16.4-no-share-dataengine.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,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild
new file mode 100644
index 000000000000..d1821bb98a65
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.4-r1.ebuild
@@ -0,0 +1,220 @@
+# 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"
+	"${FILESDIR}/${P}-fix-disable-mime-based-actions.patch"
+)
+
+RESTRICT+=" test"
+
+pkg_setup() {
+	ecm_pkg_setup
+
+	local md5
+	local srcfile=/etc/plasma/XX/10-agent-XX.sh
+	local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
+
+	if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
+		md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
+		if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
+			elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
+			elog "Copying to ${newdir}/env/10-agent-startup.sh..."
+			cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
+		fi
+	fi
+
+	if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
+		md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
+		if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
+			elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
+			elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
+			cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
+		fi
+	fi
+}
+
+src_prepare() {
+	ecm_src_prepare
+
+	if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
+		cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
+	fi
+	if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
+		cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
+	fi
+
+	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_use_find_package appstream AppStreamQt)
+		$(cmake_use_find_package calendar KF5Holidays)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package qrcode KF5Prison)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	use gps && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${T}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${T}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+}
+
+pkg_postinst () {
+	ecm_pkg_postinst
+
+	# Clean up pre-5.17.4 scripts
+	if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
+		rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
+	fi
+	if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
+		rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
+	fi
+
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
+}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.5.ebuild
index b522d47f4492..682fbeb00f29 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.17.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,14 @@ REQUIRED_USE="gps? ( geolocation )"
 
 # drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
 COMMON_DEPEND="
+	>=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
 	>=kde-frameworks/kactivities-${KFMIN}:5
 	>=kde-frameworks/kactivities-stats-${KFMIN}:5
 	>=kde-frameworks/kauth-${KFMIN}:5
@@ -65,14 +73,6 @@ COMMON_DEPEND="
 	>=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
@@ -98,18 +98,18 @@ DEPEND="${COMMON_DEPEND}
 	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
+	app-text/iso-codes
 	>=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
+	>=kde-apps/kio-extras-19.04.3:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/ksysguard-${PVCUT}:5
+	>=kde-plasma/milou-${PVCUT}:5
+	>=kde-plasma/plasma-integration-${PVCUT}:5
 	x11-apps/xmessage
 	x11-apps/xprop
 	x11-apps/xrdb
@@ -129,15 +129,42 @@ PATCHES=(
 
 RESTRICT+=" test"
 
-# used for agent scripts migration
-OLDST=/etc/plasma/startup/10-agent-startup.sh
-NEWST=/etc/xdg/plasma-workspace/env/10-agent-startup.sh
-OLDSH=/etc/plasma/shutdown/10-agent-shutdown.sh
-NEWSH=/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
+pkg_setup() {
+	ecm_pkg_setup
+
+	local md5
+	local srcfile=/etc/plasma/XX/10-agent-XX.sh
+	local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
+
+	if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
+		md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
+		if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
+			elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
+			elog "Copying to ${newdir}/env/10-agent-startup.sh..."
+			cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
+		fi
+	fi
+
+	if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
+		md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
+		if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
+			elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
+			elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
+			cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
+		fi
+	fi
+}
 
 src_prepare() {
 	ecm_src_prepare
 
+	if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
+		cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
+	fi
+	if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
+		cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
+	fi
+
 	cmake_comment_add_subdirectory libkworkspace
 	# delete colliding libkworkspace translations
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then
@@ -165,41 +192,28 @@ src_install() {
 	ecm_src_install
 
 	# default startup and shutdown scripts
-	insinto "$(dirname ${NEWST})"
-	doins "${FILESDIR}/$(basename ${NEWST})"
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${T}"/10-agent-startup.sh
 
-	insinto "$(dirname ${NEWSH})"
-	doins "${FILESDIR}/$(basename ${NEWSH})"
-	fperms +x "${NEWSH}"
-}
-
-pkg_preinst() {
-	ecm_pkg_preinst
-
-	# migrate existing agent scripts to new layout if no files there yet
-	if [[ -r "${EROOT}${OLDST}" && ! -f "${EROOT}${NEWST}" ]]; then
-		mkdir -p "${EROOT}$(dirname ${NEWST})" && cp "${EROOT}${OLDST}" "${EROOT}${NEWST}" && \
-		elog "${EROOT}${OLDST} has been migrated to ${EROOT}${NEWST}, please delete old file."
-	fi
-	if [[ -r "${EROOT}${OLDSH}" && ! -f "${EROOT}${NEWSH}" ]]; then
-		mkdir -p "${EROOT}$(dirname ${NEWSH})" && cp "${EROOT}${OLDSH}" "${EROOT}${NEWSH}" && \
-		chmod +x "${EROOT}${NEWSH}" && \
-		elog "${EROOT}${OLDSH} has been migrated to ${EROOT}${NEWSH}, please delete old file."
-	fi
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${T}"/10-agent-shutdown.sh
+	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
 }
 
 pkg_postinst () {
 	ecm_pkg_postinst
 
-	# warn about any leftover user scripts
-	if [[ -d "${EROOT}"/etc/plasma/startup && -n "$(ls "${EROOT}"/etc/plasma/startup)" ]] || \
-	[[ -d "${EROOT}"/etc/plasma/shutdown && -n "$(ls "${EROOT}"/etc/plasma/shutdown)" ]]; then
-		elog "You appear to have scripts in ${EROOT}/etc/plasma/{startup,shutdown}."
-		elog "They will no longer work since plasma-workspace-5.17"
+	# Clean up pre-5.17.4 scripts
+	if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
+		rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
+	fi
+	if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
+		rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
+		elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
 	fi
 
-	elog " * Edit ${EROOT}${NEWST} and uncomment"
-	elog "   the lines enabling ssh-agent."
-	elog " * Edit ${EROOT}${NEWSH} uncomment"
-	elog "   the respective lines to properly kill the agent when the session ends."
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
+	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
 }
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 35710d24fd42..b675a7f6c47e 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.4.tar.xz 39716 BLAKE2B c242d54ca4a572dc89796875241816ea698ce21e563abb7443ded4f7a51f7fd5479b9e9bc7b38a59806e802420124c19ca3598546a5ac04163d096b065d68a7e SHA512 ded5142b88452f5df3241a71760e77811e1fefacdabff8e5a044fc1e73c0b0d6cdbdc96dcf6cc1af1bcb35b8780ed13e437d7bba54f7fca872869f94d3daa21c
-EBUILD plymouth-kcm-5.16.5.ebuild 799 BLAKE2B 9860b4921f67b4fceff4fdee47b6f1e056cc567ff545de71c2e41f979e291a702db009705cd2f26f6c25263200cb350def1fd1f0f2e8838b28b8a25ccbe40835 SHA512 c53bc03e8707855afbeab7a4f73e0df4a43e553fba3c9e438ca33b7c4429166e0520ba9ff3e76cef2777dc17bc3874c825ef710277b44de1d57f883bd9e52524
-EBUILD plymouth-kcm-5.17.4.ebuild 949 BLAKE2B 6e16f1a763ada41a5212555fa66d33a5aa2297f573747889a6cd4f9de94ac959d86cbe494923f95680eb03e647b3482bcfca632f8e73fb3ea951dcfebe85a098 SHA512 f0eb68ba3290191d608eeb1edd917659843cd2662f808a40244b8afa7c30ac6fd86257502ecc633673e195ecbb34ccb1b9a886ae7c78bcd3e07809e5a8f262c6
+DIST plymouth-kcm-5.17.5.tar.xz 40372 BLAKE2B a78f79960dd0623647be478fe37c9d15b7eb55c1a6cc2037fcb72d5d86ed0226860fc258850b7313bb75788580e0089f86656b97480c7b0d93c726ed6bb668ae SHA512 2751c89408538c58821d71aeda47c57584b647f006b7fcad0a67d0247a861523be6b3e253a2e3b32c9f0f3be0613385fef49bc2b68d8900f1e9e1be54e989494
+EBUILD plymouth-kcm-5.17.4.ebuild 946 BLAKE2B 80418a72df297e72b8805e9549c55513370d14f666a0aae959c9962e0c8d8cb34a950c6429a4db9f9c2ae25832a87110063d6ef19237e16c4c9675c848918036 SHA512 934ba0406780c272daba5971f8c287688b6b0f9b9e9aaa93d89c492d9eb97eb7e4d21fe6fb099cc5b5d85c38fe4e1746d993b3dd0c6946f96dc390407492ed08
+EBUILD plymouth-kcm-5.17.5.ebuild 949 BLAKE2B 4d123546776c4491eabd0e0391f6c44767043551f23a06427846e06b900587d257b30bfb93978b971b5728fe4312d967b3436e579183900e1758bb03a67077d4 SHA512 57cd8bf692cf13249957e72cd40e1e7e54e4e36d15b72048d6743cbd73fa1b267d06c1276f81f792a40da8c0c4c231a0b4255dcbdaf9634baa37b4c49c164d11
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.16.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.16.5.ebuild
deleted file mode 100644
index 60f20d14aaab..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.16.5.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.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.4.ebuild
index d390caeb19d5..31f758101bca 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.4.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.5.ebuild
new file mode 100644
index 000000000000..6a65a50a3e04
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 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 0d111b61a563..5cc567949ab9 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.4.tar.xz 43308 BLAKE2B 529aa7c4ad85de97cee208249ff0a7f27f932c34e95f3bc9565646cd6452196b742a9ea59575e43347be05f56efce54b0bed4cfd202043259b8af30b0b283957 SHA512 85aa85211985177366cebbe081e7f943adb6b9f17e427be3ef46d7f747b34757ec1e28ba8931ef67bbf33cb117be7a8bc99cb3e44e3ec15763b73c05f69e5d81
-EBUILD polkit-kde-agent-5.16.5.ebuild 638 BLAKE2B 1419ae15608a79c9cf0b6f9f57636f199b7038869fd3638102280c214966c76c1588c898f88040346854f73f8ebbb8dda40caee1f373f0279701873cbe09c7f6 SHA512 c359e8a9db5e8611ad2f1fbfe9cb9d42da2bd13b8422f0759af7af5e7a285e0aa2d1b473d06c41fa11ca555f77aa0966ec83d8d325cf6d062a801119ba3b09d3
-EBUILD polkit-kde-agent-5.17.4.ebuild 800 BLAKE2B d5f58270f6c348488ea7671fde882feffc57081a2261ab60660c9426e62a54e84fc96647585c82a9a42d8512ab8bef7c387b713eb02a8bb35a9d4981cc9bab5d SHA512 66d7bea3c884520308dbd051d38b6b5a1ff4a8a0e33f19d0769c771e6cfbfa17a2d758c825f9d9abfb49f14a7a7d5672eecbf7d8b070d851f59bbfb374f0ed8a
+DIST polkit-kde-agent-1-5.17.5.tar.xz 43340 BLAKE2B 14f97204f9d93e4aca9d0f9bb98dfd7b74b03796958cf065bb4026a03489159ca45634b9db009c2a025fcf826a1ca8ad1f32e962047d56e0010b017b6569979c SHA512 0103449f58a82c07ae76e214a7fddcf29b034c5e9f73b6cf2d6b11e2e4510b1deba1a0cccc578304defb445e9012d40deca88c647b3727b83574f2eeb223894b
+EBUILD polkit-kde-agent-5.17.4.ebuild 797 BLAKE2B cc6a1c9b9da1e83343f4f06731a9d8ea6310cd227aba3c37ce08fcdfdef9bc570d8ab7ba909ef7cf3ff2277c75a986655c31f785e48a6f324ba7a380d27b488e SHA512 ed74386fbc54a73bee8b6173c301215cb42d67f67f63693e18dcdb81f0727c39ceec03518829b9e4a396009a2226500b48e3c0743796d3328410567a350be935
+EBUILD polkit-kde-agent-5.17.5.ebuild 800 BLAKE2B ca9b96b5f81915909da7910cb8b1cd5a3dbad070c19f953411c6c610d8920782dc3c1b549ec149eae6e19482cc64fa707bfc3fede330d8a7f067acfdbe0be151 SHA512 fd82a150c0630c061dc00b7d09de9dbd948c09060a8bfa05a6e3166f79c2ee67bdf1723021ccb6992dc0640f44651475b06d98605660f9b60ddc5ae5f1e00521
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.5.ebuild
deleted file mode 100644
index 05a4c34060b6..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.16.5.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.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.4.ebuild
index aa768daaf33e..4ca2953b42ae 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.4.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.4.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="PolKit agent module for KDE Plasma"
 HOMEPAGE="https://kde.org/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.5.ebuild
new file mode 100644
index 000000000000..9000057b6fee
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 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 c87e8687317c..051a579ca5e9 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.4.tar.xz 594592 BLAKE2B 049314450dddb7e1656d914d06b1b5a0c1f6dc2f4dccf1322a7a4e85cf127c67a10e847d343b7b234255fb8b7fda495d0aef978f13661f8e55249f976903f018 SHA512 c9ff02fb154e6088e0e0c8d26375d932b9a751d7d0b59cd9a380ccdd795f523f45143a1d6fb587ce9acafd393a7f825210041d4a2bef2680d81ab6bd8195e5fb
-EBUILD powerdevil-5.16.5-r1.ebuild 1610 BLAKE2B 717de4ec5ce099cde256e3b0b5ae006ff7785376272288164472db755933da5ea348fbebce56d6113c09462185888e2d1c41039a8dd37bf402552779ce403a70 SHA512 9e08c8dfe31b9fbfea1d0e6b11f33ca43b1fe5fa0d2b3b0bfccfb67cf4c077a6013439a0f8aeca962bd7e572dc91c90081cb5ae008bef806716a15ca11928bf8
-EBUILD powerdevil-5.17.4.ebuild 1862 BLAKE2B dca058298f5fd86cd157ba81b658f8937938f6db5cac70c40392841d3fe103bb16e3a2ef23fbd5659bec02bce958c2a89f6d5beade8ddbacdd3984ebb4dc6d8f SHA512 7cafba1fc288a543a879bbbc9f6891eec403bf655bc7f95e81a4f627e4c072110e3eeba0be34c71201793d388fd5b77f16b24b6964d14d417379c1bd537315c7
+DIST powerdevil-5.17.5.tar.xz 593788 BLAKE2B 3bd0bd3c37ccbd0993beeb53f2a76f08ea84eb81811bb1f7da8f59d75f39a8f34ccc6d9b10fc93002a52d1b8a76b9dd35e3790643dfb7c1687c14ce914a0d66e SHA512 a763ea1811cfdb6978e3e4e26311a9ddeb2d11ea5a80eed6ab5e28361007526554750f41b4f8adbc44a2d1fc16324432fc4f25152441dd17eb81c80448c9820f
+EBUILD powerdevil-5.17.4.ebuild 1859 BLAKE2B eaa2c96431f7ee5c3df42ee23ed1a9d989d83c404c1f39792e8e2821e13c502b793b6e6555f5cb8476fdf106783766f999a3612e75143bc41ab68eef5b6b9f14 SHA512 7e154b9e6bff8c70dae531b3679d7cd85e645dcd6ea5c35560aad1fa1d3db16da32da7ebf4e8e9680db7cb66f2546438fcfd4e49dcaa924528452c71eea3ef5a
+EBUILD powerdevil-5.17.5.ebuild 1862 BLAKE2B 6fb487b1295b56f625d2c6ec881bd96eb9ecafdecf9a3471f4bc76048cd23db0510c41012a961467b1bc6a8c041bec2d6bd9ca92a7d7baef5e92329c4d37754e SHA512 4b29487fd5f0e0f18fa851c07bd32ceabfd8ed1f59de9d85aa59de8228df5a1163988ca03c9349845a3b2d9b0e1779c35ff5fc7350f34893d3c2978c4f2a7c27
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.16.5-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.16.5-r1.ebuild
deleted file mode 100644
index 8ef5ef69b15b..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.16.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.17.4.ebuild
index 5a82f68a1a4e..13217c2cf3a8 100644
--- a/kde-plasma/powerdevil/powerdevil-5.17.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.17.4.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="brightness-control +wireless"
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/powerdevil-5.17.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.17.5.ebuild
new file mode 100644
index 000000000000..f08e8decc861
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.17.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 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_use_find_package wireless KF5BluezQt)
+		$(cmake_use_find_package wireless KF5NetworkManagerQt)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index f1617438b3ff..6de409112e5a 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.4.tar.xz 59004 BLAKE2B e89561fd449829708e74c16eb39a49ced6cc2096c20c85bffbf7193fa4b33007cc1859afe4398b72f12016feb9e46cc59917c7a737fb68816d256d8480f1989b SHA512 a2bc0059090afdb3c1dd697bb914b52f94ad0b8d87c7d9535f5f825c167b93146f251c197207fd45f4eca3d27c766fe5e3686d482fcd9c26eb27c882c874bbf5
-EBUILD sddm-kcm-5.16.5.ebuild 886 BLAKE2B e23150a39b9958ed42d574d19bcf2e7bd6be18425d4fdde741b4c9b4eed8ab7373bb816c6d028e2e21fa2a9d539560324785538f4ec881b668e42682a098fb2b SHA512 f1dc68580e781468ba23e3bc69d6a4fd885b0d5380faf073a57a5c17cdef696aea8569afa5eecf1fef51dceb4b62156dabfb2fe492cf72b5729833f0111ceee9
-EBUILD sddm-kcm-5.17.4.ebuild 903 BLAKE2B 08bbc176b60fd7b2f1e24592348d3c92c81ced13932a3657cfdf5baea7585a4e2064cbae71a2722eac256bc496d81e2a1ac32e186c1a6b8439abc779340ce4c6 SHA512 e6c2886993bf9ae8ca0c4f3321f568c503ad6e74198109a9c092ed835818bd72f3d7a189027ea80da1d54dde105322dbf0e4fa0d852f149bbab4692481bad2f9
+DIST sddm-kcm-5.17.5.tar.xz 59304 BLAKE2B bad791db8bdc4ace1060d3c49e6ce5100d8aa39c42f356ad5dd9b92f8e0a45b518c759ec5ff6d66d59e89b6ec1502050eb5093ab731ff4aef155ede3bf7b1e8d SHA512 8ba8024bfa336ab1344dc5c7f39e8395fbbef2cd4f4695be45c1a777fa06918e1a877d90b073518d182ee1cbfe67fd44419c9f67ecb24f2ffe832cac78da00b5
+EBUILD sddm-kcm-5.17.4.ebuild 900 BLAKE2B 9ba2c580b104c4fa8404f0f2c38b84a63aad6519d3bf7a804e27b6c981677d5cf2a42583def360edb7214e70dbe29843b35eb3f018566f23616f6d296383fbd8 SHA512 a0b65d7632050a926de5bfb8c14ae7d163da1a76b81f77cb85c32627a634514a8ed54c3d4d29aaea9be31ba7a4db5394f7f72e907f623702f76b05b1fbb59c7b
+EBUILD sddm-kcm-5.17.5.ebuild 903 BLAKE2B 7bb22312026fb67723e56770f9357234e49084d4307889bb8bc379de45145b8a53e41a69b0135c00955ae51152f691f66c233a81f439136de13e44147ac42bb0 SHA512 265363db0c0740da10c8f7025af0421af077f6d7b5d1ac39c100f48a743d5989b55e7ac4c332c0774f6c80f86a744393339d2f600e3efd8e816c8a65e84387a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.16.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.16.5.ebuild
deleted file mode 100644
index 151ebd200e6a..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.16.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-COMMON_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)
-	$(add_qt_dep qtx11extras)
-	x11-libs/libX11
-	x11-libs/libXcursor
-"
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXfixes
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	x11-misc/sddm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.17.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.17.4.ebuild
index 81512ea852ef..cf177affaa3c 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.17.4.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.17.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.17.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.17.5.ebuild
new file mode 100644
index 000000000000..40c5c22a69ef
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.17.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 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 2afdf5e67adc..23fdd2941045 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.4.tar.xz 172764 BLAKE2B 99af8adb54a43d649ae44832ddff7e65acdc06416b20bb26513eda22dd49f73cf6d2b734ba12424d32f66e7074a515bb97d31d00562ddbd15624f7147df40704 SHA512 c06662eaf4f75a498a2e28168e88ac70b421ed634b8757aadfd27e31e1ad259b2e3199d56af154cacfe4096f5d54e2596f5c2eb914b6668ad040cad2d7549194
-EBUILD systemsettings-5.16.5.ebuild 1411 BLAKE2B f7bf5ba22264ec03c07bf296dc0ec0d75cc2261aabde796fbaaf400b24177194b56251c9124b6c560e2a3a5d20007a86f07a16d72c0d6853aababb084bc449b3 SHA512 3c161149e19a792559b360a7b5863df3b87c5c30795c035fe94e36fddb633ae11453ea3f93545440d7966654269fe3add7e38b51dd8411793630c2614e089d39
-EBUILD systemsettings-5.17.4.ebuild 1779 BLAKE2B 310e7d380a701dfc76cadd300a53f0ab725368a5aa36560d38bdab9ebada84cd79eb48fdcd9976630d043f40d421740230b6b897a8213296c2841b503010f261 SHA512 70eadb859f82d134504e848425a8f9cc8009f6811f89e6d115d7c397dfb5b792242a1f70b5668c50547aa079ebaa0e393c6984247df8ffd4da0f3d4ac0c02d36
+DIST systemsettings-5.17.5.tar.xz 172720 BLAKE2B f8cc7bd6e554e0a88c4241ab255b63fc259f09182c94e5ceba6a931a79927c52df926e8121180ea96075bf428dc28e3cedba9a4611491e06a151fe8d23a380b5 SHA512 75844d5bbfe518f857f24df46769ef38460518fa7eb548ba4903619dc6336d85f2d8d4ba7dc6b36bffd04dc1cf6f3e515e49a4bc537d2b1fffb374005c622b7f
+EBUILD systemsettings-5.17.4.ebuild 1776 BLAKE2B 5ad7d3b14162c9c403131cc86217dd65a3a6c88de58044d4b6476d9cd5f1b9203f70e886945716ee784a7239f256174e46ed20c0a9e18308c5a09be6512ed858 SHA512 eeac6fdaea801f3b50cc24a09a791c8356b54b06721031542a99d5f54e24b4f821cd4f42b75397cf379433f7754f023d701de55c579e124c143fe76ba61222eb
+EBUILD systemsettings-5.17.5.ebuild 1779 BLAKE2B 33787a9a9475f7570f110a41d94c5d3c9fa9cc104fcd5c859733dc9bd095a952f1270c79d13e7debb6a7a266bdc37ad0931b7afc9773f6e127120403406d0977 SHA512 b5b5dbe0c687e507dfcfeb0e76a83e5c982182fd91bdb7e0819af547fee10d9a9697abbbb564af83afddbadc802f504aa7ed038e72c3c6c7bce3105107dddfbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
deleted file mode 100644
index 12bfd748c79b..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
+++ /dev/null
@@ -1,58 +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}
-	$(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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild
index 54ffd396b902..f33b1039c611 100644
--- a/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="Control Center to configure KDE Plasma desktop"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.5.ebuild
new file mode 100644
index 000000000000..f8d92ce2a4be
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.17.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 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 923ad73ca6b9..20f5720e1043 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.4.tar.xz 2163860 BLAKE2B 67c5c533e021741b813ce8e1e3dabebaa607eca546088791e0e55f15feb4ee653cb711e4a4ccf72a22ab742a7d93a65f64eccdda0fc5b7a51440710730a5cb5e SHA512 f0d7700b535c554a5c7604bbd0a0b3bdf307012744324d28579b707278e13bc56136e93060d0925bc403dda46fed5649fa842c65965b42ca397391d114d1e00f
-EBUILD user-manager-5.16.5.ebuild 698 BLAKE2B 47ff0768c259489898cfb2c38dc9597f0fa98c058c6daf70fce8ad4b033e2d230df2af6ec317770a60585fac97f3003bcff051c182380f876f6bb5c95478a5f6 SHA512 0de5e8cb97e348b07195f1e6780d688fcd51521a47a810dfcae8eb87ed2a07d8778963b6eaffd692c2168139f33660b0591e12c7f6feef6b90d2ad66e6435191
-EBUILD user-manager-5.17.4.ebuild 866 BLAKE2B 803c08f7780890922b3ff21143406481deb1172367e355e92a50c66df57d1d743377f7b96b7cade7a857d305f20b8e0665240269bd92b6602a74f8a668116f40 SHA512 9d1027f6d77a9c29a24a39b5f329b673a529b650481aa8a26e5fffa77021149ca1a9e8b009349b956ecfd9fcd7043ef75cb9d348385f4792a5335daa4342bbd0
+DIST user-manager-5.17.5.tar.xz 2163828 BLAKE2B c5587a7afd748d75e9c9f679a8c3b99a3ad7c8b392d9dbbb45b78d9cda48ace69cf03d2aedbbf7b92fad8e20864d6fd7e94278da241a72cfe87c9c2b9dbc815a SHA512 34aa3ace5ba19e602b202bfc4cd1573423a122980e5d6d2815693e709b938e90816de6d12c4e53d97cd1c8e9d1dfa796558fc2afec6bca6767f1da4b5b365989
+EBUILD user-manager-5.17.4.ebuild 863 BLAKE2B a181144d1604a279d09a5afa76056460725622b606e85611289ade8ff2a2728e875a9cdcd8e13e424e10127a65450f5a29c37231e514e2fe0b6fbc344ace2da4 SHA512 eb13e4f2b2685dcf4b24c11242c24b9125f55bf15d86995ea20d65f36cf84be35dad104e42330834e54d1ecb72ef2a54a8a94dc06ce1824913fa09050e9a26f0
+EBUILD user-manager-5.17.5.ebuild 866 BLAKE2B 8d2b3275dda8cfbc18052eb5e1c7c2920365038a12d28fd243defa7f50c7e2da823752134e84b7c6d54945d29ec63b63d761fb958a53d85e707849a29237a3d2 SHA512 64c1d2b0b9cc5c244be2e99150ae4877a46876a3a031d59df8b13f51457d3bcc3376f59239e60edf6533800eebb115ed17bd04768ceacde4b479f3a96729a25a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.16.5.ebuild b/kde-plasma/user-manager/user-manager-5.16.5.ebuild
deleted file mode 100644
index bd567cc39876..000000000000
--- a/kde-plasma/user-manager/user-manager-5.16.5.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.4.ebuild b/kde-plasma/user-manager/user-manager-5.17.4.ebuild
index ca0484843177..d8c6be55b629 100644
--- a/kde-plasma/user-manager/user-manager-5.17.4.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.17.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/user-manager/user-manager-5.17.5.ebuild b/kde-plasma/user-manager/user-manager-5.17.5.ebuild
new file mode 100644
index 000000000000..c15b885a44f3
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.17.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 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 6a62df225eee..4756176dc56f 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.4.tar.xz 63064 BLAKE2B 14150aaf52629973192025e572c0b8444554023bff2a5dfd3cffebccad7a880c6490d79451e62a0997e411f45ea90fb5ad39dc39ba8917344c443d56582093e9 SHA512 2c4ce80e6a0bcc9486d1b3947c27f1af00870d6ffcf0b35c35bd7413683fae393f1b21646276c6200a41c2d5d98c84b440a8fdc3b0ac283466a45709fc151d1c
-EBUILD xdg-desktop-portal-kde-5.16.5.ebuild 1172 BLAKE2B 94b41e6e577a19f43b3316f92ab6061ee94fa37685236d5a2712ccec8f695e9b858828c8f3ec5a5adf013bb6d0a112584cc9d1a5fffbb248732dff23b3b26e0d SHA512 823b7e52915a5f2125339773f8734d13ac3a3c914eef07f153dec4752e63af50540856a3269dc653c812e031303912abd9850bbd5e0ef200f10900ad9de34b65
-EBUILD xdg-desktop-portal-kde-5.17.4.ebuild 1154 BLAKE2B 8603f2af27d26d25019fe8fb537f6efeb5af5d7d51d922e88bb9804a4635a62094507b1139de8fa258074182f9dfa6acc6f3a047b915cd4cbc9b5130d6a0f4b0 SHA512 e200ebc166f155ce54bafac6ac4b3a52bcdefb4c8a957482aa7c5f95b5d89df3735e59628d48eaa90777e7dcb90e7be34d0f4c05946ab3e6ccae26a866df3511
+DIST xdg-desktop-portal-kde-5.17.5.tar.xz 62912 BLAKE2B cc108a943c925c0943a4a391b4c00619d734837106c617d8dc12a21e890707dbd1aaace11dfa2ecd9b9a32a08dfba57b3baf1e7b33dec481a15e0fcc9f1abaf1 SHA512 b5a82d6744e49d2f6edb7bef2120f5517216dcbf8681cf50fb5522444f635d6cae17cf499310866e351ef9eaab35d37f604d241451a23fbd5f037e377cfd102c
+EBUILD xdg-desktop-portal-kde-5.17.4.ebuild 1151 BLAKE2B 2a004307b2028e2e765c0c3694dc2597539230e773cf43104ecaf9ead12d178f2396deb91bf9ae17c2695f5becf83eec51c254879ca87b8c472bd18cf806d5f5 SHA512 2219cafe1728dde3f8c6d56c8f924d4972645373c0c48c4423af5dbb69b55ac972ae5ed06531485e5abea53ea459543285e846095c7af30a74af39441bce1098
+EBUILD xdg-desktop-portal-kde-5.17.5.ebuild 1154 BLAKE2B 30ca03f780fee1fc905bd96fdf343c4e021a857e3572166f61098744d7162780f090e0b29bcb0026f72f976c637aebd822c592a83f59d67fb39a7266464719fa SHA512 041b090a6b73cc6a1454fc15dbdf6194fd7142f423c954f227f1e6d17cf046a40a27db3b5d9a5c0ee44e2263166b199f79a4e86f1b9b0956c7c7a03e15129d6f
 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
deleted file mode 100644
index f728d449e5a4..000000000000
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.16.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit kde5
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
-LICENSE="LGPL-2+"
-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)
-	screencast? (
-		dev-libs/glib:2
-		media-libs/libepoxy
-		media-libs/mesa[gbm]
-		media-video/pipewire:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kwayland)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	screencast? ( sys-apps/xdg-desktop-portal[screencast] )
-	!screencast? ( sys-apps/xdg-desktop-portal )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package screencast GLIB2)
-		$(cmake-utils_use_find_package screencast PipeWire)
-		$(cmake-utils_use_find_package screencast GBM)
-		$(cmake-utils_use_find_package screencast Epoxy)
-	)
-	kde5_src_configure
-}
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.4.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.4.ebuild
index 3fa3551aeb31..9bb3b36aaa2a 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.4.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.4.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="screencast"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.5.ebuild
new file mode 100644
index 000000000000..ab383c29457d
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 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="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="
+	>=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]
+		media-video/pipewire:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/xdg-desktop-portal[screencast?]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package screencast PipeWire)
+		$(cmake_use_find_package screencast GBM)
+		$(cmake_use_find_package screencast Epoxy)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index c191c4164e43..f120ec842865 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.4.tar.xz 4962200 BLAKE2B 2050dbf77dbdf144017e0ddf4b827b9dbe27b8f475eedaed969a442e036f162cabad5d6b47fd650491ed5989cade48ebafbd5f599dbc790c14515ce01ebfd626 SHA512 3f5aa07ccd19604bc399bb1d30dd16ac82e1405613c1f4a939e3c2cba3b4a478213095617052440dda222f1712608533e5806939117752d31b0616a6009cf45b
-EBUILD xembed-sni-proxy-5.16.5.ebuild 937 BLAKE2B 6473e8e3eab0f3bd10a1d074ef32929e1f4a5f9e01ea48182df4afc3f1b1350a5631fbf275e934696b2237588a3559a429261d1cf1392b3c354846560be0ce08 SHA512 28b2489919c5487c64eea3f31c94e4d0b1b90072e7ce0d6f77e8b1403b997d95c86cc07634628b049dde96f42f4e9df984e49a7eef529b06ec55fd245f8182c3
-EBUILD xembed-sni-proxy-5.17.4.ebuild 1039 BLAKE2B c97e58c743eadef1f5ce5e1b7ac91b256768961d187ad7f1ea9d813c439c1f9b896ca6dd5ccdd90e5412e0f8e2b6f65a50aaf426ddfa264e1f3083caed9b1913 SHA512 81851dafac7087f5e15d24222cc09cffe1624c42ebc77e20d1a7e6431d39db5fa93cb1d4f37c8edba2119c6f54505f4a23fdcbb790b6053739e25039fc9aadb3
+DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
+EBUILD xembed-sni-proxy-5.17.4.ebuild 1024 BLAKE2B adad43896a32ea63b375722c7bb47b1d3815923fc4c98dbaf37562f6d80e218da8018bdd1bf92d0539a5a55e90ee0e8871a2bd35f0551465cbc054f6b79860ed SHA512 6e244d51fc9b44a19859d192fe1d56e04c5fe0131a27ec4ffb56e98f27549a59a90cdbb3e060359e9b7b8ddb11205b76c5be0d50050576a23c1185ab8b6d3729
+EBUILD xembed-sni-proxy-5.17.5.ebuild 1027 BLAKE2B c0deef143075afa3aebbe7167fd01a72aeb69290751784a61343546d36c0c8223278665349aec752ac85c62afcdc3827f68ba27df481fe111432603a2afccc58 SHA512 6175b75470335d8b3a6acbc8c3956d356bbc6fcff1063682b9cb480826caf6c08ccd18ac12f2400e0570e24a9e04f90764c940a0ecd4bd826a63b2d3af6e6ffd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
index f0e14f08c6f9..f2088176430b 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
@@ -7,14 +7,14 @@ KDE_ORG_NAME="plasma-workspace"
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
-inherit cmake-utils kde.org
+inherit cmake 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"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
@@ -37,7 +37,7 @@ S="${S}/${PN}"
 PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
 		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild
index 4faf2de2b993..dc13af98ef7e 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.16.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild
@@ -1,25 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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 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"
-KEYWORDS="amd64 ~arm arm64 x86"
+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_src_prepare
 
 	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
 		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /kde-plasma
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)