gentoo resync : 17.02.2021

110 files changed, 3140 insertions, 7 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 75fe10535dad..2aae2afce6e2 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 7281cad815a3..9436e7ae8c79 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,3 +1,5 @@
 DIST bluedevil-5.20.5.tar.xz 158768 BLAKE2B 8204f1c34e64839ef9671e2c285c394c5a3408d0d4e1d11a8f69f0b51cbffaebf7fa3a7aec7f3a5182ab2754e376762ca0cf90ec84e0c146b2c7696d2db372f5 SHA512 768100b8f34e9a4d2cf1f64910ff490f15be04a2aecc241d64e72c4b57954cf1f48be93c640f93f8c455ef69548f26e659f7a4bec88228490b85130ba042328a
+DIST bluedevil-5.21.0.tar.xz 161716 BLAKE2B 41f7fb832df1bdc8dff47e6de83d3e2ea7682ad8c9396c5d0f55b91661f7ed212d7d51018032373dd40150839185825af615b4c764e75b9d0a753ae176a0930e SHA512 f49210f6ad539d5698e26b7fed795b25dbd29d2536b339b34de1bc020ebfff6e6f1f7d8012b949bcc50d62662bc44b3946e740e367b0810498cd4b4ae79e35cf
 EBUILD bluedevil-5.20.5.ebuild 1186 BLAKE2B 7b169cb6e8a4599a2de5976e385acbedbdbd70e4cd21d1bf84cffa0cbfb89163fd5baaf8e41f1b418588c51ce04ed30eb601e63415c4b4ee443114510db49d21 SHA512 a42ed02515a3c4fccd8e61f8e4b652cefdad781b96f5b09ee669f42f49aa35340484c92be3a4c7d5f9b7396f54aa573c1c8503ae85bc11052d7ad53222cca9b4
+EBUILD bluedevil-5.21.0.ebuild 1189 BLAKE2B de1663eb39b8772d69b8afe50c384d25360ecded70aabc74b2ac273c74cd10804cf840d3fe4dd72f366f6f81a1bf237d9b0252dc1ec4c6f9122934220e6f96ed SHA512 4c33bf82562a9f838c506c4ab9e51becb01d7af91b8eb14bee7112a1d56bb9354516bd0d0371a38772ea980e97349cc26959381865c7ff8c13fc844d68a0ba59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.21.0.ebuild b/kde-plasma/bluedevil/bluedevil-5.21.0.ebuild
new file mode 100644
index 000000000000..058498af5f02
--- /dev/null
+++ b/kde-plasma/bluedevil/bluedevil-5.21.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Bluetooth stack for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
+
+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
+	>=kde-frameworks/bluez-qt-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${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
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 5aacd654f5ed..363e4fd9adfa 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-grub-5.20.5.tar.xz 3153036 BLAKE2B 05a09e03e8ddb608566e6c9b1d28f117ee3b17e814baa2125b3636a872230733759ef76ab3030e288cced36d0380ad357983c1a2735600a0c98ac4eaba852251 SHA512 22524d3031689e8dca73833932bd1661fc7e85aedaeb136fc43cb9b72324efeca4c35f08fbd6d28d6c1b8333589b939ea162655173e54568c0ee4e4f1ee5d1c9
+DIST breeze-grub-5.21.0.tar.xz 3149780 BLAKE2B 54de6084916b6bb6301e85ed2b5e8bd8e5083e6f270e69ab7e2dc7b2df1a4a01b6b780b78f9df55a8d19e457cfdadc5e5da2c5624c813bc4f78312140d5321f1 SHA512 60d65e0bfc9d0d6c7b836042216101b5a68603324faced5162dc58fae3fb5184bb7b91da1f52a379ec2dd61c024ecc756441d5c93ab080254311f94455473224
 EBUILD breeze-grub-5.20.5.ebuild 401 BLAKE2B aea7a41c8088bf3f858366719857e1f6ab94258a132e42adf8fe38f0e89cb3d815916a3e6a9821077f1e0c36b9fe2e20159c27ee953be73c211e5ae9f48efeb2 SHA512 8f4eef2d928c524a6001a4693fa083eed4cad3e15a14eb3a37a4b33e34217c5d911439121bb9ef49bc39508a351c97306ac73f0fd557e8526b8eb8ebbd9facf3
+EBUILD breeze-grub-5.21.0.ebuild 404 BLAKE2B 371c8e22792752990a85c1d9b7017bed34d607e55bed1547e0f3a4729ff4d97804240c5fe53f48da2316519da052519f3a175e70c8d23c95292ebb692179cc6f SHA512 447a6adb952a7e43c6fd758404a71a40d30de6d3130808ca6518299b02cb1bf09c2a52f8f57d7d5c2a9d72f82820a912fc2f529d281361c7a02f4f40528d1061
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.21.0.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.21.0.ebuild
new file mode 100644
index 000000000000..e7e9654ba6a5
--- /dev/null
+++ b/kde-plasma/breeze-grub/breeze-grub-5.21.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 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 4d4f8e4d9e4b..40a6f9b67b2a 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-gtk-5.20.5.tar.xz 43068 BLAKE2B 09263f81c2a20970b6a3e0655292fef30cc3cc8a0ba4e458dbf046e306a9ea706c405fa022b670950ed8aecc762663a1e1548331f1e3f62b56fadfbd9ff3acf0 SHA512 4c159f28d6d5163cfbf6add00d1a5edd8caf4b6530e4d8b8744ad99ab6193dec3d774c267ab3a45d8eb8aeee0b3d7e3b4848ef6a21d589bef33763392a1fd6d1
+DIST breeze-gtk-5.21.0.tar.xz 47200 BLAKE2B 7ba644a5d068a7eaaffa73365e2c5b326c51195c0ed981a51b2085d02f9d8cd93f7a48a4a2eb8132b3c1f4ed059e479a95fcc6fcc2c298dda7cbb066de096734 SHA512 124497cba18033e29c0120a871c0e8a01fae64371b6dde6e8bfe800bf2c3e6cd76d2adbeab711f2a38b0a2c157d4752a5ac29996ef01c28329a9dc3705e88dac
 EBUILD breeze-gtk-5.20.5.ebuild 790 BLAKE2B a2d20d872e041fb9e76d8123887a6a81a6e3ce1ca3d10ed991f02a6ff56ae436dc0ce7497d88b0480053ee94a2fcebe2c8f91bef40fa5a939cc258b172c01408 SHA512 26d318ef28fe68711010ea601c753d29fe5e12667fe923c30dc9654c0391f86d801b6a5e147edb75794a94cf45a512c9c01e48b906c0af2e1a6e6d8ae3ef0f65
+EBUILD breeze-gtk-5.21.0.ebuild 793 BLAKE2B 0db71a373448e6e9afbd8687a9ee4c350893673b39806fbaa6aaf2c9a2ec632a4d354bd37194e5f3bce508f0cab872b6f9a2f6f5cb0acbe192d7cd5372c50938 SHA512 40150be22f419b4bd803cc85fdd63653625530535ab23d188fc8a59eacd9d35d44fd0223e18fd9c005eb6127ea556b991c55db299852338bc402654cfe4b4a49
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.21.0.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.21.0.ebuild
new file mode 100644
index 000000000000..536330cf9187
--- /dev/null
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.21.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PVCUT=$(ver_cut 1-3)
+inherit ecm kde.org python-any-r1
+
+DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
+HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/sassc
+	>=dev-util/cmake-3.16
+	$(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_configure() {
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 1f94ac56693d..a3f23b9e0da7 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-plymouth-5.20.5.tar.xz 108832 BLAKE2B c0205874e22c60697e30f84cdda0d344248d772d7308fa9d3e4cbed54abc8aad56614de83b4f40daae52386110b46c6d9cef356a936738e9dbf91270eaecd578 SHA512 0c2526c14069f36b86fb4fd4a2b0ca7e283ed44f3a2a80f9b6de9efccefa5cede0d9214cd0c2a6adf43a78f72291d06d3dd00b01a10d36e517f67b1a432836b3
+DIST breeze-plymouth-5.21.0.tar.xz 108840 BLAKE2B a9ccf08cf82227f8f2e3176a30684c7a0a215fabb7c6cc4bd80645a6dd5b3486009c94020b0f906f5b4b80c883f8d0e8ec172ae7f1237deffd1a8f5a57ed600c SHA512 2f9c57e7b81d49c21554b0929e2cbf077b685037627f34180fde8271ffcac0b4850a1377ea6eba384958d1407c0ea00121e7fb19494ffd42f2676936cd6e98ae
 EBUILD breeze-plymouth-5.20.5.ebuild 515 BLAKE2B 91d05f96398d5237cc9c47352f6455bbdda760ed2d7db5ff32915cf8f21409c91802883a27f06cce68509c691111b5f7e70be824b8a30ea4e231ed60e554f63f SHA512 0e9ab01c65a53885509a2b1dade68c387a6ecec47351b2587340761320b6482d8fab508f5dc950b5eb9f8d7e63fb2aa238bb62e31cb3eeea6a7a6ff8e573fb96
+EBUILD breeze-plymouth-5.21.0.ebuild 518 BLAKE2B f898711e5d8ce6f0ca7f222c8e022a8d694d175c7129fa531c81f8b0af9b57cf4b9e42fb9ed8effc4a66eeeb0e6b42d9160caf8a76d674c76f1a7d0bea0e029b SHA512 b51d26348cb0757125cc99248309fba671f1f2228f0f52a64161a23e1a10aaed1e293feae0b55b652b4b04cda19fbbd1df7db99601d7dc8084cf1416df82d28e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.0.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.0.ebuild
new file mode 100644
index 000000000000..ff8cb798041b
--- /dev/null
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.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 bd3edd08a9af..b57d385cd1b3 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,3 +1,5 @@
 DIST breeze-5.20.5.tar.xz 15695388 BLAKE2B f8ff7df9449106815c3c356d96321118a388ef84530dd69f570fcfcb96ab9c20ddda3343a58535ad86232a34bf00ca6091c60350002e04c4bab8018e12a8b673 SHA512 1be4d2c52b683b042a4b094fec75ce069b011f547f8c9f58a04a17cc933537bb018dcab826525827a09b607426a65fbaa40b66ad3232267b34d4214be0a8e13d
+DIST breeze-5.21.0.tar.xz 26283192 BLAKE2B e39427c2727963c93663bdce31f0a6fff5a21e90d1510ffcccd6038fe8da656c35666b34f0b315332b407371988f8f2dd3567490383bc134c326c45934329162 SHA512 c4ce4f25a81493114651ec7f5d46a9d0af0ce355ef267224d4e01163427e4fc2e3aeaa98c752f05f16156ed09dc1b3413cf591a95cd281b14122d6710b1e0aa7
 EBUILD breeze-5.20.5.ebuild 1265 BLAKE2B baa89c16e94aef4c3897609a0bf12cdc27fc2ba2e9c968a3a736e8cf56f9ab299792207726c68f9f66dc3f0a8fcc1feb7a25e35d74ba74274a5d386a220474b1 SHA512 45c00dcc2299ba52cebbb75a24a9ebbf2ca6cedb45a5c6ffaa39f51ea70a666632276be32719826530f992c362acc4f2c97a8617573801cab4f69555f71e78ba
+EBUILD breeze-5.21.0.ebuild 1268 BLAKE2B 11228fab5b51622697413a77b077f76a66a2d17df97d79947fdcbf3ffb0857a4fb520e09823dced6d4261a1dec534d295123ea4fad61fc426fc37774d53eb6dd SHA512 7716ec449468758f10ad4fd88c962578ae930213dfe4f783dc752dec11734109737b3494b09dfd733188d14f2078a42649da304166a35897f14d55b7e6e3a91a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.21.0.ebuild b/kde-plasma/breeze/breeze-5.21.0.ebuild
new file mode 100644
index 000000000000..aed61f7b0ae1
--- /dev/null
+++ b/kde-plasma/breeze/breeze-5.21.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/breeze"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/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/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	X? ( 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 X XCB)
+	)
+	ecm_src_configure
+}
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index ecfdbb85ede5..eaca56bcc625 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,3 +1,5 @@
 DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7
+DIST discover-5.21.0.tar.xz 8424684 BLAKE2B 917d42e3f504ebd3307ee39a1de99722b421265d4448148bd948e55ec287eab5fc1b7888d4d60cc80af8bc655bc1c4a48b3bdfa38a45f53fe502cf54aeedf5c6 SHA512 6afba71e09046f82c0ed54a6e7fe624cb5d1dccdaf8ac27a992cdb7963626cbc50c456cf736c2316440253cd7c422c905caca210b4456f23befadbf2c7a5b95b
 EBUILD discover-5.20.5.ebuild 2090 BLAKE2B 1827c172905a2f72feff67fe2c2581fb4e5de133b04b5ecc07ef9bbff64e321954f5a23f072ed3c58d528540f50bd99f02a781239319fca55d0a98b206b0adb8 SHA512 1c4f19424f1403912d9a2ada4b001e7bd67924393c3f4ecde7199674d0b7dc130362fced07ad684955c6cc3a2a94b412948fed762e9c0ee7d7e3eba4817f5687
+EBUILD discover-5.21.0.ebuild 2143 BLAKE2B e283005809d09d563e2c29f860354b7fa790902c071c97e82311ee64f9af7a7f600e4091f6fa9501a083a3b69e6eeeee21e38c00c287fa77f517dd8aaa675275 SHA512 b8360c3ad884f3713afc9f110eb4a65d92883f7a809885a9a99571e7ea1bfabfec50d2285812cb110b0788a8cf9b6a94daa232e766912351f8aea6ee5e9b807c
 MISC metadata.xml 468 BLAKE2B cd98862045ebe78aecaf3dc74526afd4ff2bd377816993e2a0aa4d61cd4f14f7b3e5779d5892244233cbef03b9aba6404aa9fe9aa161f2fc868e369df6ea626f SHA512 a8807c50a9ab4b8e9fe2876fe159a3880bbaeb36a84ad7e7fed55cf6367b1c17ed7e0af135a579685bd4a5d8b550f38b240ac31c00e463befc22de35fd67b2ff
diff --git a/kde-plasma/discover/discover-5.21.0.ebuild b/kde-plasma/discover/discover-5.21.0.ebuild
new file mode 100644
index 000000000000..1b2b39717b58
--- /dev/null
+++ b/kde-plasma/discover/discover-5.21.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.78.0
+QTMIN=5.15.2
+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 flatpak telemetry"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=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
+	firmware? ( >=sys-apps/fwupd-1.5.0 )
+	flatpak? (
+		>=dev-libs/appstream-0.12.8:=
+		sys-apps/flatpak
+	)
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=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_Snapd=ON
+		-DBUILD_FlatpakBackend=$(usex flatpak)
+		$(cmake_use_find_package flatpak AppStreamQt)
+		-DBUILD_FwupdBackend=$(usex firmware)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 686392: needs network connection
+	local myctestargs=(
+		-E "(knsbackendtest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index d5b9d04bc647..769509784f67 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,3 +1,5 @@
 DIST drkonqi-5.20.5.tar.xz 755736 BLAKE2B 00dfcabeee2a7deae7cd4705d981000935c8ae9010cd0357b21b4245d4870a73b2d08539dc394d18db22112a77acd7be75d4c5c37cc3da738c71d22a5f21b6cd SHA512 b47c70a3fd2e9f2e7afe663e1dbdb93cbd69e3c864edcd68ca5a3af72abd554647b069d1f92a38c2a67e4a7abcc351003eee185ea751b32f26bdb164d0a0c3b4
+DIST drkonqi-5.21.0.tar.xz 768864 BLAKE2B 758e75e6319167522a3acd3df47806807b70bf1a055665e2398494a1b1fa3088106c7d33e205d4a71db99a5f372d40ea8c823e050853340e094bad269034007a SHA512 846b9d656850cc1ad92ca9d11432c6621bc04bef84a73c99c4d559980e5e85c4f909088f732b41a5d989efdbe65db86b910456bb4acda268be8078cf4ac35e31
 EBUILD drkonqi-5.20.5.ebuild 1641 BLAKE2B 1c068c1e5fe42e91de3894219caffb74a2addd291be371aec836117c9fad9dcb12a15e850ad4412af13737ad1f7e2cb8dbc4f5a2676c340142e460401fe143f3 SHA512 490ea4d8560d4b7853345151ed17d3c9189a25cd34c08aa6d2df54556e477de12885b5c95ac04de928d5c059c066a7c0b01da8ab45d56fe51160e267caeb47ad
+EBUILD drkonqi-5.21.0.ebuild 1644 BLAKE2B c3d630f525ad416df57417e77654c225d14f8bddaee42eb44f8ad0112bbfbab0cc23a0928c68e0c993f8550495f5779bf971bf99897c99ca32e37f192e889459 SHA512 0fd03763e16ac7586f78c10607ccf01f65e51fe7665388122789fae56f4660d4f5796eb097491deae5b1706b4c3fa0c7cc2ce83055fb72ffccea76e28741a7f2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.21.0.ebuild b/kde-plasma/drkonqi/drkonqi-5.21.0.ebuild
new file mode 100644
index 000000000000..eef51370febe
--- /dev/null
+++ b/kde-plasma/drkonqi/drkonqi-5.21.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X Qt5X11Extras)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# needs network access, bug #698510
+	local myctestargs=(
+		-E "(connectiontest)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing the following package:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 90b1b60c0ede..e484ba92640e 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,3 +1,5 @@
 DIST kactivitymanagerd-5.20.5.tar.xz 95236 BLAKE2B 1fb4803309cce1207226fb330759c2235672265d2232c8faf9e3d8505243ff2fce4cc955a6a46a83b1d5ab3719fe39c998d4cb06737145a57b4122818945a0bf SHA512 eade394ce5e10f1dffe60784142a797ec9180cf339557e6f06f235b00127fcb910ea42bf0260990fd1197cf958bdb2bb607d9c7e0cd4a5ad075fa6d46c21bbf4
+DIST kactivitymanagerd-5.21.0.tar.xz 99340 BLAKE2B bbd51fb17b26929064c638e72be81c32de7e5aa7d9932f7dcd56ef0c3ba79f7920ef194055ae739fb5c0564b1dc232420ac32f020fe76793618d6b34f4c35993 SHA512 e2971ba8ed9a8d57aae05797905290d5d02cae699b656e6725b45f83e748157b4a9e6fdb8a3ee412f0236c5fbe6b9233088974cdbf35700d136e7395628ad07c
 EBUILD kactivitymanagerd-5.20.5.ebuild 909 BLAKE2B adc2e13006c15daad7e6ce0435492420f1429cec352fb7a98b6a3d3f839bd5c31c24292f03553b0cb64f41a5301ef6ba9ce362b24811d0044b09e3cef55ef2b6 SHA512 ce43e7844ad4351c4a2d635170092739981fdeda832eb1c6f5b0f41fe7066238bf55269dd86adf0ef106008578427371ef951fe489f68422364dfd7001e6b12c
+EBUILD kactivitymanagerd-5.21.0.ebuild 912 BLAKE2B fdf5dcf1d9755ba3e637697856f6823b32b0e213f9f955502b2f73ed0699ec25ddc30fdee811f04d0ef0e51c13972630ad866fc59dce2ed5dd9ab4087f57f2ce SHA512 c6e4042d983a07073935910a3991e22651c614267b770e67850a74da38c06d73846f8396e75937dcb3e0d2157fb483eed726808edd23f77e479e9e4434a80b6b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.0.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.0.ebuild
new file mode 100644
index 000000000000..7d9be6d060a1
--- /dev/null
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 71f87bef86ac..58504b7a2d31 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,4 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
 DIST kde-cli-tools-5.20.5.tar.xz 602472 BLAKE2B b42d9e8f89cec058c2d98d37b77310737807ef63d4adc408f5b8150ecfbce5fc8076e3f44dd5a67fb1125a419202529309c04f08295bdc34ed6599153b873179 SHA512 60507745d0df94361cc506d00f82b361656e02b7a35d79f77136536b6916d7f4b5e379986fb1f20bc8401140451e90dc8d08891031b1d7c31c74658f6fb20662
+DIST kde-cli-tools-5.21.0.tar.xz 610328 BLAKE2B 23414a157f63227e68ac16551b6085e583467c54d85a6cd1a63f8cd37fb3b40f9da0d24683b6bf481d6687dc4da952cf78a6567a575fc7bc53f2f6c7cd05c753 SHA512 0c580b245e152f878f00d13c202707fec5566ac0101a580a53e0b39a5624aa8e6f2a343147b53af7f54fb496926adea2028eaeedc8b671bc8f76e661bf4ebb2d
 EBUILD kde-cli-tools-5.20.5.ebuild 1723 BLAKE2B 27a37e3d774e414f3803b5985acff0411ddddfa730c4360c95614f9dd775ec42313730559d563827da9660d6f5b6adfc845d5e15ba17ea500e2e9ec1ecb753df SHA512 5bfa56010993cf83806cde159c7ed968758fa65fc7b0e81ef66b75eee46bf228ad3641255ee9c8700aabf7061f1dbd5ac78d8226b06e9240669873f4ccdb2029
+EBUILD kde-cli-tools-5.21.0.ebuild 1725 BLAKE2B 30712fd449ff0dcde833be319c73a003e1f846b47c7e2b1fb4bfd660bf9f4ba1715bcaad5fef5460e1cf8570a8c18c883c8572c51bd8ab79df5311d42b06e9cf SHA512 6ade4e9918f5b4671657bcae5d3a7a73e792f347c1daa45c5cb4ff6a8ebff2cd53e1e491ecaa3cde1054613acb3c4800e5beffb5aeef32365bc1bf46ba037620
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.0.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.0.ebuild
new file mode 100644
index 000000000000..d7a9e6759567
--- /dev/null
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="kdesu X"
+
+REQUIRED_USE="kdesu? ( X )"
+# requires running kde environment
+RESTRICT+=" test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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
+	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" )
+
+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 a13237804db2..362dbd93c298 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,4 +1,6 @@
 AUX kde-gtk-config-5.20.5-window-decorations-reloaded.patch 857 BLAKE2B 7db0137fccaa223cf8d58c7be61c78385659ca691aa07f067c15bbeed2d092ddebfa1f69d341a339036b2953d154742c46acaf2cf008e1f299078313c2bfc8eb SHA512 47f2f5120c135c0c814f66be6d28f4dfc2e9c2d6abdd23c09b309bc6e737459d654f6dd56119dd2f53f683e0e802d440e9dcf250054d310659b0602cc3aa551d
 DIST kde-gtk-config-5.20.5.tar.xz 68208 BLAKE2B 89d52f60f0a3cd9d1407a8a537f2893107cc7ba37a5763aba532b665dc0b6c529c6bb9d5873de961e86e3be3cf386de907307bbdde119bdc6fb15b8e958f4881 SHA512 066fff2d3fee4468eb0b5cb27da857bb7d27f2d88f0ac5dd31b1eea928c051c47b3c6d7b5d7de08415cc498d7a6773af37035ede35e315aadd32893a3b0ab846
+DIST kde-gtk-config-5.21.0.tar.xz 68680 BLAKE2B 9031f2682eb50ec97248b6f24d871e56c9f19ddd553b2f419d9ca30ebb1ee7bfea395aafa80e11c9b654cea9a8a03ee659870c4e6ed695f1dd6001220d640cb0 SHA512 75c765db780abdacd3eeeabd7edac94b9efe6801e680a1439246e5eda24c3839bbe017e0833f75340ab50aac99be592d851cc90c6d81f658d08fecd26f6dec49
 EBUILD kde-gtk-config-5.20.5-r1.ebuild 1355 BLAKE2B f0c4d2ed76d28fd0da23004b600d8bf80f7fef4765916cc4370be31ec28491a7acbc9fc6a7d2ce245878cf760673b602b0dd02bbd041f24b9ee8a671e3a1792b SHA512 34f9130c5be4a6699ac906d3f5a2b82cc59e775e2f7e868fe617a6fa5c50c832895ea40e0103eca0ff96e1189f1f67cc26b0b9a7082de7cbabc745a3e989bb9d
+EBUILD kde-gtk-config-5.21.0.ebuild 1284 BLAKE2B 1caa31b3e7a070545e6ca10e1664c56624873858ab67804b8c067cdd1de09a926b4b0844cf71f47bafc4bd68dab9371bc33a99ada369162187c30e7d1827967b SHA512 58746fec183dfb86ce170895b1b0e8bc779038674620397acbc30e6d58fbd126b535176602b463741d04073372cc2a767061bdeeb0bfaeeb092b13c4b4475d51
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.0.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.0.ebuild
new file mode 100644
index 000000000000..beb08dab9bc0
--- /dev/null
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
+HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
+
+LICENSE="GPL-3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-lang/sassc
+"
+DEPEND="
+	dev-cpp/glibmm:2
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	gnome-base/gsettings-desktop-schemas
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-plasma/kdecoration-${PVCUT}:5
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	x11-misc/xsettingsd
+"
+
+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 a02be40973f1..5aaa4e9a69c7 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,3 +1,5 @@
 DIST kdecoration-5.20.5.tar.xz 45524 BLAKE2B 3ba5a83c51664ce45b21055ca839cd390feb206d98c8b4380895ccc81f861b741a1a01d70f0417f36020322e5e94aa58ba41e75300a2d987dd3a27f65907b5fb SHA512 020130695a865a98acc3b8ec783650877addec8beb6ee96b87bf74f7bedd63aa2d06629d3f8f59a1b76ded72b4a6c85d462d61ed6c9a37876fd2f8123af8fdfe
+DIST kdecoration-5.21.0.tar.xz 45908 BLAKE2B fb270910d34cef854a58d9994e95ce4040a91e00d3af8b4e2b9c66431f50a04b04602ac2a94937125ee08590f239bc6c6ab52cff281401ce711436ae9082185d SHA512 60f83261c2f9aac1aae14f17038fc683d833a646e039468207b34e5ed24442aeddf9fbb32b9bfbc90a7f9729f801d86cbc6ccea677e445853e4bda3176c862b1
 EBUILD kdecoration-5.20.5.ebuild 479 BLAKE2B bfad15f8c0653891ae88aedd7210aa0be9f48b8fd7e440f07f39dcd0a01978c9ec270bbbb9ced6c3b8b48fb547ff2c1a74497b1796d1101e0a1b0239abbee207 SHA512 5809e9fb0e8214bc568758ec5df8969b60d650a3f5f88064c473134d594b0a3a5a71196f5f29580a8b5161c006afbf5c9589077407410bdd953fb0e481526585
+EBUILD kdecoration-5.21.0.ebuild 482 BLAKE2B 1f05ec563a39747de006d90775cde1e0dcaa7c732cee664c9d5649cb5e890322244fe8d893cf5f2e04f8f9222692a687d5887c8f7dd36848bb94891bc199f37e SHA512 4f775a14805a61a08bbd78d9c8634356d7ab8db9352aa650425cece9530acf537eb68ee2b91cb65e78c861b4c157156a2fb691a7e6dfda7b5d08d531133b524c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.21.0.ebuild b/kde-plasma/kdecoration/kdecoration-5.21.0.ebuild
new file mode 100644
index 000000000000..9af5da017be7
--- /dev/null
+++ b/kde-plasma/kdecoration/kdecoration-5.21.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 0a961aaad245..273126b417c4 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,7 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 AUX kdeplasma-addons-5.20.5-no-kiconthemes.patch 1004 BLAKE2B a1b1e95d377b15ab9753df6ca0d4121f6690de8e32782b3cda5f3d42b5be2791d400189c990ae4f2820820c8da68d3e39150bbc6de95db7a0104da4c74a01ed3 SHA512 376c8b2cd185b7ee633c43067192e775db61cb05456df615c6230076ca3ed0e5ae04e7e1ebb1147cbf482094d82748b3a29d1c52fa81d5a5fbbb9b6f18ab9499
 DIST kdeplasma-addons-5.20.5.tar.xz 644352 BLAKE2B 2579fafc102210006a8cdb4b303c865ec3aabe149c0d0acfa47640c272e4327fa84934f33e14f6c2fad20656fbe145793d375c81fa4028251cf623e37b243aaa SHA512 3a4f0715ac1dbc9edbb62f253b48520f9b011c29f87ef0a7ba25ea14dc24dcc698405e7d8e83593b51bab2976b274b0ac869cab8b17a50ba34902bd8121ee421
+DIST kdeplasma-addons-5.21.0.tar.xz 626404 BLAKE2B e858f4149ba62de02aa2a01343480d0e2d0bf94642626442c38ba3b9c7c39592adb3516383563afc2c0893a997c15c93393562c2c42a0aa335ed40a775bf3b1e SHA512 398aac7be23f10260b68afa5092aea20bd40d4070397e6ba07c17408075e421c4c5c1432ecc2c23a68b421e79ebc2462bcc154bdf88c4393ea91eff18674d671
 EBUILD kdeplasma-addons-5.20.5.ebuild 2161 BLAKE2B 2813bf768a3a911b5f3f6bb795be186afbc318f7459bede11984e5f7379280d1e4a553682a09697a9d81d8aa92c5592ebf39640d8977eae0d37fc8dbd8c99736 SHA512 ce676856febab179ed0de7636c43ec20eccc5f62252f8bb7a93cf78d0557dea85be8ff8f3035a2a80ce2b947a11318ca970e342eb518801eb09995d4f99d0552
+EBUILD kdeplasma-addons-5.21.0.ebuild 2114 BLAKE2B 7001e5ec8388f4e206e434286229b6afaed279b99dba51e092ad97e34b9b774ae78bbb924a8364ec4550067f9db0353be9ec1da6b8e53925bfc5154717ed1668 SHA512 943cc0117a8a0d93efd43739d205fefe9f0d84d1cffed4ea2a645e56ca387d72128790d036657d489ba33d1c671318e0f3d284e5b8a0fe0e1f0108c834520dd3
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.0.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.0.ebuild
new file mode 100644
index 000000000000..bbd7b3069551
--- /dev/null
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Extra Plasma applets and engines"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="comic share webengine"
+
+RESTRICT+=" test" # bug 727846
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${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/kholidays-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kpackage-${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
+	comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" ) # downstream patch
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package comic KF5Kross)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Disk quota applet" sys-fs/quota
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 60840b88e965..9c7ab3be9ea9 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,3 +1,5 @@
 DIST kgamma5-5.20.5.tar.xz 81560 BLAKE2B b27cce9651fc78d28758f252cecbe36af52de0e76145b3a08abd0d741be015231fa1501201c115f29fc4f324bd05a3a327866cb594f5c72f34666e7c3978e67e SHA512 ea92e80a3c16e8ab357e9185d8bfaa157cb75edbb6f3d64b0c4d6f2951ee2335d52cda4c26913e160449c7dfad35114e8819acf95ebb12e011a3e7e8d4f0e654
+DIST kgamma5-5.21.0.tar.xz 82636 BLAKE2B 69e0818ea5ee95b373e59ae72a4bfd306be416741ec9d6a3e48b052feec0334001f95f48d6a1f4f1753502e4d65fe67ea2a72ada5a160055c375bf22d4d2a53c SHA512 35f33b0467dbb357fe2a01663794d846cb53953edb2c56b8ecd90cf0e55f36696fe0109a79aa3cd89c15ace11623e41c87adb7e18bd621dad761ec70846da4c6
 EBUILD kgamma-5.20.5.ebuild 677 BLAKE2B 3bf52f57c349619543fbc9c21da7f2bc5d3f43392e1c93e443431316af858edbe98ea644f573e4b2bc60349436af3fe9891b62d18d7ebd097429e1f4213168a4 SHA512 12d05f2f9bc9a147f54ceabe03810b397f393d988050648debd992ec22d453210491ff2292a5034cc3efa3498708b8ec0dcbf5f03b6a1e25bd02942e45547d58
+EBUILD kgamma-5.21.0.ebuild 680 BLAKE2B 0ece52aedfb8ea461273608140e3c70a8f65cc1018499fe607dd7efe09861e4130be5f49ba70fac35c04047f6b7440df4f11647a58fa71e946c37ede66c74db2 SHA512 19a7a7a7cd7c0fcc890626edc802e7935a728d4b9bb5e0d7d2ce45586f12aa0364ecc96fbe43183614d2506e3521dec98c4dc0e97eb51699c62b95804e0ca3b3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.21.0.ebuild b/kde-plasma/kgamma/kgamma-5.21.0.ebuild
new file mode 100644
index 000000000000..af7bf1c1798f
--- /dev/null
+++ b/kde-plasma/kgamma/kgamma-5.21.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 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.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}: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 e4e9d509a250..2d2c350ef40f 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,4 +1,6 @@
 AUX khotkeys-5.20.4-unused-dep.patch 780 BLAKE2B 82fe708c5e56a2f848dffeba923ea21f1661888d985a63d399bf79d8ab0fc502a7c85e1702b540cd6f5dcead1befc899c7fd3ae0c57266ce63817c12cc2e84d4 SHA512 6ec31bfe5b0f8cf21ae5e35b018829f1b88fbbccc39c27aeeac4e2463cf6c766cf9a5c51d832d7b06b14b3fc2cecd76ad5114e52672e0bd6b569034544caf963
 DIST khotkeys-5.20.5.tar.xz 1856468 BLAKE2B a29c2c6dd9d34dbf2919ab4020bc6b3ec16d25f0462485ed1940598a238f99b8066176462e6ce24ec2784150601d574eabd469b1fa9760f2afb630392c4a7d4e SHA512 7a18896c40749611b333b3a7cd5c064e61449579b141856f2d75f02fe0db12924fc8e6ccada00c6cca29a57aac5877f0c791d7231dc047b8b32c168ac507e110
+DIST khotkeys-5.21.0.tar.xz 1860620 BLAKE2B 9514faf32b1f90c4dd0690eec7b60a55735d87cffcdb708fb9af91edabaee0a38457fad2378fa715e66b2cfbdf4b43c415d677b285cbb149c8c090585364a58b SHA512 c8f6c1bdc2d31ff7486c07bc16e295f4a52b5e108f8ee39415331edd3d3acbbe1fc8f5a3e48749180faa5c5f974fb1b16d374e7e7526977267c1c252e01d0cfc
 EBUILD khotkeys-5.20.5.ebuild 1403 BLAKE2B 38399ad2dab11d01440e70a695d87252cebba536ac1d839b6716cd75d334663a2e0291970eb11a5ab9f850578aae65e2c894cd7f2dfb1d076b25f2d03b937982 SHA512 acace4a1d436a6b976909b4358e6f8e94bb4ff85983af66f631fafbfc602c018ba99d6517421a76a69375e1469ce0b1e9c053b269151af1a9b161d16a05a79e9
+EBUILD khotkeys-5.21.0.ebuild 1349 BLAKE2B a4d1eb4425c0f5699d74ed4e87b0c02570fbddba4624f82ce7f4a0b848fb49afda4bcbe9e48e56fb9ee8897524402dc7475642555e0ac7ff2356c8d79900cfdc SHA512 4470d2c6d0c0c1ee24352a31f36b9588ef2601038dfdbb3e8faaee8473ec1bcba896bf80b483124a4a68de7a4dd9546c7499959893a6550583c342564a9232b5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.21.0.ebuild b/kde-plasma/khotkeys/khotkeys-5.21.0.ebuild
new file mode 100644
index 000000000000..489ce01502cf
--- /dev/null
+++ b/kde-plasma/khotkeys/khotkeys-5.21.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5[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
+	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 6c63384f12a4..18e002e2c016 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,5 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
 DIST kinfocenter-5.20.5.tar.xz 1286404 BLAKE2B 3420e9d73e5cf73c91733fb3c72a4315db577ef5248e11036c4a6bdb1e897deb5983276ef903c25664ceba549cbad12bff2b6e6951abc90fbca0cc97e42c60ae SHA512 c7d2eb7307682f7bdc8ac22d1905dcc8bab0e258ee5f3458c4f40e43fee4d14ecd6b423f4357b338e05924db93d7c9914d3c36756620aac9fc6d0897ea4e5a90
+DIST kinfocenter-5.21.0.tar.xz 1300796 BLAKE2B eacf7004ee65e5d889dd8733d5132c48f082104a28e8793b08b4faf8a72a524e3a9db4fe5556f36a278009f1ef55358c603e14a2749aebd9f7653946c09a84ad SHA512 b5e98235af9220b5994b968a27638b4a127dbe5cfdcf8ccc790c7a056a940cf49f2e8f32f6e0accfaf85980b13404ab9ec02f80745bf6c11ab0b99d857104cde
 EBUILD kinfocenter-5.20.5.ebuild 2723 BLAKE2B 876ec8fa6011896043d29a9ca1d0d29f6a731a6cc76f7ffd92532afc590b95d76732fb662f562ffef0c92d967a4875460d2e584c52dd6a1b7c45066f9b8c9843 SHA512 93894982ca403bf8d813262c4a5ffe64a6d88ee92a16b82055f6011cb9a7fe31e4be8c0099b78620775290ee46b43c099901ba74bc67ad4bf0874b4d01f49905
+EBUILD kinfocenter-5.21.0.ebuild 2571 BLAKE2B 80fa094802787108a201339e487f869af21f90aeecda8aeff3436d66ad5f1b15c9f7e85376a360cbb258f81f347b07c8b12380dd5b5e74939b5f9a6c61ec8c69 SHA512 6e59d812b431d5bca6ce342447cba1c137a9024ef8582900a24a9c1e99685ad4dd5c2939717f408c42168af6fab9fd67643d75a3a51b996171033430ea7cb18d
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.21.0.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.21.0.ebuild
new file mode 100644
index 000000000000..27a3658cb7d1
--- /dev/null
+++ b/kde-plasma/kinfocenter/kinfocenter-5.21.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Utility providing information about the computer hardware"
+HOMEPAGE="https://userbase.kde.org/KInfoCenter"
+SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="gles2-only ieee1394 +opengl +pci wayland"
+
+REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
+
+BDEPEND=">=dev-util/cmake-3.14.3"
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/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/kpackage-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	x11-libs/libX11
+	gles2-only? ( media-libs/mesa[gles2] )
+	ieee1394? ( sys-libs/libraw1394 )
+	opengl? (
+		media-libs/mesa[X(+)]
+		!gles2-only? ( media-libs/glu )
+	)
+	pci? ( sys-apps/pciutils )
+	wayland? (
+		>=kde-frameworks/kwayland-${KFMIN}:5
+		media-libs/mesa[egl]
+	)
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/systemsettings-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package ieee1394 RAW1394)
+		$(cmake_use_find_package pci PCIUTILS)
+		$(cmake_use_find_package wayland EGL)
+		$(cmake_use_find_package wayland KF5Wayland)
+	)
+
+	if has_version "dev-qt/qtgui[gles2-only]"; then
+		mycmakeargs+=( $(cmake_use_find_package gles2-only 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() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "NFS information module" net-fs/nfs-utils
+		optfeature "Samba status information module" net-fs/samba
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 48510653255f..167a53f595e5 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,3 +1,5 @@
 DIST kmenuedit-5.20.5.tar.xz 893840 BLAKE2B 5fe62cd5c297a21dd4fcb5298dad813bc4607aad90884e3f465f914b49c3d509af4d15cb1797ed179d7a912ff4b82fb4c802abe6fa142e31fb008600bc3ef842 SHA512 c42ae1351ba6eaed7996078aa31864a64fe6551fd688ab84146459f30d195aaa8d412ee526a011df8c21c1e60f8cb5541a5b0fbea85f4702b2249e2571c27a15
+DIST kmenuedit-5.21.0.tar.xz 899096 BLAKE2B f15bf013fd96c7905eda8fd17fc0c4f26f6dfd37e9068e45c6f5bfe66a542dc54dc9419e9a32ccbf775507ef227952975b808bf4bbcbd06ea85c7fe3311251f4 SHA512 bcc629ddfbfccddb370eefc120ba7558aadc69c359497b874dc46cb39b2df8612570ed0e7f53032c853774f3989cf2d2b8a4d59d9f9e0f910d47b8eaf7b32f51
 EBUILD kmenuedit-5.20.5.ebuild 1096 BLAKE2B 32b74d2ce2e60b8629a3be5c0bc2c8371b230e3b9667210b77ba40740bb5cd2bd253ff15d6e984cb44c6ed3f13f0a420adf017bbc6ab5d381d2b206e5ee4c978 SHA512 2c4598f4ca19dd8a00b2ce25b7a9185464350ecdf882f98157a6efa98bdf9a6a790c0ca3eb75f374da614448fa1878ce4e088cfa0ea01a47e110f3b1f5cec5b8
+EBUILD kmenuedit-5.21.0.ebuild 1099 BLAKE2B 74a2395ce6ae711e411a67c7e2908ae80b68531b3b5069b42a220662d882a1534c486ed3acd556b582b212f535c934cd9421f7e5d933ef19e23538507e43b719 SHA512 e12c911466e871c842c369a3356d1c38797850e1abc9ce2063c64f894fdf042d758ecee8505acf0e0dc7f6255e9fb98b7dd3dabeb08815e050899fa745615e70
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.21.0.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.21.0.ebuild
new file mode 100644
index 000000000000..2bf8c1c49a8d
--- /dev/null
+++ b/kde-plasma/kmenuedit/kmenuedit-5.21.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.78.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma menu editor"
+HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
+
+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 9bb3d4430741..007e39d61a8f 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,3 +1,5 @@
 DIST kscreen-5.20.5.tar.xz 114932 BLAKE2B c703e4dd605fedf26dea0f04829d9ee900f8c007915123cb6e68c68bbeba8655bfb833bc180c2258c48e9e8c672d3b057bf2b3380fb7f687bbf0d4202a1217ed SHA512 c1a618605afe4861f9ea563472df104e0cd6f015b2ba1a0621ee6d18bd653598a6de0f800901dc07e8142969633d302e68d66f3b0b9650cbc4b6cd0eeca14dd1
+DIST kscreen-5.21.0.tar.xz 114516 BLAKE2B 7b140fe5e200e7069a4f796983ae7113659576d65d210a0aad321a4c8896db4d5b9a6a72ddf825e354e83b029631e38165d2c63a15bc44ad03b14e3efe772bdf SHA512 cc329342b5c08c1afe1e63aedb0a4b941efd4f6f493957bf7ea0c874bd57e343e2e62e6619464ff906e96c5370dcbc82873d43dc1f41735c2c543f73b7476804
 EBUILD kscreen-5.20.5.ebuild 1225 BLAKE2B 90e88d5de8bf1bb094912bd415f232e26723cc555be0107a85ce2c07fcde5be6ea00550c82e6e597673260c3364e7eaa1b28613e4c11944d1e48a576cf1a317e SHA512 75ea7aa848c2c453b9264c1975992e6aa8b1bd4b86f48daf58be727e42bbf0f21e1eaf670657c2ee8795b5dc721ff52715dd3d84bc185fc6727f76b71925fa18
+EBUILD kscreen-5.21.0.ebuild 1228 BLAKE2B 5af0e37ee6712365f678365b173e44f06b3654a1f09affc685eca5677abed37e317b8ee2813e7f32192fa74d44e9cd3804ad23f2300c5164bfc13c141f69ee3a SHA512 71e00ac5b1e885c8b2933d3fba7594bfb09bf49d71c61e3a5d0bfe219f180f5628c9c6f2ab8011fce87900faa3fba9810b301e0ea5fdd191b07a848c4aec5c82
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.21.0.ebuild b/kde-plasma/kscreen/kscreen-5.21.0.ebuild
new file mode 100644
index 000000000000..6a5279a3d2f4
--- /dev/null
+++ b/kde-plasma/kscreen/kscreen-5.21.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma screen management"
+HOMEPAGE="https://invent.kde.org/plasma/kscreen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# bug #580440, last checked 5.6.3
+RESTRICT+=" test"
+
+DEPEND="
+	>=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
+	>=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
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 7da60ab90f47..f78410e71ebe 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,5 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 DIST kscreenlocker-5.20.5.tar.xz 115988 BLAKE2B 7a051bea3952da85c272e32bb0c04c94bd0eb5fa52e01e90d9ce7d2902b3e3fca97ae7a6ee2c0994fa775309e62c7b7f0ba8b6634f04188370809cef7142835b SHA512 0993013374b91a34fd9ff204012f83f63a4ffcde9c6562ae0f7544fce78f5d526ad0104154ad5a104742df77d77b2267290c451cf90b1931ad1b36254e2b7ec6
+DIST kscreenlocker-5.21.0.tar.xz 117280 BLAKE2B 181ee14ded67b828627d0ca608245ff9ef4f45ba924d7b10737264aec4c9cca859f15a47aa96fdebb2b93eebc97a71d44a5309fb73b6f4c4269072759ccbbfc5 SHA512 c429f20b6fb6e5e3209c22a15d18d0e4c8a34e5ee9c58d8bb9077c19ecc8e5d0d7d57ceabad0a16858f25add7bef9ca8f9b62c69a5eaa01e8f7e6086d95e9f08
 EBUILD kscreenlocker-5.20.5.ebuild 2146 BLAKE2B 3d3dc126b774e8138200799d790f0085f97fce4656635331c378b842b38567e1cb3692c6da55650473144c457d96d167bc4b0620b06718787a32cc8d328de7d7 SHA512 9e2f4532549c8edacbe448e3291c7f3d4a40e02a3ebcd7057535ef0d380c114aad8a143378e743e9d3031becbe0a97a3b67a019dce3759517d3e53940618ab2b
+EBUILD kscreenlocker-5.21.0.ebuild 2187 BLAKE2B df5f250032a485be33101850a40aabf177952b449d980e72d11c6263b10e6a6267920e3ecbf76500fff86d86ceac9b73419b92401247346686e2f1ab9e3e40f6 SHA512 e92d78feca234fc66e52067d76cfe6dd6bdd10f57f9dea21667e80e87c4a2eb1db898b1ec73c6d0fd921110826a7c4a5e1c2afb7152db216058592e7811a6b8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.21.0.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.21.0.ebuild
new file mode 100644
index 000000000000..b1c7212ccfc3
--- /dev/null
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.21.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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="+pam"
+
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	dev-libs/wayland
+	>=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/qtx11extras-${QTMIN}:5
+	>=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/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libxcb
+	x11-libs/xcb-util-keysyms
+	pam? ( sys-libs/pam )
+"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake_use_find_package pam PAM)
+	)
+	ecm_src_configure
+}
+
+src_test() {
+	# requires running environment
+	local myctestargs=(
+		-E x11LockerTest
+	)
+	ecm_src_test
+}
+
+src_install() {
+	ecm_src_install
+
+	if use pam; then
+		newpamd "${FILESDIR}/kde.pam" kde
+		newpamd "${FILESDIR}/kde-np.pam" kde-np
+	else
+		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 704d8e431a9e..ddb26024b393 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,4 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
 DIST ksshaskpass-5.20.5.tar.xz 23516 BLAKE2B 328adfbf6ca7adcc9d9fbdb22d86e0e44b4056b4d7b3c3af13ebede5002ed587aa2102c6a90c27691f102f2c15ce08d2876e1dea6cd0c20833a21800b0b3fd21 SHA512 2dbe7b59b3469ae4ab20b896d11f354c6e335e5178a8647f1e71a311389b29c16cbba7fc925053ade3076063af9fd0497af3b8e060e554e68ba40b8fef47de55
+DIST ksshaskpass-5.21.0.tar.xz 24036 BLAKE2B 1649b92dfbd517359645136116456b62885759a77cfc08ac01dd6848f3c523d10a1126315c4360a20bd5749b332d01d4f0528174de483fb17cf6c286c5adaebb SHA512 1056df56db91394ff1a8b56000147beb5cd6078835e0dd0903258d567ce15cd668a01509bf90eb2bf6a66b422bbd2082d4a21c2689352f6f160eeab432f62a5b
 EBUILD ksshaskpass-5.20.5.ebuild 1433 BLAKE2B 6dd8e7879c893ce4ee72ed3689436ba10b2dcd013a9a65a44b2214045effdee41e5826507067bd0c5dd2796a2fd3cc195ed8d576f53ec96a90d6c235f7caa5e4 SHA512 a166ec2e7109ccfda8e8d942ebe4e8b377d1de94c83ef4d97a552a7d7ecade3a8e4eede2d06b9aa7a5bb94a714a83985ee9d59d44b244cdc2c51ec9fdb0e158b
+EBUILD ksshaskpass-5.21.0.ebuild 1436 BLAKE2B 78209e2214b368bd0e626c8cbc118853e1d470e98e7252d7695adb33a557db26e0e1cd6fbf07bfd3481fb84816685c3773134289f9ff03ffd0391c8bac7be9ca SHA512 4c3a1ea65d435496251578c5739e684cdabcdb17ff459bc2a85660222f318e1906996aa1644952f3e8956dd4b03876993929400b30a54f3e163394a0c55518bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.21.0.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.21.0.ebuild
new file mode 100644
index 000000000000..264ce2581b93
--- /dev/null
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.21.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
+
+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}"
+
+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 dirs
+	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
+}
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 2ebf78fed8a5..111c936119ac 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,3 +1,5 @@
 DIST ksysguard-5.20.5.tar.xz 564408 BLAKE2B c22fcc8280aea81007ec2366ac3f64ea7f66f1740a30ea49ffc4317c85d8e68cb5cd29ad4afd34dcb3a37ad6362bfbfdcb59b29e427d58c6de179ba107360a26 SHA512 17c96a3e19e428f90f729b813443199a5ab75608c0f46321127b1d4e2fc68a6a55df9ac8e3f194ae97ad533d3d22006c230f34ee328984e32205046e91487b08
+DIST ksysguard-5.21.0.tar.xz 603184 BLAKE2B 46ec5d9c37747bf7dbc633d4832407ee1d087788d67f873bff30825a5de88cfb3979cf1a6d96e0990c99edbd273e5bf31ce1ed0d2998c17ba08630060f9948c0 SHA512 61eaec3e3a33c3c06defcce3d3743dd249ba264f9904898ee9e172cd652feec5c852abeaf0c80b118ad8ce386467980638e81d7d89a0a8b8ee0dde771f7de38a
 EBUILD ksysguard-5.20.5.ebuild 1618 BLAKE2B a8f8411e274e63b6ef8664d52a3990fd2a3aed4a1c2ebe636582a71a8ef422b290ecd2c56777fb76de26592bb3fa64023a3747b91869f98b1b6cd1f1d66f32de SHA512 efc507991101d517864977dbdee3f588f14e4abb98c7f04165aa6c2e5fa0c1fc8a39136c6fccfd4b71a55f12e5372d9973de77929fac4fb9246bd4a3745226e4
+EBUILD ksysguard-5.21.0.ebuild 1675 BLAKE2B 985c1ff013f119dcbbb129a0da22d8ce2e0468d711d2ff7ce3643bf1a10c115475c14951fc22ccaaabfd331a297de243d63ea0197f7e0b637b059dcc8f40245f SHA512 f5a5e49fdcaa878a4ff7bbd106b29888be76a32d15d975881564cce42df92ae711959858a0bc17b0f84a726095671bb14e2616946d1bc6725983d8f5dc8850a4
 MISC metadata.xml 508 BLAKE2B 0c56534db9cc082a5aed32fc958940d305acadc6aea338945edfc1adc349b51437bcbc549fc1983b73bfe4b511a0328be0632571ada20dbc2f6cb15f7300de5a SHA512 acf19c8d5b52abe5a2c0cb8fa4c75262613cf673e597ae3b3a4ce79fee76d75fbd2632612267eb9e4a18b27d32ca9c0f5df3a9d6a68f67e9a99d87d51ed2dba0
diff --git a/kde-plasma/ksysguard/ksysguard-5.21.0.ebuild b/kde-plasma/ksysguard/ksysguard-5.21.0.ebuild
new file mode 100644
index 000000000000..f9e3877d1ec4
--- /dev/null
+++ b/kde-plasma/ksysguard/ksysguard-5.21.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+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 +network networkmanager"
+
+DEPEND="
+	>=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/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-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	virtual/libudev:=
+	lm-sensors? ( sys-apps/lm-sensors:= )
+	network? (
+		dev-libs/libnl:3
+		net-libs/libpcap
+		sys-libs/libcap
+	)
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package lm-sensors Sensors)
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+		$(cmake_use_find_package network libpcap)
+		$(cmake_use_find_package network NL)
+	)
+
+	ecm_src_configure
+}
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 45155095766d..ad7eb7178f59 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,7 @@
 AUX kwallet-pam-5.20.5-socket-listening-error.patch 1444 BLAKE2B 6013b4229b4047b35b6d7550fc8fab1b30027bd31500bba2ef7dbb7e5b53d3d7a390feb4d81ff29646c76e3b53bd9032dd53e441409ed7406cc4630d8a6f93b2 SHA512 61bb0b7a344d9213d4dfb4258dc8e8a92ee94be7117daa9cbb54a02cfa1d1a746e57ec83107d375274f062e94759bdc59371064c712172c77740585a07684608
 DIST kwallet-pam-5.20.5.tar.xz 19812 BLAKE2B d0ad931e47a35b5589e9c34bce924f697446460bcfbfcceb4e3f0564182bbac822f13488dddc592f7b6a119d774b6176b86df8ddca55fb0c9423d0c7634fa9cc SHA512 5f728c2fbbcbfa7a2b50a2d9b60e557360b48d6a5958ce290ace3e2ae8c253b56f64178942f958d38e7e62e0baf1cad0ddb2aa28e11d145f3b507d58900dcb03
-EBUILD kwallet-pam-5.20.5-r1.ebuild 808 BLAKE2B 082e5a473cb19979ef46a500e9f634010ce06d34489157cf51202e7bf7f80390d7faf255a13cdabaf3747d61eeedc80fd5d096dae8836e777e6f29dbbb1f40ef SHA512 30a06f54018546969015a2d01a819c1f3ecff730f8fca7756b63653f1002421dbeab8d6d3f7825df9cbc27138145f532bf34c40e6e7591b56131f51d7e0cfb58
+DIST kwallet-pam-5.21.0.tar.xz 19892 BLAKE2B c38e20335db1c26620b6e93bbcf0f3481188e55acf1b7dd400418a63e8cde736b5d770adfe2cd78dad3213d972263fc14a224c077ee6d34e7ec14bb2fdc9e148 SHA512 5aefbb97267033251d93627cc89f7af4fb33ab3d9c348937fb36a445a2fb09f762747d28c29693569ad2cca474c04b4b4fb612e961f40ea209fc13fcf01b660e
+EBUILD kwallet-pam-5.20.5-r1.ebuild 806 BLAKE2B 8fa44b4313d2f160a0ffe2ca4646e20be438cf2d7fdea5eb52c6f9c13e73aa764d054473cde813d14dac7506977269f67fd5bec2c68a34f0f235c08e1e697d75 SHA512 cd505c66399ddf5bacbc7e16555780fbf19fa79616a4a4b92381248d287507b4934e5840fe4c38d404c05d59fcbe4f64ac47d9d319afc5604012f25e2e27c833
 EBUILD kwallet-pam-5.20.5.ebuild 731 BLAKE2B 765882c0d776f007a3c69f75d31b6cbc26de29fff3b08ae19713b7d18afca38bf4fe125feb4cd469f0f0cbd8e6ae879899735f9425090f4d06dffcbb57856ea0 SHA512 cce42e607072fcdbce047997bb27a48fa7e180318259f150d50d71c7d59c8feb02af13abd4ac9115dc20e5d2d07aaacc80330a89ee0adf87037e8edbbc2ecf45
+EBUILD kwallet-pam-5.21.0.ebuild 734 BLAKE2B beb05743d815f9521942c13dd324e90fb9265d15e865d6291da95aabe6c5308cc9dcb11c1ffe2f1ca01fb94a4b9b6852ba3bb93fc01fa6f3af03851f0ec67246 SHA512 43c5cd42e4c87bc9c7dbdb03b70631b1243f04e88b044cf22d1a616d3f2f4226db0ebc1af827e804f37bf30bacb09e5670d8125fd371534a9e08d52add896218
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
index 2dd76daad167..7179e0271a44 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.21.0.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.21.0.ebuild
new file mode 100644
index 000000000000..8a587a1fcf29
--- /dev/null
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.21.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.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="
+	dev-libs/libgcrypt:0=
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	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 edc1487a41e0..e0cf9c6363b5 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,3 +1,5 @@
 DIST kwayland-integration-5.20.5.tar.xz 21372 BLAKE2B 31fdacff1225d61332c8b9ffa7365a191d55dc1d698f3b0f0386adff0fc9dc2a31e7de8f182de96bdd6def85927cc02b8ab9819e3f82fddc499897785f55e562 SHA512 46b8b799082c02c045155f3cdea3defbcd2684b1f39ee851d46075cea89c78e55172a7f5c5584d6e50c0af75640c120a6d35b3d4be6feead86df17efb30d581d
+DIST kwayland-integration-5.21.0.tar.xz 23272 BLAKE2B 4bbc5058349386f6865f7020f08d9d84543f7c188c4728a7be25f5a68576b3c12a2be826130f54b51abf078a5bf172d39c73eb027fcddccae4bf3f49dfbfc3ec SHA512 28d7da74102a8146c8c41df882fa12761c19e2adaff384b529c826fed723f862279077cd33ceba37993329e78dd20c7e9ae738f2f74169b1ac9308eb32134cd9
 EBUILD kwayland-integration-5.20.5.ebuild 699 BLAKE2B 9a6e9b7c4d79ee888a4857ac896241f9a937d06b59c7e3cd7ee23eae6a2c17c41d21425969375f8fda76b44e11476e634712ca6eb8cce7781eac379b9d0b5b44 SHA512 5353f1632d829788fa7a1a4c6fb38cb99eae5f8005c7c343bec9ea1537c137e9af8e50770d6879dd03482956a11a4ccde5e85b9db5a40756f4498b809f4291ab
+EBUILD kwayland-integration-5.21.0.ebuild 702 BLAKE2B e731c790b15e48379fbcae8c2d21ce035ffb57a209db5bbd3fe7d566c89e36e994f7d2a375414a6c3aeb2016045a99fd252459392c4a64dcf145d29e290efd50 SHA512 f8efedf7d1a42cb763caee2a92fa9b0a21957e1ffde00dec4de8748ec976cd3e642a0dceb0adc2c195c1580c03573013ac258528c34ea9fb8b812789c45db578
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.21.0.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.21.0.ebuild
new file mode 100644
index 000000000000..42cfe4a36751
--- /dev/null
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.21.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RESTRICT+=" test" # bug 668872
+
+DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kidletime-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index dfa0e0f928df..5a63e5d9d059 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,3 +1,5 @@
 DIST kwayland-server-5.20.5.tar.xz 220976 BLAKE2B f3f3fd6b6ef18c014457d550e0551e07a3a7d6dc0664ec661f8e1756f4b07b83dd45f0aad58a427d21ac1335e88a7486bd3cf70f7e4edb62a5ea7e3984ab8a55 SHA512 fb3ef80061541998b110b5edb20d84541704cb82c5f087bcfc6f937ab4bf44e54d37b1a4576875e46082e0425f2a4f69e63e55e043861a89f447d887232cacb5
+DIST kwayland-server-5.21.0.tar.xz 219324 BLAKE2B de445bc37ad4461a6193df0b19ec39f48df1d87ab8a3409c68e8fb225daf445e87b88e7479ff8431cde956110521562d7215660f71a99a6ef54606b0f87d2049 SHA512 0c5b97a4ff1e0d2757d0e6527ee93934507d422114d4be1b15de7df4b37583081ffaa46a706c1b8ad963454332fda067e30060889b5a82fc2ee063b1bffff4ba
 EBUILD kwayland-server-5.20.5.ebuild 783 BLAKE2B 43c0ca3b268f9ca661e2abd1aeb6eb0d51e3540a85034654af5077ebb25046b41fffe26c8246062e1dd4fc239be5019220558914e2f7d9ce40d24ec415f40430 SHA512 9f71f6e2afd18cb92be2c8db63c3f2b1787f84dd3c57843e1e55b70a2ae891cd33f7b6d3c12bc5dd7dc28661c6f43bcf4a95d05ddb92ace9e84c6fd8080cd4d7
+EBUILD kwayland-server-5.21.0.ebuild 786 BLAKE2B 2e28112087e217dedac8ef53fdb73163e386be669a26a28c75b5231d9563ac093af3596a71af9337ae2696cb5ca5db196130ffdbf2681f17cb9ba9fe8fcdd292 SHA512 5071dea6e346d76f4c3c97eaa1b1d013ba4f473202cdd41d4177448682dfad3198d53d1dab49c97134c7d16325a1f141047bd1663b2d8334947657ca286337ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.21.0.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.21.0.ebuild
new file mode 100644
index 000000000000..4850b06ad02e
--- /dev/null
+++ b/kde-plasma/kwayland-server/kwayland-server-5.21.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Wayland Server Components built on KDE Frameworks"
+HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
+
+LICENSE="LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
+
+RDEPEND="
+	>=dev-libs/wayland-1.19.0
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[egl]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	media-libs/mesa[egl]
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-libs/wayland-protocols-1.18
+"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 81f7aefa5a94..aaef62869190 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -2,5 +2,7 @@ AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8c
 AUX kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch 5670 BLAKE2B 52c854a9fcc850f29a517eec5d6ced50ad840ce54f124ccd6caecb6446a67950463673e264d17af784d33b9cc44435a01e176a75aac285ff8169b6117c137261 SHA512 898105b424df78ca043d854bd811a112614b05d8df484705726c91149b47f505b6ffee494eb4cad81fe7ac10e922715e8d2b88ba11517d66c125c93070e5fd19
 AUX kwin-5.20.5-revert-new-focuschain-w-minimised.patch 2199 BLAKE2B 66835e1af9193c29735fe1f676e344927d1ed769b17e54a4b70abdd9d253c2eff22e0ea0f65fc2674c90868f008cce258b3064545619b1ed0fe36929194f0e70 SHA512 8b9c693c4293816a92b9d91964834bd52cb217c4369af442de1b0a19e107112941c6c0e982dd2757d55e861da6f00a8a95db5d95c9e2b7951f635516f149ab13
 DIST kwin-5.20.5.tar.xz 6329444 BLAKE2B e80890c1a353b3b8a15659ea3f88e08b84f29ee863aa41ed99758e93008def940450abc2ad66bc2f5d4c9cd391a3d6ddb21eb2ab79d3696b7373f8ae0fdb6d89 SHA512 e9186dc71e3e9b913314a83fe9413b956d61d633f0e8418fd47d82178c6f50eb75b03299c00495af351b0951df23057500ef28123123583c291a0c29ea3414f1
+DIST kwin-5.21.0.tar.xz 6392544 BLAKE2B 47eb30a7668ae5f9d61ac79f5d6d1eb89f23d87cf5b4869263d4d742654f5eacf42d89d08942691b221cc765352929b112ffb3c6e5ee7f082484459b67c341a7 SHA512 f311861f6ffa364eaa09aeb8d3a1ef384ac955fd630dcd40dc506feae393bc05e3b71c69a5340a70ca1f6d34ac7070ba7af6f9bc7d7bd9bd82d8842ec1e594d9
 EBUILD kwin-5.20.5-r1.ebuild 3941 BLAKE2B 99593d2bc2ae9dd12ec340f2a610e23ae7870d2f88d2881707b65bd60efcc022f32c38a0420cc77b4dfa2ca542410040ef8efbb96d771af2f2743f6bd1d2238b SHA512 afacac18c55ad2325828a0d9387b024ff72884eb1de2e42fcb8494a978ec422d10c85539f2f986c3320e66a41ea85d3d3abe93d69c3e62de5373dc62f8aeeff2
+EBUILD kwin-5.21.0.ebuild 4014 BLAKE2B fcbeaf35c56c14c0b985b6dbdf0ca572bc98cb443493f0753f5b486882d13e70611f866b67ab60c4f7ef862b7ee22b7cf43e8d4348aa40442f7fdc822f8aba6b SHA512 0f84bf3a0ab0401d03c3335ad3c67601b1e41ea28ea6ac394350f2571b07ff625a7e285d436d986cd9ed6ce0f5f0080fbd3a1e736fa191ed503265e5c22b2cff
 MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c
diff --git a/kde-plasma/kwin/kwin-5.21.0.ebuild b/kde-plasma/kwin/kwin-5.21.0.ebuild
new file mode 100644
index 000000000000..d8fe20f41eef
--- /dev/null
+++ b/kde-plasma/kwin/kwin-5.21.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="optional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="accessibility caps gles2-only multimedia plasma screencast"
+
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	>=dev-libs/libinput-1.14
+	>=dev-libs/wayland-1.2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=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/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
+	>=kde-plasma/kwayland-server-${PVCUT}:5
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/lcms:2
+	media-libs/libepoxy
+	media-libs/mesa[egl,gbm,wayland,X(+)]
+	virtual/libudev:=
+	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
+	accessibility? ( media-libs/libqaccessibilityclient:5 )
+	caps? ( sys-libs/libcap )
+	gles2-only? ( media-libs/mesa[gles2] )
+	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	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
+	test? (
+		>=dev-libs/wayland-protocols-1.19
+		>=dev-qt/qtwayland-${QTMIN}:5
+	)
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_prepare() {
+	ecm_src_prepare
+	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
+			-i CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package accessibility QAccessibilityClient)
+		$(cmake_use_find_package caps Libcap)
+		$(cmake_use_find_package plasma KF5Runner)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	elog "Optional dependency:"
+	optfeature "color management support" x11-misc/colord
+	elog
+	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
+	elog "windows to the end of the list was changed so that it remains in the"
+	elog "original order. To revert to the well established behavior:"
+	elog
+	elog " - Edit ~/.config/kwinrc"
+	elog " - Find [TabBox] section"
+	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
+}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index d79a14d88fed..e2017e6c9599 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,3 +1,5 @@
 DIST kwrited-5.20.5.tar.xz 20508 BLAKE2B 8555ec109bcffe731428bd379aa78498b89685a03db22f19949b7db6d609bdfd9d94aae0de9d84c8b56620a432e35fbf20c834f9f46ba13955e724a9c4fdf580 SHA512 77b2b3be3b3c3fc7689d9e8907a4c76bcfc012ca862a02d77273f6e373407e72ccf9e68d1e3a1b8eab99bfb390d472591074108a5233f48e7c97221d87f4838a
+DIST kwrited-5.21.0.tar.xz 20536 BLAKE2B 4f937ee0afee7cb490f0a098de0a9da56d3dc0ae4bcbf33b481fdfb05bfa2c7c2f49948ecc171bba478e62f672510d5f67988dd0d33c22c0c642e594515b4d9e SHA512 8a98a9edb9648a26e6ee67a62ce8a1c3bbd38c7c6b8d0e7b1f7891f891998374e7a644e164d4521f7fa0a29da29111370d869d88778b615da588eeb603f2de3e
 EBUILD kwrited-5.20.5.ebuild 592 BLAKE2B e61189e803740da434c1947b07f7cefebcd6d673f399d5332116741656f950a7a79f7f9159a6818b1f78fbdbf586586084a29d856355534ea97586143dd72a5c SHA512 4b772de6b79b9febafba47e68f5135607f9485a49b0c3639236288f181ba1606e2b8d057c56b7241564baa6af785770e396d45d0f78e21c026e9379b66474008
+EBUILD kwrited-5.21.0.ebuild 595 BLAKE2B 87805904849621a12e2e4ca85a8251998337736feeaad43a7bfe3e94278dfdcad12b38f78fed19c15cfb8c8c1c99604ad5d89b565e8a072e5bdde6026246a9fe SHA512 182ca4dd5c1bad07b7cd8fdc2456db2193820405ebb547fcbd0ba975f2bed7becc87e57973c911ef756904c9e8a28781d98f930b70c6a6b33ea53473c117bc38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.21.0.ebuild b/kde-plasma/kwrited/kwrited-5.21.0.ebuild
new file mode 100644
index 000000000000..e2ebeb45a573
--- /dev/null
+++ b/kde-plasma/kwrited/kwrited-5.21.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=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
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 573c4c587119..e824caab7484 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,3 +1,5 @@
 DIST libkscreen-5.20.5.tar.xz 85368 BLAKE2B 886156489308315c3366d7b6efa994d715ecb7729ad51a5b36285de2265ca49eee23f712a56301388398099336e7a07dca869fe23e1e70c876d070392b207a32 SHA512 4fd9e5a2f215f2da752929a2688022d78ec16a70342613efbf5649a1b6be09f0b4e60cc780ccc985c1b725ce1b38f42c7f8b7bd92eb2cd1612aa2c5a005fbbdb
+DIST libkscreen-5.21.0.tar.xz 84684 BLAKE2B 0e312d64b60c905c18c0b1cc0697bbfc7ca2ff94f9c27cbd605cd39cfca223c32ec2931b1934ae65a905d75e4bf7b6b4afe92e934b8d931d1661f9729506c739 SHA512 a8066dfe1a1798e8803dcf3018ff252b8f83dd9f5f4052e0744e77fe36965bee2d002148e40e0fcdc8814ec7f13fb63a4582c3f2768dfe6dd858b851c95fb461
 EBUILD libkscreen-5.20.5.ebuild 647 BLAKE2B 5ed57c2ae5202c78bff6a157b0e13aa9e14823407ebfd1c965e450e5f3cfd3a374bd6a4e505edf6359ddab7ed0f524529548a3d9dd9ad3c993f6505c5cb22b76 SHA512 b42752e489219cca984fcffcb5c7d1910a6a2d71b4335bda4f2ffa1ebbd6b0593ae47d1ae1c0b126ed5141e56c25fbd105f99cbc954738c22f21dc5d2b746b20
+EBUILD libkscreen-5.21.0.ebuild 650 BLAKE2B a0149add0cbfd3b0d9d284bd66ae2218614406abf327314973628da7ed99c8f273a0c6f84894a8ac5d01c6f76c38032f42a27d65ce747bf7498d4ac1c3ef08bd SHA512 1f3c449d3b6b4649ce75401a0459ae1ca5864840b2f5d86b20f36e63c5558640edfa7d413785e9ce5536fa10e017653b9cdfe835593c6a01242c44e585dd5eb7
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.21.0.ebuild b/kde-plasma/libkscreen/libkscreen-5.21.0.ebuild
new file mode 100644
index 000000000000..41c0ba6395cb
--- /dev/null
+++ b/kde-plasma/libkscreen/libkscreen-5.21.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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=""
+
+# requires running session
+RESTRICT+=" test"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b00fb70d8e4b..4c97600cf802 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,4 +1,6 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 DIST libksysguard-5.20.5.tar.xz 699156 BLAKE2B 749cbe4b73e8377bb3dc026000492d6dd0cea34dd13aafd32754aa84636ccf416e60fc97ca17c1810ea0b2458f6ec09471a383210b1a6b025a745fded3a1c734 SHA512 56fa61e1149f8a97f1884755bbc0475a1f9a458eb785d29416b4646e9a9edb1f2bf85e56dcf49226ab1509b4a63bf4334c1ad9853026ccd0eaf68dffa79864b0
+DIST libksysguard-5.21.0.tar.xz 705860 BLAKE2B 32048c24c756b77891ebb3531d6a0f5272e4f1486411161ef6ef00ed51fe58be46beaf6f37ac468e85092588b97573ef7f95b2f1ce434f7a876c292a509c54ae SHA512 a2e655dcb14ce4776d55ac88d550b7f284877d5d5f94c26b3c3d171b7fb29e4e02670e1eeb203dc73c22da56f23cadc21eda680f8ed57ea28a6bde51efb54de1
 EBUILD libksysguard-5.20.5.ebuild 1689 BLAKE2B 89ab4bfe0742a8b6c3bbd6e8d356527e78328e9ba96d9a27ecb0d19c8690d1ec65f626e43e3ce5379100f90de32a9b17cdeb82170ec8b5b44f0b29ca88195d05 SHA512 acb35714b8b71469fb5ac15ce0d5283d79d01df335e5fdb3fa97aa5102bad9554fd35a808ebf8ed466477d4b07b86ab7e35325fa9cc7f42c13f6e4b226a14e18
+EBUILD libksysguard-5.21.0.ebuild 1692 BLAKE2B 8722300112574be9d64f40d6f16ca02f0e6b1f6df5c39444f01c8980f6a6f6a2f86707934a2c347236eff6a458b9340dcfbc37ce8fab3c291709377cd2a7344b SHA512 dfca3099d64f978bd907d191618fde54909352bc70eaf4917825b1844bd6adb3f13b9c81b8a04cf729b082b2bf3486690986281636c88c1aaa7ed786fa093446
 MISC metadata.xml 542 BLAKE2B ff3326f819a0324fdc3ab339c3172f91d1fabd5eae8faffdb3b3bcbaab2a73fb3882e57db5fb6bdb669b5ff3338fc8b3ccc63b771255e527c7a64f0cac0d3cc9 SHA512 ea5d493aa7e05db1b63db2556ff3cae361aee8a18fd2688871cba9882f91b8dbf7897b91ddce16b2acf0b12efe100e8db0754fd86126a7c1d95b6cee02b576c9
diff --git a/kde-plasma/libksysguard/libksysguard-5.21.0.ebuild b/kde-plasma/libksysguard/libksysguard-5.21.0.ebuild
new file mode 100644
index 000000000000..8fe421d7b8db
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.21.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+SLOT="5/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="webengine X"
+
+RDEPEND="
+	>=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
+	>=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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kpackage-${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-plasma/plasma-workspace-5.18.80:5
+	>=kde-frameworks/kiconthemes-${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 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 f51bfc39a777..3757a81ffed1 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,4 +1,6 @@
 AUX libkworkspace-5.19.80-standalone.patch 4989 BLAKE2B 6487cb2071b4ac026966d23cfe5dd6ca8e3ddab77cffb08d51b5266e3a9ea16f74a90d987fc1b86891a65b40bcbacc3fd9dc865c79e08206cd0ac67cf7bb82cb SHA512 d86365f59cbd20979c9f7412f106c34eec26d3ce0361269e192c0310d3107fb2486eebc1fb7fc7bd331887a883ae5722259467b4edb0d23cb4355ab472f93c7f
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
+DIST plasma-workspace-5.21.0.tar.xz 9710020 BLAKE2B 8b041e723f9e69d176d6d63825b469e4e848b9dd10f588d5523f5c03562385e56d1e4c0930a3d108929396542b8d6dddb2e1fe2fe3721e815b00b9e603068d21 SHA512 c3739f9b689e08912f78ffb9ba1ba4ef9661c6aabf9e5a359604b5683917f35c4b47b94bbea684c21ff622507ec9196b6f532f5530fb78311f5007ff32d1f83b
 EBUILD libkworkspace-5.20.5.ebuild 1409 BLAKE2B 522dd3752451c44c7e3552c48fe51e91cea10ba2707844dcaaaf7b01aab0310a7c6499beeb5fe1b33dcb5d91670936748df735d99fe2ee2bf77ab1e4a22d5433 SHA512 42954b88ffa84cc9aa30fa82fc00061c5cc5225210e47cc948de50ea7c7fb620bb9b07bc4bdc37d4c5be0610b4b4fe8de7be3970dcc11737842ee599be119a15
+EBUILD libkworkspace-5.21.0.ebuild 1412 BLAKE2B dc76b5ed98f5d012b685f756a5601a1e4a6b9ec28198993237c66b1fb513e9c12a78ffe1ebd04f1b9c3bfe292a3ba5b78fcd373e2585a3edb9d2ef583c49937c SHA512 17630960b9279510e25892787c051645fc65a18254f0a3b8b109162d43c6cafd8b15b4603d1472e7f6a9a44d8f880175227b3956f062eabade9f969e6780a80f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.0.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.0.ebuild
new file mode 100644
index 000000000000..b11c824373f4
--- /dev/null
+++ b/kde-plasma/libkworkspace/libkworkspace-5.21.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 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.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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=""
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-plasma/kscreenlocker-${PVCUT}:5
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+"
+DEPEND="${RDEPEND}
+	>=kde-plasma/kwin-${PVCUT}:5
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.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 32cfe33fcb35..bc2e22693579 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,4 +1,6 @@
 AUX milou-5.19.80-disable-manual-tests.patch 849 BLAKE2B 96f6148e384bcaa62cd7748bb695c86dec1d12b93252a5deda724ccee92b72ab9cdb132848746771dd4ee539eb8ba6f83681c410b28c1a203cde50a0a36b7ffc SHA512 c5dd9078754ef0dabe5704df18423ddc273c0ac0d7a685cc3df949588202bc18dd3542925e67dba868074e2e4bb5ad06ca4c6d8efec91d19af6fbea2642d6d2b
 DIST milou-5.20.5.tar.xz 55388 BLAKE2B 5d2e977c884753a315c0c424d30ff5fb2ebc04e660b0243d2c352fb105811fde54f9c57f4e96a7abf2cc043ae6ca9b348ca4d84deefcef550814ae2dcbdd7822 SHA512 a67d939dc832b77ce957cc2e1b9a9e56412618d94217e0bb958db62fa41c5ba2e6e4311e0300a79800ef1845e425ca0e275fea10ece9d9a60bdf7bf690b71b32
+DIST milou-5.21.0.tar.xz 43788 BLAKE2B 3b07a9cc2847032853f1254f2c916eda656f3a1baf3271d75315a1132ed6f2f2bf534163172e7d3a9a08d5d83aa7c0fd66590261854576930d86d5a979ad4f4a SHA512 5e4d677e0d8747c485b24cd0de4fc36c175973721002420a357cd0d00471978110f39f1e47b17492bd33c98a816c0073c3ac723ab23ef36367b2b1eec1681a9c
 EBUILD milou-5.20.5.ebuild 913 BLAKE2B 828d57300e687005e26521d5b2a1319865ee34291750fe66d5e2e2eea738090269035d242fbb8ced5e247848d0ca8a323aaa63bbf9eea3655ff8ef8e83caae9f SHA512 122b969b228816e4d2552bb5e52acd11efbff05b4208312b59049981abf94de250f04b3b38f08ab55c6e1f2ddabb4af86bf4abedf7a7790ac84d455136fae34c
+EBUILD milou-5.21.0.ebuild 826 BLAKE2B 174d1ca45903ccb1f8bc9b65736b14fdd433c6f461f0deebf8a01c1e5412a47137d8ea08ed05dd3fcf4b0c5609fea7d3a81524e5fe4c6966d4d9c2de868a3619 SHA512 2b9c9b644bb0534b0c8912b1e62c75666a1ec5e53e8fa874257fe04ceca0a5ab1637c200241fbfdad30a823171f8755fcff6d24defebe4328aebe4967e698c27
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.21.0.ebuild b/kde-plasma/milou/milou-5.21.0.ebuild
new file mode 100644
index 000000000000..34bfd6694bc8
--- /dev/null
+++ b/kde-plasma/milou/milou-5.21.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Dedicated search application built on top of Baloo"
+HOMEPAGE="https://invent.kde.org/plasma/milou"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 64a6b1438605..50bb0388bdb9 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,3 +1,5 @@
 DIST oxygen-5.20.5.tar.xz 4471660 BLAKE2B 9ff9c4479d34020dc92aa6d68f44d80c6a5620d8f22449a67a1d02df0f6d68313b3f88c7e41e292fdafe2316f6b50145b7a5d4ce128e0961782e7cb71d18bf86 SHA512 c3dcfeca4264c460adec8a6f08a616d3647c8e7f4265a23b994ca1106d1c0a3aefd7732377f5e6a38dcecec4728eca2bd54a7290b2d52ab81a66b7b971503282
+DIST oxygen-5.21.0.tar.xz 4477276 BLAKE2B d5967743e1d76b85305e61df952f12e3c760220a7ec50118e7cd472a9331577e8748954c3c7e95696849c9f6e642879aa1072014e6b9c8707e33e71a1eabdf7a SHA512 8741bfdd0dfe00f69e8f83af008bfbcec04b4f21e3d7d8208c2084969704f1ff3b5908acfedc4ccf3911656831b7cb2b099871b35213ad10ad62d79b9fbe2164
 EBUILD oxygen-5.20.5.ebuild 1363 BLAKE2B 7c9c6354c95b83c9a998c7a52f11cbf6524031e3ada6fe351b3defe401f2c418f54b1e6f4808454f1141d55efdb1896d9cc388412ea97460928690cbd91ed20e SHA512 9bbfbd9f56bd3343356174581fbb912eada64ba1f2bc5c3468dd12da5b12efc5c38a88135248f76598e72590e2eb54eef7a80b3ac8292aa39afb5e6c16a978c9
+EBUILD oxygen-5.21.0.ebuild 1366 BLAKE2B f9f685072a018fc41718742036547fb54a4abb912e2ad11cc211ba3364e8975c9aca0e5ff9e80cb71d39cbcfa561685b53fd0aee17ace68ce6179bef3516541c SHA512 10fd34e2a536cfa743c69ccd44f9f44a27ad3572bf1f335051bf3c5955c8f9441c9069caaf1a556e9d15e2e3eb42895086cf9b4921bb00badb6ddfdc1c5de36a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.21.0.ebuild b/kde-plasma/oxygen/oxygen-5.21.0.ebuild
new file mode 100644
index 000000000000..704b47383914
--- /dev/null
+++ b/kde-plasma/oxygen/oxygen-5.21.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Oxygen visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/oxygen"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="wayland"
+
+COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=kde-frameworks/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
+	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 0e5e1a7db6c2..f5a1da68ec47 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-browser-integration-5.20.5.tar.xz 193684 BLAKE2B 9144233b0a36e913328e930a59973432ad9e83066e7bdd602a672f354e991fb6a971598c788e658ab55615ed6e2e0731d9749d1f6d471f928375b4af0852a2be SHA512 d6017397dc86c5e835b914748fe9fe4c3f2b499174dfd3a0a9575446a831478deb692663b6c0b6d6ac37aa309a5a0168a5db5d56babd8e802b419022ce88f152
+DIST plasma-browser-integration-5.21.0.tar.xz 202860 BLAKE2B 03776913896a97b2d22b5106a1e838a64b348a032c49122211f141a5fcd4b0a86438d9a93999b542bd756d56271a3cbc73cb981eb7d1b3d9bc01a5ab68d49e55 SHA512 b695ec46168889f84258046f0b732349655053dfd999fd60bb72a7e31a16b61ed168b39d857621051fde195a43696bd379235c8965007a9de738ce6b1c229145
 EBUILD plasma-browser-integration-5.20.5.ebuild 967 BLAKE2B 1828fad5558bbbd88b3341860e17c42540eb794a8fe42bffa4f5bc39cc31564cef001bd643592af374d3e4f55796fdcffb1298e9c9665bf7bf22aa5c5d5f169c SHA512 9363154d26a04e728d16688f60f357a8cf4a5d1a53ab446523db95f337fc3dba2817be615f8059f35547cdf8cf862f3712e62a05a1a0576ddb09af832702c5d0
+EBUILD plasma-browser-integration-5.21.0.ebuild 1012 BLAKE2B 66882e1122761d060b97b7c2159b4b5ed74308279a0c423c07b947249ddab66e081f5eb29e85d8df9f395f3a823cbe9eb730050987cbd66409113e462898eb0c SHA512 0b93a8bf8d6e5da64c919bbe7664dea2ec5834a7f75da9c42a9610da0518ef986c722dd20151f7deb062bdad7f716f8b8d76d5602cacf5b4b046bcacbdd2ef92
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.0.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.0.ebuild
new file mode 100644
index 000000000000..770d65f8835a
--- /dev/null
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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
+	>=kde-plasma/plasma-workspace-${PVCUT}: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 d47ad008cb24..6472a15c6863 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,9 @@
 AUX plasma-desktop-5.20.5-compress-new-input-notifications.patch 3572 BLAKE2B 90872167841b752dd3803d176cddc5ff053e64a4f0dd95bdfda8565c683c0e837b8df7e34efbc16abcf95b75821b73a7ea114da7dfb4ccbec73d3921d8d131eb SHA512 2468be82790c7beb41d8b40aaae5b0490be04761b687188790bd80d0c66ed28a7b26468dba60338bf4ea45a15700e32c1ade1fe1530d693457a9470b7b10f883
 AUX plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch 995 BLAKE2B b4e00a862885bae9cad600c0a67dfb1578c2bda0bb96b9585d5690f3d4303de1cd6808c7abc3709c030dba25c98d9cb7d4e8d0aafe0d1b89ffe48a6b9d15101a SHA512 3ad5a021eef8a20564b06a4a67952484712733efb989274438330343d40c86164fcacfe41d39b36d8ffb8839de1be17b63b39ed0ac705b5dd660bb2bdf22a9b9
 DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b
+DIST plasma-desktop-5.21.0.tar.xz 15897396 BLAKE2B 0f7e312bf94ef54f4d6e38bf8ad2777588c6b4b69a277e9621356ccf588bafe6b02ca14502a8b4cdf447642d9b9b4b6cf27693a42097aad9df58c470dd41f815 SHA512 fea2e4626538fede72c75e995d73f82d4ec95914737e0e2ac1e90e71f8752d06bcbedb0b515fb3a47ea1c315d986f8f836efa39899d9f923c526b30aa244ada4
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
-EBUILD plasma-desktop-5.20.5-r1.ebuild 4882 BLAKE2B a2be15516d67c52e6c9c5b2710ca2bbdb073a6c88e0a136e0ee4290d57ebac7ae05e6ce362a5156fc9423c9d027340296b8018258f63a9464f5ed048be837a1e SHA512 ce3e0684a3164866b6e2af8d5e52a9c42f60f40f5c9ae4e3766e2e5c65738c7d5ab9d452364bb1bbe891da5e05ffc1d2cbe08e839fe1dc9f0068221174513699
+EBUILD plasma-desktop-5.20.5-r1.ebuild 4880 BLAKE2B 3c4e0f2b83cbd72f3eeeac99bdcae15ea35418bf335aff621ae354fb3c0ebb9ca7a65b59a7cb0de26517afe04616c89dda27d0289a63ba33d8591667b69765a4 SHA512 50a9c2343ea0bca8ea8b4930a01d91c0c7e134aedff32cba5077f15b4332cf6257a9550f92ad832d3572caf1342071a919d0e9fdf58bce58fbfe3312b1eb8570
 EBUILD plasma-desktop-5.20.5.ebuild 4758 BLAKE2B 1fdcf427ebf602b6340e0617da18bec58456ee1661a8e3b351d0279d0a91593edcf06588f58bd05a4620bf8b3b0b8ee37d7806063c0aa1793b1867ad7170663d SHA512 70133d7de94057e62b25d52f327bd699a689898695f99a2787cd84793d83f6ddbd4216566e64de73289ebb142f5034a834a9db71283fd95fb9a516b705cdecc7
+EBUILD plasma-desktop-5.21.0.ebuild 4922 BLAKE2B 21fbf7d3e8351ffc280bc2074dea08b4345faa4cb95f79eeeae24b6387357d62c998b8e75ad0442a320039e497543993f703f707f53c19bbbad8b6b3a693aa72 SHA512 5fda0060d3ca4b4d2abf7b66ca0cb1eb148c9dd908d0a3f78f7f1d4d620df274b6101d6660278db916a8957b1cc1c0c9c3f06686425e1e2fad817fd8ca21ea54
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild
index 5030782af343..b37887892f76 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.0.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.0.ebuild
new file mode 100644
index 000000000000..9c62103b0a89
--- /dev/null
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.0.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma desktop"
+XORGHDRS="${PN}-override-include-dirs-0"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/attica-${KFMIN}:5
+	>=kde-frameworks/kactivities-${KFMIN}:5
+	>=kde-frameworks/kactivities-stats-${KFMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kded-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/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/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/libkworkspace-${PVCUT}:5
+	>=kde-plasma/plasma-workspace-${PVCUT}:5
+	>=media-libs/phonon-4.11.0
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbfile
+	emoji? (
+		app-i18n/ibus[emoji]
+		dev-libs/glib:2
+		media-fonts/noto-emoji
+	)
+	ibus? (
+		app-i18n/ibus
+		dev-libs/glib:2
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+	kaccounts? (
+		kde-apps/kaccounts-integration:5
+		net-libs/accounts-qt
+	)
+	policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
+	scim? ( app-i18n/scim )
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/kdeplasma-addons-5.15.80
+	!kde-plasma/user-manager
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+	>=kde-plasma/oxygen-${PVCUT}:5
+	sys-apps/util-linux
+	x11-apps/setxkbmap
+	kaccounts? ( net-libs/signon-oauth2 )
+	policykit? ( sys-apps/accountsservice )
+"
+
+PATCHES=(
+	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+)
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use policykit; then
+		ecm_punt_bogus_dep KF5 Wallet
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
+
+	if ! use ibus; then
+		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
+			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
+		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		$(cmake_use_find_package kaccounts AccountsQt5)
+		$(cmake_use_find_package kaccounts KAccounts)
+		$(cmake_use_find_package scim SCIM)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+	)
+	if ! use emoji && ! use ibus; then
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
+	fi
+
+	ecm_src_configure
+}
+
+src_test() {
+	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
+	# test_kio_fonts needs D-Bus, bug #634166
+	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
+	local myctestargs=(
+		-j1
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 7eeac5d937a7..24093254e778 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-disks-5.20.5.tar.xz 64636 BLAKE2B 769c131e069861dc06a56ebf0e5f8aef9306ba10660228a8a1b0d6a240126556d18a8c5323255efaa237bbb116c6db2881047257e834597e112e79906d1b64ff SHA512 dd27cd4b612620de2a28001bfd3c95a3ec41fc8f96fb0421ad660885600b663df95315a8cd0710c0457f51633dff91cdefc75417b3751f9c21d50cc45fced9bd
+DIST plasma-disks-5.21.0.tar.xz 70096 BLAKE2B 095c6b4ecede23644648d504f7b80d81d67c9b76d655a63196822339db0f072b8f963137dc352fb2e207b0d2993e27cd442bbadb8cdba2eadf7baa219e427aba SHA512 13564306325a0d39e077c1480a2642aebaa7c72ad8d0b4f5dfdda27f88c9776c32a03edd0f610baf81e417c4279027d41309c81bfb1e51da4ef040a3cdb63e5d
 EBUILD plasma-disks-5.20.5.ebuild 1030 BLAKE2B 927fe7401594d9e5078d6349b599550e5a1151bdf34afb9c02ab6849a53bc868596d48973db1c025471013a7c1913d35465874f7bdef33a2c945da1815fa3991 SHA512 a32351344827faee19cf7dc2a83f28f956cb3ace3096c424c7c881ef68004b201df7d6cfdf9fde870870377d920f73b82edd44dc3918e7eb6d2010be0b7c8aae
+EBUILD plasma-disks-5.21.0.ebuild 1033 BLAKE2B 869737b0f6b0e30df52c79536b43b7b76a1234f80e4bb7feba9c63e0e7d6f01ba952f73b4da94fc4ce5d1e34a876eac834c1ee71dbb60d7728789d93d87af047 SHA512 20400ff9dd87e44b4f894a08ceecbb0014751099b3283790923d4f45c7c931e41116ab860c9f8373c94c00cafbf56db289aecdcac5b31ef1c563f2e230c497c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.21.0.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.21.0.ebuild
new file mode 100644
index 000000000000..c37f759db76c
--- /dev/null
+++ b/kde-plasma/plasma-disks/plasma-disks-5.21.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="true"
+KFMIN=5.78.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+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
+	>=kde-frameworks/kauth-${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/kio-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	sys-apps/smartmontools
+"
+RDEPEND="${DEPEND}
+	kde-plasma/kinfocenter:5
+"
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
new file mode 100644
index 000000000000..aecfd4694c7f
--- /dev/null
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -0,0 +1,3 @@
+DIST plasma-firewall-5.21.0.tar.xz 329136 BLAKE2B 842fc9139ea42cb06b9aab295040156da3adccbf9821a9474acb2f36fee27cc6a148e575790ae2876c7e431c7ff559fab9db3d6704ad099d5d89d9c2fb10652f SHA512 0d27a3667e5fc42ac11aef8ba92d6a81f933ec80baa1975d819a81a3a3aea114ae3513483d3db590431da6bfe9943f156b6aca1d51355699e2794c250ad83c0b
+EBUILD plasma-firewall-5.21.0.ebuild 1165 BLAKE2B cbd8f0e1980a5c6ddc004600bed03e089fe5ad161c7e6138effe909d36f31f5f799083c89aa9fffbfb2dbbb0e774b8a8c367637abba7003e6f4bae0df37430e2 SHA512 c685f1e151e7d22a549e6cf03d730059c46a4e836bd8874144053d85965a4c303aa9b51a145adafd3695b4e534695928de8c8cb47806fd4657dac791ba39242e
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-firewall/metadata.xml b/kde-plasma/plasma-firewall/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-plasma/plasma-firewall/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.21.0.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.21.0.ebuild
new file mode 100644
index 000000000000..83c3d04d6785
--- /dev/null
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.21.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.78.0
+QTMIN=5.15.2
+inherit ecm kde.org python-single-r1
+
+DESCRIPTION="Plasma frontend for Firewalld or UFW"
+HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/plasma-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	|| (
+		net-firewall/firewalld
+		net-firewall/ufw
+	)
+"
+
+src_prepare() {
+	ecm_src_prepare
+	# this kind of cmake magic doesn't work for us at all.
+	sed -e "1 s:^.*$:\#\!/usr/bin/env python3.8:" \
+		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
+}
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index b70cc4a2600e..4280765d5be3 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-integration-5.20.5.tar.xz 59740 BLAKE2B 8c6e054db3047093556ac9549ebe28e6270001838f28eea92138f4acc02c79235f6c0ab8d82de764dae16efa81cc7ff7519736935bd77153612ee035f7abf337 SHA512 fa0806c756d394ab6f419252396f9d0a18652ed652adcb016dd2885f5238df843814f4661c63b193805834dcd43cb346f69ce33339520229c215d2ff45a24604
+DIST plasma-integration-5.21.0.tar.xz 60936 BLAKE2B 8f1cde5275dafc8e19a40205df459db74b4d452e6069bb5af19eb408b859eb6456fd5ee1aad24bab6137f921ede2aabbcb6a34e7423a2bdd604884aa45d11852 SHA512 723338e7cdc4e62199f0d1eb30d2e08ef6c0fabbbbac98d90a7503c77a336bc07c7341acb886bb7f6ea412ea094c785b70bb2a343bfe056508eae2ef257ccfd8
 EBUILD plasma-integration-5.20.5.ebuild 1235 BLAKE2B 194e3e91201852ac809135bbcb2ffe9c0a19a36bb580310af719d53c4edccb860be165917d484d283dde10a3134576887da66a9369690dd84c96496c1a0d3748 SHA512 e82e9265f293ff1a50bb8b02cc84c3fe46035cdccc8a5bb4970c29a5734e7dcf1fda1a5736a2320ddd178fb83e8ef14cf96c7503669fbf8eafd5863fec350e46
+EBUILD plasma-integration-5.21.0.ebuild 1238 BLAKE2B 96b065cf1d222f0bee22340748fe946ac96e07c69a68ac9801e62870408ea4e9a605af9a2470eaef1ba9f5c115574d9dcb3ef90f679f763e4adc1954ce983a55 SHA512 f272b795211b2010b83728f1b49594c34edfddf39b2f7f9255d9f0456daf7e6a3b2ac2147a7b832c1dc32445ee46f3b90780f9907c52f1fedacf314fb2e75d5a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.21.0.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.21.0.ebuild
new file mode 100644
index 000000000000..30c2bb013da9
--- /dev/null
+++ b/kde-plasma/plasma-integration/plasma-integration-5.21.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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=""
+
+# requires running kde environment
+RESTRICT+=" test"
+
+DEPEND="
+	>=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
+	>=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
+	x11-libs/libXcursor
+	x11-libs/libxcb
+"
+RDEPEND="${DEPEND}
+	media-fonts/hack
+	media-fonts/noto
+"
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index ddd7143d7402..91b1f9b2a133 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,2 +1,4 @@
 EBUILD plasma-meta-5.20.5.ebuild 3646 BLAKE2B e0e2f932a40c719a31a3c083c92c79d0953106ccc5f062d1214f4c93f8fd598182fa9a41910db67f1d1cff9a15164a4167fc11640060b15c4d5f8baad8909f52 SHA512 a483608e1b05606a3b93189beda17e7dad428cf183d48b8425dbb2d69124637fe34d4ff5ef499a386a7b9418f983d4181744d4fd6b860e201c1478edc4956462
-MISC metadata.xml 1978 BLAKE2B 4ea42f2c1a260bd6aeab7edcfc0d66bf10a7bd7624e7e8d679747cdd84d0cbfece968ce19ae0f31cc5746280f50e335ed46cc5d57fd85b4da66db941bdfe9447 SHA512 7ff4b7d77a372710105a10b71594e88e6f3e86908feb6d15ac47939e93e2235f3a482b3c1a2a77bbbe63c5de97438fa17a93784e8b45fee0281316d8f9e74f5b
+EBUILD plasma-meta-5.21.0-r1.ebuild 3784 BLAKE2B 2fe9b6fde4f9b3702703a38cdb721c660f6dc1b9cb48ad2e97f43dc122f7a2443b592ff05d3726d8396b78343cbe314042e891c07c561cd0bba65fa5923d215f SHA512 4a86a31e4d37695ad509656906335ee8ce1b912f884ffb7a7147b390e7f11a7ee4d39b16f2006ff8d9a76c4c3ce5b9c8b847a940a90589cb753faeb4f23396e1
+EBUILD plasma-meta-5.21.0.ebuild 3735 BLAKE2B 89f1760fa87bba9ff66aa375c2e198aa52f5d79ade102aee1a0d46f98b3323f33729043a77c3c8e8b03c280d2fc760de6387efeaad3071a668a641c844a347ae SHA512 4c3f5f48a60661bbc68e1e48be7d6cb4551e95bdd1fca5f51fbd130369879347d43af57cab572c9fcf14b419305b124567596c91c91dca09ae38ceb9ad9e76d0
+MISC metadata.xml 2201 BLAKE2B fba16211ef409ab937c66a0b0cff7e2fcc2f0c97261836affc481114187d8c1280cc3d06b387656f6e176eac39839b588ff536ce3d85524cf34691b09fc260fc SHA512 ec6ea4d1d873345f63df46b097b59c76bb674120b0813e7a4634a17bd0319c238f892cc7d59f745279f8a3e6a0f5df1cb5d4cf22017c15a298d699d9d22e2186
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 85111e032741..0f90ac488608 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -7,10 +7,12 @@
 	</maintainer>
 	<use>
 		<flag name="browser-integration">Enable integration with Chrome/Firefox with browser extensions</flag>
+		<flag name="colord">Enable <pkg>kde-plasma/kwin</pkg> color management via <pkg>x11-misc/colord</pkg></flag>
 		<flag name="crypt">Pull in <pkg>kde-plasma/plasma-vault</pkg> for encrypted vaults integration</flag>
 		<flag name="desktop-portal">Enable <pkg>sys-apps/xdg-desktop-portal</pkg> backend implementation for Plasma</flag>
 		<flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</flag>
 		<flag name="display-manager">Pull in a graphical display manager</flag>
+		<flag name="firewall">Pull in <pkg>kde-plasma/plasma-firewall</pkg> for system firewall administration</flag>
 		<flag name="grub">Pull in Breeze theme for <pkg>sys-boot/grub</pkg></flag>
 		<flag name="gtk">Enable Breeze widget style and system settings module for GTK+</flag>
 		<flag name="kwallet">Enable support for KWallet auto-unlocking via <pkg>kde-plasma/kwallet-pam</pkg></flag>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.21.0-r1.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.21.0-r1.ebuild
new file mode 100644
index 000000000000..597a81a351a8
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.21.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 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 ~x86"
+IUSE="bluetooth +browser-integration colord crypt +desktop-portal discover
++display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray
++networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt
++wallpapers"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+RDEPEND="
+	>=kde-plasma/breeze-${PV}:${SLOT}
+	>=kde-plasma/drkonqi-${PV}:${SLOT}
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/khotkeys-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksysguard-${PV}:${SLOT}
+	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
+	>=kde-plasma/kwayland-server-${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-systemmonitor-${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}
+	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} )
+	colord? ( x11-misc/colord )
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
+	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			x11-misc/sddm[elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+		x11-misc/appmenu-gtk-module
+	)
+	handbook? ( kde-apps/khelpcenter:5 )
+	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
+	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[elogind?,systemd?]
+		qrcode? ( kde-frameworks/prison[qml] )
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
+	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
+	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
+"
+
+pkg_postinst() {
+	has_version sys-auth/consolekit || return
+	ewarn "An existing installation of sys-auth/consolekit was detected even though"
+	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
+	ewarn "There can only be one session manager at runtime, otherwise random issues"
+	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
+	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
+	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.21.0.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.21.0.ebuild
new file mode 100644
index 000000000000..839a71e3f664
--- /dev/null
+++ b/kde-plasma/plasma-meta/plasma-meta-5.21.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 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 colord crypt +desktop-portal discover
++display-manager +elogind grub gtk +handbook +kwallet +legacy-systray
++networkmanager plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt
++wallpapers"
+
+REQUIRED_USE="^^ ( elogind systemd )"
+
+RDEPEND="
+	>=kde-plasma/breeze-${PV}:${SLOT}
+	>=kde-plasma/drkonqi-${PV}:${SLOT}
+	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
+	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
+	>=kde-plasma/kdecoration-${PV}:${SLOT}
+	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
+	>=kde-plasma/kgamma-${PV}:${SLOT}
+	>=kde-plasma/khotkeys-${PV}:${SLOT}
+	>=kde-plasma/kinfocenter-${PV}:${SLOT}
+	>=kde-plasma/kmenuedit-${PV}:${SLOT}
+	>=kde-plasma/kscreen-${PV}:${SLOT}
+	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
+	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
+	>=kde-plasma/ksysguard-${PV}:${SLOT}
+	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
+	>=kde-plasma/kwayland-server-${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-systemmonitor-${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}
+	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} )
+	colord? ( x11-misc/colord )
+	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
+	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
+	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
+	display-manager? (
+		sddm? (
+			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
+			x11-misc/sddm[elogind?,systemd?]
+		)
+		!sddm? ( x11-misc/lightdm )
+	)
+	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
+	gtk? (
+		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
+		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
+		x11-misc/appmenu-gtk-module
+	)
+	handbook? ( kde-apps/khelpcenter:5 )
+	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
+	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
+	networkmanager? (
+		>=kde-plasma/plasma-nm-${PV}:${SLOT}
+		net-misc/networkmanager[elogind?,systemd?]
+		qrcode? ( kde-frameworks/prison[qml] )
+	)
+	plymouth? (
+		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
+		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
+	)
+	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
+	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
+	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
+	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
+	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
+"
+
+pkg_postinst() {
+	has_version sys-auth/consolekit || return
+	ewarn "An existing installation of sys-auth/consolekit was detected even though"
+	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
+	ewarn "There can only be one session manager at runtime, otherwise random issues"
+	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
+	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
+	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
+}
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index c574809f6e69..379f23cc978a 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-nm-5.20.5.tar.xz 865364 BLAKE2B 3a316674e9c9bbe7df09c34610f117bbacfa60515e93077103a7956aa1999cc8bef7e4e5add53d3ccb847557c7fadf17ab23d82e392e1b2822cecb9dc33598bb SHA512 6413dcbc6b8723384ecc6897331947343f399bedba6aff9148bc34485b54c5fd6a91b77d63390b0c398c8bcad8151de3f1746c71f3cfae9476632e2386ab6ff7
+DIST plasma-nm-5.21.0.tar.xz 892360 BLAKE2B 87a65872b26bd83547fa3cdc1d25c0d20c837b4a08729333d089be9dd5888dc66b4aa39b7bd543d3eeb4111be90256639f75e3c64dcb04d9a4f02aea0ce35b6a SHA512 250a0a77d8d532ecd567a2c06ba2436caa08bc99fb99c357c784a404e5d75d1b5eb5ecc266a667b6a301845479cb17f318d0494cb5314ca03c4586d6a45ff1a0
 EBUILD plasma-nm-5.20.5.ebuild 2320 BLAKE2B aced27381cb8b277a01c3d4b3799cc51fc8936d867bc82112fe5511ac5cda11ef1a52bb76122974345c21449218d4185d461979a670898ccb3191903e683a7e7 SHA512 364e2fd1608293b335445c867a1f7b20d652127cb81fd6fd353f575058ab70271113765a09b99c7355662e63946aa205b4532b7a4b2a37d1cb6655956a7b48a0
+EBUILD plasma-nm-5.21.0.ebuild 2282 BLAKE2B 7c1b2813717dc39483a257860d11e3cbaac35afeeccf4662462d1f825696f989200267322209637b21a9737e3e9e69cffee871d9f612ab8e3e86155de6755fa2 SHA512 4340c6e6803aaf7c9106be05f2a7121ee2292b9dcf332b35ff0102ef5bf9a654e5e009223c13172ee289fc8c43ab1468568ad726e8618bd7b1e8c4086cea1c81
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.21.0.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.0.ebuild
new file mode 100644
index 000000000000..108df149cb1d
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.21.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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.3.0:2
+	>=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/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? (
+		>=dev-qt/qtxml-${QTMIN}:5
+		>=kde-frameworks/modemmanager-qt-${KFMIN}: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-frameworks/kirigami-${KFMIN}: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 c63803bc98c7..29226ce62ada 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-pa-5.20.5.tar.xz 114276 BLAKE2B c41d5093af494ab0eb17452098e47dc53b56256c98181a4f034df8662aafe51b3138fbb41ae7ba0b9d31e6595bf8871d93b6838f69cec30c0981690c4df85233 SHA512 8d01c79fd75e494f816049400a10929f427bf09d79ebddd73a125d4795722fea44319450c5f4d7d8627a03fca4a8f11405e267a87ca5e85016038fedc8131bda
+DIST plasma-pa-5.21.0.tar.xz 113300 BLAKE2B d1b30c100fd27d3a47313dd9d6360560b43c4bafa4164d6b8920b2f9e15fb4d52f9a600c739c49e66dce4ac8643f3ce6fe6e3d1b2568a74107679911bfa5ca8a SHA512 932efbb4487a9457c472b9e19c35fc43940f1d9190f6d8db60fd32fbec19c6fcb43db45957a8bf7a52320d30495e3ccc9fa43864003b364d8b12f0e30ab47a77
 EBUILD plasma-pa-5.20.5.ebuild 913 BLAKE2B f18b9f14e13d6896ce77bb0d86c8bb131788fb23e4b14431c342b365f6c363ea9083a8ad94d1031e323812e98d5065b91988dcfaa459a7e3e9ed7efb3e4bd622 SHA512 99e8aca732b0813b6f1583a08cc66d2d0f6f1d9c99f8ce14564bebf0a8192caedc9b694de1600ab8db6a5fe0c8a5b6d11a7f30530db8825f3731775bada4e1a9
+EBUILD plasma-pa-5.21.0.ebuild 848 BLAKE2B a9bd8f4cb56285bfbe788cfe59fac4b53600540f3ef0caa82b50dd1f6f8f916eb08660e42073a0eb9374335789511dc49dd8b3a1da323912e7469fd7990c175b SHA512 e07ded7b928e6a4ea7fd7c08ee7a5b27f1872290e19b83c3e2385d49c91a3d02d823573ae48170082a97b71569bb9777875317576269fa1de03764588fce6b8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.21.0.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.21.0.ebuild
new file mode 100644
index 000000000000..ba8e016472b6
--- /dev/null
+++ b/kde-plasma/plasma-pa/plasma-pa-5.21.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.78.0
+QTMIN=5.15.2
+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="
+	dev-libs/glib:2
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=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
+	media-libs/libcanberra
+	media-sound/pulseaudio
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	x11-themes/sound-theme-freedesktop
+"
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 1a720bac9bb2..0e877aba739d 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-sdk-5.20.5.tar.xz 266680 BLAKE2B e6ba310a3d089ee36a9098d9a58276cb8491a0c3016990e7643036ee905624c5f974b0d2e470047b59e5cc114a80e7426dbf1d0561bdf4fd26a218e47ade8ca8 SHA512 d10a5413835ab9ac4f1c521839f56b12862d87eed25c13d7ea70398bb892da7ab558bfc62fd2fe8451fc11ab9023d2e9a6e78c677bfa3e104c15f8e87ae1db77
+DIST plasma-sdk-5.21.0.tar.xz 268684 BLAKE2B 56ca63af690cb154cf4e7d8c8c71ecc167c167e0da5f279c452d5a16da3d7bba83481d0615232efa1a21c4dfeb9de43d9f13b597677fc8951e2ee6b8e3aee8ff SHA512 c4cc365e1ea6fa207beffa581453ba5fa5cba3fb97850658f88291f50e37c89ec225e35bc6421d4d500e4af66d2ae4535f2059e4ae745099f7fce82a2d1d7e08
 EBUILD plasma-sdk-5.20.5.ebuild 1254 BLAKE2B cb559aa2ee0528a7eeb8e243b20fb5523815824f462c753710ddea96ad91fe209901c229364965afa5b9f642bf5e2d58f9f3574c1fa35baab1b3d6a554abd2b6 SHA512 049e651adceb62effd9bd377788eea05297b20647159ee8eff151d7accd0eb8ddbf769e6dddc2f2e3c411c39d58929f0d7a03cc76cc523e0449781b7854d91d9
+EBUILD plasma-sdk-5.21.0.ebuild 1257 BLAKE2B bd78d766a673b1391c37592898a78029e01a59028c8817634bb8a7a18ac17831c84be987c63dc25e53983fe2e95e13a9194ca99ab556bb526505b5d571715791 SHA512 c059fa133e072f96a5b89be8c33abb2a8a478ff0771010d0fcf24aa7b7a1c03c3c6ae0abd18be44bb1750b6d6cd3326014f7a6c7acc76e70c04e27a6834b0947
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.21.0.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.21.0.ebuild
new file mode 100644
index 000000000000..30a3100c1fbe
--- /dev/null
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.21.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="optional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index b16faf3a4d7d..15e3133f62a8 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-systemmonitor-5.20.0.tar.xz 105596 BLAKE2B 93a5feb8fba244580e65b55633d803e14051b476f3ee5fde617285c61a84be7b22c5c09f4a14e0e7b9b3c88a45868c9f8c5c72e8cfd4488add192e9e1ceeb594 SHA512 56c6a5fe4646aaa2fc76c30f28362252308516b06132501efeb9905097a5c895250076b09ef2bdb7a9f4ad77435c622bd4b3f1ad5b69116f6654b3046829f2a0
+DIST plasma-systemmonitor-5.21.0.tar.xz 122720 BLAKE2B 1414fcc592f30010a73be9e22f52fc1e548d0d1534bbbcfa2546770964ea9b673cc35433d77195793b4dcba55da835fc938273bc75257f0e8f33022a9140c34a SHA512 146354b49065b31f7df56bd890c965a84a401efba9446d36356d672aae7fa531ec330a4f4521e29ab7cc7ce4d043c99d2ad8ed5afbe98b3e6c51a81e0821a9a8
 EBUILD plasma-systemmonitor-5.20.0-r1.ebuild 1201 BLAKE2B a1e49bd8b4106cbda357a6067cb8854ff3d2e0b81a3fa35f7d07552b20ff2e0bb9f98770d7109b34202d077e0fdcf6fd9bf0ebe00ad644dba20a0e7080aa8bdb SHA512 02a6ccb0e36661a502fd5e7547310b4c57ded67196b194281499af9278c80671478dfdbde001a8c8432b93c9f7d3fd1b4fae53b4c1f438afed4dcd8674bb0bd2
+EBUILD plasma-systemmonitor-5.21.0.ebuild 1162 BLAKE2B e298828268ed4d3a38bdfc0993c963f6625cbf228c3a15d46704555c16d7b4a483d5f23cf79a006905d82182abb9ef8730608a351ec06a88eeb057ece69b6ac2 SHA512 4d115e4fe0631e7da440403412d1843903170082957d3842c858c7ec39a01aa8acc646e666ca53378a946134c171b91e5ba6368be642a2c836d00834a0ccbd60
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.0.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.0.ebuild
new file mode 100644
index 000000000000..abb5050abba2
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.78.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="New version of KSysGuard built on top of the new KStats daemon and using QML"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-systemmonitor"
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+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
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+	>=kde-plasma/ksysguard-${PVCUT}:5
+"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 8b0683ea9d7c..f9f2e7ba179d 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-thunderbolt-5.20.5.tar.xz 56824 BLAKE2B eb3289a0e9959cf291d1eed2d52597d9ffdc8993096ec0b1ba850720c726fe412ac43bfcf8f7b4c721d6a982ce1f127e323b420ec57da33dcd206438d9602ba7 SHA512 ce07bfd0733f6dda4429b77afbe699edb85e46cc31656ccb7a6cbf366fdba2720b4d92e4327edfdb164867873bbe7d21dd2da5e8764bb36e8b3c154ab8f3088e
+DIST plasma-thunderbolt-5.21.0.tar.xz 56720 BLAKE2B 05fdb63991ac12f570cd8d851fd386d02a35a2dac678d87629a4d775c50da7835cb784e9432b0938542e273cc9cbb1de9a3349ea14404455fe7d939925c82d2a SHA512 ffa8e2a6a81c3d89633777f6c67405c6dfcbcacd6cbabe82baa1d83e7a449f524052242227a0e7e7af8e720146b9cdfe9849edd6321f04b86058347b0dc859a2
 EBUILD plasma-thunderbolt-5.20.5.ebuild 890 BLAKE2B 45c2d0e5db8d5afcb07765774699b20deed7edc2c0ce65cc63e220023b887e47183dc34dc77c262e6ecc8320197111317918b5408e235762f66d35729ef13382 SHA512 62504d4a964d604279263fcf03d1d3f239357bad1725e680d0d4016886cec7fc65be18dd7aa522a17e4d816990b943b196dfd78e1013ef6fe245cb485aefa9b9
+EBUILD plasma-thunderbolt-5.21.0.ebuild 892 BLAKE2B 1619f3da6ae18c44b222c88b36cb101ade4f4fa255bffaec4436f9666a7cd4fb23f7168527a1f47b23b8f782167368a1450d914f0e25b7b61724092bfc5d30cf SHA512 6968cd7f758cf76d3fa0b9ec36c0a96115dd4db9e9e06f8318cc1a826c33fdc0256909d52e6ae43c40ae5fa5f185ae2c465902dbd1179af38ff97d9491de2a28
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.0.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.0.ebuild
new file mode 100644
index 000000000000..5d4f6230a1e9
--- /dev/null
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
+
+LICENSE="|| ( GPL-2 GPL-3+ )"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# tests require DBus
+RESTRICT+=" test"
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=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
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	sys-apps/bolt
+"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index e8713819fa8f..277cf9e22074 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-vault-5.20.5.tar.xz 159080 BLAKE2B 2aa427337eb69b016eef9d5849c465cc8f55a900cd35739a88c51f622ce01d5b4a8676442ba78fc0b555e09de7a31b3ed6499c85968f5178d3613b88a6d114fc SHA512 2e3d6b221fdf363763b732f2e0d82afc63aaa727bae8755940c6e53eecb9ad6526071162202a24c93065a3e80598b3c25a71255a2fe032c71a771e611bc80c9d
+DIST plasma-vault-5.21.0.tar.xz 158992 BLAKE2B 6e1a37ad3d21d1aa34d8c6b67912fd3c3232e8d0079b4e692989216529e687c3c18795caa7634fa689a483659653eaa070e5a47e051d18fcb1bf34a356bd17ac SHA512 ffb93d6a17757981887e3735576aad300d9e19ad5633ddab53ede73561983a7801bc696dd0f9f001f411a7f73c8ec9a0bd6148583a118f739512692fb827fed9
 EBUILD plasma-vault-5.20.5.ebuild 1274 BLAKE2B d58ac0f5516afb9df2192abcc98f61fbc6f1b626e76723a3a963859e7acd6242b1c3a91e5879c34608c161a1d841b310f7aa52e669e4f1824cb803396ad4b7d7 SHA512 6c9dc99f2a4e04a382b91b822ffb2a363c8952ed111159b8e1da9703ef553e813574a3cdc89497e29706074f6709d90eabebd6d7525d20bbcf5c63bace02d8da
+EBUILD plasma-vault-5.21.0.ebuild 1277 BLAKE2B b1a2e5e4565be74e7a08bccc9fde69613fea4b7741087f6f915771efba623634b0bfac512d7f8dec254d8a7c0de9b5b6e24f3f69d2dce2eba40f9c060d34c5dc SHA512 d0438390a8c0b1800b3cbdd90324ccb0f1cca0d7310ea4b5b5b5fc91ebb076c6916c66186276c7fadb4a0413ce0e2cf09c7617116735710d94fa6a22a1e2f0eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.21.0.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.21.0.ebuild
new file mode 100644
index 000000000000..ae3298a41293
--- /dev/null
+++ b/kde-plasma/plasma-vault/plasma-vault-5.21.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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 ~ppc64 ~x86"
+IUSE="networkmanager"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	|| ( >=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 4d39266d54df..51b620235be1 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,3 +1,5 @@
 DIST plasma-workspace-wallpapers-5.20.5.tar.xz 45932988 BLAKE2B f97004b26d967acf8dc4e24b9d5efeb99c56d69f640d03662162ecf9782c9e0343d99c5ba2813ebab9d9811a03ca37c6ad73ed420f0bb88a393a49e1dce69a76 SHA512 60719b4d963b8e8e4306c2ced7433aa8a009029de7f5fe5e1d4a1743a2554bbf5a64d572a839c2210a474a51e849c7a5bae74dd121f06ca80f076d85bc8eb8b0
+DIST plasma-workspace-wallpapers-5.21.0.tar.xz 48099188 BLAKE2B ee2b0440785ba36e337d0644fcb160f46ad72fa953c2cbddebcf7f952f97c878fb0bfd72730aebaadc7a74b10feafa083bc60cb70b056fa02711aeac850d50e5 SHA512 be8f352cfe0df3257e66dd80a30340325f1aabef4192c797614e6bb8ae439e0ded8954aa47271eaec6281d0e447bd565faac2a45b6cf51739dd0bf408937ab67
 EBUILD plasma-workspace-wallpapers-5.20.5.ebuild 348 BLAKE2B c1e079d7883ab5f823645802a14b49636285ef2e3f4016f93ac898bd2506a447939922f5718c1952ebd1f44951dce635ea360c29f63bac5aff85cc18ea8994ae SHA512 f51435ffe85756594615cb8dfdf6e5986c94463521922ef0e36246adf96da0f2dfa1195372c26da325878bd32c873fbc95892c747c9cac133cf66582438d5a26
+EBUILD plasma-workspace-wallpapers-5.21.0.ebuild 351 BLAKE2B 478fad4796a3013a7341ba3cbb940094710b9c1a7b04f08b8dd3d1d00666204693e2ace866961502ed99c310c735bae867b740657bed355a17827153d87c0ae8 SHA512 94099de5a96a3bec754c5d76519a0b48180f23401619e86cbcc6b2ec615f1071b4a3921b90c6cd6b24c29466fde7938dc421dccd93f01435ab2353dc5d56eb46
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.0.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.0.ebuild
new file mode 100644
index 000000000000..d290aa752bae
--- /dev/null
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 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 492ab0f25298..eac6f93af79e 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -8,6 +8,8 @@ AUX plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch 2671 BLAK
 AUX plasma-workspace-5.20.5-revert-activate-krunner.patch 2362 BLAKE2B 0f2d2220fe54b508899ae0f70ee8d266282418bf7e54be5b9c051f45dd540905dce55563f182d2ff7ecfe36c50f617b53368cb404e61e22843bb6a1cc263b04e SHA512 f027ff3c2fc200af8d26cb9307e0fa932f0c0a56cdb99740a8c84dd9eb41542ec661b54f18944cdf3856292f54184d351cdde126da82ac649ca4d95955c72452
 AUX plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch 1475 BLAKE2B 79b9ca4dff4f88c2343e294c9243a2221f20d14ebbda8dca87b371143eee618b7f9118ec1435c6168cc1be81a129ab9b6d21615c08f777355b0cdd6978b9847e SHA512 0a0c87db98be7fed51d0b193f683a60fe6119f7f47e82966bc01cc5c5afe6f74d7f3edd8939e709f2f72363741a5cbd7f464890fbe0bb88d25c4f5b235d3dfb2
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
+DIST plasma-workspace-5.21.0.tar.xz 9710020 BLAKE2B 8b041e723f9e69d176d6d63825b469e4e848b9dd10f588d5523f5c03562385e56d1e4c0930a3d108929396542b8d6dddb2e1fe2fe3721e815b00b9e603068d21 SHA512 c3739f9b689e08912f78ffb9ba1ba4ef9661c6aabf9e5a359604b5683917f35c4b47b94bbea684c21ff622507ec9196b6f532f5530fb78311f5007ff32d1f83b
 EBUILD plasma-workspace-5.20.5-r3.ebuild 6339 BLAKE2B 33ac47bb12ea5b8108c65d33ca094817e37d4947240d9029fabaf361f84ee85369a12562ddb3498514f36fb9681cf7cb5c804809ab37de9007bce715ecc72775 SHA512 84988ecad6415f617e7a9d133a5a85ce7da539ed5381490d008e1cc8d94be51a937e05d2772ebd9bd691b9539f59c882b45ca9bb186bdbcd4da7c38b84b92176
-EBUILD plasma-workspace-5.20.5-r4.ebuild 6405 BLAKE2B f62bf2a0bd442258ee2ac538e1c81415b2d4cef535149d60bf33afa3ce281c01c0a0491e521ad6d8da1c60b9782cfcfaf0b286597ed01266b1eb5304e99c236d SHA512 76fa8fa0be2598bab8acbcf052912d01c266e1db18db53d4c6f98181a109661cf25de03a27af6ba072799751b9f7b44ac3951d8c48bec240527be37a449553c5
+EBUILD plasma-workspace-5.20.5-r4.ebuild 6403 BLAKE2B 02afca1f9f3bb2ee1b4a28f80033153d59f6dad9b441000725f6ab0a75e09908192b2e1dcf3cefa5ddeed42ab44d3284f68ccee555eeede8a969028adfe78fc9 SHA512 b092bb319afe8c39a61ae76ec575b72e889b6e9c2b2c85a4f33c4bb1fa414dec1fe583fd740f7933a1fc5fbf8861fbdf8239fdfee67d7b39b0b424c1f8291190
+EBUILD plasma-workspace-5.21.0.ebuild 5986 BLAKE2B 2a862efbf9e65228326184b614e2d7f0b89700777be2a92f447242197d699836d104d9e2b1f46bcea7ba5e9644f9d50df2b40367fb68b74a48ee3238b12cb13e SHA512 91891d16dba6ae51e7d9ad2dd9f4d2e8e7310b132cd1a84d9c2309022343748a17a599aef84ee105a88a76533c3c69b051f6df7819fa9e55153ffb8269754d21
 MISC metadata.xml 723 BLAKE2B 14f4d2f1ec1c0e8d511be9b01aa0f3ad09bc7bb8e6b26a9ad770834d38bf1539443a4e81af7c4237e094f4964ba7203d9dbf4ea3558a07b6df12636e48294d67 SHA512 2bcfe167618c426ac72a47160a6f62d4b9b93624a7926f978b347c64212e80c7a9678221fa0799d303860e84dd9f3f8aa96e6f64a5a67335817dfbf24010eece
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild
index 7c9a6156b56d..8687bc3158f7 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.21.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.21.0.ebuild
new file mode 100644
index 000000000000..f5bd3552dddc
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.21.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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 +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
+
+REQUIRED_USE="gps? ( geolocation )"
+RESTRICT+=" test"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=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/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwayland-${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/prison-${KFMIN}:5[qml]
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=kde-plasma/breeze-${PVCUT}: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-4.11.0
+	sys-libs/zlib
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXcursor
+	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 )
+	fontconfig? (
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libXft
+		x11-libs/xcb-util-image
+	)
+	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
+	gps? ( sci-geosciences/gpsd )
+	qalculate? ( sci-libs/libqalculate:= )
+	screencast? (
+		>=media-video/pipewire-0.3:=
+		x11-libs/libdrm
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	x11-base/xorg-proto
+	fontconfig? ( x11-libs/libXrender )
+"
+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/kdesu-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kquickcharts-${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.19.80:5
+"
+PDEPEND="
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+
+	cmake_comment_add_subdirectory libkworkspace
+	# delete colliding libkworkspace translations
+	if [[ ${KDE_BUILD_TYPE} = release ]]; then
+		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
+	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use screencast; then
+		sed -e "s/^pkg_check_modules.*PipeWire/#&/" \
+			-i CMakeLists.txt || 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 fontconfig Fontconfig)
+		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake_use_find_package qalculate Qalculate)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
+	)
+
+	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+
+	# default startup and shutdown scripts
+	insinto /etc/xdg/plasma-workspace/env
+	doins "${FILESDIR}"/10-agent-startup.sh
+
+	insinto /etc/xdg/plasma-workspace/shutdown
+	doins "${FILESDIR}"/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 dirs
+	rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null
+
+	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 783a8c4aa7c3..995533722903 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,3 +1,5 @@
 DIST plymouth-kcm-5.20.5.tar.xz 43024 BLAKE2B d7a2a6a347484f27d73ade549da7cd338ca23f2e69543c8f2724222e3585fe0f49067ea94c1a70e8fdead16634e408fbf742aa798c5b594e0040b96eb54263ad SHA512 a150c77aad5cc663dd8f2d718ddf06472563782ff5d831bc3ade5b790cb8eb4a15890181c7587e5c74d73db0b2f05185b705ff1288c43b3940461aecc87b5e78
+DIST plymouth-kcm-5.21.0.tar.xz 43124 BLAKE2B 27cf46a743058f0bdcc38dafbdad639303ad2226d0f09ec8d5d2d7df0e176d745c0601f99f65fbed2c49943ae18825dc18d3aa9135ed1c4384054cd35931a9a4 SHA512 574cff24a37d2d2cfdfc1e965c15315c893e8f6de6734c8c532f8bbc533ec878c1995ac663f26eae494a989306980d48a1fd036f8a6cfd86701a969894146b9e
 EBUILD plymouth-kcm-5.20.5.ebuild 958 BLAKE2B 56cdda9d404624a30ac92f34adeda79496b7a934e9f0452e45ea728e453c9de5a911ca11d6d05c204fbbc2fde66636668fed7c7d88b2fdc1603ea9200da7d3f5 SHA512 f8939dc468cd8b68aaa391e81dcb7f7e8128a8d65eded3487315377186541d057526e73f6049a845969f27a8f39e68d012a81c4d357942e8ed231284001f8a54
+EBUILD plymouth-kcm-5.21.0.ebuild 961 BLAKE2B 8edb2c68e448a4fcb16f60d39bbaa473f15712e8faf90e0978930205836323eb845a9b0e84ee1dd2725ebf49319bb6aa22c241f73a911f412931bd5262d18a19 SHA512 2d35693c74675d089e64bc6a881d4cf20c96d360169f791f84edee4e86c1310dd2952f4361c9a9d400faa27ed1f1774d9a3441845a114711742cc3a0770a2542
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.0.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.0.ebuild
new file mode 100644
index 000000000000..9ed282fdf179
--- /dev/null
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BOGUS=1
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for Plymouth"
+HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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
+	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 c5fdd529a289..44eaaac3569b 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,3 +1,5 @@
 DIST polkit-kde-agent-1-5.20.5.tar.xz 44792 BLAKE2B 41adcf417e8ce207b3f2a28f8c5a9b2e7c4da155290c55742529101319cf8ead12de22d59b4fe8bf7e67b6e6b48fc7b8afbf9655d58903d5fed3447e85bf7d2e SHA512 fcc06391ec8d8bb8a01d86ef1f8bdc45cb0ee5fef23429b5488a62497036ac6001a928d1920e92306b3ec77669ea73ab2f1071652cde12786e497fa48adf8328
+DIST polkit-kde-agent-1-5.21.0.tar.xz 45720 BLAKE2B 276514995dead0fe2d7741e7b4683ef1d6756537ba9eadb383a67a5d5277a7f6db506f7ea4075dc1e39ed8f6034e4222bdf1096e7015dbfbd572e186415010f9 SHA512 db576b70b01f252361a8a20b200d969aca3926eb0ede1dec8c2aef99f16d046912d516e619a4329e78855bc2ba4693513770fe6f80c36f9739c95d57d8416fec
 EBUILD polkit-kde-agent-5.20.5.ebuild 797 BLAKE2B cf8202ed6dd97e164233f887d8361fed86fee23aa12038c10eab511e32ae2d12a1ff35cd782da84700a5480e8ea361892e609fc064cf049b2406fa07c1f64c0f SHA512 00c522ce0838c4fe3adfecd94a16f5bb0459e6fd987e9bb3d8e936000259b55a6e69ad54e75fb78cfebe80d268650a4d8784ff844cb4e8fce358f98fdc4ab85c
+EBUILD polkit-kde-agent-5.21.0.ebuild 800 BLAKE2B 92a7c92b7900cfc9fd4860b88636707f9ea40c3f9142fbfdcb02e52ebcacf1f4dcb4e4b803c1eeb4512a4589540a5401341d0c18bef3a3747620d8c1536f455f SHA512 f4745d2ec23a291e566a7ada84ab96cb053550b037346fc5d73391b4e4e1bc3d319e4a3537b5ccfcc14711ec8674b863e87a819a858bcd28e3daa187b6ab8f2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.0.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.0.ebuild
new file mode 100644
index 000000000000..a1b389c8f03f
--- /dev/null
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="${PN}-1"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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
+	>=sys-auth/polkit-qt-0.113.0
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index c8d0fff8e7e0..d09629dcefb1 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,5 @@
 DIST powerdevil-5.20.5.tar.xz 610300 BLAKE2B 9d392db560a7685a3cef29bf61ae553a8bc8e3d6e30e22ccc5316117d78d7087c35060e777912962ff421cb0f23481fa558cda59237254c7ce201da97031d89c SHA512 c862314d5ad446fb48c08f3e6cbcc72bad0f1825756954ae0d2bd1ceac55e3324124698d3d0803103ff35561bf4fcddaa00831b7b4cb93763d17876a348a3c6f
+DIST powerdevil-5.21.0.tar.xz 614224 BLAKE2B 18977be625a14224682cb86e5f3da182a977921475c0b6f1399b7726aaf6618a47ffa7c82294b791d8a061ee1c0ebba25b80be6a0ccd3861aa557b7be085f088 SHA512 35a3a3b898e848718d1b187cd289fc8b7072d9a08686315e18227a0f8bc2312377c7212a8d6981164f12ff5a36b7184ffda801aa817681dfdf9d9fc3d9f48f23
 EBUILD powerdevil-5.20.5.ebuild 1944 BLAKE2B c607dcdde420cefbd792c3da32155ddbe3d9135fad8651d030154e601696c5d17487e98ac1a566d6fcf36b2c81b2e93792580097c9843d8b49207d10a9c5c625 SHA512 9f856f88e9ffd80d1b0a3a2679d6fc07b03752d6039ab6279ce1ce3142a3d934ba8a57797f68338a6a5c6d103e5ed3c861606b31ec30f4c29107a369917d0c89
+EBUILD powerdevil-5.21.0.ebuild 1947 BLAKE2B de023cf73d2f0cc42eb56f96c85acdc8b4e6484950584c41dcf212ce8c3668c3f1b8d0d04d0a0df8430a9db0dac28137ab1f126c998bc8d97a0705874a273be3 SHA512 e2f6dd8e020594a000ea107baf2cb74b4396e1364a5568054b4757631e7035823621b08157a0732c156eee77c7d67a1dff179a95164aad57d7e68bcda38b6198
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.21.0.ebuild b/kde-plasma/powerdevil/powerdevil-5.21.0.ebuild
new file mode 100644
index 000000000000..88affe646556
--- /dev/null
+++ b/kde-plasma/powerdevil/powerdevil-5.21.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Power management for KDE Plasma Shell"
+HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="brightness-control caps +wireless"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=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
+	virtual/libudev:=
+	x11-libs/libxcb
+	brightness-control? ( app-misc/ddcutil )
+	caps? ( sys-libs/libcap )
+	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 caps Libcap)
+		$(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 2ec934604c96..6aa2899d704d 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,3 +1,5 @@
 DIST sddm-kcm-5.20.5.tar.xz 64796 BLAKE2B dc2365a08f64ebf0709ceda56599e7a183c0fd2c7ba33a05efb5132438c2e92c9c8b7d5e775c305e5739d04e633dd15119939e352e5842572d06930d7ffe9ec3 SHA512 96511d979046bd97da1513be559312f851e63b3e319ee2f78ac83b275cf748e30ded430d3f6b9736da21e7710802dfed31ae23187888d367537e3642aed1769f
+DIST sddm-kcm-5.21.0.tar.xz 62868 BLAKE2B d612d9e21b46f62b82ff96475f057bf1287d56105c5e82f13dde574333093fd770969a5c924d1f00695c26cb7e4a6ae3d3dd714f86d032db24fe91dac4cdc351 SHA512 84224dbb02deb431c34d053610eb86c970684104d250535bf393720600017c663e0cc72e1425fb7920785d890d35f99b805c7af10bb32a5450b791aa731535ed
 EBUILD sddm-kcm-5.20.5.ebuild 912 BLAKE2B 2725b43e1a871a9cfe473112129e2ede2c720561a25edc40781f7334ac3d897040935e648a9f4bbe702db72d37c627a6d26a997bad7d7951fad3fd1bda93f42f SHA512 e231cfd5380e8c39b057fb9e8a723aa5b1c411379a314721c2c257c6c8f3940907a1d3f11544186f61fcb0f93eb8bf10cdfcb90181d080ad92fb279d5f39c956
+EBUILD sddm-kcm-5.21.0.ebuild 1075 BLAKE2B be6fd62070598ddbd67e0a1e8cc2d804991e21cf70aff5ed91e97a61564093ff6207d1edcf187d4f9a815aa146b0c2e7ccdbe24ea24bdafcb559161736c9ec91 SHA512 a33e7d37c1c0b14123b3eb53d95a165f7be9ed5a266329df30df1372db22cd3e8e29c05fa85f7c181a9d803eb125a3ab953cd9a46dcc713f0a6da7de1e42c520
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.21.0.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.21.0.ebuild
new file mode 100644
index 000000000000..6cead9a95c39
--- /dev/null
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.21.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma control module for SDDM"
+HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=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/knewstuff-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	>=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 797759146f46..324db08b4f47 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,3 +1,5 @@
 DIST systemsettings-5.20.5.tar.xz 193844 BLAKE2B ec81542b9bc06931eff60204f87e2d6aec8de57f97d57d4e057a8805bb4c1b02278c9fb12a9545bdb632d0896a6ec30833ef024e5b4232fe41baafce5af517dd SHA512 c68669f5a5d08ce52a9b0034d319f691a9419cb035ecd04895313e7c853cf6c01e72c8ee1fa15f92f7f22a9734d45b2373d9a4807d576783dfd7f5b5de14c994
+DIST systemsettings-5.21.0.tar.xz 198000 BLAKE2B 065bc8d78db6f80549146b814c1829bbb1a61bf3f9cfef7fc5372633d53096fc4cb84daac7b9e26dfbf4e294be7bd55ba99fb25c84c3b6eb7947b30619c3ab7d SHA512 41d6978fe23de2dfdef045ea00b7a7ce4426fed3bb3b54e14587b1e6264fdc36ab55ddfe9f0c2f021a02f7f6597dcd5a2dda94262091bbb7f55c0c5b64cba7f1
 EBUILD systemsettings-5.20.5.ebuild 1703 BLAKE2B 1635bf7c59dde6879e89f136108f888e660dc0d233ef86d80ebeb4ca8f582c9199a9b841b89c091f1715b89cb2ec436118be708edf09e9d83665bf0bd85424d1 SHA512 af49d529a55f13610687a7b01501824b8fb9165605e952ea832eb1ff2b4225309f229490551bb3e404bbc641826c4801e322e8221f77ca08a4828519b4a0a655
+EBUILD systemsettings-5.21.0.ebuild 1706 BLAKE2B 75cac4750269fc9e4c1d9b44dad22042bbbdf93a777f5911792d7e3e636b3509b38aedb327a18730236986dc9dc2d7fde3b61b7b4c10a9e58b8670790d5faf04 SHA512 dde98e16ebcdc9bdde509a992ceac08846a73884c19a41cb4e8189a1bfffa6e2f131307957434c0043d26d7d48f0faecf196ba422929d2d1c83b87120fb6f32d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.21.0.ebuild b/kde-plasma/systemsettings/systemsettings-5.21.0.ebuild
new file mode 100644
index 000000000000..4a60d5472e1d
--- /dev/null
+++ b/kde-plasma/systemsettings/systemsettings-5.21.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="Control Center to configure KDE Plasma desktop"
+
+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[widgets]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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/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/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
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+"
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
+	fi
+	ecm_pkg_postinst
+}
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 8995464b2fff..67bda460ec0f 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,3 +1,5 @@
 DIST xdg-desktop-portal-kde-5.20.5.tar.xz 81876 BLAKE2B 9a0a8052a7a7d9d0200723440176bef37ae6e29417ccea67b222096f0b65e3c371ad83071d93ab05ec6d7de377383e61c126da3775f31189ff1bdd3c4a947933 SHA512 618abd6182e561664b10bd751792622dd88f05932c88505e141ee143e475b228727d2daa509bf113906a97ffc507cbd11f51e15b729f2e55210d9c0000f742a1
+DIST xdg-desktop-portal-kde-5.21.0.tar.xz 82516 BLAKE2B 02a1b0a0cdfc4f4afa10ba3284b017ed9f0d07dc65f8d7443ddd8e82e55e103eaddab0ecaccc409d8a1a52d38f29108fcc07cc41f2fa18559232374f017166db SHA512 e0a336a41802f9d80160e10b6c15f2a6ec2a4fd0549dd9e7454265d86fc3509dbd8f4bd598b28b7c8012d46bd472bb3135b8c2c436387fc2cd5a805df1221a99
 EBUILD xdg-desktop-portal-kde-5.20.5.ebuild 1098 BLAKE2B 605dabf48ead7954293cbad4674f56b275c426875236d896b4824ce2c189fcde97ea5b34290b1f7712b77b3f39cd2edcdc88359f12e77d3802e32c33a96ad8e8 SHA512 88a0f4b23d16feb7386fd021c3d5cb193f56d05069c38dcfcce78e9aac888a54bbc7bdee64ee5c42931e933dcb80235e8347b47592198f69bbab0fddbe64af43
+EBUILD xdg-desktop-portal-kde-5.21.0.ebuild 1101 BLAKE2B db908b14d1110a9d0565459c9ba59c2ad61fb01e8a2f0c051ed4c162209060163b2363401618898e912673d3446bb01523640062c905ae6ceff7e32f00dd7288 SHA512 3f98463d46c5b594ad09e644fe543ff9cfbb111a026ed361dcf5e44d507b061c7768282a4ffd70c011abfc473032c3689a99eafbab5520214f903adfdaa1c43a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.0.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.0.ebuild
new file mode 100644
index 000000000000..1fc676793fbc
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+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=""
+
+COMMON_DEPEND="
+	>=dev-libs/wayland-1.15
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+	>=dev-qt/qtwayland-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=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
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.1.1
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=kde-frameworks/kwayland-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/xdg-desktop-portal
+"
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index de139dedddaf..bdffcc295ef3 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,4 +1,7 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
+AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
 DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f
+DIST plasma-workspace-5.21.0.tar.xz 9710020 BLAKE2B 8b041e723f9e69d176d6d63825b469e4e848b9dd10f588d5523f5c03562385e56d1e4c0930a3d108929396542b8d6dddb2e1fe2fe3721e815b00b9e603068d21 SHA512 c3739f9b689e08912f78ffb9ba1ba4ef9661c6aabf9e5a359604b5683917f35c4b47b94bbea684c21ff622507ec9196b6f532f5530fb78311f5007ff32d1f83b
 EBUILD xembed-sni-proxy-5.20.5.ebuild 1008 BLAKE2B ec20ad28545f19387f66e83b6b084581aa9cd9714dcc77d69de13b4ff691fbe7c7c94fdf2fe9632f5db3551f97a135eb4d6a0a6d922d114ed80cf31896ac84d8 SHA512 2af9311890058f23bd5dfda125b6d6585d1174e945af9c60d3870026a5a4de7f4aafc5df3fee0f3807ea6d9b225761740be0b16ca3e629ed8986695e5fbde680
+EBUILD xembed-sni-proxy-5.21.0.ebuild 1011 BLAKE2B 6abdf4c21db6ca55b1553b3b295a8e4cabbf91a86fb5c30f9a52c4de21ecc82ac508255c55646eb4f72a8c0367f7e8127f372e2b193363eefe63d5d97e0aef6c SHA512 643cb0f0dcde66fab7882ee80c945c5766ab43193560bcdbd6d70aabc0f8a2a7337ed3903de1effacc63a95707f7b7e199bb12d10931d690b075f95b14837b4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch
new file mode 100644
index 000000000000..a1f09aa93c4a
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch
@@ -0,0 +1,60 @@
+From da1c5074e390b2ceca3f632f14adfba55def45ab Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 24 Sep 2020 22:34:28 +0200
+Subject: [PATCH] xembed-sni-proxy: Allow standalone build
+
+---
+ CMakeLists.txt | 36 +++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 443ff07c1..ba15b9ea5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,35 @@
++project(xembed-sni-proxy)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${xembed-sni-proxy_SOURCE_DIR})
++    set(PROJECT_VERSION "GENTOO_PV")
++    set(PROJECT_VERSION_MAJOR 5)
++
++    cmake_minimum_required(VERSION 3.0)
++
++    set(QT_MIN_VERSION "5.15.0")
++    set(KF5_MIN_VERSION "5.74")
++    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras)
++    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++    include(KDEInstallDirs)
++    include(KDECMakeSettings)
++    include(KDECompilerSettings NO_POLICY_SCOPE)
++    include(FeatureSummary)
++    include(ECMQtDeclareLoggingCategory)
++    include(ECMConfiguredInstall)
++
++    find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED)
++    find_package(X11 REQUIRED)
++    find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR)
++    set_package_properties(XCB PROPERTIES TYPE REQUIRED)
++
++    configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++else()
++    set(PROJECT_VERSION "5.20.80")
++    set(PROJECT_VERSION_MAJOR 5)
++endif()
++
+ add_definitions(-DQT_NO_CAST_TO_ASCII
+ -DQT_NO_CAST_FROM_ASCII
+ -DQT_NO_URL_CAST_FROM_STRING
+@@ -65,3 +97,7 @@ install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+ 
+ ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION  ${SYSTEMD_USER_UNIT_INSTALL_DIR})
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+-- 
+2.28.0
+
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.0.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.0.ebuild
new file mode 100644
index 000000000000..20c70be4cbba
--- /dev/null
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_ORG_NAME="plasma-workspace"
+KFMIN=5.78.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit cmake kde.org
+
+DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/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[X]
+	x11-libs/libxcb
+	x11-libs/libXtst
+	x11-libs/xcb-util-image
+"
+RDEPEND="${DEPEND}
+	!kde-plasma/xembed-sni-proxy:0
+"
+
+S="${S}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.20.80-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"
+}