kde-plasma: Add KDE Plasma 5.18.5

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

98 files changed, 2910 insertions, 0 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 0cf509865ca8..5db025ee5ed3 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,2 +1,3 @@
 DIST bluedevil-5.17.5.tar.xz 160996 BLAKE2B 57ad3e69ed6addeb96bc4969bb8d37f738c03960b43921421f35af5c4f6d230f92160875c1b0f2ca201d2d3ad5227df1e5d6626b251cbec4659845847c93ce7c SHA512 b20616e4e9fbbe144b7ce0b3c4e1a72d543deaa018ab3fc4ed93d04d613102a29743b33060140d648ca756f87094f682768142752ac9ffe9d2ec6ed08a7e9b1a
 DIST bluedevil-5.18.4.1.tar.xz 167832 BLAKE2B 20536738dd5d7480117a4f6bdeea0a0899691b0ea368c735f2c2339fb6373c709466742d7f9fbf9f4eef2b336acab1be117069116c581ec3c653f9e42820dc85 SHA512 dbefd648e525b4dc15dad77748e27726bcdd4790d9a12b57cbcb878c45a8bba25d94e49f68fcf28fb77e41e95a26d0bfb00c1c7faf3983197ff500f462ae2c2d
+DIST bluedevil-5.18.5.tar.xz 168016 BLAKE2B 06460bd1b40f70b7b6f3641ee3921819ee7c2137af906afb8ebc5a9ea3b3161bb8494b930eae95a18ec6aa8ce6191500421499a944fd9dbc9041a9a48a3a1492 SHA512 4e5e55626d02a7ae820a43e760397e3b221749cd940569d180a67adba141f9afce418f1cb07c9fb1e607757461317a76343b5c6b86b3940a96711be9b4b66323
diff --git a/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild
new file mode 100644
index 000000000000..dd47c0e87222
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.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 ~ppc64 ~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 b258c9a1072f..47f3a120e0a2 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-grub-5.17.5.tar.xz 3140888 BLAKE2B 628d01a6eeb3844f5251906e9c99fdf83bd03cfce03cee16a77e4b1ba1dcb9d80bea4c785b2406cdb241119dcad5f4534c452221d01927b2427fa0fb25915584 SHA512 27de91fb3c645c8a4a041bcf9be70887b430aaa5972ce550ae4624f3d1ae738e7e8f9fed074f2073e1c399aee3dcce1b5ff611f683b2fcf7ade60c37b0f6f633
 DIST breeze-grub-5.18.4.1.tar.xz 3145304 BLAKE2B a8612b786dae75af378700dcfe13ad91108d8bd80d4f1b1f714903828d84b92df00e7b83a73973e964554dd34c3433071b1208ce74d24592450d211f531b39a6 SHA512 1b170cc767f6d2178db4713d4ce68d61d9462ae2deda633b1afb3973e37cb16e156a012c94c98853855ef82d1087b4f95c0f0f0480b7b38a876e8bf3eedc762a
+DIST breeze-grub-5.18.5.tar.xz 3138804 BLAKE2B 236f590f19df0a8faf28bef3dfc0a555434902ff284a978576d67e0f7f2076f42d3cca8283d3b979cc3d7afddd1b50a2cde09dd3a23056798d7a6ad7c6db9635 SHA512 969154c602cbd7b334dd48550eb53cbffce16b355aaf971c6b5b372ac43b42aba507bc0e972f0de0051f34b75c80ac295b4f3ef8e64d5762b56a7d0a8d216d69
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild
new file mode 100644
index 000000000000..6ba651f29041
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+inherit kde.org
+
+DESCRIPTION="Breeze theme for GRUB"
+
+LICENSE="GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+src_prepare() { default; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/grub/themes
+	doins -r breeze
+}
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 8bee54768c36..0c5ff4823dc3 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-gtk-5.17.5.tar.xz 44424 BLAKE2B be93a92d77fbf42ac1ae9af0c40d77d32194c07906b008e5196181c78c37fd92788ce8020bb6a5c69a5391fb82c8e84394852287a1392f3f24f048891f272a23 SHA512 022ffc78ccb0e60819fb92444ce3396c5367e2557290980d67da27aedf10102f80ed4a6a61ca962e873a5ce053c8529be49179a811fab88202f5be118311dd31
 DIST breeze-gtk-5.18.4.1.tar.xz 42364 BLAKE2B 64186148c283526b7a779aa3059c29df94a5b67490a249c61f5fafdf0cfb4d808565efbf5699614f9c1c16562b440b0a88c6fc2da099bfed9c484e9f1422999f SHA512 c04b7b438dd3f23526627b1c416ff9b29d8cb6d8f27370731ffae9aad53c6554251a36663097d84645597b3cc541fbb80988cad093786a5d497958bd5e9ff57b
+DIST breeze-gtk-5.18.5.tar.xz 42396 BLAKE2B bbfe9cd57c438ad1b1cb144b0393ee45d0ed0aeebb34b38e557e2950d7e0d8ec950c1404eb2e17fad7421becf6486cbd6d2c44b414fde62f27076f4fa2419791 SHA512 3dea9af26cd18dc0388c76c070c5a375054b6a03ffa97e298341924fd909e2dcc49a7c7b431b36a158c1012ce6f9d48f98ef84fc6cda0965d9a24ab18c7c0951
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild
new file mode 100644
index 000000000000..da547ee9b70b
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/sassc
+	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	>=kde-plasma/breeze-${PVCUT}:5
+"
+
+python_check_deps() {
+	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	if has_version "<dev-util/cmake-3.16_rc1"; then
+		mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	fi
+	ecm_src_configure
+}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 777399172601..fc4937cfb582 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-plymouth-5.17.5.tar.xz 105628 BLAKE2B bb0999dd5f2829d41708912c97d4ac4ab1d4954d80e1a7d89b5cacee705c2545de6a9903c015857687c8d69841471667bbc806d1630fed0a3e53724ee240a404 SHA512 85a028f9c248a80c1cd78646006197db6308633cacbc26fa931f525019b4a978c50c15355a8de0ec824a806be3af02d7edbaaad8288348c6a146d2cbbdc5970a
 DIST breeze-plymouth-5.18.4.1.tar.xz 105724 BLAKE2B 76bd038e7a837b420a10804e95639130f626b7896c7f2d6df8f8c53470f48bb3d6118f70c62f1ebfa827ad51f5005217aca91b5af4edbe6b5bab0ed75a3b8719 SHA512 1ef09a2a41c1025643c344555821bf2538198f42e52fbf8e10d69896f2d6cc13c6c394a5b11ea27bd1a8b2d447d024c1dbf6cd00b48ac57e4df2f3c02d4361f7
+DIST breeze-plymouth-5.18.5.tar.xz 105672 BLAKE2B 6aceead2db0c977951cdd8e6d93314276fd920846e77a0ac5a9e195937b5ec116f3c2be371096d77dfaa9546bd2b44516ef8ae42ddd2aa6760684cc693418b3f SHA512 45206a6c99047b8b68fd5806dce608ddc09c4208c7966ef276bd7096949ad05138ffea2d6272e5c5ed5985ebbde9bfb7ce8b8a1074f56286dd3e1b840937b98d
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild
new file mode 100644
index 000000000000..9ac3d9978b8f
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+inherit cmake kde.org
+
+DESCRIPTION="Breeze theme for Plymouth"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
+DEPEND="sys-boot/plymouth"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISTRO_NAME="Gentoo Linux"
+		-DDISTRO_VERSION=
+	)
+
+	cmake_src_configure
+}
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index dde6ad0ba00e..8ad9153febe5 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,3 @@
 DIST breeze-5.17.5.tar.xz 16582504 BLAKE2B 2f1bce5eaf2a2fff3d2eef2162c393f49db27b9636f21caa581b523a6128bfa33985398242230ea33d61b2291bc9aedaa36705f94869a8a50d8523c54e7e22f9 SHA512 b31032d6a2722b108d3571cb283af1aeca214661bb74c9435f6333a9ca5b19e5ff69c1e43dc00e9aced936d1fe87177a0dc19cdf6b29ffc7886225510b467df3
 DIST breeze-5.18.4.1.tar.xz 21582908 BLAKE2B 64b6b245facb1a6c6a6d2eb2511aa1c8f02324a017619ab639f0aca5d20f8b70426720a66775d907fef7600d1fdcb30c01852c758d82dc190f9516b7bd94c291 SHA512 41c540c0136dafb35da6abcf84f6d0d9be905599c1448c1efa8a8c61a77a1b0903a11bfd821e26691deeb8aa7e5268e198c9d1846ab1d4c6590fbecc83d75342
+DIST breeze-5.18.5.tar.xz 21583276 BLAKE2B abd1afc0fcfde8a7b72923824908cdc18124ae2e544446a7923e1a6a88ed89876bdac127867a8c33473d0e0c83b360450fafa1c3f72fa938837de03b157de055 SHA512 d4797d9ecabd1d1bcaa483722c255f1a79aad5d15bca0daee571eced2e5c295e39ed8cd6039fca39d9e1a1456bd823f30fd332b2811a04df2b2e3663a04abff5
diff --git a/kde-plasma/breeze/breeze-5.18.5.ebuild b/kde-plasma/breeze/breeze-5.18.5.ebuild
new file mode 100644
index 000000000000..84ee6ad4ff97
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.18.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.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 ~ppc64 ~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 c6e0ec3348ab..ca01019cb499 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1,3 @@
 DIST discover-5.17.5.tar.xz 10449596 BLAKE2B 473a93fb66183253c814932e86be7d5a5f454a6146cd202cb2b43d60223f8e15370622b3eb572c27ce041c8fbd9f095ce9733ffa5464d386bdd419cd80db2e75 SHA512 8d8d6675a894f1f50094021f93d38b7bc6d2927fb8434c002e816c1c322ca25134cd73a1b9fce22bb07ae091ccfb156c22399896f47ef1223b8233febb45f866
 DIST discover-5.18.4.1.tar.xz 10475044 BLAKE2B 2fd687ec858d172b69226eede7b808b7f8d5ee59a2c2e913d228825c02c21044a316e77daf532bbe00d4f152afedc79a3edccc7b3cb6d2feff1550ecff27be84 SHA512 bcd3d4e0e8452b9f2bcffa7a2779b7c4721c3e013f451a018d231a463c1d374539fe6b4c95377006adb15c31e562fb67cbb203be1f311bde375b67aa76eb8eb9
+DIST discover-5.18.5.tar.xz 10475624 BLAKE2B 0085fbc4bc0225863fed7d0a01d21d512d283ba5d3289840a3ea6c423ca876121a90065220918e088b7652580cfb79d30a5f01e445374931f3a1279e27485417 SHA512 6ae578815d54ccb770d4d113ec04f0e75c4b93cb1b4a1d636009072da83721e440a4fe817613f1b676c852cf2fb3ee1bb7192c60b174753578449e0bdfee7195
diff --git a/kde-plasma/discover/discover-5.18.5.ebuild b/kde-plasma/discover/discover-5.18.5.ebuild
new file mode 100644
index 000000000000..d576b1e64597
--- /dev/null
+++ b/kde-plasma/discover/discover-5.18.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+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 ~ppc64 ~x86"
+IUSE="+firmware telemetry"
+
+# 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 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+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)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	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 17044fe4a46f..4d896a1badd6 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,2 +1,3 @@
 DIST drkonqi-5.17.5.tar.xz 740416 BLAKE2B 01b22252e5d9c3d88fb960387f681f38480dddaa79ec319074aefdb95867fd9a71efb1ef2bf9278de15e876265db4aca5f530de1968ea849be60c64e68a4346d SHA512 73ba55c8f5223580c2638c3ad5d12be86703a02639ed5a34b077205f1cbc927efb13cb88ee84ea23e58b8d5bc87b368bbcfb702fb0e8f76722dca39981b30ff0
 DIST drkonqi-5.18.4.1.tar.xz 747700 BLAKE2B 6b17faf284b639e499661346c3f03a77b1d07edf7b03404635f19cb488228e950c7993397c3535b44cd18117f6172bf5a5d30d313ca84199e5663d5b2c4cdab9 SHA512 5d9c7dfbe4687d88ffe43e6676d6dbd04c97816acb4819604ff6ea5a1f9b987834b2831e75281f8fbe6837a42c410a6a595d61e6f2a4b8a9bd6c23b2102ee544
+DIST drkonqi-5.18.5.tar.xz 747984 BLAKE2B b94f808c7edf8e02628badd63ecb5edc9dd80d3e157f46c72fb884d5c35a2a5c70e9080235a7be84150dc973765f42572fcd6e907bcf6a58c100d80b7188bbc6 SHA512 b4862297e969f501f526880560acbd02026b64a0bec2f6e3b2b30f4bfe5ff2abd1798e3bda920bd61adbb6c9a3455e0c4f304f3f37bcafed3f3d8e6de1bc67a9
diff --git a/kde-plasma/drkonqi/drkonqi-5.18.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.18.5.ebuild
new file mode 100644
index 000000000000..c808e156a986
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.18.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.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 ~ppc64 ~x86"
+IUSE="X"
+
+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/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/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlrpcclient-${KFMIN}: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 35ea26a86452..d443aa8a96d7 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,2 +1,3 @@
 DIST kactivitymanagerd-5.17.5.tar.xz 86660 BLAKE2B dfa615796556aeade9206c98180072348e587c72930de2f1cc6c12101879dedaa46485251a136c5a85dfd9a92c96b899edf6c0fef263cdc46a047bd7a3e1bff0 SHA512 584094f45abb922f15dc9b4db2da3cc624087b1524e3e161a4f4cc91425c534c37281d2a46e642320519baa389b69d7843a19b0720788b9795df9a24d0478ccf
 DIST kactivitymanagerd-5.18.4.1.tar.xz 87080 BLAKE2B 786ef9a9feb811f393bad991a1b652ee854327e3c46378c4c02823dedbb337517b2caad3b64660c9eaf2dbb5804ab800fe758394af8dc926448cfea991ff65a3 SHA512 b3231305643247fa82f267ac942878136f1710faf1fe3b084efad25e8a3fb124ebbab5cf88251dd54d8e8bbbf3ac31088b25bf8047307adef95b5d40c8175ee0
+DIST kactivitymanagerd-5.18.5.tar.xz 86988 BLAKE2B b87b6f96d60d1d5f77d052c79f45559c5826f83a35f4a64b98b486bdd90daf4b31d05ac9f1f84d628d7651b1a76fb9bebaddea09f15d055b6924a80c44e9a334 SHA512 2ee59f78cc948fe11577373ea69f895efcaa7d4f239362d3e060382c3be0f67511a0baa64a404c1e0e53d5777775afba60f49e58476c70dcdef6c63358ca4dbc
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild
new file mode 100644
index 000000000000..5c762c5cbcf4
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.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 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 8eec52f698d6..c3ee8eb0b1a5 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,2 +1,3 @@
 DIST kde-cli-tools-5.17.5.tar.xz 590264 BLAKE2B 6758b9e153a5f87fe903fdae4587e16f5c61eaae043a7ff370bae5b1f596afbaa63bcddbd1439eac8776f20356b96589a86d87ffe7311cb54973035fda17e517 SHA512 65c1fb474abc193eb1ca3cf230865edc795e5df85d9daac7ca594a507e729db6dddb50dcfe4b7caad19f87b4a752d793c8ca590101b59a2a16ec7b079cf524e8
 DIST kde-cli-tools-5.18.4.1.tar.xz 591952 BLAKE2B 29a3814dea8bca3ea48018670ce0fa8c89640ff3ac699f9fac0b0904a65f1695716ccb1803250c8c5bfafd05403f327535a649f9b6ac956d0e59e7eed057ead8 SHA512 9cf32f4b87b1cf45f9e034c9929ed38a39de989c36cc0118d4f544fbb9ceb4b9419d2d518165a1c2d0b0dca4ec20f063f771dad4859bb6df1975afaa6388412e
+DIST kde-cli-tools-5.18.5.tar.xz 592020 BLAKE2B 6a35db9d2e68d6ceeaad72553e5d295e54d053b624b1803080dc123451b804250ca0881d6c70b626dddb75ae48b6db398cec5b9c48a25cdd87d18e03873ff612 SHA512 c73695a1ecb81b9222e213f0e98c37354560e32dc56fe8e5ebe1665f7f86a88326bd7a32f4b66d2a73826c9d684f5410306ef5e6660751601c77eae0c6f16d4c
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild
new file mode 100644
index 000000000000..3010997fe7fa
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+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 ~ppc64 ~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 9edabf9bb1f7..07b457a2b897 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,2 +1,3 @@
 DIST kde-gtk-config-5.17.5.tar.xz 155340 BLAKE2B 10363865751489a16dfc62924694b0b47aa05c7e097a512822ae54026bacd4cf167cdff0e7c7d29e7a7aba8dffb757fa176f60fec62df8aedb0d51f9da7b9fcb SHA512 29cea96d6f7471717ecb2f48df5e19a96c7730c9f47157dc01c236d11253547aba57f5cb30cbb08659af53dba81160ff1982f9ed2908aaec91940365eb625201
 DIST kde-gtk-config-5.18.4.1.tar.xz 24644 BLAKE2B 030ee2e1759d01a35a00a70eea00489c0ee9e80beb02e21fd826f40656de164941347d731c1c464a132e0fb4916bf867176078392561fc98215db90b83d97eef SHA512 9a6ba26c4d0b4936fcdc8a32a8d0e48294757a3315de38bba64bbeaed2d23a0ccf117d54208af502f30e5d5878a4a925a84c061adf23741d5f64db539efa2737
+DIST kde-gtk-config-5.18.5.tar.xz 24688 BLAKE2B 3c51e37b1df8c9a48d766158b166b5177727b51c3a5c59435a8b280383af5de74574396272c2900b7a801d8ff0c97dee39e84737f032dde11fd0b2ba2d89f5dd SHA512 2ef81b454789136692fead9af2b8d7383805ed5cf91f9f781e637f65cbc293b9ac03be7583f5b5848c4db956da4212027c5b54a878c3796ff975292deef9aa84
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild
new file mode 100644
index 000000000000..1cdc9e44ed17
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
+HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	gnome-base/gsettings-desktop-schemas
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
+	)
+
+	ecm_src_configure
+}
+
+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 daac48768303..bd4156525b7c 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,2 +1,3 @@
 DIST kdecoration-5.17.5.tar.xz 43256 BLAKE2B 6ae568d7f0e2ce70ac119e61a25c599da91702bdd5bbcf5f54f2d045c3ffe4b55ff7554bd65378d9209c7464001e88308598ba47eb1ec272be80793265ec4e07 SHA512 16a46ec6b4db366f501dc72a70c1867f7acc77bae68a13db406cd72d3587a851504eed8bcf8f6c3f908598c1d6d0061ad61e4226b98ad95f4871f828626f332b
 DIST kdecoration-5.18.4.1.tar.xz 43848 BLAKE2B 27efcf97057158aa452732e62f99d3c85f27a3dcc1bd07ae0166e6b6b92de5b835a8e538fbed7a935e1cbcabe94af5181bc1cc3d631289382a8cba1fb2b5e8c4 SHA512 32ba5c14b8b11a9874131405f0cddcec8eec634afd016cb8454a0247ccef55a8411a718e1d3eccc5f23efedafa0a1d32a62e0dc9b20ce9133a09e23f4c6739e1
+DIST kdecoration-5.18.5.tar.xz 43884 BLAKE2B fb1ed23440ac6e1813bb02e9d714e4a6d85587c92f7d379d9c05c981469fee8d73351d38b9fedee84b8b016b5e0aa44074dcd666adf7e8fe511870f264b01131 SHA512 ecbeeea7e2239999995facee481794bb35da359b3e64c0b4e10dd7b0d18d8cd43a6a13ff216ed963cd7f59a78b0b190ab994e6d30f7b84572a8cf69a74abb164
diff --git a/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild
new file mode 100644
index 000000000000..0bf22cdaf7e0
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Plugin based library to create window decorations"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=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 1cb454dd3072..b5090687000f 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,2 +1,3 @@
 DIST kdeplasma-addons-5.17.5.tar.xz 605648 BLAKE2B b6792d6723fc71564f9e583b3a0af8a45e06480150e7369e35dae0168a4eb254d91c268e1cd73064658b53373fd4933c7c7fe9473b904bc291fac4021e93d50c SHA512 ea836cdc99f583448d4b272b6d6b1e98c4926127307ac966dff779236ec10401af627958994dbc22959a13db9b67bf1b4ae05e911491eea874a2ce210c37b2d5
 DIST kdeplasma-addons-5.18.4.1.tar.xz 615120 BLAKE2B 7a25ae1089347f56ea1d982263373ea677c0103df7fdf24eaf2470b82b6054b419b015bd383adb629e70d37f2f7924a53a91e30314909ac16358adaee8da278f SHA512 1ec38e56b132e1d774973d2a8a758bfc88de01c96a11e95507bfebb4c5fcce35c6f9e446fabf5e9754678232d31ee95d8470340f7d5c861960ceca81b20b45ee
+DIST kdeplasma-addons-5.18.5.tar.xz 623872 BLAKE2B 684c9e569575024fe96d6043a91e6a810db69205e3867db9840442b901c120db4f0dacb09540a145f5ae90b5fc6fcd934e26a3d4435e9d23eb374f4e5ca1e391 SHA512 7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild
new file mode 100644
index 000000000000..18a7b7492842
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.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 ~ppc64 ~x86"
+IUSE="share webengine"
+
+DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kunitconversion-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 614b51620229..198e14cb4fba 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,2 +1,3 @@
 DIST kgamma5-5.17.5.tar.xz 80304 BLAKE2B 7e2b66c84e0589740d329ea9c8d575f071b60ef25fe8bfe9ce90256a999a461d2c21faecb78a612895fbfdc4ba8486baf7e3260982d1c16f0752c03cd83c20d7 SHA512 cf89d538b4b74c8121f9ff15fcf01cdcc09a3a9e9fca7750e831aec5206c0ed31e917da787bf313d03860b86de2d2715cb96b5ef00bf68043121a6e7d0e7a290
 DIST kgamma5-5.18.4.1.tar.xz 80804 BLAKE2B 88c8cc46844639d8e5ad7d3554ea8436dc02698f79fd3fc9979904d4fdfecb36de23201ac611d14c2c445ec1ee502b1e0a676d906611c6d5891adb64034c0f02 SHA512 5ad1154a84568d0cfa7640f028f9059e5b9f09f1104990ef21d06fb7fdc3d74ba7c6fafcaaff7b4f303682bf521f10db76849b131f9a020a2b8d354b5e1160a5
+DIST kgamma5-5.18.5.tar.xz 80720 BLAKE2B 7dfc4f96389aa0004b6db92b03eed051a2c2651210069f9f86f6c430ad3d095b16296083c4d57524de092afb2306b841fdfd7166c6805f70761f9af55cf8bdb1 SHA512 a6d242293468eb702600334361bc1299823235b059df64ecc6b2a6219f7801a1fb7ac7f13e71475d877ac03623d72043a6c35c31531fda97af883265deca735c
diff --git a/kde-plasma/kgamma/kgamma-5.18.5.ebuild b/kde-plasma/kgamma/kgamma-5.18.5.ebuild
new file mode 100644
index 000000000000..afd05d6c3b4f
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.18.5.ebuild
@@ -0,0 +1,32 @@
+# 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.66.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 ~ppc64 ~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 b35bd6a74d0c..f6d29a53f616 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,2 +1,3 @@
 DIST khotkeys-5.17.5.tar.xz 1853632 BLAKE2B dea94dd9c53a0c6d9f6b08a258a69b8e7dc3e64207ecc32429bcaab494dc99ac6d11428ab3886bc47f54444a54731cf784765be6dbaa19220fa6b1da31348697 SHA512 772e743860db25fcd9953de987d86f2eb1d463fa8f517add7f67426ff868c6b943dc515c23936bd803a680884e73a081e3226037b5f02080244b401b1c1211c1
 DIST khotkeys-5.18.4.1.tar.xz 1854956 BLAKE2B ccfb3c556f8a29de9b049ae54aa06ae46f2da6d6efdf714ba256831a8d6f45335d8b8a1a5c044a3cd83e5b8f7781cd4e570b74a180dd6e860b3b241aa0d9bb50 SHA512 9c290c75caf175e66b69f182cb81348d0926b03dd569533dd6da380c299d416fd42f06d6c18fc6791c913e31f955c9adc98c20215442d7d93561b9bdb278e36d
+DIST khotkeys-5.18.5.tar.xz 1854812 BLAKE2B cec0db1fa589ddca9515e19fcff6dba580c7567ec381c2961e5211fc830398f4f3a29f9e67f8e7821096d5052f710357ffcec3517b8893930629c356590757b3 SHA512 67e5d904127764e89d4a5c5d1c5fcc6ff0070d2a298f1032189dd3e9e17246482431ae651869d157625fc81caedee2a897947a6cb0bbe7508b5d76c61f5fca85
diff --git a/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild
new file mode 100644
index 000000000000..9259113b2f86
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild
@@ -0,0 +1,50 @@
+# 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.66.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 ~ppc64 ~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 642def5f8a1d..d1ba38c498a9 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,3 +1,4 @@
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.17.5.tar.xz 1343896 BLAKE2B 0db47b3ed5f937c7701b52b194be71c6ccf474d5a1ede18864f32b1e374972cbd2e15f26b99f30fe4feba6adb153d87a05c5ccc5feb2bdd36ccc4086eda6f688 SHA512 4f759cc614061e128d57dbbcaa3253fdcda3ab96f3149085c320a0fe826f93b19a35c4b642e5ae9726c0e049ea7a4f8b6490575aeefb22b57b2c4ad8c0f1cbf7
 DIST kinfocenter-5.18.4.1.tar.xz 1256192 BLAKE2B 629e89033d767ad15dbdaa69d5e11fd3b171b1db34af84ab0a3192ece4bc5537a7ad0e1d88e0f238432ea3d643b28401fde04738243c4f94bf1d23a9ec27b85c SHA512 6b7c5c4c755afdc3c04ca15f6a958cf541d33b03c731fa77a5cf99fa015d0e35a00016ab7f21b6b1f30afd7c423dc4fdde03557645b040d325509a6ae8c44dcb
+DIST kinfocenter-5.18.5.tar.xz 1256744 BLAKE2B d67951273bece9cd106a3d10857b18d005e6bc03faec8e9749b2111016c318c4c518611bb50240a01395b59838a47a6ce24df06ab870092aa425f04854fdf3ad SHA512 c9896870a92b3349c262698c4902b98f6aa12523c1757890367d1e277954b0ac7b040bbff0095f7a6abf47e6a31b008070e3a461713c7cf4a591617b76c37886
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
new file mode 100644
index 000000000000..7ad414c34049
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.66.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 ~ppc64 ~x86"
+IUSE="gles2-only ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
+
+BDEPEND=">=dev-util/cmake-3.14.3"
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=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
+	gles2-only? ( media-libs/mesa[gles2] )
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		media-libs/mesa[X(+)]
+		!gles2-only? ( 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-frameworks/kirigami-${KFMIN}: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-only]"; 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 07d73f1bf5b3..99ac694adb9a 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,2 +1,3 @@
 DIST kmenuedit-5.17.5.tar.xz 815568 BLAKE2B 07c667dab13b6ee6af5beb10fca4aad9485b815e4ce4a06b19a4851085bf074d38c4c4ccd36a928c06f753f541e76040be18b301ad95cf8d6358fb5c363ab7c4 SHA512 a48652b234834b004c3ecbc8706ee8c3594896d4e5fa29407aeaab10c37575f29539e37117b2765fdf9a9d93db2b062b88b71466ca7b3a1b7e10eb1b2c96b0e4
 DIST kmenuedit-5.18.4.1.tar.xz 814100 BLAKE2B 8b113364e67aa2e7c6d70e69b34d0bd245b0d937162613d6daba76a7637d1ea24e49cef3a3e71e6fec5d7c66a6590785dbbffcf9047c6dbf44f966a4b2f4a8fa SHA512 6a4e45a8c97de0badea82d70ec1085b3b34c06fd11723dd024263e966bbbbae5cfc4c42dfe217f79e59d84723c418f7146f0dee55ace0fbb77645714731f4a49
+DIST kmenuedit-5.18.5.tar.xz 813952 BLAKE2B d5c58ffa7cf3813955f9f87f119c11333215fcffb3b3dcdfc7e601839233d4611b3e0359c3313b4035d957d5890229d57109ab7b4929fe860b7b9c997d1f9d72 SHA512 647aed82a3190e2c27bac4e50eec681684dac08c6f3f7e8e0d2d02b8667e58b367a35a66b830083037570999655652a94f26ae063e253ceedd0db1df00ef834f
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild
new file mode 100644
index 000000000000..7ad3a0f55a07
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.66.0
+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 ~ppc64 ~x86"
+IUSE=""
+
+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/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${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
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kinit-${KFMIN}:5
+"
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index eac7e6f0a219..a58a65c8f742 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,2 +1,3 @@
 DIST kscreen-5.17.5.tar.xz 100672 BLAKE2B 02c3f52d6cd457ee7e9343790aaf6ba87227e4b8499b3c5fd1920c5140b59a60b81a9202ebbde05db4705d25b2ae949e44247b63e32a645616ad2bffe7b2c6c2 SHA512 3a0abdeb8aa4ffde8a3aefee71292916ea1331ff91292976cb94b6def068d012ead4fe1aae3c6ad9353423a701cfaaa051f0455897fd80693a3281a33fe3d332
 DIST kscreen-5.18.4.1.tar.xz 113152 BLAKE2B 18bd46ada9faaae029b86d383a1c6cd613f50632129746d4a63cc0b6947fb1b843112fd57554ebd3d4f8dc71c44e4d89bddb1066ba7f8a54c4d190351f670023 SHA512 8c0b7f493dd73d2d79955b3836db2cbcf46bb9f73284ce362e5062ae7c54f2e1a7f01bd91c6bb846ac3bbe3bef5a2e92df52f29e84e7dc5bad438a6a9ae94798
+DIST kscreen-5.18.5.tar.xz 113256 BLAKE2B c4cde78164cf3b344fa2ff7905a37cbbf0f32bf3cb527a1e54493cd6f831e617ab85d80d15a489690c503e7f4fd35bb8350f4d1edd6149b3c3e21f52df0286de SHA512 310e9f1b2a46d4d81b78a2567e4b183847e22eeb08d1912748968c7cbd77bce7622aa51b1931144e732c1fac6bc3e7827c2db0d9d539e31e642b9d7c0827b36e
diff --git a/kde-plasma/kscreen/kscreen-5.18.5.ebuild b/kde-plasma/kscreen/kscreen-5.18.5.ebuild
new file mode 100644
index 000000000000..9ac37b817e10
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.18.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="forceoptional"
+KFMIN=5.66.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 ~ppc64 ~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/qtsensors-${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 47c79ff0b051..b35e1bf900ca 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,2 +1,3 @@
 DIST kscreenlocker-5.17.5.tar.xz 123744 BLAKE2B 2b2472d5cd99402930a3003e1a8daa07cd40b7501648e4007c947e55b9e130f8336d267409c5c60d2d4d2544ec4b8aa6e1acca287296407781d44c5c22ff8519 SHA512 152a310d8e3256da1b08b7b0d0a9e2be826a18d3c9ede61bfc764efed02e66e11f209edf953c9098a378e1566d3a7ee1013f733f205f66543174ec0994750248
 DIST kscreenlocker-5.18.4.1.tar.xz 125164 BLAKE2B 634eb53bad17df283c0e44258660f6b066f7dc70cab6f402d861a9d76e4880d9ee206ffc86630122fb0fc7bc6694b0f639cc85398dfb3c7260924245078d5493 SHA512 f58e46b6b86ab49f458ca00604655369755d51b54e7f97ad1f640d4fa51bab5d904ee26c0981a2252ee4edff3063a40f5792b860cd39d19f3db8ba93ec9aed5b
+DIST kscreenlocker-5.18.5.tar.xz 125144 BLAKE2B a4d4a570edbb6994eb42390c42a1193ebc7776c28483b9edb7ab4935c18be3e042459a9919216547a275e5c02794ac468364e1a65cfd62beb17a2f09b34cb659 SHA512 27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
new file mode 100644
index 000000000000..5e66c8cd5e94
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+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 ~ppc64 ~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 c7bcfb07fc55..bd43023e6c12 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,2 +1,3 @@
 DIST ksshaskpass-5.17.5.tar.xz 21372 BLAKE2B 134a533570b75d66cff195819d41b782b67e0f308d6b36efdd7ca223cfb8994baf29506e3cfc34c6786d35eedf792ed6519b40b0f39360468465c76a197c8362 SHA512 c3a6d5b914c13cdd2ca94a237168702729755ba51e036bef1fb5f09f9e7d1c01c176ba14f225c5ae3781434e8fcc047dd250f9da8d3704da09e9712819a5948a
 DIST ksshaskpass-5.18.4.1.tar.xz 22228 BLAKE2B 09ef6d7135c68284a4a36ee81c55a15190c372dc77e2c332ec88383684d8ae14603a1109da800279a6f3b71602b3de65f211cfda92b0eaeadaec85422dfaf11e SHA512 42d3615b631b225a455c939a72a0a1cd1766c7baa7bf9396b4509c880f37784beddaf2596d124362d9720901bad776aaf6b248ccf8b53e0691d74c948272c952
+DIST ksshaskpass-5.18.5.tar.xz 22148 BLAKE2B 31521b28a840bfbb14cdef2484dde8908a0ffbeda5d54663243bd93a070d77d72019b5436f0a4f838e7c8b9f60992b06636e181b6ced51d17a13ba4f7c3918b6 SHA512 8cf75491c04537cdbab11613dc0f9317631c282e4f371664164dc0936d08f744a39777b696b772e05b06ef1257d42f7ae29abfbbd022e661073fdf880fe63fcf
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
new file mode 100644
index 000000000000..cf1f23b87d8f
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.18.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.66.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 ~ppc64 ~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 48cf4ac5bbed..9827edb987c3 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,2 +1,3 @@
 DIST ksysguard-5.17.5.tar.xz 515292 BLAKE2B 216a52db86ea02b0c2e6a4e291ba41e5bfd4833732fc1d027ffdba45e20f688ecc9299646be8b81e010abe3602467f48a33f75278646c6a33359c55216e0b482 SHA512 65c66d469487fafec4eec80ab9fb55e48520d87742b64819eeadd659d7ad43b87f647ef3031aa73f348d5716aa416089012bfb125d44fed01f3fec836d5ef549
 DIST ksysguard-5.18.4.1.tar.xz 517548 BLAKE2B 1e7b8c4ac809c5625226137d546e58f6ad1e13ffec9266a9d4ea88294a877ae0506ff4d11c6e8165beaa2c923d235fb4b4793ad7ee6b51a2dd14d23f5cff71b8 SHA512 2c2bb6596987effe558eeafe855a4914186da815a7688b68c75bf44daa29e5153b0cae4b2692f780fe2001042dbb12568e3c708b711c179f93fb7110f50dc696
+DIST ksysguard-5.18.5.tar.xz 517648 BLAKE2B b50623c28a3884adc5db326d7b0745c558f02e1f515efa9a5d591948026447f427e08cb72805d7f1c8821cdb0038c894e4322520cf2630656e464da6f69af401 SHA512 2cfb82caef5d074b945f0a7478b32af86d49e174d4d294dfe6a54acdb0b1d335e151828a4f239b52cf767ba04d9e93bf1632f2a37e2b1d611128543e0e0008a3
diff --git a/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild
new file mode 100644
index 000000000000..a15e75cfb1d7
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.18.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.66.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 ~ppc64 ~x86"
+IUSE="lm-sensors pcap"
+
+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
+	pcap? (
+		net-libs/libpcap
+		sys-libs/libcap
+	)
+	lm-sensors? ( sys-apps/lm-sensors:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package pcap 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 6cf3b5280785..ea697926af4e 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,2 +1,3 @@
 DIST kwallet-pam-5.17.5.tar.xz 19712 BLAKE2B 2166498cddaabf55ea77312b96e863fe666afffe976507aa4f1c1421f7182c8db195d55b7462d3355acadb4cf2008792983712ec286811d22348ccdcc6cbfbbc SHA512 3a15ad62cb59aca1165c3159572669e5a44a2f1bb6aee51937b4d970a4eb901f7fbee74ed874ad20d65e3adb4009e143954dda1ee31ccd223c3a1b3208da6436
 DIST kwallet-pam-5.18.4.1.tar.xz 19840 BLAKE2B d5d6879b6fe71098eb92ca34a1c11424d590c7ff000f8b476b666fdd2ff09767aa3489ea9038d92375073815a42a73d08984851823f798099ae874f563a4536b SHA512 7be9fe57d29e3f03344cd477902c3d5ce9c19223645d1536502dbe2d6f74c0aede4435c997e6f9880bd3b44b865ee95579e64f73485dc6b6305143da44877b67
+DIST kwallet-pam-5.18.5.tar.xz 19800 BLAKE2B 695fb89d1a54bfc44b06bee4881ae357a42c82b6506a6ed7966c30bb28137ee379ac1beb9391982c15ac63e95c0a1bbba2e0950ee89e050a2ceaf296b98958d4 SHA512 050b3ca66f3b078bb7bccb4a3b7750787bf22d18af60972969f83141b99eac4441fa08d48022278cfe28c8f96f7a1d9ca346f155d8ddbdb60b17bc9c142521cc
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild
new file mode 100644
index 000000000000..849263d4d766
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org
+
+DESCRIPTION="PAM module to not enter KWallet password again after login"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	dev-libs/libgcrypt:0=
+	sys-libs/pam
+"
+RDEPEND="${DEPEND}
+	net-misc/socat
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
+	)
+	ecm_src_configure
+}
+
+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 53775b2eae78..9219f979290f 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,2 +1,3 @@
 DIST kwayland-integration-5.17.5.tar.xz 20184 BLAKE2B 4597ae60ddc805745d519cfe7959c9d423a01ff41d3c3565600d807943950cb1008265d8cb685ee038be0950af7a2237e4de78d4574aad3aba816cb09419a21e SHA512 50ac96f4ed957ed264e8f700dc9bdb71ce04cb4a6385c2316890171943c4b7a23ebba08eb7047eebd99ad7c6d485f440c8ae7375c040088ddfffbf7f5824634c
 DIST kwayland-integration-5.18.4.1.tar.xz 20504 BLAKE2B f19f2c65d51f92bb23f8495d5775b4eec23e7eca69afcb7ddd9699817c6241ce8cd03ff9a34110c28cd6c76c19514c03a39d3878feae3dc656ba8203bde060d8 SHA512 0ed673ad47091d946aca199d7e28db4ccac0b7274b2e5c774765cc8d6f9e91dc531bbffc50c448947cd144ad8c0766d7efc4b31826b7bf250bcbe9c9844a22fd
+DIST kwayland-integration-5.18.5.tar.xz 20496 BLAKE2B 74d2396b475a462710fe28f1ee710935a927579e852bd7105785159309ba745acddf527b4ee335ef0e233fd4a43404778af88cbc50e0413d393896d9eed2d299 SHA512 65d87f1e9e9c957e9e9e73dc04da65e23d0c12cb93eb52c86912f4b15a360d6848cc26edbb97be3444c9a5d7a16ade1aebf2d241d4d1a1530aaa5523d1e9f9b1
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild
new file mode 100644
index 000000000000..c23dadc1b568
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.18.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.66.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 ~ppc64 ~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 43af7dfce5b9..d1fde6b7ef97 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,2 +1,3 @@
 DIST kwin-5.17.5.tar.xz 6251468 BLAKE2B 52e2c11e6164d0c1da49f818e842fdbfdea599460204ada2fdd5f1f09cb230d4c1fe96e8c00a85d8c9518af7cfcbefc584d0223701448b5afc009af5cf01e0cd SHA512 67e1f7044579b7c1ef7feacf92910f449c7eb5f6ca3ada3e1ff5820f811c1b4a168690b74a163659c84c9daf0094144b5584f287fefeaff8effab48bab7258f7
 DIST kwin-5.18.4.1.tar.xz 6274296 BLAKE2B 78237c01e2b21645158a2d9aa48ebc495dac1fd605b8ff4914f5e3b5167fdc9a5664988fbcbf1245e4dc7ccb7d11307fc42f0b17bd3a17e7994c40c505428c63 SHA512 5e2ef7a8bd2969121d560e6558791298d8506d1af4c67aca8e6d2377af76e10b8e6ee32f116911a85352a74195a1cbd6dd4d40054f1796ff4b54b1e5418a5772
+DIST kwin-5.18.5.tar.xz 6274772 BLAKE2B 1614515df60667fb6e8f45302db13dc43ca896c7266c2e2846fd1a1da75b4054cbe14a27b8b3f7d71ae6398e2cf4d9e8e2a68af1c1fa6809a271c5b29574a023 SHA512 b703891824ec31e8ae29df27a11499579ab95789a838e893d5904e40aeba27b0ddc04836038d5b4c062d75ceed277d07e67eeb1b4e957ccf414f03786037d562
diff --git a/kde-plasma/kwin/kwin-5.18.5.ebuild b/kde-plasma/kwin/kwin-5.18.5.ebuild
new file mode 100644
index 000000000000..a66ce81e1bc2
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.18.5.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="caps gles2-only 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-only=]
+	>=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,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 )
+	gles2-only? ( media-libs/mesa[gles2] )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+
+	# Access violations, bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package caps Libcap)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 3bf126b0fed8..fb2242e5dbc5 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,2 +1,3 @@
 DIST kwrited-5.17.5.tar.xz 20080 BLAKE2B f9947b9d9c3350b7c08037a30c14b35e5f5d53339f99df5ef53703fc7c53b739a2e168e1581a2ae1007606590edde56d20adf07c711f2680e3dd045f6838f682 SHA512 b317860d6a9307ef9e24e48a538b7f1c8834133f03d306592bb5bdd855149f31195a4de7e46db2edeb3f26b5b608c7b16fbb46a5eeaf6b482eca14073f89b32c
 DIST kwrited-5.18.4.1.tar.xz 20272 BLAKE2B 4371be0024e8ab04677c52aef1a5c3faefc9dc2a2d456c309c633f25ce1b29046fb1fac88a08df21dd1f9fa06eb6b768bc8ab923c89b46dde37ff4f16fb45936 SHA512 5a9e793821d7f1178aca890429ad581717ae7c5503c3464d42c611e02f20a0df61a4f97bd944d1774b779910f0678fac4b010968fc20e050786dab5584597ed8
+DIST kwrited-5.18.5.tar.xz 20236 BLAKE2B 3dad52dd60ad24dda97165332bd2a6182ac3fd9aef57b2f3e90ece0cc899617d99e84d696d3647c84197d088f383eaa9c96e88367abc310e1bdff81e0c57f842 SHA512 2c28ba26228394989524b46e68cd2783eff5c412ccfdaf12947976bde6a2ba732e696c3d8af666f87cf67062c75485fb0ed01f58ff3d727fedf8d440ddfd4f84
diff --git a/kde-plasma/kwrited/kwrited-5.18.5.ebuild b/kde-plasma/kwrited/kwrited-5.18.5.ebuild
new file mode 100644
index 000000000000..2582c33d16b5
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.18.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.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 ~ppc64 ~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 aabe5c4c987e..61bc8b52df01 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,2 +1,3 @@
 DIST libkscreen-5.17.5.tar.xz 83028 BLAKE2B a224c25d51e705b7f08dd3fa7c96d77680dc9289d35d696f00396e9b9ae1aaa3aa737d026a5dc9f6e54601562d21c79d09b6cb7d0f4694b303ddf1ef5fd758be SHA512 6ddc96e7213097513de955fc1c1b53ca947c325102079d83ce110dcd21c95c6e9e5b0be9c9a2f95f03e0eabf965d42e83a278806d11dc46e5915d906adc9a96b
 DIST libkscreen-5.18.4.1.tar.xz 85504 BLAKE2B 569295f9e9fb65388b3e8f4824fac2f5e8d34dcb371831601da6eaa7d971069752f370e1fbf750ba29263de7e8281b5574ab34959d37633fde7da386009ead8d SHA512 73e5d105701d11f1bbe403034614d89a6aab3e4f47d949633e2104c590c62a4e89e7643558056d45d16e43d326c52a950024b84f184dd86fff9cfd57f37efa43
+DIST libkscreen-5.18.5.tar.xz 85532 BLAKE2B eb9c85c88888dc82486cce8cd55c06cc9c180ac84a9ebd005cbbeb26233bccd3a48daadbff42cff33c92bf871c89bd84c5f291210bbf7768c7ad7b45641d7a0a SHA512 8fc36bfd5aeb94fada51be1895ff2cf1b9fa98332f1795ac5e9d5339a35d87a24ed15c1f44af85205198c584eb411191f72ef8de370d1f97476d75db1458cb00
diff --git a/kde-plasma/libkscreen/libkscreen-5.18.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.18.5.ebuild
new file mode 100644
index 000000000000..1d4fad5fb6f2
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.18.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_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+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="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
+
+# requires running session
+RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 8dc86b6f2a4c..75615dd26f53 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,2 +1,3 @@
 DIST libksysguard-5.17.5.tar.xz 605628 BLAKE2B 6c10b1299a1408f508a183a869468580ab705f35b20d6086118641e57c0ea87706e3d2c6812e9829c920fc03d472ce33df9c863c0b3359db7266506b142b7220 SHA512 15e12044bca64b5019c30e3e009a4533b03a19627e2ca8ce6e0fffe3c6554f57ae7b86d82be18d92edd7c6abfff9d123462915f44ec33f796f7e6b8b3e2491ba
 DIST libksysguard-5.18.4.1.tar.xz 610492 BLAKE2B 33621edf25b7d2a3badac5662895bc3ba8009303db4d4146a679b8da935cf938b53916247cb9af2a499b6866ba0b6a929465e87c8d7e8c8635024b2bf8e6c82e SHA512 4407bb15ca4e1e70f8c082ba11c25b4855330ca54fea15c900610245e2966bf2eeebbb6d5ea94bc0627df869363837660bfcca0a88fbfec9cc2ca43e0b635cd8
+DIST libksysguard-5.18.5.tar.xz 610320 BLAKE2B c644bfa216ae851eb1520b9135add670ecbc4733be7bde27437a876141ca9f37c3531a78c347e7c00149e1d1f287a680954c3e885cfdc0838398626d6ed3d651 SHA512 a648d0db1378165188187db9de78f816b1dfe647ce7e7ea2d505bc04c5008d2c24b2a113bc73c4fc4b3ddf467682ea3b306286f4bffa2c750918112892d78fb3
diff --git a/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
new file mode 100644
index 000000000000..01dc3bb8624d
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+SLOT="5/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="minimal webengine X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${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/qtwebchannel-${QTMIN}:5
+		>=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 Qt5WebChannel)
+		$(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 4e881a236f18..f81f992c6270 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
 DIST plasma-workspace-5.18.4.1.tar.xz 5696208 BLAKE2B 66dcee693d7755c378971f10ca1a0f8a3020c33df688628d8c3298d5a09aa84f0fc12d5cc5e102dc727a838b3a71114a05dddaf17aaef2ea5d48d71119bfc836 SHA512 683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7
+DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild
new file mode 100644
index 000000000000..51ebb58c4a8c
--- /dev/null
+++ b/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Workspace library to interact with the Plasma session manager"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=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
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-plasma/kwin-${PVCUT}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/plasma-workspace-5.14.2:5
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" )
+
+src_prepare() {
+	# 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
+	ecm_src_prepare
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		cat >> CMakeLists.txt <<- _EOF_ || die
+			ki18n_install(po)
+		_EOF_
+	fi
+
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 36045deada4d..dcf73d53cdbe 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,2 +1,3 @@
 DIST milou-5.17.5.tar.xz 63276 BLAKE2B e3d32791c5f2d8e74d00cd9cb6be1d2f4512253117cb15c935524f531465a1834faf3e58ef864abcdfbea0e3271d2289094073643729e43749789c68d9e8cad6 SHA512 f8be011264ea7a49c2ee899d57e42555382846f4ff448214b520264ddc9609da779421b8a74f6974de26fc0bc0357c5ee4d5344dadeeec9522d952e6dbceb579
 DIST milou-5.18.4.1.tar.xz 64316 BLAKE2B b3d39253d32f74a34920296a26f3279530a91eb31934a9aa2d2dc20467612717e9422c782a5c1a4fe0fbd693ad50ad25c26a14647b44c4a30c3465b1a15aa104 SHA512 812b1ac049c7af9cf625e1203cbb9ae0e36a99ac3b89781f4e007974dca460cbf9e866b3773a2117261bd845d4a7c65f70860b45e54b6b87124695c011a3e51e
+DIST milou-5.18.5.tar.xz 64264 BLAKE2B e4dba1cded6c5b833f35086b3cc943e4bfa4a0a6df530eb43aba7efbc40ea48aad8c88a2221546e7fdcc411c136232af84b7ab6a45d99233369c4a2c628f56d4 SHA512 3c1d0b032e8f26a637aed8067d919d95bcbf033e0b494bc9a2a0295d000773ac3900903dca96eb32d3fc1b831884e3435ab91a26c9cd179548c3b2cd0377577d
diff --git a/kde-plasma/milou/milou-5.18.5.ebuild b/kde-plasma/milou/milou-5.18.5.ebuild
new file mode 100644
index 000000000000..3f9556f47b21
--- /dev/null
+++ b/kde-plasma/milou/milou-5.18.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.66.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 ~ppc64 ~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 7f812ffca80c..a68b3caf26d6 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,2 +1,3 @@
 DIST oxygen-5.17.5.tar.xz 4470600 BLAKE2B 7dfcc26a05c479c30e10223a5af063fd5580fee375d62e3261cf79cfb41fffc63af299af0690b48a2417f4562f1526f84cdd1debf53193085062f719b944d1bc SHA512 59a49c3718d7332640ff5f8ffee6afe665dfedb8504728d80a7672859429739a7926296b462e457f2fac5b98a892d51b32202db8f0ea75dcea61138449f79ab3
 DIST oxygen-5.18.4.1.tar.xz 4470196 BLAKE2B ec89d581d70ba5d860a366068698725d27b94d2e20ae001f1e45e5461fcd637be16fcff98bb550e878a20e9ede94cdd2af4228262e0dd130e2eef1b13803ef00 SHA512 b6804c0ff7b2234603c6e9d0e9957b8eb5b44b663aa427571a841b7ee421c7e95da2213afb4d956390c5a87828a530a13aecf7f86be63c0f56410259771c516d
+DIST oxygen-5.18.5.tar.xz 4471212 BLAKE2B 72839684b00bd9382475c26dec2d4ff73b8f84318a326c12e4fc25f4452b731c23f853b1eace2d2257df5e82ddfb104fcd70231b7431546902384288438147dd SHA512 e965e8edbf94d2bd2241202030960615286c454c02bedfbca29670c9dacf55b5f34a8dda1ec3ef9f18f4bb864ff8721acaf559f14cfc1c22e7b5385865cec579
diff --git a/kde-plasma/oxygen/oxygen-5.18.5.ebuild b/kde-plasma/oxygen/oxygen-5.18.5.ebuild
new file mode 100644
index 000000000000..4c77767f6b20
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.18.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.66.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 ~ppc64 ~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 21cd1648b9b7..48d11f8e494c 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-browser-integration-5.17.5.tar.xz 147220 BLAKE2B e995dfdefdfc4ec8decc5d957e900b02ad756458623824d4c81a375540f5956765118cd85cd4814783596f7573dfbd357db0c75085cdbd4db6d9a8384d540620 SHA512 5387838cc22dd78a21da5c9d0ab3529878e107b5f06d21252bf2a93119171d20180920cda28cd5e1c5b780db1cdd0d63b206e3d988f088c8e5d1d14c08ddb5f0
 DIST plasma-browser-integration-5.18.4.1.tar.xz 156100 BLAKE2B 9112099cab87c0f6b89640db2f65b7f9b2122d33e6d59e7ad1a6fdffba98450c2f863708d79c4233853cc332b5b14f03057ce23b1845a3882c494716c4156a83 SHA512 05fcc78f68a029862daaae816d2c95a14b7b3133c9ea00cfad7cac32337a6b1642b15f23313dec665686c928f0405d18cafa20b06d16afa1ae8ce752d74e9066
+DIST plasma-browser-integration-5.18.5.tar.xz 156428 BLAKE2B 9f83e33c871ea59fc73ed6dbf26e137f5dabfa4bb2403d71a0621cc0c41b1a15b461631b6ab864649780fe50c54f9428394716d8d5055453b51616c393daea96 SHA512 096bfc0940fa3a40fe5145078fe801e2436779ac3333e953a68f7a68d3d592e3978606b70f1678c83a0748221e4d992ce14e0cb72c671f242d13db41390e8730
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild
new file mode 100644
index 000000000000..4d2d15d9ea73
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.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.66.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 ~ppc64 ~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 ec023aca35b3..c5b9a857adfc 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,7 @@
+DIST evdev-properties.h-425ed601 3662 BLAKE2B e538376a81fe519eb43c739a842111e449643deef968398181e948e9cbc0d71b280ae35386c1076f06e0d315ec1a0fbda883cf43d41e752564e1e9d921285189 SHA512 7a7425787d94c7d7f22c0870976af523c82d2b4c2c14dfa56e969a23a02bf97ed73b268790d4e59bc575a094e9d90c0c90d84af116f02583a360d1c70d6dbcd7
+DIST libinput-properties.h-e52daf20 9255 BLAKE2B 05e002dec267e5019ea37fbbb862f0786c671773021f246d0e925b7850ee063c64fcad216db0d03f5561848852bfcf699b197e42e4d4ae8a0d1a9c9c213cad52 SHA512 20e00e7c8df2126dbabca969d5a5df2c5aff9d4b7d5d08a8676d9b2ff90cc422c979e253f6f0d98f1df55c66de98bfd9bb81645c223b1fdf5dfc044912d8216e
 DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4
 DIST plasma-desktop-5.18.4.1.tar.xz 9411912 BLAKE2B b34792e3418230fc7a6beabfe595c6873e61e884f7ac8204444ce5785d7e048f2eb145949240ff20a2d8821a3cee4afe4a4200e7b88b015e5906a6f9bbb8f1ef SHA512 4cac140ddca8ce57a6e27cfac2946824db40a0adf9f0a9b6fe6079f9b899f4b145941803d4a0f1c575a27a8c76d6a7e889c3218287a126efedd9e722fa9d7089
+DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
+DIST synaptics-properties.h-383355fa 5932 BLAKE2B 5108697e861f0de8c6fdafa731f819411e09881801c32fc1d3f5d8a2cf360655fd551dd3ec858195c056d6666863947441cebea6f119f37e2cb65321c85cc902 SHA512 91065cbdc64da46dfa19ef93e939bf4e4773ecf740a228551e4bc38dc83dd84f83db6f2dfd1f1be2108dd54416752285298dfe5a447a28891ca194463d9354ae
+DIST xserver-properties.h-d511a301 9515 BLAKE2B ff660a01266ef52ca01189040cec71efabeb683604621dc435e0a65de58919fea92ad9e14839c538132df74aaa395d1f63e75120d8361420c20072b7ba0152fc SHA512 916c05e13798a538b7dc9c46d77764aa65c582d6c513702ad18f10560eb71605f1bafd08a4eff6c86adff51d5a007185b2cdc71a07af138c82130f1fd9c28f2d
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
new file mode 100644
index 000000000000..3118913e08de
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
@@ -0,0 +1,85 @@
+From b11915786a97f55074b7bfe4eec6f3c5cc08ae78 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 6 Apr 2020 00:41:07 +0200
+Subject: [PATCH 1/2] cmake modules: Allow include dir overrides for various
+ input drivers
+
+FindEvdev - evdev-properties.h
+FindSynaptics - synaptics-properties.h
+FindXorgLibinput - libinput-properties.h
+
+Hint: Dependency for touchpad (Synaptics): xserver-properties.h (xorg-server)
+---
+ cmake/modules/FindEvdev.cmake        | 4 ++++
+ cmake/modules/FindSynaptics.cmake    | 4 ++++
+ cmake/modules/FindXorgLibinput.cmake | 4 ++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
+index 153128a90..c19c31a96 100644
+--- a/cmake/modules/FindEvdev.cmake
++++ b/cmake/modules/FindEvdev.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
++if(NOT Evdev_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1)
+ 
+@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS
+     HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR}
+ )
+ 
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
+ 
+diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake
+index fb5f9bc3e..eb56965e0 100644
+--- a/cmake/modules/FindSynaptics.cmake
++++ b/cmake/modules/FindSynaptics.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
++if(NOT Synaptics_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
+ 
+@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS
+     HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR}
+ )
+ 
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS)
+ 
+diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake
+index 1550751ae..5b7af5e79 100644
+--- a/cmake/modules/FindXorgLibinput.cmake
++++ b/cmake/modules/FindXorgLibinput.cmake
+@@ -31,6 +31,8 @@
+ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ # SUCH DAMAGE.
+ 
++if(NOT XORGLIBINPUT_INCLUDE_DIRS)
++
+ find_package(PkgConfig)
+ pkg_check_modules(PC_XORGLIBINPUT xorg-libinput)
+ 
+@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS
+     HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR}
+ )
+ 
++endif()
++
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
+ 
+-- 
+2.26.2
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
new file mode 100644
index 000000000000..181e89e7db38
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
@@ -0,0 +1,26 @@
+From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 24 Apr 2020 18:55:30 +0200
+Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
+ dir from include
+
+---
+ kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+index d2f41d70b..3eb3171ee 100644
+--- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
++++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
+@@ -53,7 +53,7 @@
+ 
+ #include <stddef.h>
+ #include <limits.h>
+-#include <xorg/synaptics-properties.h>
++#include <synaptics-properties.h>
+ 
+ #define SYN_MAX_BUTTONS 12
+ 
+-- 
+2.26.2
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
new file mode 100644
index 000000000000..bd37d0f65a0a
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+
+# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
+# just for 1 header each. touchpad also uses a header from xorg-server.
+SHA_EVDEV="425ed601"
+SHA_LIBINPUT="e52daf20"
+SHA_SYNAPTICS="383355fa"
+SHA_XSERVER="d511a301"
+XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
+SRC_URI+="
+	${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
+	${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
+	${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
+	${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
+"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+fontconfig ibus scim +semantic-desktop"
+
+COMMON_DEPEND="
+	>=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
+	>=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/libksysguard-${PVCUT}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}: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? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=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
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	!<kde-plasma/kdeplasma-addons-5.15.80
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.18.4.1-override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
+)
+
+src_unpack() {
+	kde.org_src_unpack
+	mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
+	cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
+		"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
+	cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
+		"${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
+	cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
+		"${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
+	cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
+		"${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package fontconfig Fontconfig)
+		-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
+		-DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
+		$(cmake_use_find_package ibus IBus)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 203d441588f0..b411733fff40 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-integration-5.17.5.tar.xz 56836 BLAKE2B aa22d2f362f07e33ca75ada88b05a93ee9bc6f2bb6e136d9a08526e54a1e68a5c7947e617085f068363f40d5748b9fdcb7a93ad57016dd6844718d843c01897f SHA512 9341ca525e1c02b0ee00d01221a68f683717f89c19408f5b94004fa13fb63fa7983609756ce64fd0b21301fb2a51a3e531c0b2bc1c46ca656dc41b08076baca2
 DIST plasma-integration-5.18.4.1.tar.xz 57712 BLAKE2B aace5d422e8bf3304ba3f60bec32554b0457cc5c3ac74ce002d7af882b5afe657714a6806dd740ee0333a6cd8a4283f6fa886418886f56bd8f9e745e75f617db SHA512 ebc6080457d1958e2cccc7db25b30443e21759c95c29dc8f72538ec2945f99019ad0598369253ec552c4a77dc49979ef3e1a46da93362a34793c0af6209c5e3d
+DIST plasma-integration-5.18.5.tar.xz 57656 BLAKE2B 3cf445f5d84de07e82369a3057a0ac390961634f8926d3491ca8dd0d603d4e4ff9e7487b69c1fbea44a4296c8960f4e3ef677e1bfd183154a36799fc95dbf3c8 SHA512 d217c49555ee17e3b18d006368ec7aa4d8585c05070bcf3a3c7e471b1c7dc830080d0405209979d8a27c7c2fc2adcd3d248e595f43f0b4a2928683f93c6d4b48
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild
new file mode 100644
index 000000000000..b69100326522
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.18.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.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
+
+# requires running kde environment
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 0e4113c5df40..946d4ed97a21 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 		<flag name="grub">Pull in Breeze theme for <pkg>sys-boot/grub</pkg></flag>
 		<flag name="gtk">Enable Breeze widget style and system settings module for GTK+</flag>
+		<flag name="kwallet">Enable support for KWallet auto-unlocking via <pkg>kde-plasma/kwallet-pam</pkg></flag>
 		<flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag>
 		<flag name="pam">Enable support for kwallet auto-unlocking</flag>
 		<flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
new file mode 100644
index 000000000000..004ee85880ba
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Merge this to pull in all Plasma 5 packages"
+HOMEPAGE="https://kde.org/plasma-desktop"
+
+LICENSE="metapackage"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth +browser-integration crypt +desktop-portal discover
++display-manager elogind grub gtk +handbook kwallet +legacy-systray
+networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=kde-plasma/breeze-${PV}:${SLOT}
+	>=kde-plasma/drkonqi-${PV}:${SLOT}
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/khotkeys-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksysguard-${PV}:${SLOT}
+	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
+	>=kde-plasma/kwin-${PV}:${SLOT}
+	>=kde-plasma/kwrited-${PV}:${SLOT}
+	>=kde-plasma/libkscreen-${PV}:${SLOT}
+	>=kde-plasma/libksysguard-${PV}:${SLOT}
+	>=kde-plasma/milou-${PV}:${SLOT}
+	>=kde-plasma/oxygen-${PV}:${SLOT}
+	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
+	>=kde-plasma/plasma-integration-${PV}:${SLOT}
+	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
+	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
+	>=kde-plasma/powerdevil-${PV}:${SLOT}
+	>=kde-plasma/systemsettings-${PV}:${SLOT}
+	>=kde-plasma/user-manager-${PV}:${SLOT}
+	sys-apps/dbus[elogind?,systemd?]
+	sys-auth/polkit[elogind?,systemd?]
+	sys-fs/udisks:2[elogind?,systemd?]
+	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
+	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
+	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			x11-misc/sddm[elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+	)
+	handbook? ( kde-apps/khelpcenter:5 )
+	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
+	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[elogind?,systemd?]
+		qrcode? ( kde-frameworks/prison[qml] )
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	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} )
+"
+
+pkg_postinst() {
+	has_version sys-auth/consolekit || return
+	use elogind || use systemd && return
+	ewarn "An existing installation of sys-auth/consolekit was detected even though"
+	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
+	ewarn "There can only be one session manager at runtime, otherwise random issues"
+	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
+	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
+	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 899d9a0cda8c..35650666dbcf 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-nm-5.17.5.tar.xz 814376 BLAKE2B 757ac2a1ed3eb1263a0034f950d688194ad1a11e6b842208f12d8abbfabcc75461510312b3e63a166d691b538c276ed74c367eeb2122774d669915366e82695e SHA512 45792671afd3ae9b8cebcaed7588524f04234394c178055211a1896a8a3e5ffcf48229f65ec7815f1ef51076860bc4388d37de6b058c24e54f0772eb1c3111a3
 DIST plasma-nm-5.18.4.1.tar.xz 827428 BLAKE2B bb9459ac0ec599c053a6f3260415790b0d19a42b12ee1ca921c4fc40a73580b99080b3291ad2b01c267d8982fdb53c5850c80a00487acbbef2a3032620fa08c3 SHA512 7534267b7e9507b5963c5226eb375bfff426291761db4bfaa8a9c60e491d296d5aebb6cb2373e75dd10b321e706ccdcdce036f174cfb6c5fb12df218f112228b
+DIST plasma-nm-5.18.5.tar.xz 828008 BLAKE2B 557a31d5a0e7886be90e62be3f5328baf4a8bbfeb3e9decf1f2f106f33bef7e64fb886b94691faab57119f231b6bbcff58514d795df75f858ca9c8ea8c1af9a7 SHA512 8f785f257f274fb9384bf2afbe4231a057c46706483e26dd2270a93a6fc97e6198916ff119d258a67d4f8bb73facb0ff67412f43e5fa66812962edb64331db4a
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.18.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.18.5.ebuild
new file mode 100644
index 000000000000..b54f6222850e
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.18.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.66.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 ~ppc64 ~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 b257a4b5b8cb..5cee11a3228b 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-pa-5.17.5.tar.xz 104280 BLAKE2B 3f6c8679c1136ac6dcef6aa608f01846e8b3f5e1826aec14d808e5c7d87c899992912fb9b72730d6f1de146acfc171e3105015126d26ef3be6f9e0d818d913ef SHA512 6ccc5aff0a95e816ca517e39412fdfcecf39958e606695820684d1dfaf654f161ef256c45e31b0f41cb5ecc7a9d4c362c29716b532db375218dd0f994c0f0ca6
 DIST plasma-pa-5.18.4.1.tar.xz 104980 BLAKE2B b0833101ff402bd3c7550de1ecd9aafc6f0806239f356166de8ebca9a06b22fab64a21c3599184cc272428bce05aaf81c770236ea61dcffc9ec25fd3049b771c SHA512 877a861b7f3811958f911a082f037916697f148969229ed6d96c2ef7238533726157637548798ca318b5b1ee89cd5ed8f9a66fad2e8cb3e9035a5ee311cae7e3
+DIST plasma-pa-5.18.5.tar.xz 105148 BLAKE2B 19b79ead20bc54d6f1e8f515980590f402c00a3c3e82841c66e8cece4f9bb90e87a7a5bf0c02afaf5e7bbfa3715c418301926120d4cd69d94d4c3dc54b8de0cd SHA512 fff3049d4879e4f6fe428985dd14f91fa6bac8fe2e7c696ee1424d610038f61fd7eda2621bfd2c2643529956f7986b59c9eead1ceb79e1cfb1397fa52b470376
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild
new file mode 100644
index 000000000000..8ed54fe8fe1b
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.66.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 ~ppc64 ~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 bf02b7adc23e..a860d68bbd74 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-sdk-5.17.5.tar.xz 260124 BLAKE2B 51e0155a59c75af6e06d96a949c0fab5baae87c839ecc2cf4e9be448eb281126a3b4fd316f154aaece123815f59dd4957548611f8af5371955fd718913337074 SHA512 aa1f949daaeabc78c2ffffe78cf5a1bcdceada360b4c2f9ce37e4ada73ce849fae9bccca9ba944c33de9d0686428079c486089e99bbf70665e9dde2a038ee2ce
 DIST plasma-sdk-5.18.4.1.tar.xz 263144 BLAKE2B 08a3763c8b8d03421d5198334af81f69d337b02cf32cd3f43b720cb42854eb0336e4f953560954e5f174fcedf602adf01d57a2e92488dcadd0a1bdaa42ed3ff0 SHA512 b16c40a1dc22fab179a7f4edc2e9693177c145a65a521da691847da6228c5c5654621171d19f74a6c9aa3d61d76bca9ef9e71b364c32cdd7b2bd47df6f7ee1e4
+DIST plasma-sdk-5.18.5.tar.xz 263084 BLAKE2B 575235302ade4bc1bcfdcef33f9fd3cc4175d4362aaabd2a3bc8e7d7235d90f3c2f81c8b499e486c0f68e029b298e4879707ebb1d23052230c2403e825d5943e SHA512 1051aa84d70d7a02d3392d3b1628b1fb4d4b666efca6e34f0688dc0015b983527039bd52140cf17f947f2d266cacb63aab7c9b547e6679a0aab094e74c1783a1
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild
new file mode 100644
index 000000000000..b3d1a3b9ad45
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.18.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.66.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 ~ppc64 ~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 0e4b2932de58..7b4d097c4fc7 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-thunderbolt-5.17.5.tar.xz 48356 BLAKE2B 18579420fcd3d99b2c948ee48391914ae33001ac95e6ec8a83d6f04d6343d25c6682e954b7c5fd1978d48b32ae200c1ce08c5a6465a037320358246a7cdb9de8 SHA512 8287e20963a31af60dff75a659af455518d72813b7e04dfd5407de4bbcda422551a000fd3ff03b67d4a052dc0421058c8ae8c31c1a92d174277d6a02819f6f70
 DIST plasma-thunderbolt-5.18.4.1.tar.xz 51028 BLAKE2B 7ed323d456c5bc0d84ef866123555c4bc3440f75c23bb859cbdf5bce861a5c84a5f1657aacf1d0f478cc14b938aa3f5bfde57ca34c22c5c013efeb8d9cd36a9b SHA512 2ae5e65741717f38f343adf3e52de67db29d069b93147236cec6172f03ffcfb64bbbaaed5056987a747feb0c27ec01aaefa954274092f34f709c955f8099b35a
+DIST plasma-thunderbolt-5.18.5.tar.xz 51248 BLAKE2B e87339f2d81bfcfb60e02284e1e57aa17b1a01844cd4e0157b3b10b1bee4d4de5b02378b15c750977350a768f2c5c2f01e629405c358afcbad0765d1c7943598 SHA512 4768a69abc474b9daa2c3f880ef12829ce4804a44b4502b31e083802a5ba4406ac52001fb397415958cd52d7f76aa7dc54f8945665957a8a5557ca93e345ff76
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild
new file mode 100644
index 000000000000..03c59fa4845d
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.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.66.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 f70c6cc5e3aa..9cc69f53f0fb 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-vault-5.17.5.tar.xz 129144 BLAKE2B 87cf670facbbea5808be8fe220a9218e02ddf3355459782977b098551ebfe18dd34c029243d666f9bb9c2262094808bdc71e77891c6b9f2907fb830e67603f2f SHA512 fe130942a31f815400f7bf61c5d822f272e32f0291bd94dfcb6b3c8317a33dd8cbf4e23724a6d670d1975511b5b9a22a75c08e918849c4910bac3a5197964383
 DIST plasma-vault-5.18.4.1.tar.xz 136980 BLAKE2B 7bf83ba0a96eceedf8bb32e6f78cdb3c1d7ad0295708e9a42f5eba0aa63b5e0f151eae8bcf3d7feaeaa552fecd906ca4699e1c62d3e12a8480864ec7323a5104 SHA512 c06bb9129e25396c44a9a7155253ebb18eeefe7d44d3f288b79f3308964ae4dbca9375820c1a5c2f389b46e17f2f3a2cee35e73b5d4a0c23051dcad8dfcff6f0
+DIST plasma-vault-5.18.5.tar.xz 136900 BLAKE2B 29b538760dbfae8cb83d820d51101bbf27436e46cff034fbc9b7541998ed6bc1870435d7fac9894b7bf105e173121e791c9d387a3c5c9476dfddc3a4b335e072 SHA512 66fcd87dee7e696aa0f5fa41adcb41134bb0da1ee9920f51057ee8729f8d88052b28f4e422795fc229767b7861226d1386086748afb356f4cb7281c1da4af7e8
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild
new file mode 100644
index 000000000000..ae5c9feab2c9
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.18.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.66.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 a62c00d866fc..cde185e9bab4 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-wallpapers-5.17.5.tar.xz 34173344 BLAKE2B dce8cc422523c55b1b9fd33c139dd8597b0130ce1d7dcef9065421d1e5da24c5f2ef3ca176154aa21c39d81f3c5d53170a3e22697cbb84c3306de0271dcb134e SHA512 d1fbdd52632009a77d31e89105323d26edaad20e2083dca27acb0f7c796f534a7a3e4223659b7ccc522513eb7f7d3e4e200251626bda60475d53f9a095ce9fe6
 DIST plasma-workspace-wallpapers-5.18.4.1.tar.xz 37110240 BLAKE2B 2c695d35552192857b2740f1b59bb937fa5cc9495a29404c10a6772427616f50162f2b0d040fe15643483ddbedc7ee37e8420228cec9de4be8d865410ad285c5 SHA512 e3fe98fd4e3265281bda7c223cb086fdc96031421d735df05fb52acca778dba0fa78110810b1c482706cb6e937bc40160130a525ab104b44ed801042ba6d71ca
+DIST plasma-workspace-wallpapers-5.18.5.tar.xz 37110292 BLAKE2B 34dcfad8d3d47a32b63a3d002cd3ce4c59a4b5127002df4c5a39c7df4296890ef59713fbe4c52693ce728aa7a349ffbf3c133a28699f314791e485b28cbdda95 SHA512 75d5042fd955849cb67b1f7711b2e3e63d03ece7aacd4fc88bcd8c8652ca40a62351c1666b9c86275d1b495fa73d0089e8046dc1f65fc6fb23d9010ddc6f514e
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild
new file mode 100644
index 000000000000..0fe9c7985bde
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.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 4e881a236f18..f81f992c6270 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
 DIST plasma-workspace-5.18.4.1.tar.xz 5696208 BLAKE2B 66dcee693d7755c378971f10ca1a0f8a3020c33df688628d8c3298d5a09aa84f0fc12d5cc5e102dc727a838b3a71114a05dddaf17aaef2ea5d48d71119bfc836 SHA512 683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7
+DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
new file mode 100644
index 000000000000..c71af205dabb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.66.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 ~ppc64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
+
+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
+	>=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
+	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 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	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
+	>=kde-apps/kio-extras-19.04.3:5
+	>=kde-frameworks/kquickcharts-${KFMIN}: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
+	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" )
+
+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)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	use geolocation && 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/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 28af342a45c9..2f7a26dc1c27 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,2 +1,3 @@
 DIST plymouth-kcm-5.17.5.tar.xz 40372 BLAKE2B a78f79960dd0623647be478fe37c9d15b7eb55c1a6cc2037fcb72d5d86ed0226860fc258850b7313bb75788580e0089f86656b97480c7b0d93c726ed6bb668ae SHA512 2751c89408538c58821d71aeda47c57584b647f006b7fcad0a67d0247a861523be6b3e253a2e3b32c9f0f3be0613385fef49bc2b68d8900f1e9e1be54e989494
 DIST plymouth-kcm-5.18.4.1.tar.xz 41900 BLAKE2B 60f47fcc5413eed65066ab4ad6ac9c3b0e5101f03c71ddd093ceabfafdd356b0f5116518e912487bff01966b673de1ee773d366ec3183c50b22e36e7f3b3567e SHA512 436e9764f8891aa3040d9f80f57ca3f56633508f0bc82b3a995ecfca0e6f27a619daf893f31b64b7bda1ad4e57f9ec3044ec32913283fe2d4218fd62d247bf26
+DIST plymouth-kcm-5.18.5.tar.xz 41872 BLAKE2B 29e9f8e56478140c0f4d54d297c9efdc33d2f20b18d9e1b1f16640c1abd1a2f5b6033ebf3053384dda6380d2a51c476842fa8587d402cba2e9bc0f98d6d44823 SHA512 ab9c883d4ed23315e925884662c72b42b350a1938b7dcf24dc30e0486fdd4c4449dcdc30abc45b3007d586e07998c96834918d2e91fcda3163c0f9f5b62c37cf
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild
new file mode 100644
index 000000000000..f7cc90b1d829
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.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.66.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 ~ppc64 ~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 90690eb6d834..f69b2807e54b 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,2 +1,3 @@
 DIST polkit-kde-agent-1-5.17.5.tar.xz 43340 BLAKE2B 14f97204f9d93e4aca9d0f9bb98dfd7b74b03796958cf065bb4026a03489159ca45634b9db009c2a025fcf826a1ca8ad1f32e962047d56e0010b017b6569979c SHA512 0103449f58a82c07ae76e214a7fddcf29b034c5e9f73b6cf2d6b11e2e4510b1deba1a0cccc578304defb445e9012d40deca88c647b3727b83574f2eeb223894b
 DIST polkit-kde-agent-1-5.18.4.1.tar.xz 44696 BLAKE2B a098336ddc38a1d8a7cb287ce753789fc1e778e3a247ea5f7f592ce1eea6210c1d1e78b5baaf1df31648c0ec2f402dd40b4591638faf449c75fa425ca9264f1e SHA512 e83c762fce852fb3835e53db8f4940a8b02f06b505f4347027c23171ce6e4cad512b002a0154459c952305f922b8f881b3c0b51ca7b9553d16a78e668deadfe3
+DIST polkit-kde-agent-1-5.18.5.tar.xz 44592 BLAKE2B c9fe8bdc719bf5719358ff2633a143690114f5d6aafa2321cc02e15f1ffcdb78bff0666e05f4a028d504d6fec85e40c7b18489782fa6dc10db71e45bb8d343a9 SHA512 d9441e2379b665aa28d79451e5390a22f7a06f946020fb8c498352b0202a7ecbf7ca2e8dfccc7ee390d51ad441aeb6d818610d0d2e6a753e63326e4c350aba30
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild
new file mode 100644
index 000000000000..a2677ec86c8c
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild
@@ -0,0 +1,33 @@
+# 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.66.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 ~ppc64 ~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 9ff8550ef681..9a1d14e349e8 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,2 +1,3 @@
 DIST powerdevil-5.17.5.tar.xz 593788 BLAKE2B 3bd0bd3c37ccbd0993beeb53f2a76f08ea84eb81811bb1f7da8f59d75f39a8f34ccc6d9b10fc93002a52d1b8a76b9dd35e3790643dfb7c1687c14ce914a0d66e SHA512 a763ea1811cfdb6978e3e4e26311a9ddeb2d11ea5a80eed6ab5e28361007526554750f41b4f8adbc44a2d1fc16324432fc4f25152441dd17eb81c80448c9820f
 DIST powerdevil-5.18.4.1.tar.xz 597368 BLAKE2B 42f200158b0217c69486aec72b32df5edc5594e30fe0db24408a883e5649b6f9808bb4e375ea47fb1d17cee4c314b4a7140d60d6e096a7e6fa04de28449bd5a0 SHA512 b7985f30965cc445cd4426ca9978a721174a3b0c371d69e044cb36edee080a99b3993ad553461e9212158f13a730210a687be2bc1f205722591307cbe87f4c20
+DIST powerdevil-5.18.5.tar.xz 597492 BLAKE2B 510d523b470f281c1b71902a6e2938d5566b3a653909d4b08d75cdfa190bd2f2a2a0befa7f71b3af331f1511733502690d58c2fed13262da82381eae66605885 SHA512 b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
new file mode 100644
index 000000000000..3f5d960a107e
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.66.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 ~ppc64 ~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 cde37dc5357b..78a54a9dfdde 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-kcm-5.17.5.tar.xz 59304 BLAKE2B bad791db8bdc4ace1060d3c49e6ce5100d8aa39c42f356ad5dd9b92f8e0a45b518c759ec5ff6d66d59e89b6ec1502050eb5093ab731ff4aef155ede3bf7b1e8d SHA512 8ba8024bfa336ab1344dc5c7f39e8395fbbef2cd4f4695be45c1a777fa06918e1a877d90b073518d182ee1cbfe67fd44419c9f67ecb24f2ffe832cac78da00b5
 DIST sddm-kcm-5.18.4.1.tar.xz 62244 BLAKE2B 92a780c453e6b7d335e080e723624318366273de8adc68c03c7cbb09c455096b753f6daffeb548f9c7289267bdcc83d16ca0eab49c76a4d24f5070150fada05f SHA512 6500b3a721e4f8798fe1e79647beac11ae6d22bb5df1f5c35d815956535e74aadc9c4ffaee72afd99c2f5ea7acefca040185fe1fc106f3e0a7d62f862c8cfdf0
+DIST sddm-kcm-5.18.5.tar.xz 62184 BLAKE2B d4d55383540882eefafd39cdc65b2f686e271f7e3bfa1f2859b2de55a46a25f03db3413533b74d73782415decbd2dd84fc6f2c9ed517381e55b0917929832c99 SHA512 614cb8780549592ffc8f4f310aca7bcdb68b04b847118d77308b039711c81aee7a9c04726d0e2002b3c00a06c09465752a8886374a286574dfb7aeaa0919089c
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild
new file mode 100644
index 000000000000..7db29087a931
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.18.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.66.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 ~ppc64 ~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 826d12214ba0..077f83cbfb14 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,2 +1,3 @@
 DIST systemsettings-5.17.5.tar.xz 172720 BLAKE2B f8cc7bd6e554e0a88c4241ab255b63fc259f09182c94e5ceba6a931a79927c52df926e8121180ea96075bf428dc28e3cedba9a4611491e06a151fe8d23a380b5 SHA512 75844d5bbfe518f857f24df46769ef38460518fa7eb548ba4903619dc6336d85f2d8d4ba7dc6b36bffd04dc1cf6f3e515e49a4bc537d2b1fffb374005c622b7f
 DIST systemsettings-5.18.4.1.tar.xz 178212 BLAKE2B 63dbb1a41381bc8d60122b1efc4eee27c3922dd665ae014a0d5645f86ee5df45b2c141107db776d0ef32b5fb7d76067b24feae6c33dfd73fae6bce48743a5918 SHA512 07e3658affdf4b65967722a92906a3a017b9217ee7443e57e07d9a7a22753fdbd27840e10dfc3716bf193c155ca2fc0d916fb6320852a352b0d0dcfc07be6ae2
+DIST systemsettings-5.18.5.tar.xz 178252 BLAKE2B ac8ec0ddb6eb54cf6133f1616284d41afbb630fd97ac55cc6eb68846c3a7e9028ecc2caed41c35f624235a74e28d810a81196ed3d6891cb0ff1387ff4bf45f32 SHA512 b6b9184570f188878daca140bd81ee13d47ba867eac5289b67295de9918205e5ebc7f7d644968fbbd9d9dfe1395cae6bd29f7ba4c4aa9a82f85b912693ae4e6a
diff --git a/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild
new file mode 100644
index 000000000000..4743a96659a5
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.66.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 ~ppc64 ~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/kitemmodels-${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 79e3af9d67c6..112738a32a0d 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,2 +1,3 @@
 DIST user-manager-5.17.5.tar.xz 2163828 BLAKE2B c5587a7afd748d75e9c9f679a8c3b99a3ad7c8b392d9dbbb45b78d9cda48ace69cf03d2aedbbf7b92fad8e20864d6fd7e94278da241a72cfe87c9c2b9dbc815a SHA512 34aa3ace5ba19e602b202bfc4cd1573423a122980e5d6d2815693e709b938e90816de6d12c4e53d97cd1c8e9d1dfa796558fc2afec6bca6767f1da4b5b365989
 DIST user-manager-5.18.4.1.tar.xz 2165976 BLAKE2B 98514820a581ff9c502e314af9a681b5bf13f7373eb45bab6a94fc387523368281d6ea423d34b12b1748ec87641d216633a71a4b167f2c9a96c6db7a4fbbd3f6 SHA512 fc05602587bfcd8df80bd7bd96de8160e60389aa9e829ad4666706ca5a61ae4f9e282de4fdc42f5245e51ae2ed877053379c6047f7cab7590c56cb02bcde836d
+DIST user-manager-5.18.5.tar.xz 2165888 BLAKE2B 011f40ce9cf18b9bc35c33ed56de416eca8ca6320f07ab725631ec335d58c2103425326c2c2e7d95385e0a70eda4b59419284dfe1d48259da45dfdc4dc04ba08 SHA512 fd3f26f1f95782e4e2ca04e92adc38953d026db9e840f823be38f66f9c790a9e154255dd821358f62c624194be8b4867354292df25289092ceaf87ce590cc9a8
diff --git a/kde-plasma/user-manager/user-manager-5.18.5.ebuild b/kde-plasma/user-manager/user-manager-5.18.5.ebuild
new file mode 100644
index 000000000000..aae7f47b293e
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.18.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.66.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 ~ppc64 ~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/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 00b95d527246..ada59b997649 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,2 +1,3 @@
 DIST xdg-desktop-portal-kde-5.17.5.tar.xz 62912 BLAKE2B cc108a943c925c0943a4a391b4c00619d734837106c617d8dc12a21e890707dbd1aaace11dfa2ecd9b9a32a08dfba57b3baf1e7b33dec481a15e0fcc9f1abaf1 SHA512 b5a82d6744e49d2f6edb7bef2120f5517216dcbf8681cf50fb5522444f635d6cae17cf499310866e351ef9eaab35d37f604d241451a23fbd5f037e377cfd102c
 DIST xdg-desktop-portal-kde-5.18.4.1.tar.xz 65140 BLAKE2B d28ffc6f278d225e3210034cfdd28eb15fc79ade2588d6cb5b65b27614df3385d590cfbaf9cb798e05ccc23432e05840c07e52e775a678b7c80f444675d74c78 SHA512 c2dd09780211dbfd7aa2d2af7de97aef317aad916db690b6658380b7d576aeb01f35477f976548690a3713568cdf1cafc985277a7921bfa586d5810125be8963
+DIST xdg-desktop-portal-kde-5.18.5.tar.xz 65068 BLAKE2B 0455aafc8e9c0544bbb5df398ca80fa395391d5205e4e1a88a09e0f8bd399bfd5c5d56ef5b2cae8892cd48e4ddaf1c49dd583e04a0157204c646d3833005690f SHA512 2380250e4d159b69a518e6cffc0f9310386683d7d852ac9b5d6c63390ccf95f325197d3a6e27482b17602d0ce7e69bd12262dceaf178ce93a81f7ad6f95d7f6a
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild
new file mode 100644
index 000000000000..9f1a0bbc2194
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.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.66.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 ~ppc64 ~x86"
+IUSE="screencast"
+
+COMMON_DEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/knotifications-${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/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 4e881a236f18..f81f992c6270 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
 DIST plasma-workspace-5.18.4.1.tar.xz 5696208 BLAKE2B 66dcee693d7755c378971f10ca1a0f8a3020c33df688628d8c3298d5a09aa84f0fc12d5cc5e102dc727a838b3a71114a05dddaf17aaef2ea5d48d71119bfc836 SHA512 683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7
+DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
new file mode 100644
index 000000000000..7ef93d8e5aaa
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.66.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"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	>=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
+"
+RDEPEND="${DEPEND}
+	!<kde-plasma/plasma-workspace-5.14.2:5
+	!kde-plasma/xembed-sni-proxy:0
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
+		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
+}