kde-plasma: Add KDE Plasma 5.18.4.1

Closes: https://bugs.gentoo.org/715884
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

95 files changed, 2781 insertions, 0 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index eb7629cb174e..bb75ee4bb4ef 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.3.tar.xz 167432 BLAKE2B 56754aa1e83c85d1792b8c86e4f937f3c915c50b44f213d35c7a336ee28757ef319217905d50d70fb89c5e45f27777664fec6f46af99b731621c67778cad1514 SHA512 d8c6b43eb62ab8e72b97d0288fdab26f159eae770cfdd5e1235fbfd46273b0d83ca886af434c143413527680b1b8cb76960671165354d0540b4b0a4322e90e30
+DIST bluedevil-5.18.4.1.tar.xz 167832 BLAKE2B 20536738dd5d7480117a4f6bdeea0a0899691b0ea368c735f2c2339fb6373c709466742d7f9fbf9f4eef2b336acab1be117069116c581ec3c653f9e42820dc85 SHA512 dbefd648e525b4dc15dad77748e27726bcdd4790d9a12b57cbcb878c45a8bba25d94e49f68fcf28fb77e41e95a26d0bfb00c1c7faf3983197ff500f462ae2c2d
diff --git a/kde-plasma/bluedevil/bluedevil-5.18.4.1.ebuild b/kde-plasma/bluedevil/bluedevil-5.18.4.1.ebuild
new file mode 100644
index 000000000000..dd47c0e87222
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.18.4.1.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 9479fa6fb7ae..1d069ed00579 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.3.tar.xz 3159336 BLAKE2B c97b820b0256f5c12d5c2d8e018165b5ee1a4ac9699df33cb644bcd8a0be39ca2cba97afe6d8a1b31b60d19b018e18bd1c0b3b3c34c6426b7abb5e17ad7f13a4 SHA512 496a9f44cd26b7932578398339af64be4fb7d69b194de110dd60b65e36335cfa2efdd3975f04d3ddecd01928e1d375bbf78b153710cab3824799d4d937247d28
+DIST breeze-grub-5.18.4.1.tar.xz 3145304 BLAKE2B a8612b786dae75af378700dcfe13ad91108d8bd80d4f1b1f714903828d84b92df00e7b83a73973e964554dd34c3433071b1208ce74d24592450d211f531b39a6 SHA512 1b170cc767f6d2178db4713d4ce68d61d9462ae2deda633b1afb3973e37cb16e156a012c94c98853855ef82d1087b4f95c0f0f0480b7b38a876e8bf3eedc762a
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.18.4.1.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.18.4.1.ebuild
new file mode 100644
index 000000000000..6ba651f29041
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.18.4.1.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 282603c2625c..7ea3c2326d79 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.3.tar.xz 42324 BLAKE2B 7e45f21f8be93269796569bb46b97d5c478e0dd5d662c35f1892200b1fb36d72a7e66e13d933903096e251b69956a1406d103c87db2021f6de2e1ebb5655cd16 SHA512 adabcfba59970b36830fe9a1060517c17fdb233e849fceaecd7b64a98171996c21ff2d3cbea711d2a4377e116a66b2ae9894bade5cade8b3a36f3cb21f3bcabb
+DIST breeze-gtk-5.18.4.1.tar.xz 42364 BLAKE2B 64186148c283526b7a779aa3059c29df94a5b67490a249c61f5fafdf0cfb4d808565efbf5699614f9c1c16562b440b0a88c6fc2da099bfed9c484e9f1422999f SHA512 c04b7b438dd3f23526627b1c416ff9b29d8cb6d8f27370731ffae9aad53c6554251a36663097d84645597b3cc541fbb80988cad093786a5d497958bd5e9ff57b
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.18.4.1.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.18.4.1.ebuild
new file mode 100644
index 000000000000..da547ee9b70b
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.18.4.1.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 afd9b4950fef..4f2975af6086 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.3.tar.xz 105716 BLAKE2B d434a7138264e603f16fccc02463fce1ca522d499a8b0dde8b2b95476b3d8bdd23d17bd8af5a84172129fc79d0ebc9fb70ffa8905cc14d0d9db0a52ece5e4240 SHA512 94a0c195ad8a619fd8ac38b41ba33dca9c27b99f8dae6e003a00612404fc2dd72519d7ba968a90f9199546c2fb881538ad9b4b070a9d73fdcfdcba51c18ee9e6
+DIST breeze-plymouth-5.18.4.1.tar.xz 105724 BLAKE2B 76bd038e7a837b420a10804e95639130f626b7896c7f2d6df8f8c53470f48bb3d6118f70c62f1ebfa827ad51f5005217aca91b5af4edbe6b5bab0ed75a3b8719 SHA512 1ef09a2a41c1025643c344555821bf2538198f42e52fbf8e10d69896f2d6cc13c6c394a5b11ea27bd1a8b2d447d024c1dbf6cd00b48ac57e4df2f3c02d4361f7
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.4.1.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.4.1.ebuild
new file mode 100644
index 000000000000..9ac3d9978b8f
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.4.1.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 3ffa27652460..2ee9bf77d30c 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.3.tar.xz 21580488 BLAKE2B 53279a62c6c3aab4cba1e75e823017a7d1ef659b41efa29178f86d8726e7f87f39ef30355466a28606f110f1f83c2a71da61263445f559a5f46d3f8f52d0e6dc SHA512 c17f570469d92414ce034f245dae022fa0a9c383c9ccf595443a6c51b278b2c97ea0480a00ec873aecd871e65f15d62e9e497774eba2d807823ff85b99798d91
+DIST breeze-5.18.4.1.tar.xz 21582908 BLAKE2B 64b6b245facb1a6c6a6d2eb2511aa1c8f02324a017619ab639f0aca5d20f8b70426720a66775d907fef7600d1fdcb30c01852c758d82dc190f9516b7bd94c291 SHA512 41c540c0136dafb35da6abcf84f6d0d9be905599c1448c1efa8a8c61a77a1b0903a11bfd821e26691deeb8aa7e5268e198c9d1846ab1d4c6590fbecc83d75342
diff --git a/kde-plasma/breeze/breeze-5.18.4.1.ebuild b/kde-plasma/breeze/breeze-5.18.4.1.ebuild
new file mode 100644
index 000000000000..84ee6ad4ff97
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.18.4.1.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 869e11d92cb9..82e51d52b2a6 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.3.tar.xz 10473972 BLAKE2B b6966d6bfb3e1caf80969436ea66adf852fd30c598d1db761b8c06e22b6ac9c62c88a197f640c86cd4bf45460777dc1d704966dbbab6b31a031e0320ed0ae546 SHA512 6070465afadf9b249ad632e13f5662b8064355b0fa7cdb39c46cb442e49bbbf953c221c51de70daa0cc4c24eb223a57df88c07a60f2782fc15758dbb5a658ac9
+DIST discover-5.18.4.1.tar.xz 10475044 BLAKE2B 2fd687ec858d172b69226eede7b808b7f8d5ee59a2c2e913d228825c02c21044a316e77daf532bbe00d4f152afedc79a3edccc7b3cb6d2feff1550ecff27be84 SHA512 bcd3d4e0e8452b9f2bcffa7a2779b7c4721c3e013f451a018d231a463c1d374539fe6b4c95377006adb15c31e562fb67cbb203be1f311bde375b67aa76eb8eb9
diff --git a/kde-plasma/discover/discover-5.18.4.1.ebuild b/kde-plasma/discover/discover-5.18.4.1.ebuild
new file mode 100644
index 000000000000..26ac53731bc3
--- /dev/null
+++ b/kde-plasma/discover/discover-5.18.4.1.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 feedback"
+
+# 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
+	feedback? ( dev-libs/kuserfeedback:5 )
+	firmware? ( sys-apps/fwupd )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# we don't need it with PackageKitBackend off
+	ecm_punt_bogus_dep KF5 Archive
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+		-DBUILD_FlatpakBackend=OFF
+		$(cmake_use_find_package feedback KUserFeedback)
+		-DBUILD_FwupdBackend=$(usex firmware)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 0e43cf2e7e21..90c73ab516ab 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.3.tar.xz 747244 BLAKE2B 77deaf90e8964e3178deb6514ecad23940c7b367c860976a2f05b1402a663a4858dcb77af3d27ff31dec72f8aea671163f0e6ef38660c4def1f3b8ca2a108ba6 SHA512 56f5cabe28681f218341aa4900f3dfc61d08bdacb5976ef34460b7663535d34a6e9ae05ff238a83337634b577aca36e795ee39d1968dfc39c7aa9a39c02f7cbc
+DIST drkonqi-5.18.4.1.tar.xz 747700 BLAKE2B 6b17faf284b639e499661346c3f03a77b1d07edf7b03404635f19cb488228e950c7993397c3535b44cd18117f6172bf5a5d30d313ca84199e5663d5b2c4cdab9 SHA512 5d9c7dfbe4687d88ffe43e6676d6dbd04c97816acb4819604ff6ea5a1f9b987834b2831e75281f8fbe6837a42c410a6a595d61e6f2a4b8a9bd6c23b2102ee544
diff --git a/kde-plasma/drkonqi/drkonqi-5.18.4.1.ebuild b/kde-plasma/drkonqi/drkonqi-5.18.4.1.ebuild
new file mode 100644
index 000000000000..4d40370fffc2
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.18.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.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="
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 704477258fe4..45afb339df22 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.3.tar.xz 87184 BLAKE2B a2ea5236a7a4a38f90495f0bcbe67e151280bb565761498164bededcee918a7b714ada06b7f133afc2873450e7cb918dbea0897aa8cd0d16e5fa77be3714fe07 SHA512 99ff54c95aaa2755bf2597ec98f234ee227182f5296560714b593cee63a4968a40223aee126bbd3d4f15ef7dc4d82dd8372822ded3e23255bcd078f3ecab4585
+DIST kactivitymanagerd-5.18.4.1.tar.xz 87080 BLAKE2B 786ef9a9feb811f393bad991a1b652ee854327e3c46378c4c02823dedbb337517b2caad3b64660c9eaf2dbb5804ab800fe758394af8dc926448cfea991ff65a3 SHA512 b3231305643247fa82f267ac942878136f1710faf1fe3b084efad25e8a3fb124ebbab5cf88251dd54d8e8bbbf3ac31088b25bf8047307adef95b5d40c8175ee0
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.4.1.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.4.1.ebuild
new file mode 100644
index 000000000000..f8a7ec97097d
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.4.1.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="
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 78b58acd8e2e..b3418941b006 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.3.tar.xz 594208 BLAKE2B 4dead525f0bc82c7037cfc2245dbd8bf0a49b26b66c91f5705dba2fe0577b65cadb8d4a74f898408b8b93f39452aa53c0e6e242043f651666f982f1ac10f4ef1 SHA512 66128d713a9dfe649d8a7e3f5969e60b2030ec9ce1d07076af537861d848c45eec987b1c64419158785c97f898929e82eb281dcb245b08ee3cbf0f3b02797823
+DIST kde-cli-tools-5.18.4.1.tar.xz 591952 BLAKE2B 29a3814dea8bca3ea48018670ce0fa8c89640ff3ac699f9fac0b0904a65f1695716ccb1803250c8c5bfafd05403f327535a649f9b6ac956d0e59e7eed057ead8 SHA512 9cf32f4b87b1cf45f9e034c9929ed38a39de989c36cc0118d4f544fbb9ceb4b9419d2d518165a1c2d0b0dca4ec20f063f771dad4859bb6df1975afaa6388412e
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.4.1.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.4.1.ebuild
new file mode 100644
index 000000000000..3010997fe7fa
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.4.1.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 ce523fa345e3..4c068619e627 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.3.tar.xz 23644 BLAKE2B 6edba447a97fad624e08582dc38425fb8d3ca0a614b572fecf899d0db2ac2864f915ff4a9b10abf3a3f8541ba37329034b4f09071f6df1dffc687a68dd0c241e SHA512 eb722da6041de041a9c3bfbe69374193d65fc16302bea423ab01eb9b9abbca74a8a04b6a3c181ec8f95783c54d6097886572327bc9458f32d6a53711dbc024c7
+DIST kde-gtk-config-5.18.4.1.tar.xz 24644 BLAKE2B 030ee2e1759d01a35a00a70eea00489c0ee9e80beb02e21fd826f40656de164941347d731c1c464a132e0fb4916bf867176078392561fc98215db90b83d97eef SHA512 9a6ba26c4d0b4936fcdc8a32a8d0e48294757a3315de38bba64bbeaed2d23a0ccf117d54208af502f30e5d5878a4a925a84c061adf23741d5f64db539efa2737
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.4.1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.4.1.ebuild
new file mode 100644
index 000000000000..1cdc9e44ed17
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.4.1.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 af77ca9378f0..3eb92aa9d934 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.3.tar.xz 43900 BLAKE2B 742875d268f0b95d39bcbbf19cd5b77cde23db9f9366e84ef9510e12a46b0c9a34ee8e347d9e25427ddbae03a4371574dfe24da5805751a45aad395a72e966d0 SHA512 607abf1a66260f7855545ea75ad6a7fcc402f2b8f3defa63d17c2601953465a60907b40fa6427fc11e8362e7dbfe7c3dbb1d7519489872c75c47e4f8c0b58d47
+DIST kdecoration-5.18.4.1.tar.xz 43848 BLAKE2B 27efcf97057158aa452732e62f99d3c85f27a3dcc1bd07ae0166e6b6b92de5b835a8e538fbed7a935e1cbcabe94af5181bc1cc3d631289382a8cba1fb2b5e8c4 SHA512 32ba5c14b8b11a9874131405f0cddcec8eec634afd016cb8454a0247ccef55a8411a718e1d3eccc5f23efedafa0a1d32a62e0dc9b20ce9133a09e23f4c6739e1
diff --git a/kde-plasma/kdecoration/kdecoration-5.18.4.1.ebuild b/kde-plasma/kdecoration/kdecoration-5.18.4.1.ebuild
new file mode 100644
index 000000000000..0bf22cdaf7e0
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.18.4.1.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 cb9bfd76993e..53da5225f138 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.3.tar.xz 615672 BLAKE2B df585aeec0e1197d539a9f6aa96e6b0f6d50e96e577dbd9c2ea3cfcba24d7dc3b346c2ea7c18ad68db282638b9101903c066e9c6fbb09f7f167c09258048f3c9 SHA512 6e2e4ea22099198de39b24292d906f50a54bff43f5c5d2dbda7229ab9ca9186a1d8a5b5fb13b48d2d5d1d2687c69bfc8189f86957c1b61a5fac10e45488f6ddd
+DIST kdeplasma-addons-5.18.4.1.tar.xz 615120 BLAKE2B 7a25ae1089347f56ea1d982263373ea677c0103df7fdf24eaf2470b82b6054b419b015bd383adb629e70d37f2f7924a53a91e30314909ac16358adaee8da278f SHA512 1ec38e56b132e1d774973d2a8a758bfc88de01c96a11e95507bfebb4c5fcce35c6f9e446fabf5e9754678232d31ee95d8470340f7d5c861960ceca81b20b45ee
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.4.1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.4.1.ebuild
new file mode 100644
index 000000000000..18a7b7492842
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.4.1.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 ab2e8174d7d3..fa7ea71593a5 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.3.tar.xz 80736 BLAKE2B 5c455b24676fd377f6b1f806dfccdadd529dc6bb1fe27ee7ed4e20b25241730c11189023bc67a62e789fd1447cb08ef5c1f1936db85a7819639b6334f2077ee6 SHA512 ccfff99df665b13b61752378e4fa5d1c3dbdc7cf0f7c24c8556404be6a6ec64583ac1243fce2ac9517143a6d52e203d78151dd96705682e8121cffa2d13951a5
+DIST kgamma5-5.18.4.1.tar.xz 80804 BLAKE2B 88c8cc46844639d8e5ad7d3554ea8436dc02698f79fd3fc9979904d4fdfecb36de23201ac611d14c2c445ec1ee502b1e0a676d906611c6d5891adb64034c0f02 SHA512 5ad1154a84568d0cfa7640f028f9059e5b9f09f1104990ef21d06fb7fdc3d74ba7c6fafcaaff7b4f303682bf521f10db76849b131f9a020a2b8d354b5e1160a5
diff --git a/kde-plasma/kgamma/kgamma-5.18.4.1.ebuild b/kde-plasma/kgamma/kgamma-5.18.4.1.ebuild
new file mode 100644
index 000000000000..afd05d6c3b4f
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.18.4.1.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 e9ce5cf6e10d..5b3c89f232e8 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.3.tar.xz 1856608 BLAKE2B bd68a6b2d734c7a20507e780dadc4d321f59406e03cef35f1722d8edbb5c2d54ad98672c53e932dd5aff8b76ec8ebcbb60f71862c572818f3f483c17b6a10ce8 SHA512 874f21eb10f6297c7defef6e646947afbfa8e07b695e734dffcfb36484ecec757f20e5cb1d7c080834d869c71d10d5ce64c9e05b6d5078ce3ed651a0989a2811
+DIST khotkeys-5.18.4.1.tar.xz 1854956 BLAKE2B ccfb3c556f8a29de9b049ae54aa06ae46f2da6d6efdf714ba256831a8d6f45335d8b8a1a5c044a3cd83e5b8f7781cd4e570b74a180dd6e860b3b241aa0d9bb50 SHA512 9c290c75caf175e66b69f182cb81348d0926b03dd569533dd6da380c299d416fd42f06d6c18fc6791c913e31f955c9adc98c20215442d7d93561b9bdb278e36d
diff --git a/kde-plasma/khotkeys/khotkeys-5.18.4.1.ebuild b/kde-plasma/khotkeys/khotkeys-5.18.4.1.ebuild
new file mode 100644
index 000000000000..9259113b2f86
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.18.4.1.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 4957c0db092d..afe8967edd86 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.3.tar.xz 1255376 BLAKE2B c82a0311a8254b76f262c6f944271ed3b315fe25586177e135f360cbf1564aa2647df1dba1c36f84e5fe1c5b07815c961c63b467b046ef2d24e6252917c6aa83 SHA512 e91dc288079dad21191591f14295c8f16c625fa34461690562d8354e82c98824d8d3dbc4c0665a861d9133dc5aa76391cba148dcde4780ead90f02f01f39bace
+DIST kinfocenter-5.18.4.1.tar.xz 1256192 BLAKE2B 629e89033d767ad15dbdaa69d5e11fd3b171b1db34af84ab0a3192ece4bc5537a7ad0e1d88e0f238432ea3d643b28401fde04738243c4f94bf1d23a9ec27b85c SHA512 6b7c5c4c755afdc3c04ca15f6a958cf541d33b03c731fa77a5cf99fa015d0e35a00016ab7f21b6b1f30afd7c423dc4fdde03557645b040d325509a6ae8c44dcb
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.18.4.1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.18.4.1.ebuild
new file mode 100644
index 000000000000..67953111aef8
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.18.4.1.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 ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+
+BDEPEND=">=dev-util/cmake-3.14.3"
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	x11-libs/libX11
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		>=dev-qt/qtgui-${QTMIN}:5[gles2=]
+		media-libs/mesa[gles2?,X(+)]
+		!gles2? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		>=kde-frameworks/kwayland-${KFMIN}:5
+		media-libs/mesa[egl]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-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]"; 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 a58c62d8b96c..f87c35549f7c 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.3.tar.xz 814264 BLAKE2B df804b61d32ba3365457d6316920fbd34395bb98b6d0fe085baf1da34c0db001763e1d03b662b1c19f2daba946f5f6b35f44e90feba25c26a25c60b540dfbdcf SHA512 9ff340ea66f0b316412df26de55e86778987a9bb20291246cb8414dc5f6643df693927ac2a765dc3c9e2e5072e3b17e986959859707f09c45156c8cbac173fd5
+DIST kmenuedit-5.18.4.1.tar.xz 814100 BLAKE2B 8b113364e67aa2e7c6d70e69b34d0bd245b0d937162613d6daba76a7637d1ea24e49cef3a3e71e6fec5d7c66a6590785dbbffcf9047c6dbf44f966a4b2f4a8fa SHA512 6a4e45a8c97de0badea82d70ec1085b3b34c06fd11723dd024263e966bbbbae5cfc4c42dfe217f79e59d84723c418f7146f0dee55ace0fbb77645714731f4a49
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.18.4.1.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.18.4.1.ebuild
new file mode 100644
index 000000000000..7ad3a0f55a07
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.18.4.1.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 b913f5f0d330..6ec3883565ed 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.3.tar.xz 113248 BLAKE2B a4e558dc0bce2abd9d81cd121cbba76d56309662603ffb1971fd5d633a4740f96a6c18828d8aeea39440bccd0066978ae16367e1d0fa423f58b73e32298db409 SHA512 61506208ba49e517aedea8b1ead27599c906f56d86f72cde1df24772dd8ebab0c683ab844d4700ce8eee9ced6a139d067e6ceb3d0d442c6f4b321252efebd294
+DIST kscreen-5.18.4.1.tar.xz 113152 BLAKE2B 18bd46ada9faaae029b86d383a1c6cd613f50632129746d4a63cc0b6947fb1b843112fd57554ebd3d4f8dc71c44e4d89bddb1066ba7f8a54c4d190351f670023 SHA512 8c0b7f493dd73d2d79955b3836db2cbcf46bb9f73284ce362e5062ae7c54f2e1a7f01bd91c6bb846ac3bbe3bef5a2e92df52f29e84e7dc5bad438a6a9ae94798
diff --git a/kde-plasma/kscreen/kscreen-5.18.4.1.ebuild b/kde-plasma/kscreen/kscreen-5.18.4.1.ebuild
new file mode 100644
index 000000000000..9ac37b817e10
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.18.4.1.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 eb31d58335d9..e0f6dec99754 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.3.tar.xz 125316 BLAKE2B 312d24dc746292ae6487443312efeffaca8903e1fab5ed898c5b9d8fc5588729723116f62ac2280f8e8ebdb45ec78e720a02b535556eb7c28a446caa447d5bfa SHA512 bb7fbf9c42a4fbe970c4953b0a64d95d45c5c1519db21e80907a95d2415b68b8c135f1f0368b9663bd4162cbbe507688f72293f4c7f0c9ed60cc7c222c31b098
+DIST kscreenlocker-5.18.4.1.tar.xz 125164 BLAKE2B 634eb53bad17df283c0e44258660f6b066f7dc70cab6f402d861a9d76e4880d9ee206ffc86630122fb0fc7bc6694b0f639cc85398dfb3c7260924245078d5493 SHA512 f58e46b6b86ab49f458ca00604655369755d51b54e7f97ad1f640d4fa51bab5d904ee26c0981a2252ee4edff3063a40f5792b860cd39d19f3db8ba93ec9aed5b
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.18.4.1.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.18.4.1.ebuild
new file mode 100644
index 000000000000..5e66c8cd5e94
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.18.4.1.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 fbf2e8076b08..ce1532612eb8 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.3.tar.xz 22268 BLAKE2B d2b181ff1303c2c936ca76956b36d02fcde601c0239ca05928238676a7f0f992f9ec5e0234f923f2a9b9b53d03f6fb5d9a6bf690ad252c37f97eedde82e91ef6 SHA512 af17ddb2950b0278c3fc6504ac4c40a20952d7748232545fadacb5ca6729b4f8c5e2b69592e1e28e5c57bd00cd6fab31c655cc2d35f8cd143965a836b2100d8a
+DIST ksshaskpass-5.18.4.1.tar.xz 22228 BLAKE2B 09ef6d7135c68284a4a36ee81c55a15190c372dc77e2c332ec88383684d8ae14603a1109da800279a6f3b71602b3de65f211cfda92b0eaeadaec85422dfaf11e SHA512 42d3615b631b225a455c939a72a0a1cd1766c7baa7bf9396b4509c880f37784beddaf2596d124362d9720901bad776aaf6b248ccf8b53e0691d74c948272c952
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.18.4.1.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.18.4.1.ebuild
new file mode 100644
index 000000000000..cf1f23b87d8f
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.18.4.1.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 6f785f22f46e..30ac62f92197 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.3.tar.xz 517000 BLAKE2B 2d8b7496797eb21e848453bfaef0242d9ed5ee352a71460f816d4da3681b41645457a1ebdd1ad64f341eb767f50ffcd98b3fca61bdbc7c5dadb4c1480d09edfa SHA512 db4c9f9ebe17621fad0326504bab88928d417f58bdf6fff2644eb1c446be1c2d2386a4668029905e79021d3c2bb2ba450e686356094ab9af024d892584498993
+DIST ksysguard-5.18.4.1.tar.xz 517548 BLAKE2B 1e7b8c4ac809c5625226137d546e58f6ad1e13ffec9266a9d4ea88294a877ae0506ff4d11c6e8165beaa2c923d235fb4b4793ad7ee6b51a2dd14d23f5cff71b8 SHA512 2c2bb6596987effe558eeafe855a4914186da815a7688b68c75bf44daa29e5153b0cae4b2692f780fe2001042dbb12568e3c708b711c179f93fb7110f50dc696
diff --git a/kde-plasma/ksysguard/ksysguard-5.18.4.1.ebuild b/kde-plasma/ksysguard/ksysguard-5.18.4.1.ebuild
new file mode 100644
index 000000000000..a15e75cfb1d7
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.18.4.1.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 2fbbbe8aa16f..88cdf0e0dcd0 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.3.tar.xz 19840 BLAKE2B 582f1c447dcb6f3d75904a85a56173541f9731356b356d1c434f6a7d3529fcf3f35adea928514bc7fbfe9068286dc0a58279b7a44bca8ca0807fa2d885fcd379 SHA512 dde5a6570f1d0e72cea6ce63491ddacd0b639cbcbb3fe90c4d3d26f8119a3597ae3fca889e179177bedd9cf4370190a8853bfcb5697430e417863570e92274e1
+DIST kwallet-pam-5.18.4.1.tar.xz 19840 BLAKE2B d5d6879b6fe71098eb92ca34a1c11424d590c7ff000f8b476b666fdd2ff09767aa3489ea9038d92375073815a42a73d08984851823f798099ae874f563a4536b SHA512 7be9fe57d29e3f03344cd477902c3d5ce9c19223645d1536502dbe2d6f74c0aede4435c997e6f9880bd3b44b865ee95579e64f73485dc6b6305143da44877b67
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.18.4.1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.18.4.1.ebuild
new file mode 100644
index 000000000000..849263d4d766
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.18.4.1.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 407ae8cd21c1..eecca93de9e8 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.3.tar.xz 20560 BLAKE2B 71ec1528519bbd72c7d5c28f55749a8fc7671e02217d559c6950290bb2c2cae711a210d0fa2d7b05845349ae0ade31694f346045fd7e2d3d85d784440e49ad2f SHA512 baac7935a55d93a114aa0edc8e0b203d99206f00718aac41be218c11b8291ee441f400bb04fd3dd3dcbb938a7f1aaa61d3ea5ddd306b478f7d78f6575557866c
+DIST kwayland-integration-5.18.4.1.tar.xz 20504 BLAKE2B f19f2c65d51f92bb23f8495d5775b4eec23e7eca69afcb7ddd9699817c6241ce8cd03ff9a34110c28cd6c76c19514c03a39d3878feae3dc656ba8203bde060d8 SHA512 0ed673ad47091d946aca199d7e28db4ccac0b7274b2e5c774765cc8d6f9e91dc531bbffc50c448947cd144ad8c0766d7efc4b31826b7bf250bcbe9c9844a22fd
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.18.4.1.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.18.4.1.ebuild
new file mode 100644
index 000000000000..c23dadc1b568
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.18.4.1.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 cdbd61520dea..01ebbc2d3e76 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.3.tar.xz 6277796 BLAKE2B 36c8e83ca49bc7fd87636f7b864e7df7ef3f1678d57b2448f6689db59b9f2b23569690734c27a9969aaa6593110eec412627e5c30db7e3b3487781f2a7efb814 SHA512 2eda8f94e095b9941e528e05c9c5720d213eae97c46ff5caff673a94ba4e20826f97a32d53704b422875d26be8eb38101a17ae99b726067dd89c7c62fbaf0bff
+DIST kwin-5.18.4.1.tar.xz 6274296 BLAKE2B 78237c01e2b21645158a2d9aa48ebc495dac1fd605b8ff4914f5e3b5167fdc9a5664988fbcbf1245e4dc7ccb7d11307fc42f0b17bd3a17e7994c40c505428c63 SHA512 5e2ef7a8bd2969121d560e6558791298d8506d1af4c67aca8e6d2377af76e10b8e6ee32f116911a85352a74195a1cbd6dd4d40054f1796ff4b54b1e5418a5772
diff --git a/kde-plasma/kwin/kwin-5.18.4.1.ebuild b/kde-plasma/kwin/kwin-5.18.4.1.ebuild
new file mode 100644
index 000000000000..76f48ca9b6f7
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.18.4.1.ebuild
@@ -0,0 +1,110 @@
+# 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 multimedia"
+
+COMMON_DEPEND="
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5=
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2=]
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-libs/libinput-1.9
+	>=dev-libs/wayland-1.2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libepoxy
+	media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
+	virtual/libudev:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libdrm
+	>=x11-libs/libxcb-1.10
+	>=x11-libs/libxkbcommon-0.7.0
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	caps? ( sys-libs/libcap )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+RESTRICT+=" test"
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+
+	# Access violations, bug #640432
+	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package caps Libcap)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 2d27567ee4b9..b31b462a90bb 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.3.tar.xz 20212 BLAKE2B ee2d0d2326170d67dd2d2e8e60cd75b9d6991583565e8971ed3df65eaa7775e5bc387fb0a123012927e5677932bd847d50c06fdde11c7b1b52e4bb66b83f6c90 SHA512 4029182606e8e2eea71fc70f912d6043f39654762c6bf7676d6f5b3e9c3633ae885f1de8d31e124e882d96e0bb824d00d94523982f238377eb7db293c41bdc36
+DIST kwrited-5.18.4.1.tar.xz 20272 BLAKE2B 4371be0024e8ab04677c52aef1a5c3faefc9dc2a2d456c309c633f25ce1b29046fb1fac88a08df21dd1f9fa06eb6b768bc8ab923c89b46dde37ff4f16fb45936 SHA512 5a9e793821d7f1178aca890429ad581717ae7c5503c3464d42c611e02f20a0df61a4f97bd944d1774b779910f0678fac4b010968fc20e050786dab5584597ed8
diff --git a/kde-plasma/kwrited/kwrited-5.18.4.1.ebuild b/kde-plasma/kwrited/kwrited-5.18.4.1.ebuild
new file mode 100644
index 000000000000..2582c33d16b5
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.18.4.1.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 9cf6999c2012..61179de51a0c 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.3.tar.xz 85424 BLAKE2B 00e462e49a385950eb3af52674719448053f01c6347e7914ce44a26c4e56c37d9d1f57e6d9a29e30dc0f90063ee504c22862c724e44901965fdffb5ca6052cec SHA512 d1e034067c95da830f056186f275c3daf74a9bac9e4903d3837f03c5d98f79e0cdf888d937efa0d700a2e316c49f1cfc9bdeacc8ca1b06eba2f52ff09784601f
+DIST libkscreen-5.18.4.1.tar.xz 85504 BLAKE2B 569295f9e9fb65388b3e8f4824fac2f5e8d34dcb371831601da6eaa7d971069752f370e1fbf750ba29263de7e8281b5574ab34959d37633fde7da386009ead8d SHA512 73e5d105701d11f1bbe403034614d89a6aab3e4f47d949633e2104c590c62a4e89e7643558056d45d16e43d326c52a950024b84f184dd86fff9cfd57f37efa43
diff --git a/kde-plasma/libkscreen/libkscreen-5.18.4.1.ebuild b/kde-plasma/libkscreen/libkscreen-5.18.4.1.ebuild
new file mode 100644
index 000000000000..7a118f7c046c
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.18.4.1.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="
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
+
+# requires running session
+RESTRICT+=" test"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index dab06bff1d1d..361f2bd35506 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.3.tar.xz 612472 BLAKE2B c9663d744d4ef08665a4e20ab595c02049316dff5bdd9573bf0c78c1a36e9a01b41a9757be09e27dff6effe45e8b546c24e7a1ff3dedc28704e1359fe3cdab0d SHA512 7e7e4971008407d763f58260fb06d91eff58aad4380358bda61572b5d8e55bbddcff5155bd1f40f7f8463874013957f7aa7f3a17dcfe2b47f911302218226cd5
+DIST libksysguard-5.18.4.1.tar.xz 610492 BLAKE2B 33621edf25b7d2a3badac5662895bc3ba8009303db4d4146a679b8da935cf938b53916247cb9af2a499b6866ba0b6a929465e87c8d7e8c8635024b2bf8e6c82e SHA512 4407bb15ca4e1e70f8c082ba11c25b4855330ca54fea15c900610245e2966bf2eeebbb6d5ea94bc0627df869363837660bfcca0a88fbfec9cc2ca43e0b635cd8
diff --git a/kde-plasma/libksysguard/libksysguard-5.18.4.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.18.4.1.ebuild
new file mode 100644
index 000000000000..9091b15ca791
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.18.4.1.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"
+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 8b1dc7810827..72eb1691cf6c 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.3.tar.xz 5692500 BLAKE2B a8b6de136b64111b51c8f96dada75f19933745285edb6996fd5c87de02f44c24b8df53b43aa19e411d578c705dce36af2e741a8dd10cd153837a37fa0ff57b1e SHA512 a0acc751e47f6b10753a41009e2b8d99bd901cbf667ce61fec04175c12d877f8dd3fe4a7f3d8f3ca18e126b72a00a59aed1edc33bc542e6e69fdf97af44eae1e
+DIST plasma-workspace-5.18.4.1.tar.xz 5696208 BLAKE2B 66dcee693d7755c378971f10ca1a0f8a3020c33df688628d8c3298d5a09aa84f0fc12d5cc5e102dc727a838b3a71114a05dddaf17aaef2ea5d48d71119bfc836 SHA512 683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.4.1.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.18.4.1.ebuild
new file mode 100644
index 000000000000..1602010c63a9
--- /dev/null
+++ b/kde-plasma/libkworkspace/libkworkspace-5.18.4.1.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="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+"
+DEPEND="${COMMON_DEPEND}
+	>=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 a8542e4c081f..d9a35ea1da79 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.3.tar.xz 64428 BLAKE2B f70a9af2cce5d355abba9c8670b34872af58906f12dd17170f292bdb9902fd1c3c47f8685b00d4381421ed1eefc596935566b5320c5b49469fdd493eebc4e1c6 SHA512 db82ef379714d7e678dea901a77dcfba986d2b27e0168ecdc44875c612eff6cebd63521916a0a4c23daf855c5bee5c75e96a8700d28b7ae87940aacc28f2d913
+DIST milou-5.18.4.1.tar.xz 64316 BLAKE2B b3d39253d32f74a34920296a26f3279530a91eb31934a9aa2d2dc20467612717e9422c782a5c1a4fe0fbd693ad50ad25c26a14647b44c4a30c3465b1a15aa104 SHA512 812b1ac049c7af9cf625e1203cbb9ae0e36a99ac3b89781f4e007974dca460cbf9e866b3773a2117261bd845d4a7c65f70860b45e54b6b87124695c011a3e51e
diff --git a/kde-plasma/milou/milou-5.18.4.1.ebuild b/kde-plasma/milou/milou-5.18.4.1.ebuild
new file mode 100644
index 000000000000..3f9556f47b21
--- /dev/null
+++ b/kde-plasma/milou/milou-5.18.4.1.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 af97c9f5e7ba..0b0b35e05a99 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.3.tar.xz 4466788 BLAKE2B 9dd9407e3e6e0b18050a00aa4bafa00d9320a967565160c32051ce1fa84fab62b048ac7bd583d76e3b190f5db609a82cee5947711336f3e7925ec0fe8aec91b3 SHA512 25cbace24d143cbbf9608722db2cfe68453be69fd14e2bbb218461ace435d6d0a186fd5cf896b4095c1a756e2e1d5086b5b2f48c27fc9f88954414124deda52f
+DIST oxygen-5.18.4.1.tar.xz 4470196 BLAKE2B ec89d581d70ba5d860a366068698725d27b94d2e20ae001f1e45e5461fcd637be16fcff98bb550e878a20e9ede94cdd2af4228262e0dd130e2eef1b13803ef00 SHA512 b6804c0ff7b2234603c6e9d0e9957b8eb5b44b663aa427571a841b7ee421c7e95da2213afb4d956390c5a87828a530a13aecf7f86be63c0f56410259771c516d
diff --git a/kde-plasma/oxygen/oxygen-5.18.4.1.ebuild b/kde-plasma/oxygen/oxygen-5.18.4.1.ebuild
new file mode 100644
index 000000000000..4c77767f6b20
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.18.4.1.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 77df0e7e8bcf..39f6ff525e12 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.3.tar.xz 155256 BLAKE2B 46de7a8a3ba532f6e7e5d2b653de700fcb722d24286d81a09f2ec12159362e401a007b13bb02ec4efcfcd2e8da14e8cb2b7aaee08256f149b4d720333de214cc SHA512 25f63cd8b5131704d869df67e674cc77dfe7a35a41599e84204fb2dc8617f0d48fe1206d400117eea32bc05d468baa353b927f7713333431071ba145d66dd84d
+DIST plasma-browser-integration-5.18.4.1.tar.xz 156100 BLAKE2B 9112099cab87c0f6b89640db2f65b7f9b2122d33e6d59e7ad1a6fdffba98450c2f863708d79c4233853cc332b5b14f03057ce23b1845a3882c494716c4156a83 SHA512 05fcc78f68a029862daaae816d2c95a14b7b3133c9ea00cfad7cac32337a6b1642b15f23313dec665686c928f0405d18cafa20b06d16afa1ae8ce752d74e9066
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.4.1.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.4.1.ebuild
new file mode 100644
index 000000000000..4d2d15d9ea73
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.4.1.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 5cac2b62d0f7..9c148e1264c4 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4
 DIST plasma-desktop-5.18.3.tar.xz 9420840 BLAKE2B 087c1245056a46157c19a861a0f3db4b7f3f64746899249002965d17671689e9ca8e269ec834da7e45828bb9351326f01dd401ebc5b938d9af110382b22f4aee SHA512 50a856af3763cf84977d1b59fe2d42b89d56b07d06ece54fe63b8d971e7731b2cfbbdb13bb3e5e1ca09143d9f0d97ba66f483cab4962088302398bb46880288a
+DIST plasma-desktop-5.18.4.1.tar.xz 9411912 BLAKE2B b34792e3418230fc7a6beabfe595c6873e61e884f7ac8204444ce5785d7e048f2eb145949240ff20a2d8821a3cee4afe4a4200e7b88b015e5906a6f9bbb8f1ef SHA512 4cac140ddca8ce57a6e27cfac2946824db40a0adf9f0a9b6fe6079f9b899f4b145941803d4a0f1c575a27a8c76d6a7e889c3218287a126efedd9e722fa9d7089
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1.ebuild
new file mode 100644
index 000000000000..ac56030389cb
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.4.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.66.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad"
+
+COMMON_DEPEND="
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/krunner-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	media-libs/phonon[qt5(+)]
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbfile
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	ibus? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		app-i18n/ibus
+		dev-libs/glib:2
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	touchpad? ( x11-drivers/xf86-input-synaptics )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+	mouse? (
+		x11-drivers/xf86-input-evdev
+		x11-drivers/xf86-input-libinput
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/oxygen-${PVCUT}:5
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	!<kde-plasma/kdeplasma-addons-5.15.80
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package fontconfig Fontconfig)
+		$(cmake_use_find_package ibus IBus)
+		$(cmake_use_find_package mouse Evdev)
+		$(cmake_use_find_package mouse XorgLibinput)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package touchpad Synaptics)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# needs D-Bus, bug #634166
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index f723e3b3ff06..06dd40b81eff 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.3.tar.xz 57664 BLAKE2B 9e70f6f77f7c5907c3e3408a15bf25c5f5c84a6c1ae831eee2f86c9668fc49bfdac59563cd7a6729007721a635f57ff4096fc0a1a3a57c1d32c49527e999095e SHA512 1df2bc77ade1ff4f3b858f00dd66c4324bc1b9f1f0a10d1b5481f6432666989a7d57f1407528e1cf8e9cb91519393e6c4d320541c4f970958dce77ffc065c976
+DIST plasma-integration-5.18.4.1.tar.xz 57712 BLAKE2B aace5d422e8bf3304ba3f60bec32554b0457cc5c3ac74ce002d7af882b5afe657714a6806dd740ee0333a6cd8a4283f6fa886418886f56bd8f9e745e75f617db SHA512 ebc6080457d1958e2cccc7db25b30443e21759c95c29dc8f72538ec2945f99019ad0598369253ec552c4a77dc49979ef3e1a46da93362a34793c0af6209c5e3d
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.18.4.1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.18.4.1.ebuild
new file mode 100644
index 000000000000..b69100326522
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.18.4.1.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/plasma-meta-5.18.4.1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.4.1.ebuild
new file mode 100644
index 000000000000..93d9b3a3b8d4
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.18.4.1.ebuild
@@ -0,0 +1,111 @@
+# 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 consolekit crypt +desktop-portal discover
++display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam
+plymouth +pm-utils pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
+
+REQUIRED_USE="?? ( consolekit 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} )
+	consolekit? (
+		>=sys-auth/consolekit-1.0.1
+		pm-utils? ( sys-power/pm-utils )
+	)
+	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[consolekit?,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 )
+	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[consolekit?,elogind?,systemd?]
+		qrcode? ( kde-frameworks/prison[qml] )
+	)
+	pam? (
+		>=kde-plasma/kwallet-pam-${PV}:${SLOT}
+		sys-auth/pambase[consolekit?,elogind?,systemd?]
+	)
+	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() {
+	local i selected use_pkg_map=(
+		consolekit:sys-auth/consolekit
+		elogind:sys-auth/elogind
+		systemd:sys-apps/systemd
+	)
+	for i in ${use_pkg_map[@]}; do
+		use ${i%:*} && selected="${i%:*}"
+	done
+	for i in ${use_pkg_map[@]}; do
+		if ! use ${i%:*} && has_version ${i#*:}; then
+			ewarn "An existing installation of ${i#*:} was detected even though"
+			ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}."
+			ewarn "There can only be one session manager at runtime, otherwise random issues"
+			ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf"
+			ewarn "or package.use and remove ${i#*:} before raising bugs."
+			ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+		fi
+	done
+}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index b1640680ccb4..283a5d7d87a5 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.3.tar.xz 826704 BLAKE2B 8cd5894239d4e0b4c04d2c7583e9b44b76104873e8512194bbb8ed73f0945f918d9462af3f4bf8d4f3bc909f03d4be7277de72c8956425bb4ce5d2f58e02b7ad SHA512 d95a908adf92c21b3eea1561cbebbf241540684afdf3e54c74a7fc6a5198f2c6a3c944f394fd634503b3b51175c65a93a012a9da72712dbe08964ab128a92eca
+DIST plasma-nm-5.18.4.1.tar.xz 827428 BLAKE2B bb9459ac0ec599c053a6f3260415790b0d19a42b12ee1ca921c4fc40a73580b99080b3291ad2b01c267d8982fdb53c5850c80a00487acbbef2a3032620fa08c3 SHA512 7534267b7e9507b5963c5226eb375bfff426291761db4bfaa8a9c60e491d296d5aebb6cb2373e75dd10b321e706ccdcdce036f174cfb6c5fb12df218f112228b
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.18.4.1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.18.4.1.ebuild
new file mode 100644
index 000000000000..b54f6222850e
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.18.4.1.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 52b241112c62..c641fbfcee4d 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.3.tar.xz 104812 BLAKE2B 63785082ff28a97854c6f6fd21b84b48478d8363614cf7102c30cf76303cbcab702f79b5bc9178c4954d683643c227da7b75fa6eb05260cbde3795b9ebfd85c4 SHA512 d47a58106a9f6c8dded6478bccfbe1561be2f5239fcbb8d4cb3221a5c5afb4e6c39ed724250e67786a64d01256c6bf276d5b4eb3e1eaec9fc34c0876cda9610f
+DIST plasma-pa-5.18.4.1.tar.xz 104980 BLAKE2B b0833101ff402bd3c7550de1ecd9aafc6f0806239f356166de8ebca9a06b22fab64a21c3599184cc272428bce05aaf81c770236ea61dcffc9ec25fd3049b771c SHA512 877a861b7f3811958f911a082f037916697f148969229ed6d96c2ef7238533726157637548798ca318b5b1ee89cd5ed8f9a66fad2e8cb3e9035a5ee311cae7e3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.18.4.1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.18.4.1.ebuild
new file mode 100644
index 000000000000..8ed54fe8fe1b
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.18.4.1.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 bef76fadcfc6..75c089cb8acb 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.3.tar.xz 263768 BLAKE2B 567d854529b9c74a6e711cc3da2c97720131eded32ba899bf6d52fb5d213732ad8c9ca09eb80bd91ea6799d70a91a27ff81d28939a6a5d306dcd83fcb8bf799b SHA512 ba64d9450f6a26ff7ebafb1d66fd0fe4612be728482bbc178f46ad845988aa53889fd689329e8532e549eb3f412f5347433359fb13386c1dabb6b07d07a7eb3b
+DIST plasma-sdk-5.18.4.1.tar.xz 263144 BLAKE2B 08a3763c8b8d03421d5198334af81f69d337b02cf32cd3f43b720cb42854eb0336e4f953560954e5f174fcedf602adf01d57a2e92488dcadd0a1bdaa42ed3ff0 SHA512 b16c40a1dc22fab179a7f4edc2e9693177c145a65a521da691847da6228c5c5654621171d19f74a6c9aa3d61d76bca9ef9e71b364c32cdd7b2bd47df6f7ee1e4
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.18.4.1.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.18.4.1.ebuild
new file mode 100644
index 000000000000..b3d1a3b9ad45
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.18.4.1.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 a0e2d6ddb187..04ae83d8648f 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.3.tar.xz 50996 BLAKE2B 00e7636a15675cc54f3f2e91d18c2b08587adee53ea38da728a6d504d4fa7342e589542dae5f29690f445a959d535bae2a784f08174378c41791ebe55a056c32 SHA512 0fc0abf69efba6fcae6bb54eab5c4a40517fd3b48ae00a9e53477e6ce2d1ae12eeccfd05f55bb316be27c054a64c24ae01b9d3d543bcc86b753768ba8d0f65d9
+DIST plasma-thunderbolt-5.18.4.1.tar.xz 51028 BLAKE2B 7ed323d456c5bc0d84ef866123555c4bc3440f75c23bb859cbdf5bce861a5c84a5f1657aacf1d0f478cc14b938aa3f5bfde57ca34c22c5c013efeb8d9cd36a9b SHA512 2ae5e65741717f38f343adf3e52de67db29d069b93147236cec6172f03ffcfb64bbbaaed5056987a747feb0c27ec01aaefa954274092f34f709c955f8099b35a
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.4.1.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.4.1.ebuild
new file mode 100644
index 000000000000..03c59fa4845d
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.4.1.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 4f83765ece04..6633d8eb7835 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.3.tar.xz 137008 BLAKE2B 88a8488306e500cf0679670b5da2a26fe6503f160373c175c59afa9945405ef463b15ed5cd41a22cf15039069a959f6ff08b9c806a51ab1fa90fd9d6d666f69e SHA512 aac8ec0bb8e7625d14ca9f359eab1db91417c6d9745067a936bb9e6153d7cfa786a5b15f5e952009faa95155f43810dd85cce0015f41df5b8a11ca401c4be693
+DIST plasma-vault-5.18.4.1.tar.xz 136980 BLAKE2B 7bf83ba0a96eceedf8bb32e6f78cdb3c1d7ad0295708e9a42f5eba0aa63b5e0f151eae8bcf3d7feaeaa552fecd906ca4699e1c62d3e12a8480864ec7323a5104 SHA512 c06bb9129e25396c44a9a7155253ebb18eeefe7d44d3f288b79f3308964ae4dbca9375820c1a5c2f389b46e17f2f3a2cee35e73b5d4a0c23051dcad8dfcff6f0
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.18.4.1.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.18.4.1.ebuild
new file mode 100644
index 000000000000..ae5c9feab2c9
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.18.4.1.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 42e3c4d53dd2..598d4af54709 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.3.tar.xz 37109732 BLAKE2B 052a17baccae066bd69f94db9d0469b7140264ad84402cea956c89fd230d4503fe9c11e17fc1493a8939bf7addef1353889c6f2a3f012b11bde2fd4716441275 SHA512 a491dce77a9ae207b0c38f2f1b66f57afc9569ed42ef61f0c36c242d9918dfd657ef06214957cc8eefcd2d3b6fd49620850d1dd494616b97e7fd5ed583590382
+DIST plasma-workspace-wallpapers-5.18.4.1.tar.xz 37110240 BLAKE2B 2c695d35552192857b2740f1b59bb937fa5cc9495a29404c10a6772427616f50162f2b0d040fe15643483ddbedc7ee37e8420228cec9de4be8d865410ad285c5 SHA512 e3fe98fd4e3265281bda7c223cb086fdc96031421d735df05fb52acca778dba0fa78110810b1c482706cb6e937bc40160130a525ab104b44ed801042ba6d71ca
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.4.1.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.4.1.ebuild
new file mode 100644
index 000000000000..0fe9c7985bde
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.4.1.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 8b1dc7810827..72eb1691cf6c 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.3.tar.xz 5692500 BLAKE2B a8b6de136b64111b51c8f96dada75f19933745285edb6996fd5c87de02f44c24b8df53b43aa19e411d578c705dce36af2e741a8dd10cd153837a37fa0ff57b1e SHA512 a0acc751e47f6b10753a41009e2b8d99bd901cbf667ce61fec04175c12d877f8dd3fe4a7f3d8f3ca18e126b72a00a59aed1edc33bc542e6e69fdf97af44eae1e
+DIST plasma-workspace-5.18.4.1.tar.xz 5696208 BLAKE2B 66dcee693d7755c378971f10ca1a0f8a3020c33df688628d8c3298d5a09aa84f0fc12d5cc5e102dc727a838b3a71114a05dddaf17aaef2ea5d48d71119bfc836 SHA512 683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1.ebuild
new file mode 100644
index 000000000000..86e79d857083
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.4.1.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 feedback geolocation gps qalculate qrcode +semantic-desktop systemd"
+
+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 )
+	feedback? ( dev-libs/kuserfeedback:5 )
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	qalculate? ( sci-libs/libqalculate:= )
+	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	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 feedback KUserFeedback)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package qrcode KF5Prison)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+	)
+
+	use 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 2a2a64ebb0e5..3d9e2deb53a0 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.3.tar.xz 41776 BLAKE2B 30afc47e322d28fa82dbcec2c0c52809eddb4f18bb92b9a9133965b51b4bcd6c58ae813bc9b06c6714741d501fac7697cf31b94afcd8c8431ecb9ef11657c16e SHA512 9b139d0ff4792852dfb3723f29762a22ba9f778a14a7b5ea882784821e733a768f66726987ac045eb4855bc4b6a4aed8fe3360a1fe856e703caf2e58a2c3de6d
+DIST plymouth-kcm-5.18.4.1.tar.xz 41900 BLAKE2B 60f47fcc5413eed65066ab4ad6ac9c3b0e5101f03c71ddd093ceabfafdd356b0f5116518e912487bff01966b673de1ee773d366ec3183c50b22e36e7f3b3567e SHA512 436e9764f8891aa3040d9f80f57ca3f56633508f0bc82b3a995ecfca0e6f27a619daf893f31b64b7bda1ad4e57f9ec3044ec32913283fe2d4218fd62d247bf26
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.4.1.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.4.1.ebuild
new file mode 100644
index 000000000000..f7cc90b1d829
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.4.1.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 6117371a75c3..9be4e80b739f 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.3.tar.xz 44712 BLAKE2B 0bbc2e54c84177df0b498bdeffdc03864f8183afcea23a979014669bf45195b70d43297c9f8b9c3c05c976c2cf4e3670e041f66bac3ef1aaf6f0c1c78f1e6b7f SHA512 d9de6d5966053aa27292cfb610ea188a932bbbdaad83a5c2bc27d254368b64d73031304969a722d17858f9549eefc38869aa232b4722b0df427f1c99a12f46c4
+DIST polkit-kde-agent-1-5.18.4.1.tar.xz 44696 BLAKE2B a098336ddc38a1d8a7cb287ce753789fc1e778e3a247ea5f7f592ce1eea6210c1d1e78b5baaf1df31648c0ec2f402dd40b4591638faf449c75fa425ca9264f1e SHA512 e83c762fce852fb3835e53db8f4940a8b02f06b505f4347027c23171ce6e4cad512b002a0154459c952305f922b8f881b3c0b51ca7b9553d16a78e668deadfe3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.4.1.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.4.1.ebuild
new file mode 100644
index 000000000000..a2677ec86c8c
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.4.1.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 db993e287faf..9d1a0844c245 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.3.tar.xz 598288 BLAKE2B 8b4a8249f0ab981ca503e277341c62c1ddeebb6c132f176a748e3da60781bc9643e48a9c9a2b572ae8964ccd1445b3e2ab2d2848de2f92a7788abadaed674fde SHA512 5a1731ca06acec967c8db5b9a41ac444d8ef4a26b1a9d56defe5c5c2a0d2a49563baa7d7584b96503625ff0fd4e21ea80d35167bec1118e6dc1cbef56e654be5
+DIST powerdevil-5.18.4.1.tar.xz 597368 BLAKE2B 42f200158b0217c69486aec72b32df5edc5594e30fe0db24408a883e5649b6f9808bb4e375ea47fb1d17cee4c314b4a7140d60d6e096a7e6fa04de28449bd5a0 SHA512 b7985f30965cc445cd4426ca9978a721174a3b0c371d69e044cb36edee080a99b3993ad553461e9212158f13a730210a687be2bc1f205722591307cbe87f4c20
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.4.1.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.4.1.ebuild
new file mode 100644
index 000000000000..3f5d960a107e
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.18.4.1.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 5c809130fcc5..9743c8d6e0e7 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.3.tar.xz 62224 BLAKE2B 4adbc243111d320d80119e550b3cde0e35f4c16bee295980ed12877f5d5dd8e21ea1a3d598393f1caa7b20bfa3598e52fe28cd8f89c7d40d9b95762a39daf8f0 SHA512 136aa673463fa9621c026af240115d5a6ddb7826f107e7c138f9549eee98b08576333ff09ea7573bb5ce1d9d8cf8a8b582fe8d627e08a0ee9943bf7badee0233
+DIST sddm-kcm-5.18.4.1.tar.xz 62244 BLAKE2B 92a780c453e6b7d335e080e723624318366273de8adc68c03c7cbb09c455096b753f6daffeb548f9c7289267bdcc83d16ca0eab49c76a4d24f5070150fada05f SHA512 6500b3a721e4f8798fe1e79647beac11ae6d22bb5df1f5c35d815956535e74aadc9c4ffaee72afd99c2f5ea7acefca040185fe1fc106f3e0a7d62f862c8cfdf0
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.18.4.1.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.18.4.1.ebuild
new file mode 100644
index 000000000000..7db29087a931
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.18.4.1.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 9720349fe8d8..f880c949181f 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.3.tar.xz 175732 BLAKE2B 9628784b5055ebce579576a59851248cbc07f191aa810c6f26b1e20b508a1b8b36dd29716639ed2297d1c4d6a17d8b049db36cecc42887c34fd899b08a375c64 SHA512 f3feba2785c7766a48521ee721ac01e51eb8a9de9d3cde484576c6d89c7154eb9f96ca60b2483932e81dba3e24d06c30f82601e1ff702ade6dee9dd9e6f04921
+DIST systemsettings-5.18.4.1.tar.xz 178212 BLAKE2B 63dbb1a41381bc8d60122b1efc4eee27c3922dd665ae014a0d5645f86ee5df45b2c141107db776d0ef32b5fb7d76067b24feae6c33dfd73fae6bce48743a5918 SHA512 07e3658affdf4b65967722a92906a3a017b9217ee7443e57e07d9a7a22753fdbd27840e10dfc3716bf193c155ca2fc0d916fb6320852a352b0d0dcfc07be6ae2
diff --git a/kde-plasma/systemsettings/systemsettings-5.18.4.1.ebuild b/kde-plasma/systemsettings/systemsettings-5.18.4.1.ebuild
new file mode 100644
index 000000000000..2326e50f510a
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.18.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.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/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 911060226b67..2f0e60950d54 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.3.tar.xz 2166016 BLAKE2B 4b3f05e74683911cabb91467d321d82135373f2119b31e2f400295d4393e19fd1244ca72134f93e4cb118e38911313b0d0eeae54654615388ec8884e5eaab034 SHA512 58f816767c8c2802a7da4d95d9a06103bface3b2b28846e19c7967a8b1f941deba0de1476c24d4951d1fa77ea13caa4c9ece9a4a4777c108bedb10390bdbaad7
+DIST user-manager-5.18.4.1.tar.xz 2165976 BLAKE2B 98514820a581ff9c502e314af9a681b5bf13f7373eb45bab6a94fc387523368281d6ea423d34b12b1748ec87641d216633a71a4b167f2c9a96c6db7a4fbbd3f6 SHA512 fc05602587bfcd8df80bd7bd96de8160e60389aa9e829ad4666706ca5a61ae4f9e282de4fdc42f5245e51ae2ed877053379c6047f7cab7590c56cb02bcde836d
diff --git a/kde-plasma/user-manager/user-manager-5.18.4.1.ebuild b/kde-plasma/user-manager/user-manager-5.18.4.1.ebuild
new file mode 100644
index 000000000000..aae7f47b293e
--- /dev/null
+++ b/kde-plasma/user-manager/user-manager-5.18.4.1.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 549f4c3deb8f..bfcb01963e20 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.3.tar.xz 65208 BLAKE2B 52d63e359f79016e4a6a6435ec1857c9eefdef4290d6c39958f3905fd73a201e22edbeceefb738ed445d2dd579f6d468bab2a5f8918e94ac6b88214122cf1753 SHA512 96c12cc9e5ee8787b11e45af7b14633ef119d8076bcf425849d707cee2be49b0cde3166538f4f8c8e01f6d57118282fedc55c81c60827474f8d5867d91a3bccf
+DIST xdg-desktop-portal-kde-5.18.4.1.tar.xz 65140 BLAKE2B d28ffc6f278d225e3210034cfdd28eb15fc79ade2588d6cb5b65b27614df3385d590cfbaf9cb798e05ccc23432e05840c07e52e775a678b7c80f444675d74c78 SHA512 c2dd09780211dbfd7aa2d2af7de97aef317aad916db690b6658380b7d576aeb01f35477f976548690a3713568cdf1cafc985277a7921bfa586d5810125be8963
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.4.1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.4.1.ebuild
new file mode 100644
index 000000000000..9f1a0bbc2194
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.4.1.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 8b1dc7810827..72eb1691cf6c 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.3.tar.xz 5692500 BLAKE2B a8b6de136b64111b51c8f96dada75f19933745285edb6996fd5c87de02f44c24b8df53b43aa19e411d578c705dce36af2e741a8dd10cd153837a37fa0ff57b1e SHA512 a0acc751e47f6b10753a41009e2b8d99bd901cbf667ce61fec04175c12d877f8dd3fe4a7f3d8f3ca18e126b72a00a59aed1edc33bc542e6e69fdf97af44eae1e
+DIST plasma-workspace-5.18.4.1.tar.xz 5696208 BLAKE2B 66dcee693d7755c378971f10ca1a0f8a3020c33df688628d8c3298d5a09aa84f0fc12d5cc5e102dc727a838b3a71114a05dddaf17aaef2ea5d48d71119bfc836 SHA512 683a97a83361149560d866f3d064448a43783c6ea715e9a5e0764ef9ec6dc8bd26e4c7a49023f913b8a649abef39614e5bd3b9e000477949584921c3f1754ab7
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.4.1.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.4.1.ebuild
new file mode 100644
index 000000000000..7ef93d8e5aaa
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.4.1.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"
+}