gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /kde-plasma
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
184 files changed, 1028 insertions, 2519 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 13c719cd19ec..bae4b1a1f62c 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 44b2d4d55a9a..229eb0b8a8d9 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,6 +1,6 @@
 AUX bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 2204 BLAKE2B ec7b389b3bd663f7c4da29c6d4afbc770e6ed2e96c1c6335e1f92b13d05dd77fbcafa508676c27e9759684eaac8087606e8965e8106d55d23427cb63aef1b786 SHA512 a678b1c40cf40659caf3387b028f605d396a03ac08d04b4d74900ce0795208b344942acc1541d3fcd3ef102adc2ded9440f391d4bec501bac5955e108b7fd1e4
-DIST bluedevil-5.18.5.tar.xz 168016 BLAKE2B 06460bd1b40f70b7b6f3641ee3921819ee7c2137af906afb8ebc5a9ea3b3161bb8494b930eae95a18ec6aa8ce6191500421499a944fd9dbc9041a9a48a3a1492 SHA512 4e5e55626d02a7ae820a43e760397e3b221749cd940569d180a67adba141f9afce418f1cb07c9fb1e607757461317a76343b5c6b86b3940a96711be9b4b66323
 DIST bluedevil-5.19.5.tar.xz 168480 BLAKE2B 2fd4447dde007540e3cbfc0994cc257cf777088582c27bb3af123df3085138496f33ce4cf9c403944de1f012cfbae6e7d72058d9536c00ef735c071da7d20fe6 SHA512 152702f37e46b3b359ff23705dcf347588691d87e1a0cbce940ef557f29e92fd9e129724ab37158b4daa00fdd38d31ad5197318dc09b33d7c834e562b6aff5dd
-EBUILD bluedevil-5.18.5.ebuild 1068 BLAKE2B f17fc8d025089aac350637564beaae3469673c38b538ffc97af05d20b458cc6a571973bcffd5220c8aeacaf672a8c80eda649f039813a5e0b401a1a6f08f473d SHA512 255d07652fc437a7d1c1569c69d4b27a38162481cde4518694e5768df90bd9dd50e2136ed3769ff0e8a923ae38f20ad1387dcec05e3270ceaceef8471c3e7486
-EBUILD bluedevil-5.19.5.ebuild 1248 BLAKE2B 1ad71171387e467ca3e8afe2d22ed5e1e54da0709d71f4a0cee3d5e2859a77c002aacc6e50b1c53c6f753d3b0ab7003e57d21e909d86d44bd3e83fa3da5a49ce SHA512 453bee1b9d31222a7d19778d28970d2e8e94da9eed698f56786be5ef9c133b3596ba60af5061abc895637f0e10b330dc583751a936e03550432445c3fff1cd2d
+DIST bluedevil-5.20.3.tar.xz 159176 BLAKE2B 35a392d2fd31fb8bde50fabaec5f4603e20b1250bd2d240e8a54b7bc147766c9f23873dc07e5303f1927446b48646b781cca0b4631b1ce2e898f7b78838a172b SHA512 6ab7585f5e062cca526cee09f32097eff141786aa8f6f4fda67d5854dd7f6ef5ae5ddec3d1ffd31173a8d3f9de27abdbb2c7ae9a15938ea7965a73437d14a788
+EBUILD bluedevil-5.19.5.ebuild 1245 BLAKE2B 443419ed1215b968d0382eb690c3255276b08d876569fb1a2556b1bd26745c2937fad9b1bcce9f34a6fd06b79f04fadb02d3233392f798403e9beab41144022b SHA512 090b68d1357195c6ccf3f0cc4ad1ef8cd8ffd23f7e8ae4499c1ce032fbd316b5b1d0b62ea3b06f09c444cf75ade6fce0966f7d6bf3209a0109fc3f09f5043233
+EBUILD bluedevil-5.20.3.ebuild 1189 BLAKE2B c4dddab958cc71e8e6f360ff367a5a43d5bedf6c01d7408b06bcc980fd2cd5df5e59321f3a1c52c636d62a20bbd22ca6615e7137bb4192fd05fbab30b6094b14 SHA512 ecee305e94e7188dee1e5fdaddbb933277698bb52c8d7c677334ea29148a7aaf85b5ee25e37e8ad7c2c44f137083d1191f73c1823e077fb131b35f3c5740da19
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
index c5e66672ebf3..956170632240 100644
--- a/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.20.3.ebuild
index 77b72cd6649c..43cb1b825bc1 100644
--- a/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.20.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Bluetooth stack for KDE Plasma"
@@ -13,14 +13,19 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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
@@ -30,11 +35,9 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
+	>=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 88828359ffb7..43648af88cfa 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-grub-5.18.5.tar.xz 3138804 BLAKE2B 236f590f19df0a8faf28bef3dfc0a555434902ff284a978576d67e0f7f2076f42d3cca8283d3b979cc3d7afddd1b50a2cde09dd3a23056798d7a6ad7c6db9635 SHA512 969154c602cbd7b334dd48550eb53cbffce16b355aaf971c6b5b372ac43b42aba507bc0e972f0de0051f34b75c80ac295b4f3ef8e64d5762b56a7d0a8d216d69
 DIST breeze-grub-5.19.5.tar.xz 3145156 BLAKE2B 5d18ed9699fe1fd5e0d3a94263c25692f4f933066de9b43098f70051dddb11fbead60032c9d28b3fb5960b7f05dc1a2d4aaf6ffe80fb203394d568f09d421772 SHA512 db589b3f8daf4518b517b74110b925319b610251e002c3e28fdd2e0a88d99c2d3108dbbe02257a60bb4b6a3e4b594febf26f7d2448ec1caeaf341d95cd02c0e3
-EBUILD breeze-grub-5.18.5.ebuild 401 BLAKE2B b40427f0cebd7be07839cd83567eca442698d69810c7cbc3e8ce420715978a4976efd2c5f0ae7bd584e6631bf9063c23a5286f10ee93e08ffcef4a56c8b9c75f SHA512 4eb3b349876f9bd17ab398d50b3990388ccbed8c07849c66476eb20c8b93199601e7d8266e25f238c3bc9eaef9d44b1b8de24e08e47344d6c5ea45cb0fe6376d
-EBUILD breeze-grub-5.19.5.ebuild 404 BLAKE2B bc692ae35e7e3ca4229fa86aeec89731c7c6692f3cb0c0464d9335bea80dca0bdbcb7d748cbb63089a6f342a42275f10cafd99e91412edb931bd6fc95eb98fd6 SHA512 a61aa0cef0893e0e419e35b909ebf10befcc0524d063e6fe038607d7de9f97517070273facb24e9f85b2c91a6609795638404679e9091f3c5be5ae06acaadd66
+DIST breeze-grub-5.20.3.tar.xz 3151204 BLAKE2B 583bd02a1e1381c04a6f50ad6007f7ff21b55f6e453bb3a113e2314eb96b274b585d19f4c52196b183f4b854557059d505c1675a77722681a1c5077c476fbeea SHA512 2a6535cc3b52f2dd58c84f1bbe82d9dd53cfc73ccd16f869c731c9a3680e0eb1125cae149d5204cb82c23760ea18ea6fcbd2c4d25a3ac41655a92a39edfab5c0
+EBUILD breeze-grub-5.19.5.ebuild 401 BLAKE2B b40427f0cebd7be07839cd83567eca442698d69810c7cbc3e8ce420715978a4976efd2c5f0ae7bd584e6631bf9063c23a5286f10ee93e08ffcef4a56c8b9c75f SHA512 4eb3b349876f9bd17ab398d50b3990388ccbed8c07849c66476eb20c8b93199601e7d8266e25f238c3bc9eaef9d44b1b8de24e08e47344d6c5ea45cb0fe6376d
+EBUILD breeze-grub-5.20.3.ebuild 404 BLAKE2B bc692ae35e7e3ca4229fa86aeec89731c7c6692f3cb0c0464d9335bea80dca0bdbcb7d748cbb63089a6f342a42275f10cafd99e91412edb931bd6fc95eb98fd6 SHA512 a61aa0cef0893e0e419e35b909ebf10befcc0524d063e6fe038607d7de9f97517070273facb24e9f85b2c91a6609795638404679e9091f3c5be5ae06acaadd66
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
index 6ba651f29041..4c4e78b0a1a6 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.19.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.20.3.ebuild
index 4c4e78b0a1a6..6ba651f29041 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.20.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index d10caef5fc51..596db01d6af1 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,6 +1,6 @@
 AUX breeze-gtk-5.16.5-cmake-pre-3.16.patch 542 BLAKE2B 58af50232fc314cbab7f6d47a54bf87b2be75757354f0ad7fbf65e36822774dc96a3d7928360b1c27c7819e7d55253db73f5f883cddbdaf89ca62e94cf1732c1 SHA512 9065680b040447fa84d4f100bf5ed7fdde2631c53ab777abac238d9a319c33d40ac1f111ec942c9f32721363fd80e71514e405cb0dc429e07b80dbbb4233c0fe
-DIST breeze-gtk-5.18.5.tar.xz 42396 BLAKE2B bbfe9cd57c438ad1b1cb144b0393ee45d0ed0aeebb34b38e557e2950d7e0d8ec950c1404eb2e17fad7421becf6486cbd6d2c44b414fde62f27076f4fa2419791 SHA512 3dea9af26cd18dc0388c76c070c5a375054b6a03ffa97e298341924fd909e2dcc49a7c7b431b36a158c1012ce6f9d48f98ef84fc6cda0965d9a24ab18c7c0951
 DIST breeze-gtk-5.19.5.tar.xz 42576 BLAKE2B 8874a468666d17318a2fc06ab6dad66e4a6e648bc46479b019e7ead84b29185f8dd334801231b2890c6aec3821172871ce4d9859daf6fd6e83bde23fc7ebc4df SHA512 cb201730ba20745cdf04e8889830e1a5f6ac530435783ca1c01c52d456c650a88f459c871fb6e6b4ef36bc771dbaa4e2d03d7ad08906c910b7b9849678bf9f2f
-EBUILD breeze-gtk-5.18.5.ebuild 1016 BLAKE2B ac9c25e163e1200f10fe3aa526e25acdd9ed5e71e933cffde1ce5a62201316e73a750d9376634dc4953e117fce62ca945c7b16a66f31dc18324e2c44af236d20 SHA512 64ab23938f10d4b5136412b58f2f6ef532d4bb36dac4081222eb852c149de9c38253e8a42e50ac0e8a6edcfd546f25b1e15409db628c8197c9ee836253e9feee
-EBUILD breeze-gtk-5.19.5.ebuild 1019 BLAKE2B 472826dba056f1904f030b2bc404a554c7714e9c57b17ced58a311cd9d7c58a379f6c31402ebad35408923e40b4397d623cf7502ac036304ee8e3736e97722fe SHA512 0208fe5d06d40f37a439374700eaaf16d3284811cdc8700d1fdcabeb81f9af695a16deda369ff264b2101a9ed8a4cc0adf2a38fd678d5646f96cc151e484fbf5
+DIST breeze-gtk-5.20.3.tar.xz 43224 BLAKE2B a6947a359f5d2030c684d503f5b72f0272835747562f36ee97d9d927ca9ea81cf7afb7ba947affb0cd4e95b80c02b2101831547049881eab3daad4ec935f497c SHA512 29b969752bb2f5f13f3e9db61f3e2c0c793dc1a7f32f9010a62bd23f4337a8d286ae782ee1eb7556641374064a34d23eb99daa3d60369909424cb1e8129675ad
+EBUILD breeze-gtk-5.19.5.ebuild 1016 BLAKE2B 5faa84f7e21350dd618cff01c6d230d7a09cab602f885072059e60703eab11f9542c8c238902160e0db45dff81430fcf140bd96313d29689255b74c2be30946a SHA512 36efa28342658411b75d2abfc734979c06498009b7fe8b2c5d2178c1bcf4879fd17f20baa7c54d6743ef29b72bb77f3d13d017d6f1bc6cb2e39ec6472ec60774
+EBUILD breeze-gtk-5.20.3.ebuild 793 BLAKE2B 932055cc82f2f1f4ba24a8b8652cfa33b4fe0552f928a63334c73d985ec63e38e0b0c869bc0ae3fd9862a24cc31733be07878444ceda9a4a462cf42d58bd8ce5 SHA512 3fba39059fe1286c265a1772964a1b339e6d0bd0df4e4c87eec5ba01e5d565d8c90c971e12a946c095c1ade7a46f32218657d0cacb00247d9b4707d75ab0bdcd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
index d5e19d5dcb2b..8b0c8bd547d6 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.19.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.20.3.ebuild
index 6e585bb20700..90808546c3ae 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.20.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PVCUT=$(ver_cut 1-3)
 inherit ecm kde.org python-any-r1
 
@@ -12,11 +12,12 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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
 "
@@ -30,19 +31,9 @@ pkg_setup() {
 	ecm_pkg_setup
 }
 
-src_prepare() {
-	ecm_src_prepare
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch
-	fi
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DPython3_EXECUTABLE="${PYTHON}"
 	)
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	fi
 	ecm_src_configure
 }
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 90659773b954..d3f7088b2d2f 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-plymouth-5.18.5.tar.xz 105672 BLAKE2B 6aceead2db0c977951cdd8e6d93314276fd920846e77a0ac5a9e195937b5ec116f3c2be371096d77dfaa9546bd2b44516ef8ae42ddd2aa6760684cc693418b3f SHA512 45206a6c99047b8b68fd5806dce608ddc09c4208c7966ef276bd7096949ad05138ffea2d6272e5c5ed5985ebbde9bfb7ce8b8a1074f56286dd3e1b840937b98d
 DIST breeze-plymouth-5.19.5.tar.xz 105732 BLAKE2B a9d0cb4e34f3d5f9bb7229c3b29074765fadcf54424562d7c91b4f56233d130efebfbd263e65b4013da2a3da1b59b7da6d77e728661d1ea5d965c413cb558e10 SHA512 8f0739379c2ddb62b612acf65c41bee57e36d98a120289a1db3245467d118e18f3c0fe67905d990c586dfbe333c47f8671893726ad5ee9c28883d938e309963d
-EBUILD breeze-plymouth-5.18.5.ebuild 515 BLAKE2B f41afede696bf0558e5a4a3b68e754031be382d6e0cbe0a483cb5da96741f87559dd1a4bbe91d7e2c85ef6be781c1f52ae236473de3288ba6ed34d2b02baa896 SHA512 a546c2747432ad3612603933b9142a001f7acbf7c6d4a45b9670b69bf9be342fbb98207ba451c478ac70570c0512ed4634e364c5bae51432e14b91e9e7476c0e
-EBUILD breeze-plymouth-5.19.5.ebuild 518 BLAKE2B 0ad41bbc8fdeca55ed91efe102d4da1674066734aa6628525f4ec52bf3ec2380fe72af884c414f7fb5d4694a08f34280df83a38754b1b5686ef4656d3a29debd SHA512 10902a266f49bcf0fe6b38212e698b26709e2e5080aa95159c34ea24e5b41af87a1c86fd2de22751d26f3015eb472b8ae0c09e089b9bda6509957a578f4e0a85
+DIST breeze-plymouth-5.20.3.tar.xz 108588 BLAKE2B c6f99081b484f9c03273592977574ec9baa4962199457e91a4a80b3d121c7466d3315a349701918187f63c15e35046b90e743e80e0801afb0a1b6435e8e48c7c SHA512 ae1f6ffb8f432f4c0c3fb5079accf079dee6d56da1eb2623879209b60edc174f9332897b43e9bb4ece92f27a039d26a3c77d7e42069323e995885ae9143d5c11
+EBUILD breeze-plymouth-5.19.5.ebuild 515 BLAKE2B 77e594cf5b75f0cd93105bb43dc9322dfadf3c7bdebe11754424160bc2f4b14037b6e1fb45ef295bfb8a399014911e7b920deb72cc1d41f48f5dde10ac094416 SHA512 db06ff20f3c67c964491cda6050c8c0b8d395c761019e003cd5f6e1492ff5689d9f40d7a4e1f809acea890ab26148205638274a2cc116451bed54a83df9d3c09
+EBUILD breeze-plymouth-5.20.3.ebuild 518 BLAKE2B 500c7078d4feb9c5f45c8731450a453a22c22f327d3e44bf4e82e931ccfe7bb67affd12af9bc83fdb131a0e801950cf4e1cae09aba2e55918addac324d197543 SHA512 8b810c7c29e4b2fad9ec84d459064f4fe87f5f74067c99ffedf74fef75dcbbca5970d8744d78b0e08936ee8f95a36d3dac86bce7864e967a6f21e4a71807a9a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
index b52bf8fcfece..5484406c9070 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.19.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.3.ebuild
index 38f5b1cecc42..ecef97101572 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
 inherit cmake kde.org
 
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 537e5207e6a3..00b432a0174c 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,5 @@
-DIST breeze-5.18.5.tar.xz 21583276 BLAKE2B abd1afc0fcfde8a7b72923824908cdc18124ae2e544446a7923e1a6a88ed89876bdac127867a8c33473d0e0c83b360450fafa1c3f72fa938837de03b157de055 SHA512 d4797d9ecabd1d1bcaa483722c255f1a79aad5d15bca0daee571eced2e5c295e39ed8cd6039fca39d9e1a1456bd823f30fd332b2811a04df2b2e3663a04abff5
 DIST breeze-5.19.5.tar.xz 22761136 BLAKE2B 379a26d103acc718281f7ccdc6d66539c78d77ca9bcbbb0d3c9d86625a4d053f1772b49584a179d38d1c00e14441695b717405898ca6ed9ce0c6e947e93ac172 SHA512 6b67b147c34e3b143e0c4c400eb3133ab15b826f9046ad2e701114f3ceaa1e2d085d864f04c28f2bdc37464a2313c6d8b5983fab5ca9f22ccae90ef1528eb8c4
-EBUILD breeze-5.18.5.ebuild 1415 BLAKE2B acd856b73e24e7f705e4fb74bc9cdd68425d1954c8c318d71549558c145442428d86878526295f16dde5fe7dc57ae73d6c24e73fff32783cb14fdfb39627d157 SHA512 c08c90f4da1e1a49f18379111592ab9456827e5231e7c07e4695927b676c0f77e72a21482ea2a5879a6c2a5a87a55db5292a6e68bfc41c57390891f3e1292e22
-EBUILD breeze-5.19.5-r1.ebuild 1337 BLAKE2B 5c9746a06bce0dd6a976c06d72cce3f827c3ba18e2d7cdd14a393504068d1e5a8fa62fa784663bd081a2f7bbb72de924d02529ff111b3f027b404e357805b150 SHA512 a9d574149acbf8bccad30258715983269e46d04bf1aba7261be3b2dcce61412f8d30c65a140f917a9893870be092451da339dd58fc913b0200d870ae5aa9479b
+DIST breeze-5.20.3.tar.xz 15692472 BLAKE2B 4ba43e37dc78961d7c31055e42f42e385f857e5cdbc2bbcb9918f540b72363082f7fd091fc8e50bb3ed88dd298ea6d244758aa417c97dcca74f80489aeab2b4e SHA512 9e4176935eb9dba2013901411c40165d65dc25231c61f2da51f2038d62c276ffa2333228f8c716f981be87d70934a395deb31c2821c82e9b5697f940b0e6f7cf
+EBUILD breeze-5.19.5-r1.ebuild 1334 BLAKE2B 1b670cb195c476531b5af8c78615b00b48b642c6361d022a9d4763147ddee5b30e73b3cfcd23582bc97eb062a061ee097284bc4aeec54f498aef24d226689959 SHA512 76b8a6bbc9c2f6e70ddcdbb980e284c07a2a45bd985d1a693ac7b44fa1af1162677ea88eb845781298dff97129737ca970f9454bdbc467c0f03aaa9eb96ea518
+EBUILD breeze-5.20.3.ebuild 1337 BLAKE2B 6fb8605ccf005f2e5720ab9289d6d672dd0f9e00a9fe97178172251c28b4709a552d5869e7cc404da35af3a1f2cc021b96a14bea8a018729b90b681e920b2f6d SHA512 f188d671b6c702134c56df166830e04efd38313c43c27dcc97c187b0f8007f861dc58b0cddc8a8a1443421ca0bc49e383ca9d5c28d360ed54cc3bddc31bf7d78
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.19.5-r1.ebuild b/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
index 114ad10efecf..89b650b1f4f1 100644
--- a/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
+++ b/kde-plasma/breeze/breeze-5.19.5-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="wayland X"
 
 RDEPEND="
diff --git a/kde-plasma/breeze/breeze-5.18.5.ebuild b/kde-plasma/breeze/breeze-5.20.3.ebuild
index cff25bbce754..8a94fe9a495f 100644
--- a/kde-plasma/breeze/breeze-5.18.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.20.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
@@ -13,11 +13,14 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="wayland X"
 
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.13.0
 RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/frameworkintegration-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -28,11 +31,6 @@ RDEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	sci-libs/fftw:3.0=
 	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index c5aa5829f38a..7012adb586b1 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,5 @@
-DIST discover-5.18.5.tar.xz 10475624 BLAKE2B 0085fbc4bc0225863fed7d0a01d21d512d283ba5d3289840a3ea6c423ca876121a90065220918e088b7652580cfb79d30a5f01e445374931f3a1279e27485417 SHA512 6ae578815d54ccb770d4d113ec04f0e75c4b93cb1b4a1d636009072da83721e440a4fe817613f1b676c852cf2fb3ee1bb7192c60b174753578449e0bdfee7195
 DIST discover-5.19.5.tar.xz 10296324 BLAKE2B d19662ea90f8be4e090e62587ae79b19c072dfac28d90c2bc1476ff4e375498e938e0b76d02487e8cdc64e297193dc62bce34484f81122d827ae0fcc5070fc3f SHA512 524fc45331631a305620f05fe67f780aee2dba7714978f32d9baa0d488185da801ee7a4d11592f2e07dfe395726b0c34d4ae7dfe3abf2b0e7632bdea27a714fd
-EBUILD discover-5.18.5.ebuild 1994 BLAKE2B 40ea5ec9b64f4ee9055f5db4140b0c0062dd1d206433914b0d7ed892d6694e5b9b296ef733362f6efe21ea38c9ec982fe3a55941db6c8f315a2e856fb943bea1 SHA512 13460232c4219a5e52f0fa97a47bb461fdaeb26e09addaef3ab4dd5ddd599afa87edaafdeae938659adad4770e929cb473220c1a09cd234a063deef8cbf012a8
-EBUILD discover-5.19.5.ebuild 2035 BLAKE2B e717d94f284918f45132e605bc705514e1cf00270ff42b7f22750f3d4225afa17c28e6019d369b40d7320fd7e987775bc618eb09c870b1c46850fd7599d37f28 SHA512 2283912b0ad1e391aab51138e8d0e892d16563741894c188611ce5cf76eecbbbd16d675486c36ab888ba129b6ff2538cfb50a10f5f9d69de1e15e5305dd9e52c
-MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
+DIST discover-5.20.3.tar.xz 10303108 BLAKE2B 7f3577c740aa46b1237545be2b7c1ce41227b74a78241fa50dcf235e9dc17dd6388c52ad0591996549944f32458656566b7cb5a21d3a142e026209382c091bca SHA512 93c1828861749bcb5f0633cc98eb6022cbd2f19a22bbd8bfb1aeca186ea389f044d6116daafad27d2e40151c2028373a75108658fddfccded8c2d4810a11e153
+EBUILD discover-5.19.5.ebuild 2032 BLAKE2B 885e08114d9fa1440380f6fad21f64a816d39776242a2aa53b14d253e17053693e069dae7e5ed62fec03772474c2ce3e690f4692f57abc7be96f5041626f0ca0 SHA512 55bd727d282f46296930d399dec6299be3dd686b3a2cc1c8e87d7816ccae73dd2cdfce5dd200ed55f9aeeff63fbe6cbc7c3fe10986f2838cb3d7a9df76921ec9
+EBUILD discover-5.20.3-r1.ebuild 2093 BLAKE2B a8b6dda4144329eae29eb82df62ba140094fe69eb742b51535d3625babf3973739df1885fe943a3e96713cc2b50018483a0a1442a2cf2e75672f3c0192cd63b4 SHA512 d17b6bfbd7fce92f70931029aab325d11e6ac6c42aa72688c469ff90f76a586ee54f2f621b8cb15333b7075a2d3da6b26beed63933053b7b6e52afe62ab6997b
+MISC metadata.xml 468 BLAKE2B cd98862045ebe78aecaf3dc74526afd4ff2bd377816993e2a0aa4d61cd4f14f7b3e5779d5892244233cbef03b9aba6404aa9fe9aa161f2fc868e369df6ea626f SHA512 a8807c50a9ab4b8e9fe2876fe159a3880bbaeb36a84ad7e7fed55cf6367b1c17ed7e0af135a579685bd4a5d8b550f38b240ac31c00e463befc22de35fd67b2ff
diff --git a/kde-plasma/discover/discover-5.19.5.ebuild b/kde-plasma/discover/discover-5.19.5.ebuild
index 9aee77dd0dfa..48dfafd990e1 100644
--- a/kde-plasma/discover/discover-5.19.5.ebuild
+++ b/kde-plasma/discover/discover-5.19.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+firmware telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/discover/discover-5.18.5.ebuild b/kde-plasma/discover/discover-5.20.3-r1.ebuild
index d5c4806e78ef..96c828a765e2 100644
--- a/kde-plasma/discover/discover-5.18.5.ebuild
+++ b/kde-plasma/discover/discover-5.20.3-r1.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,11 +14,18 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+firmware telemetry"
+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/qtxml-${QTMIN}:5
 	>=kde-frameworks/attica-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -35,17 +41,15 @@ DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	firmware? ( sys-apps/fwupd )
+	flatpak? (
+		dev-libs/appstream:=
+		sys-apps/flatpak
+	)
 	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
@@ -58,9 +62,9 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DBUILD_FlatpakBackend=OFF
+		-DBUILD_FlatpakBackend=$(usex flatpak)
+		$(cmake_use_find_package flatpak AppStreamQt)
 		-DBUILD_FwupdBackend=$(usex firmware)
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml
index 59d0ace33b0b..2b2527d41243 100644
--- a/kde-plasma/discover/metadata.xml
+++ b/kde-plasma/discover/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="firmware">Enable support for firmware upgrades using <pkg>sys-apps/fwupd</pkg></flag>
+		<flag name="flatpak">Enable support for flatpak repositories using <pkg>sys-apps/flatpak</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 2129183a86a5..d7f0aa6d22fa 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,6 +1,5 @@
-AUX drkonqi-5.18.5-init-bools-w-false.patch 1702 BLAKE2B fb60d49278011acdd8ffc4eacc5cfa07afc34f3dbe240945bf87c2ed23f4f94bd4284fe3df25e53e28467a2d4ced54b47461a440cd70be41e17412ed9c2d9c52 SHA512 87d3ec1db263b1cb1eb27684da40815eafcfc8bf512ec771eebd3481bc032a6653686aa22f71313b46dfda7e1dcbdfd5b2bde9930d69f0939ed2ddf7b25529c9
-DIST drkonqi-5.18.5.tar.xz 747984 BLAKE2B b94f808c7edf8e02628badd63ecb5edc9dd80d3e157f46c72fb884d5c35a2a5c70e9080235a7be84150dc973765f42572fcd6e907bcf6a58c100d80b7188bbc6 SHA512 b4862297e969f501f526880560acbd02026b64a0bec2f6e3b2b30f4bfe5ff2abd1798e3bda920bd61adbb6c9a3455e0c4f304f3f37bcafed3f3d8e6de1bc67a9
 DIST drkonqi-5.19.5.tar.xz 744412 BLAKE2B 54840e9fab41f09c6184eb29e3e7bfb17d08a76966b7bb9776f1f044671c61073bd38ca4b8f96c6c3eb4a534871550363941cf2fd94a177f770caccec9a3339f SHA512 0dcfcb5018f1024ad751c234f7e67b865f06c8e8bf5a1a95a160df2af97730ca111f4cc8614da646c8dbe042a206d3d4be214790abcf617ca454582161f0aa24
-EBUILD drkonqi-5.18.5-r2.ebuild 1683 BLAKE2B f0edb1519a89f54fcae1960d4bdb68beb1a02a708a3f1608204179711e33644a656ab353b1e8901b9947c8124852fa5a1bc9d70fdd510cc87daef86c489c6807 SHA512 4027d7640d8706c79acb24245425dfb9542ca0814bf5462edfee89f9ed91586fe99c5dd6d58fafbd490d17851c4bf9b824e1442cdcad60a2188810dccc41147d
-EBUILD drkonqi-5.19.5.ebuild 1644 BLAKE2B 0514f69cc5b926938f41eccdf2c0e8b407843eedbe5e7098872d899c166f1b84643f1122e59a9708a4a99beea129a7dc6b47ca06148be5b3954b02bb75125ac2 SHA512 324a1ab861f1ac30944c66aaaa0bc1271ab9f8245712aac3715fd5817396d1c70d7ed40cc05c53f6b08735aec3955ae269fc8ecca2169de550ce3f0255fa1e2c
+DIST drkonqi-5.20.3.tar.xz 754608 BLAKE2B c54d704278d0ec6e4286b32dc020e634936a073d709b30c49473f80c6c308fcf78a1cc099a3a7b0af52b2c04c77ad626d4569efa1fef095229ba2aebc3038505 SHA512 0efbd66035c2acc749cabfea439e286e2934b11ac7b957c729f5692b3ac236a9eab992742fd721214578cef7807e4306b13c8bde64acb4b63f0df30c332f46cb
+EBUILD drkonqi-5.19.5.ebuild 1641 BLAKE2B 1277c750214b86b6419ef30f07c07d88f014dbdd7613707f280dfdbead0c6dcfa613f35f794c6345ddf52035fe67c58385bff763e3ced75b21a58611042ecee8 SHA512 8c0056c6b8ca5091d8ce4edf71a0f3506d740f7629c3dae4c4dd996e3a48d136a54ff3c79b8626da0312ec9bf4133b69a2ef6553b14b621f19683f84907e815c
+EBUILD drkonqi-5.20.3.ebuild 1644 BLAKE2B ca4da4615321276ca6f454a75052ee5995f14345f339f62aa1c2b772cf53e7dbbab0e2073084319a5e13e4423ad7a29117f58217d8bacc451dac3ecd20157282 SHA512 29a125ad3459a99ccfde6ddcc5e5ff5ca89848489f3dc827adbd5d86d925915f4d31323aa2ef51b1f76d82df08df0733a9eb0b151754e968b23015274836f622
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
index 55352758f183..dad96335a28e 100644
--- a/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild b/kde-plasma/drkonqi/drkonqi-5.20.3.ebuild
index 03342eff8d10..830deaf8d0ab 100644
--- a/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.20.3.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 RDEPEND="
@@ -35,16 +35,13 @@ RDEPEND="
 	>=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
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-init-bools-w-false.patch" # in Plasma/5.18, KDE-bug 421187
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X Qt5X11Extras)
diff --git a/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch b/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch
deleted file mode 100644
index 6ce33a7198ab..000000000000
--- a/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c517b795936fdab641849ca83ec8c3e253e32de8 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 12 May 2020 12:25:52 +0200
-Subject: initialize bools to false by default
-
-Summary:
-This should fix random 113 errors (user_not_insider) coming out of the api
-
-I can't really reproduce the problem other than by setting the bools
-explicitly to true. Seeing as they were previously not set explicitly
-they could very well end up true accidentally.
-To fix this let's set them explicitly false.
-
-BUG: 421187
-FIXED-IN: 5.18.6
-
-Test Plan:
-hoping for the best!
-tests still pass tho
-
-Reviewers: davidedmundson, apol
-
-Reviewed By: apol
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29675
----
- src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h b/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
-index d30f379..8b4e4bb 100644
---- a/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
-+++ b/src/bugzillaintegration/libbugzilla/clients/commands/newattachment.h
-@@ -34,8 +34,8 @@ class NewAttachment : public JsonCommand
-     BUGZILLA_MEMBER_PROPERTY(QString, summary);
-     BUGZILLA_MEMBER_PROPERTY(QString, content_type);
-     BUGZILLA_MEMBER_PROPERTY(QString, comment);
--    BUGZILLA_MEMBER_PROPERTY(bool, is_patch);
--    BUGZILLA_MEMBER_PROPERTY(bool, is_private);
-+    BUGZILLA_MEMBER_PROPERTY(bool, is_patch) = false;
-+    BUGZILLA_MEMBER_PROPERTY(bool, is_private) = false;
- 
-     // flags property is not supported at this time
- 
--- 
-cgit v1.1
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index f0cb1bed1b82..9af04e8c51e6 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,5 @@
-DIST kactivitymanagerd-5.18.5.tar.xz 86988 BLAKE2B b87b6f96d60d1d5f77d052c79f45559c5826f83a35f4a64b98b486bdd90daf4b31d05ac9f1f84d628d7651b1a76fb9bebaddea09f15d055b6924a80c44e9a334 SHA512 2ee59f78cc948fe11577373ea69f895efcaa7d4f239362d3e060382c3be0f67511a0baa64a404c1e0e53d5777775afba60f49e58476c70dcdef6c63358ca4dbc
 DIST kactivitymanagerd-5.19.5.tar.xz 84996 BLAKE2B c5dd47d35fc1bcb5a1f64ed0a60d96f85398372d481927511269abe98512ba38c1128fde760dacbdf044dfca1b52eda68aa3558cab2b9238a0c957bb0edac009 SHA512 884f839c68b94da264042262b730baf81ca4b65320daa2b4de2ecba0698728600f25de77feeb6ef69bc9d98b06e827d8ce467fb9d7b54807442d7d9cf2b9b9a7
-EBUILD kactivitymanagerd-5.18.5.ebuild 909 BLAKE2B 186668843d8dd45c3e02ff06babde90bbf84b790703232bdbe71bee67232f8bb04bac8d66e18911385f8d438afb7a453e2a74588dbc3c295486404394cbb6741 SHA512 c401c84644ef4b046a71715e1c9f55ea6fc58137258b6cb8b8c63211d79e720faa988ee26bf9dc14e2db38d0e5600b878f3a7f3ae46555af747dca7d3ce9fe13
-EBUILD kactivitymanagerd-5.19.5.ebuild 912 BLAKE2B b88e37153c7f952d9315dcffc49749dfaff82637937e347437a158962de34e1c0e095d026365a0bbac35ed8a7e60d918579c0aa99d4b9675cb33a258c87afd44 SHA512 fedee3d5d65834f224f95c49d06aeecc3fdb3174252be8c17aa44aa46f41705f29f402bce8f36d9176f133de3490514fd83ef4e2d06f79006fe286cf895a18f6
+DIST kactivitymanagerd-5.20.3.tar.xz 94756 BLAKE2B cebc08a10bc283b3b67db953ccb63e0686ccd62d6fdf04d2554bf1c94e021e4da8461eea410fda8b8a7d11341b09e22dc255c113999242d7547adce5e42d9d60 SHA512 ecfca37a39a2de6594818f85f42d56e12aa9b088bc85a88550bb092ada62a91d4818db3cf39ec4b69288865cc126a4fcf36f4c02f3fd5bc9c2e9e9c9cd06c1ab
+EBUILD kactivitymanagerd-5.19.5.ebuild 909 BLAKE2B 0ffe727777c14ef0e5b0c7a5b039d49dd87a32f0d2468741f3bf7d4fa29cd96e9c067745043c8451ae536a1a6aab7486e4694428edbda97bf9a41c64d2074d46 SHA512 c0810c97c98f1cef8351494c3790a9f7484f0242d8f48d1630f76cf6f05b61f9ebabca3e414e3441c637bd01734fb0a5da63cafb9e4a3c2f467e42d9447808c5
+EBUILD kactivitymanagerd-5.20.3.ebuild 912 BLAKE2B 66448bba8ebf1dbc0d373b1b60b05cf967e4007a816eef1a040219690bde7890fcb4067b503d44eb59d9a93f28f1b892f9bb0b636148d48dd904e5dee261e75f SHA512 626b6c7a3122441351eef8ef4da53ff438464c752fc31f47c87cb209181baba7cc248180587c514e86729c6b17af4df5b8f36881360d9c5896c30cef0f2e4465
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
index e1951a78bb41..c925697828a2 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="System service to manage user's activities, track the usage pattern
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.3.ebuild
index 74f742a83866..841f91604f6b 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.3.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 6201f04d632f..d74ed9c9b53f 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,6 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
-DIST kde-cli-tools-5.18.5.tar.xz 592020 BLAKE2B 6a35db9d2e68d6ceeaad72553e5d295e54d053b624b1803080dc123451b804250ca0881d6c70b626dddb75ae48b6db398cec5b9c48a25cdd87d18e03873ff612 SHA512 c73695a1ecb81b9222e213f0e98c37354560e32dc56fe8e5ebe1665f7f86a88326bd7a32f4b66d2a73826c9d684f5410306ef5e6660751601c77eae0c6f16d4c
 DIST kde-cli-tools-5.19.5.tar.xz 600580 BLAKE2B bfe77d7d5d9528b3b7d089341afa1cf48bd05d2b82c596a85eddaa197ec9ddce4c83f223e6698979b10e764f4468b3a5bfc94777400d8aa927227cbd0508c975 SHA512 9e8de408643caad7c0de52cd348c35678c92b478587a2e7fd6b0cfd1d93dd578d9060c58b1dacf4b0143840d61860b51f41b53b7c2349112b855c9bad3c9b897
-EBUILD kde-cli-tools-5.18.5.ebuild 1723 BLAKE2B 6024fb092f668527899e80160ff9072ac44d417f4243ff9d0e6c42928c3a97a4120e3bd44a5b203825bf69b7fb925d19d06104142664cd03b71343bad4935fbf SHA512 629c9d412e063ff0783b9b931c49b15b9c18b54478ce38d8404c1aad478c2e067d1d102b50048e2a5019b370b2a902ede2e791ae4adae52b48859011f963b82f
-EBUILD kde-cli-tools-5.19.5.ebuild 1726 BLAKE2B 662d27dc5bdd6c219978407c61d7f24c71862ec3d5c078ebb99c8518aef181c196481e6eb98fdc175ad307d0ee1072347cb50badcd6a0780c55f521f6310d664 SHA512 0a60ccb65c571f56bd24a00e546ae292e6bbba9fda04df2315dce09b0621cdb161f2ccdb5e282deec0b5c61ed4f3df9a116398d5d277568d66e28edc4ddcb5f9
+DIST kde-cli-tools-5.20.3.tar.xz 601248 BLAKE2B 926e7a1d9f806f85b26bb30242947f7c7a21ea1ef38e72166124c1924edc4a88bd514f9ea2455e07167a8064a3deb995d2c1bb2802796cca5307e1185b91fcea SHA512 0fd55bc416efcb247a7262029040efb58d515a2a12906b69f92895a94551772eea4ee31261ea9cbdda374eff40bf78a97865850e41cd7e7542d092b57f795aed
+EBUILD kde-cli-tools-5.19.5.ebuild 1723 BLAKE2B 9477d1d27efd6aed0ba74fe6847d8cc1caa543b7cf02b0425dac1ba3c3c308303cf7e2d5ecbc969f2a0a08d2acfa8127f4cc3e4b4a1a3ef0b1743b1691941aa4 SHA512 281271bdb6ba3f1da7bbdc25ec620442941058e0650ca47817a8076d41e5de9780999448a465ae37002eb542d61a3fd9c158ea939764c450d1969a5509128c15
+EBUILD kde-cli-tools-5.20.3.ebuild 1726 BLAKE2B b916cd4cfafd374e99e1b7a3451886f6ba1a7c837e0b68a388b64bd7d1346910621fcdfd724667c9c4be202c62ea8c502dccf7123d9fdb93e57d5fa0c11c2a14 SHA512 8f44a7a97e3de16a0ecbc56a84a35cd936470ed59ac402e042488e55f79683dbc711261a3c2b41a8fbcb7c8e2ac137d996ed71bc3eddcadf723183925a1bdabb
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
index 2a6fc52bd9af..231d15c17e77 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.19.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.3.ebuild
index 30926bcc804a..8f483a252e8e 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.3.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="optional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,12 +16,16 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
 
 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
@@ -36,10 +40,6 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
 	X? (
 		>=dev-qt/qtx11extras-${QTMIN}:5
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 86c62c293995..e91f68d5a2c4 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,5 @@
-DIST kde-gtk-config-5.18.5.tar.xz 24688 BLAKE2B 3c51e37b1df8c9a48d766158b166b5177727b51c3a5c59435a8b280383af5de74574396272c2900b7a801d8ff0c97dee39e84737f032dde11fd0b2ba2d89f5dd SHA512 2ef81b454789136692fead9af2b8d7383805ed5cf91f9f781e637f65cbc293b9ac03be7583f5b5848c4db956da4212027c5b54a878c3796ff975292deef9aa84
 DIST kde-gtk-config-5.19.5.tar.xz 26224 BLAKE2B c55e69d3447179817b0a152b837843f97eb3fdf7e337b1cdabcce4089532a23609777fb57aab1615aad70369d5a22b2707c5eaa10783500e3ae33d57cd868e2f SHA512 d9875fc1af767b7f318520f386a62404779c33312eb5bad1eebc924a36ca05d822cf219b56548cd050e0965b0dfd581b5fee533a77fb5d745e51f63b350ff79c
-EBUILD kde-gtk-config-5.18.5.ebuild 1107 BLAKE2B 060f075b7c0a977800f69d8a03fde17eac20393675f41823639c415f9cdf6372b4712485600845b6769d9a8fd716de638118416af68d227bff12c50eca8dd6b0 SHA512 01d0f342aa3940290b552a06558c06ecc358463e4f498ef4fc07fc7cb0d8ccd27d79f8b7cbb88413a6f5df9d57386b2ae83c9742731b2e71571e8c663de6dd8e
-EBUILD kde-gtk-config-5.19.5.ebuild 1192 BLAKE2B 655ff657a8d854bc0c88a88b3e9a0fe6ce7e11a09f3f440f3d8c2b1dc19d55af1f21dbb1e29cc3ff88980ab3845ba5dcd8fda15e7018a21d10e0c7c819dd979b SHA512 476815a5ad594869c853a0bae065075cdc0709699bc602e9a92e3a6776548eff9e833feb75a936a5d0b4532c81c7d8d55ca063593e569ff1ba47175671897abb
+DIST kde-gtk-config-5.20.3.tar.xz 67992 BLAKE2B c340c7afc56ea4e37e7ca3d3de63cc0238356e2cc80a3c8628b9d74285dc6cfc2a53907e5c9c0d4c7b597d330886ee113a711f54d22068c53c8e7ebad52a67af SHA512 4b6aff87d72c031ee57462eda01d20dea1aa760daaa93192e754c8781026d2879714c5fcae1fe62d4af66cb649c52e38065722a24ed90157641bdb9b92fa0fd5
+EBUILD kde-gtk-config-5.19.5.ebuild 1189 BLAKE2B 5dd189ee2135920e6bd5133139a27819959c9b0e4840e48839968e218a428e6a026d713a234b71fa8b9de7526a52e8c56f4f5b0413e9ca3d9b0d4b85ade4d57d SHA512 9da0e6205029ad1d0ab8a4dbe8d8a2b448f88890adecd7ab43e98b15528f5edb128d3af7f0d01b95b7e8f8bf3d1b463c7ebf0397544ff62212de8c53b0eb492d
+EBUILD kde-gtk-config-5.20.3.ebuild 1322 BLAKE2B 230fea630976af028a8dd4f9938a3e0722debcdd80062f14dc608f9ab36bf2690d9ef49e05a56257f12cd78c654d1535189cb105c697084ac7b8a1e2472b4425 SHA512 5f3c3a50d9ffb64dd07e57405994e557e01a9608e3e0a3076bb2eecea3f750fc1575014a39eff2306150ee7f0eb4a560352de699c5cf26f53e2f2b2146706a07
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
index 25d360c08e36..84d17cd8b3f4 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.3.ebuild
index 584df58ceeb5..f061fff0a222 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -14,23 +14,32 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kservice-${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() {
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 6a82849500fb..f2a059c15be7 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,5 @@
-DIST kdecoration-5.18.5.tar.xz 43884 BLAKE2B fb1ed23440ac6e1813bb02e9d714e4a6d85587c92f7d379d9c05c981469fee8d73351d38b9fedee84b8b016b5e0aa44074dcd666adf7e8fe511870f264b01131 SHA512 ecbeeea7e2239999995facee481794bb35da359b3e64c0b4e10dd7b0d18d8cd43a6a13ff216ed963cd7f59a78b0b190ab994e6d30f7b84572a8cf69a74abb164
 DIST kdecoration-5.19.5.tar.xz 43832 BLAKE2B 7d72c6014e6893f194c3c1faa2cab0cde122ed51e39006c95eda2bff247601e54d973cb2ad7ce6a92bc410db288396e279efb5b15c911d7008d47d566e9b504d SHA512 74ce5ed6a071ebc484103a2efbfbf3f2f624852dc00e141ced85813571bffb351f832dd6162c1c672274006c7bf2c7b64d59e5224f5eca6d17cd3e3a2e35151b
-EBUILD kdecoration-5.18.5.ebuild 479 BLAKE2B 4f8ea237078478db8e5e2e20e0db3c21adc7711a81d71e893c37cb01257c9089e0f1dd91a9891ea441ec32fb37b7da194cd3ea29dd6a22137d6b73c7d9ae6c24 SHA512 65dd0c311fb15f02cc0bc6f419a37cf9c0be4aca2f285083a9d0b27df820a65c848bf5ffba6df2519a4b9d7bd999e4ab48f4e9e5b4e9d86424a5eae2ba08ff0c
-EBUILD kdecoration-5.19.5.ebuild 482 BLAKE2B 794786f50a4d4861a6ec87761157518e0863f4b473a3d928edc381c299ddb74ac73ffe721196437b577e78586ebc9e28a31f3afd6d117b64e6f71049a00f8129 SHA512 afe1046e09eff50c52c6f060eb24c9464ce26de1c8773ba29344c33036a6369f2633d3661246c13de22a0c8587598b91fa8818c5aa895f36beaa474b00cfb5ae
+DIST kdecoration-5.20.3.tar.xz 45600 BLAKE2B 58d2ebfdb60ab7866d861e66ce0f67ea30ba4c28f12d7af59c4a140c4ffb8dae1b24909fb43f7ddc8186ec8e4f6043c65cf67839cc310e87709dd96fea3cf1e1 SHA512 602ca27b093520d4e42e510ba7da2ef1bafe0653d6b7d48abce623bc2628d19fbb9d11b246e038e7562d58a1302ff2c0df13459b618bfdd66fc8efff66832b4e
+EBUILD kdecoration-5.19.5.ebuild 479 BLAKE2B 384f16ab8b0c5570039e645d020c66f7dd1888dc3c85a729f6502cc6f4fb29cc25b6af3de43cd32aa1833e606d4474cacc9f769768c3beef41c5f850f8b10003 SHA512 2fe4ee5c8c65275957344333c4186bbbb7ad5257b94b1438bf2414b551caeea0cb3adbc2f5f48b2f04687bbe00d7b6fbd9eefb086ce065dc13f4a1f3b84d5ccd
+EBUILD kdecoration-5.20.3.ebuild 482 BLAKE2B 61264c6a0279046b16aab4aaa08999de7d2fbd2784aa23e1fa9d83d1785014d8201b327e064474ff8d27be77d2fb8080a1be43c5fd6bac5bdb6cfb612e132954 SHA512 8f7bb75a6e4e878572da47f495d3264298dccc1895f35ba5dc98caa490be3f1f9ab8dc8728d6b3c5ae67d28844576dc32e7e26fb836654b77f2db4a1cd48aea0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
index 9122ffaa5fd8..329199112f30 100644
--- a/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.20.3.ebuild
index 180cd3e093e2..e66f43ab382d 100644
--- a/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -14,11 +14,11 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
-	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=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 730a615b42a4..eaa60711483a 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,7 +1,7 @@
 AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
 AUX kdeplasma-addons-5.19.5-fix-potd.patch 2485 BLAKE2B cddf302e5956c3c215c51c08e3358083b02d27038b6e46a345881f2ae4b38c7af3f0012ca300fbe9697bcc15165d09bd0596f91f743dc6cc6bc7f4b286a85951 SHA512 5ef0b40c381bdda5a701240e4622df2044ccb68093b2d0853671db9d6de7274f28723b799d4552e2a99d35e67c232d26a0e1a24939bf02c155366c050a0bce6f
-DIST kdeplasma-addons-5.18.5.tar.xz 623872 BLAKE2B 684c9e569575024fe96d6043a91e6a810db69205e3867db9840442b901c120db4f0dacb09540a145f5ae90b5fc6fcd934e26a3d4435e9d23eb374f4e5ca1e391 SHA512 7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6
 DIST kdeplasma-addons-5.19.5.tar.xz 629136 BLAKE2B 992df5d362aca213531cb96b8d01a3c2792ed91562d4f6a7f71e8b50ba6ee28cbd6501b75c7c91923b6afcb13fdf1b385189f718d8cebb482d1cedd040f67d94 SHA512 93de717c623605ceb9fdcedecdf656030b6e9bc360ce834ea918403f64f250029e9a2406bddc0b324e4738006d4ca155bc509f4a7d40c073a2aefb2017db9731
-EBUILD kdeplasma-addons-5.18.5.ebuild 1752 BLAKE2B 010e42c867df1157c15996b23f68cbaf268508a53842c76caff7831975f60c9a3099798e9579167bd093584d690390ce9d43524ec3e7aba12a7c3d94c70ec2f4 SHA512 253c8e7abef4701ba3ec136ea225a4c181491056cf66ff3a4114522a041d6bcf36bd14da939d3e3979d793de50e845207dd4f9453b0a5d9335668373f79c479c
-EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2185 BLAKE2B c917128a820f56cd8d01e8a75d076b437651e167b38fdba2834667c0229292a952edecba8ea9b3fbe0c0a58a97a00e628707b3f5a161640b8a8ddf424279b359 SHA512 3b0097081115e210f94b09d4ad6026978feacb2dc3a5188fa6de204a139545e843e48ed21b8382c38a34e6f6f9ef95748d6d716b9408d1d412eec755e2584247
+DIST kdeplasma-addons-5.20.3.tar.xz 634740 BLAKE2B fa7141863c1aeb3b2c5d43af12eb67288b67030a76f24e86be73f7b1cadd461151a4c54a6e9ac5bda2a8d1cf63530d1d83a6812041b5d683485592e325de2359 SHA512 e1509b547cea891af84c1d5d1a2bc3232a0039e4a96852d4da898eb83381bcd5403f6bea5d8bed2400f5c77d74dd3c82bc00b05aaf69396df7d964a90e240347
+EBUILD kdeplasma-addons-5.19.5-r1.ebuild 2182 BLAKE2B ad22125c6d0d678ca69b404131c9472057f35f13867a0268ee2f4c0139a12841b37b1fbdca11dad1f575436a26769fd4d24b416cdbeb023ebfb89c4c58bfa186 SHA512 0e9e5d29a0a6dbadfb4adaad2ac6f7776b441463236680e7ce6e8982eb3c315b1520df3a78852534d1c62a78ce17bab8dd55307ea6960e60acffedd905309e32
+EBUILD kdeplasma-addons-5.20.3.ebuild 2123 BLAKE2B 91c91591fcd5e923e652495eef9f6db3c7d68dedafcdd86a3b3b3513f68d111480868bd2033dfecd0a4b3231f70a75dbb936ea69b8ebb2750f4cf2ee6dcb9a02 SHA512 8874430e4c50ca99e55a15cdbd8ea7ce1b8550ccdd5287bb9c6434db5ccfd0c103cd5b4d10500fda16eff970991715ae4f36fcdc016fe7ab4de133dacb6168a4
 MISC metadata.xml 567 BLAKE2B 5009c2a6fd74956562b1b3b33322a457a0d295ae472f89208c3756d9847aed9f7b501d0a7e135e95c1a455a57f65876dca71e94446043b9b7d3dc551d58da854 SHA512 2e2fdba9c39b93e082b24d38b1134245e682b07a99b587c9eb6060aae318dd10d08af661880df478a1a97a23c46f1259a4753b9b6169af6af75babfbccf1c7ce
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
index 3dc39311c4ce..5fe105d32ea5 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.19.5-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+comic share webengine"
 
 RESTRICT+=" test" # bug 727846
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.3.ebuild
index e17cb42f9487..3f921c96d88c 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.3.ebuild
@@ -3,19 +3,25 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
+QTMIN=5.15.1
+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="share webengine"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="comic share webengine"
 
 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/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -30,7 +36,6 @@ DEPEND="
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
 	>=kde-frameworks/krunner-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kunitconversion-${KFMIN}:5
@@ -39,24 +44,32 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
+	comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
 	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
 	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
 "
 RDEPEND="${DEPEND}
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=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 e8c76d547508..f579c5f553ab 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,5 @@
-DIST kgamma5-5.18.5.tar.xz 80720 BLAKE2B 7dfc4f96389aa0004b6db92b03eed051a2c2651210069f9f86f6c430ad3d095b16296083c4d57524de092afb2306b841fdfd7166c6805f70761f9af55cf8bdb1 SHA512 a6d242293468eb702600334361bc1299823235b059df64ecc6b2a6219f7801a1fb7ac7f13e71475d877ac03623d72043a6c35c31531fda97af883265deca735c
 DIST kgamma5-5.19.5.tar.xz 80752 BLAKE2B 33280fb2b7856d7b6029e7c05323897a393ca2a1d86f8951327e237cdd29b22f07b64a46ffcaa78093866036c09324605b485fcc103e144b5aa9ee4116e1a338 SHA512 bb758ac5a4ed21563bcdad3eca07a822a8bdebe5d5cf4862f92f2b38dc9a8fc4b15b8cf0e96d6a329b969eb36064c8723ec432a044cecf1c25fe43853cb8f567
-EBUILD kgamma-5.18.5.ebuild 677 BLAKE2B d7dbd83318e6dc2d34d74b8389d41aaddaac1867ea15e84c2d7c677c6cfe7b3cc9c36c4d36b09ab77afc1f27b05cbaa419759ba37b7c8b7de59603767851e936 SHA512 96da9c6f596b496a9bd957fc74a34bb2f3daec9e7bd9ad307c748c4482e44a99df081bacda1044df36ba46b7084fad949063569259dac0f3a6e8be008eaf53cf
-EBUILD kgamma-5.19.5.ebuild 680 BLAKE2B 02ccfa00c504f68aa075e04cc0de9f4298388d09722cbce6a956f64fd0134ec98b4a49a0c3c8ea5ce66ad9c2c7bd3eee7586858ae5745770e722238bb70bf471 SHA512 60c93ee99f6b4c957d3f3f258b5b1e5d0c980c8934cb6efa0506bafe29e6c9c58e79199ee59d448fef4b9db5e7ec7251cf8cbfff8e63185a3fa5204caef8db10
+DIST kgamma5-5.20.3.tar.xz 81444 BLAKE2B b5763ca5f0c1d20a3561a2a2ef277e314b869627d96c680febe336697dd3245180fd35c3ee99df08cfae6ce5ab938f6af7d6ab82c47a92d93142fcba81ea56a2 SHA512 d2a9f9afb0873c4da1baed33e4f128ac19a00980ea6e6c3bf5b498e846706efc843fcca16bdfe505ad852ff1953c7c9ebf00a934e573a8ecd6b392ef9c5b9c84
+EBUILD kgamma-5.19.5.ebuild 677 BLAKE2B 2c3b13deef596a3f1b9b7b4a211e0903d7ac7aae05bfdf8f301f08955e95eb7b2d10827f309e10007f29846eae9abf803c2b3eac3eded9c3a12ae3eab4be9557 SHA512 6016baa4a43307b102666c57f12a8329541578bba5609c8baf7a3d7d1a564ebacefa0cef2bcdc6658cb981916c71b8b287a2e4d04148a3048f35683bcdb71f95
+EBUILD kgamma-5.20.3.ebuild 680 BLAKE2B 54aa4511a8e88332610a32b075ccf4d48c1db11c89753329ab02d1368b3c15070a261ed6fea818d2ea5d1f4673bded3c66d740801546776405a01d083f480d60 SHA512 c731bf61cf1c072a8e67bdc8d0257407e8842fd2431f5040423418696b4051c08163e416d101717a34774c7aba8fdaf7bd3cfcef30b6885a95ee9a7950ac27ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.19.5.ebuild b/kde-plasma/kgamma/kgamma-5.19.5.ebuild
index 483007e88996..3d850099431c 100644
--- a/kde-plasma/kgamma/kgamma-5.19.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kgamma/kgamma-5.18.5.ebuild b/kde-plasma/kgamma/kgamma-5.20.3.ebuild
index 4e47514a459c..632cbd817964 100644
--- a/kde-plasma/kgamma/kgamma-5.18.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.20.3.ebuild
@@ -5,25 +5,25 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 KDE_ORG_NAME="${PN}5"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	x11-libs/libX11
 	x11-libs/libXxf86vm
 "
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index b513f3d302f6..4fa9f006c966 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,5 @@
-DIST khotkeys-5.18.5.tar.xz 1854812 BLAKE2B cec0db1fa589ddca9515e19fcff6dba580c7567ec381c2961e5211fc830398f4f3a29f9e67f8e7821096d5052f710357ffcec3517b8893930629c356590757b3 SHA512 67e5d904127764e89d4a5c5d1c5fcc6ff0070d2a298f1032189dd3e9e17246482431ae651869d157625fc81caedee2a897947a6cb0bbe7508b5d76c61f5fca85
 DIST khotkeys-5.19.5.tar.xz 1855968 BLAKE2B 464797fce42a50313c187743a7213b870af805aea2f75e0e3564e81fec49c334f9574515b267a1acd57dae1f7e8b6e62849ce6e554db52bd452bcac05374660b SHA512 c7832ea7cb2890cbdf9d160b1658a393e105903e54b87cd10cf00f5bffa1b240e70685a201e2b4d580b4083e903770a2b26fd65f68f05302798320e7f20103be
-EBUILD khotkeys-5.18.5.ebuild 1346 BLAKE2B a48049323571b5962e3478b014d90e7e90d5df0d151a33c66839cbe98cb6a081e5b51fae3ae1d376c30af659210e3e159c35b429daf5a161766f3278ba82b8e2 SHA512 8e6e833dde654a7516f3c81e1c059835e99868ece482c7c992eb17275a57896b23636dbfb7ccb97025a29ea4311acb4a6ab0ab3336c3b8d38c805aa9f7c55667
-EBUILD khotkeys-5.19.5.ebuild 1433 BLAKE2B 9604a126919ceb9810fd51fe3afba82619dd92e0525e5b30d62f3243497c3f1a980ec30ce4a6b4ca37ab2ab3c317aab5f140e4100be9f402fe72487da3d5a74a SHA512 d86be67f800db15c82e99bf137201e1e953c374f3e53ecffad677f541cf9b8359309a35a2bc8968ee68f76567f3fc879eac2cf1e7f8fbbfb720a112a7b24a9e5
+DIST khotkeys-5.20.3.tar.xz 1856500 BLAKE2B 707e2f0d49ebb16c40b038698fc55211008a6f13c704b43103ad6e1c7608ce092c8cd95ddeb15aaada28f7b0e704a30ad2b59688e3562cc5a952d64aec83acc0 SHA512 dd1439d7d9ab7d13ab657e8e1f13a0ad343d62a2883f2b483972c39de82b97e4cc7a71ba1ef3a82597df9ee151b81064d8681880c80f5191fdcaac3ddec6acdb
+EBUILD khotkeys-5.19.5.ebuild 1430 BLAKE2B 91463c3d1a6378a0d89685cbaf7aa99b9b3eb3d32e22c10f3179bd5fc546118f187b5e75dd7af00d54571cc8cb4d5521c2e7b011b6525220d1d11bb68aae6e33 SHA512 5da2a34138e88fa67ab3a6d6557e373ef610681aaf4358900f790172c7fbd59e7589ef016a2f9bbfef21ac7b802c2a057b853630bb5c738d423caa45ea215950
+EBUILD khotkeys-5.20.3.ebuild 1310 BLAKE2B b3e0a4cbc35ba03683ffaefe441a404d1788f72054b64172e50a7fcca002fb8a437e6721eb8c2ddf17a82c08f7c4e967d6e4ae9e6ff3ca26672a8239f509dbe9 SHA512 dded081aad7e408c70334272d35e24f238b4c6e78bcbf7d22b84c3a42a79b08be6ce8117804d140d5bb1838d0c7317da49fc5f5668a7c9768e6fe8b465ab2014
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
index dee7fe3cce95..3a4fd854f704 100644
--- a/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.20.3.ebuild
index 8eb1ab7b9a1a..53a2ae627eb4 100644
--- a/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.20.3.ebuild
@@ -4,19 +4,23 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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
@@ -31,11 +35,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
 	x11-libs/libX11
 	x11-libs/libXtst
 "
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 22ae77c90f1d..53eb530c81b6 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,7 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.18.5.tar.xz 1256744 BLAKE2B d67951273bece9cd106a3d10857b18d005e6bc03faec8e9749b2111016c318c4c518611bb50240a01395b59838a47a6ce24df06ab870092aa425f04854fdf3ad SHA512 c9896870a92b3349c262698c4902b98f6aa12523c1757890367d1e277954b0ac7b040bbff0095f7a6abf47e6a31b008070e3a461713c7cf4a591617b76c37886
 DIST kinfocenter-5.19.5.tar.xz 1265760 BLAKE2B 3af323d32e07d310aa224f47c292ae03748aacea0d7cf56770e5a301f9698d1767159f97e0d43733d9a09d6cfe56c41a4a44f988e3000a1dfc06f271accef0f4 SHA512 732d6111f59e099fb032966667b6d7907e607939884714a95f0a2e48903f8a0d7e2331a87611ee058a4bc18bcb012c92040415812243fab4d618a07f2e7dccaa
-EBUILD kinfocenter-5.18.5.ebuild 2837 BLAKE2B 4d8a032e2c3bd1c6b21110d3eb0268d1303c20a66c4d85eab8c1edf5770f9fcd580046307397a254bb41b038e69cc777f7c93eccc55cfa33a48a3c7438ef8b58 SHA512 7544ecb8264e79e29a8fb8541461c0af09bf099fc94e7f7c45d22fb3db3d8c6cb9c7ac2d936b5cbf34c61e5b860e1c0a3e024a70c398c9824c0a241741d1f2df
-EBUILD kinfocenter-5.19.5.ebuild 2763 BLAKE2B 6b141716d89837ea694e9699a2077cc8c580f4fe3233e036e149d9bc32a3edd824edcddf2b4520f5cebd27bd27e35b404e1cb73b9b18c8dc71dae180869ece7e SHA512 39078cd8c51a809566792de366a5899090b622e8fba47755f6b481269c2e17709dd14d2cad69dddbc191b13f8f2fdb2ad58bf015ecd4424053e4d8daf32b5daa
+DIST kinfocenter-5.20.3.tar.xz 1287892 BLAKE2B 8e756448e64b754d82211ed504c7fc0311b13d98a10aeffe8dc3fde37d29c48aaf05cce0c603389f799f297ee1c668b91865ba5d590f879c6a897499faf253be SHA512 c165d6fcd210b14acd7f10b901c16b0c367aff92a003fb4dc8ed255852a51f5ab28d12f7042d5baacb6aa1116a5e0a866c11b59a1310ee7258bce0b6393edcfa
+EBUILD kinfocenter-5.19.5.ebuild 2760 BLAKE2B 4bb04ceca0ade7cf3636d3400c421d8f1ec2afdc874c6756f771f9fbeb1812776a051a709d36e170b18080240e9ff420975beb1cc8b2a46f8cf5f95d6b879057 SHA512 2b5f78e9aed13a248ed1f82d6db44fe262ee0737de76929f1236b90b25c486c1553a6197f06ac478aba1a44620d5526bb5623bdade1a44ded68897007310e810
+EBUILD kinfocenter-5.20.3.ebuild 2726 BLAKE2B 4f7de3153fbbac983fcbe1655bcad8426c134fc48ad795afc94c8ee06a6bfdeb55b2baac7c46cb1d84b1c9b9c667fdb0f276f782e79f4500302e0743472d8530 SHA512 99459f8c81df94808c55833c30307e6c252b6edf8063bc851becfed832d13018f55895a2f047e4240b80a35e0312e1f76a7543a42063130ec1260c2ef9c89ab8
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
index c6c5f5f40bc7..8efe0163f1dc 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.19.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="gles2-only ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.20.3.ebuild
index 12f0d193f407..444067eef583 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.20.3.ebuild
@@ -4,10 +4,10 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
+QTMIN=5.15.1
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Utility providing information about the computer hardware"
 HOMEPAGE="https://userbase.kde.org/KInfoCenter"
@@ -15,13 +15,13 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="gles2-only ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )"
 
 BDEPEND=">=dev-util/cmake-3.14.3"
-COMMON_DEPEND="
+DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
@@ -55,13 +55,11 @@ COMMON_DEPEND="
 		media-libs/mesa[egl]
 	)
 "
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
+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() {
@@ -93,13 +91,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	ecm_pkg_postinst
-
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "net-fs/nfs-utils" || \
-			elog "Installing net-fs/nfs-utils will enable the NFS information module."
-
-		has_version "net-fs/samba" || \
-			elog "Installing net-fs/samba will enable the Samba status information module."
+		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 4ea1f76c5904..5ae7bb12289c 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,5 @@
-DIST kmenuedit-5.18.5.tar.xz 813952 BLAKE2B d5c58ffa7cf3813955f9f87f119c11333215fcffb3b3dcdfc7e601839233d4611b3e0359c3313b4035d957d5890229d57109ab7b4929fe860b7b9c997d1f9d72 SHA512 647aed82a3190e2c27bac4e50eec681684dac08c6f3f7e8e0d2d02b8667e58b367a35a66b830083037570999655652a94f26ae063e253ceedd0db1df00ef834f
 DIST kmenuedit-5.19.5.tar.xz 896836 BLAKE2B 35e921a58856a3ed63f5ef912b06d3db1670e6e7e278d2120aaad69964a2fa60f536634d3b0dc3781a6b487df5aa948eec4ff943a7413f88dc1f9f40010a36d3 SHA512 332fa310a8a4d0c792e05db5427d16b3290998f0da5c7184d674d8104e8079bff51065575a98f61b83899df6cdd7f4be6daf0a5dc014f30bf1ced49c896e1241
-EBUILD kmenuedit-5.18.5.ebuild 1096 BLAKE2B 896a8ad423a24adedc31aec1a314f4c0bc14634689704f7a19e412e918564397aab2310d77249d9231a8ee93ba9fa738f48d648259ccd300f174e2791325091a SHA512 a1584982a98dba6ecbdd3a3b447e900fd658ca3731846ddf0f9da36f8abb4825cc6a5fbc2487ee33bfb0641b5cbfc88ee5b8533580615e6c3ce129406bd24e34
-EBUILD kmenuedit-5.19.5.ebuild 1099 BLAKE2B 2f70ec26d4b883d3bcfd50ec435646a64e926534076f5bd84d383c1019e7e17ca6e89814542201f91f9406eb4496932cffee497cd99923edaad659e5db935aa0 SHA512 99755e1e319533ca67037137ae347cec318cff4e6521e93ae5a71e9b17020d94289f109a728d29537d5c759b2ec75edc57108d5961c98d3ff75bd5ea5c3d5087
+DIST kmenuedit-5.20.3.tar.xz 893664 BLAKE2B 49e0ab06561e7d561f002a6d2a421d130365d6a38d561a07bc166460f8707ae362ca256f3dd466a438c33b00a579e7b95077fad4409f6dc95c83ba70d6f70bad SHA512 bf3d32390d944096a83cf2f7064ac56d677f036cf2f5f57b384d97f940228b0f006c69ebcace1821f5c0ffc4f18115740717136b913991e9dfcc63c2187d89f5
+EBUILD kmenuedit-5.19.5.ebuild 1096 BLAKE2B e373c8f1d299065e26dea7068505fb6bd3b15a126faa71cf677c3e2636bfdac8ade7348bbac549f13a6bccbbea9bd6625400d1eac37a669f471fadd928f8d642 SHA512 9c7cfe3711745595e76142084903932b1ada8d43c2bc14a8e93cda4afffe3e29251068a216ea89f46f4f65cb30730d5e9d0a2bc7fabfbcd3d256fe56f7e83c0e
+EBUILD kmenuedit-5.20.3.ebuild 1099 BLAKE2B db2bb30fd41501189705e36d388af92531a908087a583383424ae70afbfc803e7b440e0c4f97dc7402ce7c9f2f3909cf170cc81fa195576d69cceb0203258924 SHA512 dac513ef2ce4fda61deebfdd9360ef877c4a85e10a9c1d48a484d092ac4f249f54ce56f51dfaca864dac43a2c132f7737df2ac9b18a14fa22437bf6fd80a1cfb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
index 9c27472d12fc..b92ffa235734 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.20.3.ebuild
index 29af3fe52040..838c509e0282 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.20.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma menu editor"
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index c60aab836286..ce6c32ed2222 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,5 @@
-DIST kscreen-5.18.5.tar.xz 113256 BLAKE2B c4cde78164cf3b344fa2ff7905a37cbbf0f32bf3cb527a1e54493cd6f831e617ab85d80d15a489690c503e7f4fd35bb8350f4d1edd6149b3c3e21f52df0286de SHA512 310e9f1b2a46d4d81b78a2567e4b183847e22eeb08d1912748968c7cbd77bce7622aa51b1931144e732c1fac6bc3e7827c2db0d9d539e31e642b9d7c0827b36e
 DIST kscreen-5.19.5.tar.xz 113748 BLAKE2B 91dda071d5b70706f8a5735905c22333eb68c8bab32fe138e77e12764bbfc8d19481b285548caefafea91f666b2c98e5b058f15f481862903fb1cc109be96d3a SHA512 ce47e5b0e16f985811d0e71d4c97d2d25d2a4258732c5b7b8706cdfd176c4883c431ea946833abcbc87fdd81ed6d546da6e23640b4586b8013591ee5917c20f0
-EBUILD kscreen-5.18.5.ebuild 1225 BLAKE2B e45dc9247578442c7fe08721baaddc265f0de50e93183d71eb3511d149830f333f8173a13e70927ebf69850896847e397c07313dbe8b2e852ed020a17e5003dc SHA512 353a602e69e79f14527ab39257988de7c47bf85fa38052564677528accbd1c042e9a1680f59afa8e3f8afdfaa83e5b2aa897f028dae1e05ad611c0edf2f525d6
-EBUILD kscreen-5.19.5.ebuild 1228 BLAKE2B 5f4501eb03fd4e47abd6cf2924021238c340a931897064a5a4df5872c797d6d2e6b1ecafdd1a0389e6f47927b4c215e9d35bd9b6e0e24986cfc3e8ae16976f44 SHA512 e80601209f9ae735b658231ed721f67ef1a1452509e76d59177796a22568d9a5888988098c79ca6a967e6fa1eddbafe8bcda7c04de87a155aaae9f3ee1651461
+DIST kscreen-5.20.3.tar.xz 114572 BLAKE2B 8b839729a1bac0e2bb49548847004929f4c7edc9dde9a36f8d2664d616bf7839438f2a6a7083f0d7251a4859d0659fd88f308e2bd71c26474743291d64f9a032 SHA512 3f7992c0919dfb6390a9a76f5bdebf6bc58660aab9eddaf9f345fa45a4d0ba721f867b5f07c13ef49ea0441592f856c83dd42cb6cbed4ff201d4e32653bc1719
+EBUILD kscreen-5.19.5.ebuild 1225 BLAKE2B c27d88d1278cbe91d87de7791a0a124a0414663906b4ec7f91f4b6ef2619f3a253dc8ba1bbced1435606cfa634e0172fe032a70fa4c681956b2acdb0db68ad61 SHA512 7d07427c0f9d9681b70af8907e2485baa178c317265b76f66190d8842f2ceedfd373f856ec6c49e21c63b5e3674bae95b47c4c5abfd1e362a8dde4ff0023c685
+EBUILD kscreen-5.20.3.ebuild 1228 BLAKE2B ad0e2646c5e2c734298054f2d4aa5358be2af5c3d7e256e054a2d33ea08c72e87bf3edcab48ec7bf0b258af00ca58b6af57c8165c206b1836de05850b107ec69 SHA512 b34092ac43c3fc5fd6024edc59512a8c6bef43aa59b4446ed835b0f43c8d1ba7ef0e76d30ac311f225e80fbde5201dee14d573d462aedc31429ef0b005ea98f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.19.5.ebuild b/kde-plasma/kscreen/kscreen-5.19.5.ebuild
index e1a12702d440..a338848cb431 100644
--- a/kde-plasma/kscreen/kscreen-5.19.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kscreen/kscreen-5.18.5.ebuild b/kde-plasma/kscreen/kscreen-5.20.3.ebuild
index a425a4922273..881d42d461c6 100644
--- a/kde-plasma/kscreen/kscreen-5.18.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma screen management"
@@ -14,10 +14,15 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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/qtsensors-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -31,15 +36,10 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
 # bug #580440, last checked 5.6.3
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 0a84980f93ec..869692c565b6 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,7 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.18.5.tar.xz 125144 BLAKE2B a4d4a570edbb6994eb42390c42a1193ebc7776c28483b9edb7ab4935c18be3e042459a9919216547a275e5c02794ac468364e1a65cfd62beb17a2f09b34cb659 SHA512 27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47
 DIST kscreenlocker-5.19.5.tar.xz 126420 BLAKE2B bef083f6ffaa7930446a234c35d628ffe81c187718be48ee3158b50d5eaf7b5989abda1d3f23a275cff5b949d101cc43e4819bc44b300674681b4233bcbf1f1b SHA512 aa112b28374e2ccfa257d161d47de96ba8a884dbf6cdc59be9dac3624e49472aad7ee0f413e63c9a001969b7e0413d2571e19f39e232e46cefe112fb7f880eda
-EBUILD kscreenlocker-5.18.5.ebuild 2352 BLAKE2B f28abd967b9d6fafb6a7c145d6cdcea966815165073f955c4fccfeaa70a134df0afe54da10a78b8dd8c0793bbe14d3fe6c94eebc18ac8d915ff635d5e7fc5b8c SHA512 e11ded96c0973a085cea50109e3206f8295633bd9b9710514d97499c2ca0b6e8497b73afcb5fcbc9d2eddbfae885ebee2ed0b12bdb69115c4b99b66e4cd7f94b
-EBUILD kscreenlocker-5.19.5.ebuild 2241 BLAKE2B 28ad29b6fa22e9c5dfa7476060b3af8648467d3244c76af9ed7293ba21daedde797e896aa81d8348c2d2ac0e98bbac45ac45305ae5ae67de2f1e304258016ef0 SHA512 b4c37e4249bcb5ed685931f24d69575b83cd74a9c3ccbee936098f28223c66b1ce16ffe39d312d1a23afcb499261fc66533b37ce1e19e1a49d0b70a73e510ba0
-MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
+DIST kscreenlocker-5.20.3.tar.xz 115308 BLAKE2B 7d4675caa5b347e55e15f7ca67919b61c48e6c5c5ec1cc50293a67f96e44aa04ebec465caf5d302b67f060790b178cf8d72fba7d2e05e3fadeef48910d9ccee4 SHA512 dc2b984ed65c167341d7ad60dda490a8889abf47a2f09190ca4e827786e7d1c9c550285e47056dd59d2d4b18f15b21b970ea8e107249bb6d77734a6a2093f721
+EBUILD kscreenlocker-5.19.5.ebuild 2238 BLAKE2B 7368868e7337088729cf8fcc9d4bd6f68f43b123bd62d646b0326d5bb719e9185b34621e373ecc6f9948f597a05dce51ad2bcdff7d0b9f12536866e8a593f563 SHA512 a50bb08b695832eb913f74cd43214a5c2ab777917fea82bb5838845f45075f30ec4f4922e5b9a575599a7a6a153f218c115eb39483f3b9f77a983aba60b13341
+EBUILD kscreenlocker-5.20.3.ebuild 2149 BLAKE2B cff77a7274ae408256c38a0f5f30b03059eef1a9b78032a1b0830d7c79515974726e087d1e6637b99757712aba8f15f0a15643cf311cc4398f21c33475c02818 SHA512 82ca10fed7cedab270436b480b32b89e3e170c5932bf14d08233a0b2c479ccd03271eb180c4758546ea09e62f790a375555e0ddeb4ce6988a38a49a4fcd028cb
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
index 33c822cfa5ee..209457e8c183 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+pam"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.20.3.ebuild
index 81e224ad8d76..055daeafa7c7 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org pam
 
@@ -14,13 +14,17 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit +pam seccomp"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+pam"
 
-REQUIRED_USE="seccomp? ( pam )"
-
-RDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
+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/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -31,29 +35,24 @@ RDEPEND="
 	>=kde-frameworks/kidletime-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	dev-libs/wayland
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libxcb
 	x11-libs/xcb-util-keysyms
-	consolekit? ( sys-auth/consolekit )
 	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
 "
-DEPEND="${RDEPEND}
+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
 "
@@ -62,11 +61,15 @@ RESTRICT+=" test"
 
 src_prepare() {
 	ecm_src_prepare
+	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
+}
 
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
-			-i greeter/CMakeLists.txt || die
-	fi
+src_configure() {
+	local mycmakeargs=(
+		-DPAM_REQUIRED=$(usex pam)
+		$(cmake_use_find_package pam PAM)
+	)
+	ecm_src_configure
 }
 
 src_test() {
@@ -77,23 +80,13 @@ src_test() {
 	ecm_src_test
 }
 
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package consolekit loginctl)
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-		$(cmake_use_find_package seccomp Seccomp)
-	)
-	ecm_src_configure
-}
-
 src_install() {
 	ecm_src_install
 
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
+	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/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml
index 7c59355b622c..2fdbf33d963d 100644
--- a/kde-plasma/kscreenlocker/metadata.xml
+++ b/kde-plasma/kscreenlocker/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="consolekit">Support for killing the screenlocker when <pkg>sys-auth/consolekit</pkg> is the session tracker</flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 7c3ca57c687d..601b14ecec86 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,6 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
-DIST ksshaskpass-5.18.5.tar.xz 22148 BLAKE2B 31521b28a840bfbb14cdef2484dde8908a0ffbeda5d54663243bd93a070d77d72019b5436f0a4f838e7c8b9f60992b06636e181b6ced51d17a13ba4f7c3918b6 SHA512 8cf75491c04537cdbab11613dc0f9317631c282e4f371664164dc0936d08f744a39777b696b772e05b06ef1257d42f7ae29abfbbd022e661073fdf880fe63fcf
 DIST ksshaskpass-5.19.5.tar.xz 23572 BLAKE2B c399be04e33a51968c7c3d962039f7aaff176c7a14bb5d8d2da36e999908aba1f3fa07337412390470cab1342a70bd37b2241b750e7bf852980c77810f311873 SHA512 7bd70985cb4a133e49d58b27c9266222913097154b78f60fc55b7ea3e684723b3ae55cdd0b44f58dd7c2cb54cc2f6046907b7881355b437689d9e470c2aafdd4
-EBUILD ksshaskpass-5.18.5.ebuild 2200 BLAKE2B d61278bda981d6764b8472b12884bf4c6685d788eddbeab0acb76d1d7da7460040abbb73a88c092947b14ef303d730e27ccffadccba946676ac36476474692b9 SHA512 411797a3eaaf443b8236fa3f87124224baf03b91ab806bb56b238660529b0ea14e772afc4cdda82b9d5e13fddb7ba4e116ad97fbb97e64f922d62617fe5d90a9
-EBUILD ksshaskpass-5.19.5.ebuild 2203 BLAKE2B d303576af08258a574fec28f8e1081ccea26d76a24fe1e0dcbb0cba1a62209864096989eca4d083f5473da4a5d778c1a47331bfa2d4df661d778641fd9c89812 SHA512 8837b123097b2504e43ad5499e7bb818125bc7ed12ee5292ca539ba8e2924fa6a20ecf526e77cbcccf8705de262501b996555271444bda0ceab7f659fe75f0fb
+DIST ksshaskpass-5.20.3.tar.xz 23516 BLAKE2B a8c868df495307003765488bb8a2b1ac4c39470905944d696a24f1b8dd49fd7f03e8eae7b10556fe94d8a8ff29e949357dd92aa208f075a15666aad637cb96c7 SHA512 e072f04b187f0047a12ac0e1ee02c28bbaffcd89650a98f9e16bef36c074a1ac9b84a861c6a9e379e8bdc1329cca5afbb1b03ec7dbec36b4027297e7fa988992
+EBUILD ksshaskpass-5.19.5-r1.ebuild 2256 BLAKE2B 5f2dc91ac1d7282916293f3688a02097d356b253d3c3a490e7b9aafb7e7229ddc9ccf41bcd49a5cf6b3d598e44bcfad3a844ecc2a0ea4e2fb926cd7456e8956c SHA512 1c9f0696fe8a7f109eea8508ab1888023eff5b3c5ef1c90706b78952c65a76a4d43ee5160f96de01d626591fd0546254ee3f0ad3d7bb7a4b95829341d18e76e8
+EBUILD ksshaskpass-5.20.3.ebuild 1436 BLAKE2B 09032ed1f73d570d966c8da06d23ccf3cb17be74cd42d72b59a718c8070692c33e82a82eb38a2effaba225944ee38b7457108b919b2c16b0a04a64f6fc768772 SHA512 0b06ec5fb4fe0be972bdf3c74f679eb1e4eb6c6d0010f5db26f9998e104573616e73d140bae2e38909db97f73db946b6f85b1498eb5b3b0477abdb3b57ce6103
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
index 7555b875998c..92cb90f82a19 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.19.5-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.71.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
@@ -75,4 +75,5 @@ pkg_postinst() {
 		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
 		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
 	fi
+	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
 }
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.19.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.20.3.ebuild
index b954ef9eec32..004a7a7eb33f 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.19.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.20.3.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=7
 
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
+DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
+HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
@@ -25,28 +24,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	ecm_pkg_setup
-
-	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
-	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
-	if [[ -f "${EROOT}"${srcfile} ]]; then
-		local md5=$(md5sum "${EROOT}"${srcfile})
-		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
-			elog "Existing modified "${EPREFIX}"${srcfile} detected."
-			elog "Copying to "${EPREFIX}"${newfile}..."
-			cp -v "${EROOT}"${srcfile} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
-		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
-	fi
-}
-
 src_install() {
 	ecm_src_install
 
@@ -70,9 +47,6 @@ pkg_postinst() {
 	elog "If that's not desired, select the one you want to use in"
 	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
 
-	# Clean up pre-5.17.4 script
-	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
-	fi
+	# 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 d4438f5a3c6e..89bbae08f6db 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
-DIST ksysguard-5.18.5.tar.xz 517648 BLAKE2B b50623c28a3884adc5db326d7b0745c558f02e1f515efa9a5d591948026447f427e08cb72805d7f1c8821cdb0038c894e4322520cf2630656e464da6f69af401 SHA512 2cfb82caef5d074b945f0a7478b32af86d49e174d4d294dfe6a54acdb0b1d335e151828a4f239b52cf767ba04d9e93bf1632f2a37e2b1d611128543e0e0008a3
 DIST ksysguard-5.19.5.tar.xz 542628 BLAKE2B 3aeacb401c79723aa46e9eb5df32785e314d7a52704d983e5c6b48dd841e908ec84c5b28c609accec990d6011d5355ba3363329973a68149f03b0b20d5d59265 SHA512 5dd3503e3792c247fa2dab274347ae00ac3ddd0090b8b5115abc90c84630e0f7376ce2ec43a853e2a9cfdadb31b142ea70190b54b65c7a45b5839b1dde5a1feb
-EBUILD ksysguard-5.18.5.ebuild 1393 BLAKE2B 9252e8b44a28642a7f25d46e402e091850761f287aaf9fe85353ead5d60ac43ebc24cbeed8ea0aedd5708911224e7211f302e766711b6279de51bba55b364c50 SHA512 d5b2f2a5d1581b86bb86824848ad4e492335a3d079779136e8e94cd7ad5e2437ba9b605e56ec35fdb3e7d6d264271b5085cf5bd26903dd8d3d1dc9075bd38f84
-EBUILD ksysguard-5.19.5.ebuild 1415 BLAKE2B 10df42e645d99d3b448f37872f3439a1c558a5de8b0771b19c24bf01837ce7baf38b88b68578d06799f21743c221746bd5f6d3b84c9031a3a51a774aed604d81 SHA512 a5bb21cb3418e07882c3f59e2e5ed0d8933d0ab8f240297907d275717168d2ba4f54c8f6e59919919f256009dccb340a485d15f2477bdbad62af72f456c01f14
-MISC metadata.xml 373 BLAKE2B 8d97f1bf96cb523b2832ca4bbb01ee86cf1d13b0b1b75809046da8601254283fa079361c1cf55708c851a08fb31b27beb8cf2df24ea9e14e4c32b8ca0692a7f9 SHA512 c1df9a56aba68a93ceae7cb2b9ea9216c40b6f619263cd8025cde82264206019a6b9d0eecb24f3a798d4f6e1a772752ceec500827e96caf8f050b0b132b08051
+DIST ksysguard-5.20.3.tar.xz 562868 BLAKE2B d597b088079c68e176e6f40d6dc468082e9906dacc800b60177f85f176a81eeb2db4ce489e8133c392ae36e1fbc97c97c6283b22ba2fa790798d993c52e55f5d SHA512 827a6e4dee4323a1fd9fe23eca165da861ebce266937691e114ea032475e08eaa07f7e8a0efb4e5f0971b1053f1d97da56906fb15a2083ec6d7a8089d41536fa
+EBUILD ksysguard-5.19.5.ebuild 1412 BLAKE2B ed15bd5f6f51235bcc2a2d3d105feaf3c531ccbb511f97387162364deb2cc2108a133c9293128ac6a6458d1a3ff1ceffaddb585c73cd07e3877b9c1376cc81d3 SHA512 2cdd16db81febd6ba22b342bef89179c702b17adcafc35223cccc1db404f062847ecfbabd174dfdb95f27be5e5dbf067299c0e8e4e06fa0d5fd72478c25bffdd
+EBUILD ksysguard-5.20.3.ebuild 1596 BLAKE2B 1c98f52cf926ad2a5ad6179817efe1af8a54ec922aebd43d3c03297b66d16589fe7415df1648e99e50a71e5ccbc648cf0d7aae87707520049dbe7a0435aa2ab9 SHA512 38ce45990aa8bc0c2dbbb82fdf6c05a5ef9e4a37712e7b6997a1de050654cda024272fa601907ac1eb36ee20e04ebfc0031a926f67107d27fb03dc369b83dabd
+MISC metadata.xml 617 BLAKE2B b122ab127e8a60b79ee9ad276ce975badbe0d0a750c85987d2aa6da790562a03a2f77fe93766187f863d1a402dca5b79bcee6c44238f6753c7d892e46b34a620 SHA512 fc4a5fd8233b70f4cdd7153aa6681423a74e03a8420534d6c9965c24a3e1c110b43923656720163aca045227cb1896246fe37fd935f5e1270f168435cf6791c5
diff --git a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
index c55c40f19f8c..0d99bed5a51b 100644
--- a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Network-enabled task manager and system monitor"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="lm-sensors pcap"
 
 RESTRICT+=" test" # bug 727848
diff --git a/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.20.3.ebuild
index 66cea4f4b33c..273236fd863c 100644
--- a/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.20.3.ebuild
@@ -4,19 +4,23 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Network-enabled task manager and system monitor"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="lm-sensors pcap"
+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
@@ -32,23 +36,23 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5[-minimal(-)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	pcap? (
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	lm-sensors? ( sys-apps/lm-sensors:= )
+	network? (
+		dev-libs/libnl:3
 		net-libs/libpcap
 		sys-libs/libcap
 	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package pcap libpcap)
 		$(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/ksysguard/metadata.xml b/kde-plasma/ksysguard/metadata.xml
index 61d3b2c41702..53a4d2a60e76 100644
--- a/kde-plasma/ksysguard/metadata.xml
+++ b/kde-plasma/ksysguard/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="pcap">Enable per-process network statistic collection using <pkg>net-libs/libpcap</pkg></flag>
+		<flag name="network">Enable per-process network statistic collection using <pkg>dev-libs/libnl</pkg></flag>
+		<flag name="networkmanager">Enable improved backend for Network statistics using <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index f9c6c695e380..5a980329fcb5 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,5 @@
-DIST kwallet-pam-5.18.5.tar.xz 19800 BLAKE2B 695fb89d1a54bfc44b06bee4881ae357a42c82b6506a6ed7966c30bb28137ee379ac1beb9391982c15ac63e95c0a1bbba2e0950ee89e050a2ceaf296b98958d4 SHA512 050b3ca66f3b078bb7bccb4a3b7750787bf22d18af60972969f83141b99eac4441fa08d48022278cfe28c8f96f7a1d9ca346f155d8ddbdb60b17bc9c142521cc
 DIST kwallet-pam-5.19.5.tar.xz 19932 BLAKE2B 28d8419f500c163ba15a79cc994af70b723dff24fa8c32e899bd856766290f20d09e3ee98e164d55596d1b97137e92096f9c2c3cf2386bb700aa0b7bcfed1c39 SHA512 3fe30f979f6ee838b073b7afdb406068f90529fbbac3513d65145f6a46ab8ba0b61ba11a3e9192c60b1ddd50e9af448c1298725fc01dca483b40a8030053095d
-EBUILD kwallet-pam-5.18.5.ebuild 731 BLAKE2B e538e72a2a41b9af859f889eb338b22b2655dcba2243b4af5db9a91f0558856ab4a8166116acf0b119593fa3ddf307cb07bb55477cb0c73bd5b8bfa5d766ae19 SHA512 e142c7fa4b65c1540180371e4644bba6a6d49e214bc02336e1edf44c9ae7a0a1571ed3b9f4f69e788205893c60c306bf3f096750904842a33087fa9e61d0b4fe
-EBUILD kwallet-pam-5.19.5.ebuild 734 BLAKE2B f1bc8f76b338c43381ebb418c1b59219dbd95377a073a05a90bead0ebf4d8efec0e84af48e68d76da839af43d2331d6f14fcce3759604b90f8d0a39557ef1ba7 SHA512 83253843bacd3d541b8b6abdf0315631bf0760f376ca6c0b514310f029fe0d0149e7bac382a4f9de00469d7e23d5ef43ae795bc440b74cdafa14794d8d2e2305
+DIST kwallet-pam-5.20.3.tar.xz 19868 BLAKE2B 0c774b155f1d6f3b871b5c5d0dce5a67a53ff46a1b5b0e86bb60e0301e2701cbbcc1d0f145d6ec01172495c61d976310323d5edd3c80028b93b34e4608603b4a SHA512 566e6c7cb3581fc5ea05fe35163af3e1f76d8baa74d30c3ca996c5b265645168589e52f7fe6bb89675f7c1252362af19bfe469fc987f0f8d843f0a897fdf0b13
+EBUILD kwallet-pam-5.19.5.ebuild 731 BLAKE2B d950afa45dbb80cbf33a5fba88d382962b9a0c6c53bd65ff445ffbcd5b062578e7909768d8102a6faae954b38853d2dbcf16e0379e80f1408399cc0f3ce2697c SHA512 87942ac14c168a76d23669b2b2ece8f828684a07125fc9a29d8b10367586d2e5039abf192cc30f3cb311e4cdbb7e3a0404b0c2d2986b3680b82d922b87fb0e1e
+EBUILD kwallet-pam-5.20.3.ebuild 734 BLAKE2B 5544f220c8e46ab9d530719b0adb42ffc1961775d8d988cfac17f37f5f3638b9564720fa0e8612246053e2bcd91764f5f9d0f0fc9bbeef1b287adca7dc6bf302 SHA512 2fd2f8578eed8295c50b63ba0b1e2d85e659b573894a7e7c6b5bf5469e80174a49db7454879f1f83ea4a3c4a5950e371833d2229efc9aaf582592e187261f0e5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild
index d6c7a68a251a..fc43479c7a8c 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.19.5.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.18.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.20.3.ebuild
index 78a943d40ffe..121f17823eb9 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.20.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
 inherit ecm kde.org
 
@@ -11,12 +11,12 @@ 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="
-	>=kde-frameworks/kwallet-${KFMIN}:5
 	dev-libs/libgcrypt:0=
+	>=kde-frameworks/kwallet-${KFMIN}:5
 	sys-libs/pam
 "
 RDEPEND="${DEPEND}
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 9df0144e0901..9885d4f9948f 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,5 @@
-DIST kwayland-integration-5.18.5.tar.xz 20496 BLAKE2B 74d2396b475a462710fe28f1ee710935a927579e852bd7105785159309ba745acddf527b4ee335ef0e233fd4a43404778af88cbc50e0413d393896d9eed2d299 SHA512 65d87f1e9e9c957e9e9e73dc04da65e23d0c12cb93eb52c86912f4b15a360d6848cc26edbb97be3444c9a5d7a16ade1aebf2d241d4d1a1530aaa5523d1e9f9b1
 DIST kwayland-integration-5.19.5.tar.xz 21276 BLAKE2B 0d2a243b665efa9a1be2464dc04a4d01e71be65cff143fddd60e49c4d4d1377ae4982087711b1c5706a1c95434aa8e751e2ea35c2e50e3a0de8ff3a36abbab5b SHA512 db5f05ac9d942650b0933d723ba7138d35d262757b229f5f79b07a621543fdd87679da28d9fa059dc48064db39b69ce34f5296decdfc126442ac3f9f4bbbb2b6
-EBUILD kwayland-integration-5.18.5.ebuild 699 BLAKE2B fc20b6e47204ce57593ae3ec743ed702ea0bbdc0e29ec265d3b6102f65f539e5834ad2ea36fd1ebba581c7e6a9ed93ff29c00f59c894ec899f52767263a10763 SHA512 8974af9f97437d0249fde1b2ad429032e787c13a76f68b18f29e395d299f2742c86ddd600f9a43d33b843222f32a28b56e555cb3ab4da6a4fa3ac85212304fce
-EBUILD kwayland-integration-5.19.5.ebuild 702 BLAKE2B f6386ffcb5bb538a6993b1b21f46903846c943949764d22e384fc1d3c8dbb4ca2ca8320f583ef5fd362bdd01e510243b61d427eaea5fe365fc2e653be7cf5a6f SHA512 0e5ee57ed477426fd8ec6ba8b8319115033824c7b2dea691305c95cf382a932880b04a993773046518ef01620e050406eb657d7edcbdd857a72bb9ffee604a8d
+DIST kwayland-integration-5.20.3.tar.xz 21340 BLAKE2B bfb612ae6ec989e875b6cb24d11e9925799e57d6aa094484fc39bd5ee79b2d90adb320e6e1e07e530e807a15c5473356f3bca3b55c6367f503179769a036f185 SHA512 1e1c6102080ecf9e5b585d7a4a2ef643009334628beafbff171621b45a08d11aa70a9ada6ae4bd958a97e5181c90f2c6d757870039ca2429888e45e66742ab9a
+EBUILD kwayland-integration-5.19.5.ebuild 699 BLAKE2B a30fefc4ac1419b0fc461154fe5e08aa1d7cfb2a6b0b814732475ea86c570fefec39fb078a9841281d81eff051753174616adf1c81884d7a127c7fe295fc30e5 SHA512 d5ee26c40bfeb3c715999237928592cca13f5366fb0cba850949a57d3e8db620037878f8e71b3de837ac961f60c4473d5d7980ca93a6a61c9943b7af4c24357f
+EBUILD kwayland-integration-5.20.3.ebuild 702 BLAKE2B 636a47bcc1a1d6242c15952395ffbaceec2231d72ed2d02191974935bf8d5a5b22e3216f31288eeab3e8a7314b9f5cdb9f0014f6f31303443304ce13b851f787 SHA512 e3f800e627b5d735092ae561042e4d0e4732e96d5db7cee9995c894e00402e38df602fa065ef95f00c9c143463e6be3ac72441e1159b7081c3482801bc93cd08
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
index 86928d0d92e1..225a89330e9f 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 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/kwayland-integration/kwayland-integration-5.18.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.20.3.ebuild
index a3aeee586daa..7f14920c0b09 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
@@ -14,16 +14,16 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 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
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 1ab1b6cb54da..b1817eeac62a 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,3 +1,5 @@
 DIST kwayland-server-5.19.5.tar.xz 229752 BLAKE2B 8730fc1e14512756478870a1446310db7a0130afffc29ad42d4a2efa18bdd0991c89c508072c4741ff6a67a28f8cb534b4f097762444ac42b3d2189d753dfa65 SHA512 5e039e38f290daed747a4c5d0fb37c828ad7ff1e05b735abb30bfaa69d67e812ea89b78921ec0877622ed9127a92aa76b5c6468126004c0f53ddf909a45f391b
-EBUILD kwayland-server-5.19.5.ebuild 778 BLAKE2B 5a2891142d16469c0e8bc10c6c71f41de9445e896e3ee2b2d8b6047b96833d9bdce317c1155a464cff65c06988ce480fdcffde4d022b514abfac756350f3ca19 SHA512 e3094e1cb02c43bfc20cf1019d4c3953ed6d3cda03af42b8336ef061d132b40fdd4441d0e8ba36f117112a29180f588b1741c4e92b59bc2b0fd36db9bd370c81
+DIST kwayland-server-5.20.3.tar.xz 220956 BLAKE2B dfe68bbd8626bd5db47a6184d3e7aae62cfd12e61761b546a5b6f117e395edf6c0f133a089356e8b2c524a2e4f02f5db47078b4b26415cbc98abc8868272c80d SHA512 bfd2f04a1ec9991073056fae6f3b3cb6cd87415419caba035d864a678175cedf96736a5fab206b7887ded5a739d0dd19c4dc0b885a0b5f0bbe9242e091503335
+EBUILD kwayland-server-5.19.5.ebuild 775 BLAKE2B 724d6a9db4e7bb3b3a36d4099184ea4b57f40392778f36b336dd316be6342659923032b7475f8f1e620a5d6bb9eff5b27768432f08277243103d6601e661ffe8 SHA512 3d3baa2749844913d51c2c67f521c8afc37cf12996b05854f483ed42688b6178950d86fdb152e35f14eee5de05c28b657bdd14a6dca8ddf628058a9daff4ef19
+EBUILD kwayland-server-5.20.3.ebuild 786 BLAKE2B b1d02cf335e6e9193f0d5eccc503b7e4e37cccc05f0091eb05a964e6b4e2d2771e818c78f938b485f7f9c649ebc99b9b52dd91edecd5195cfd130d8446845110 SHA512 e7063db25f5fb0861e61aad565b42eeb46e1b0202b8ca227d80054ae97849a046f7a62e9d2a80529360cbe5d2f342364ceab01c7ae97a03f899fb604e1318925
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
index 4d73fcd3d6f3..feb358f16c17 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.19.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.20.3.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.20.3.ebuild
new file mode 100644
index 000000000000..32972b455ede
--- /dev/null
+++ b/kde-plasma/kwayland-server/kwayland-server-5.20.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+KFMIN=5.74.0
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+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=""
+
+RDEPEND="
+	>=dev-libs/wayland-1.18.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
+"
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT+=" test"
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 637fb73d9207..0ba1b4ae7bee 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,11 +1,7 @@
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
-AUX kwin-5.18.5-dont-exec-QDialog.patch 5916 BLAKE2B a8506ca70519c5f4a0d57ee26b76897f292d2d62cfe72b04084a8f098c543db7c431cd0d7c86a5689a064b86bda3223ea200aa803605aa6708a3bc037498ecd3 SHA512 ea9b4715ae677f22f46d0ef8661b9f8c75b27eadab928307dad0093e9f60592f9866dcb38d84794e621b3304690d5226a139d172411dd75155088701090eeba9
-AUX kwin-5.18.5-mesa-21.patch 8683 BLAKE2B 87f8ffe26103586cc9514bac2e2723b26a53296e4583ed6c38ff79cbc08ee9b51764db6ac907885498cc0f3ecc501ca96e22131955302a7e284bde8ea780df67 SHA512 5ecdf8124126cd8853b8ff13e88fabf74b2a890ee2540ba22365bb41fcc9201392b72b13b2aaf4c3b67cb54403d8a5fb0cd894ea33a7bea90a9226e40145eba0
-AUX kwin-5.18.5-qt-5.15.patch 1718 BLAKE2B 8c1f51bfe1c91c588fb44bed8840ef216c0473fc41e7c5acaf0ad6e46280f1f5c843760351bf262638732b22aefdfa78c220acd65de389a79a948f39818755d1 SHA512 1995b8ec0de12576972c6a28db32dc108bf0d2f7a5a49eff007326fcea4fb070f4cbcca0783c2bb80389f92b64d3ad295107697a9363cf19f32f70e7202c507d
-AUX kwin-5.18.5-wayland-lockscreen-greeter.patch 2254 BLAKE2B ce05dd3389e5de51ffa960215c963765170b72a439e1b9440f3614bc64fdb7949c040f686ff935b357f6a96d88aced49f5aa23a0e36b6065555bea59b3e58547 SHA512 5b72401deb460d3d09f444f1a120d5bf75c0c3ed7e75c609b57a5a46a84159ba80be8e9277b50a9c1796e46ce34712fc5bce8bb7021b9e4199d7b5a798e42efa
-DIST kwin-5.18.5.tar.xz 6274772 BLAKE2B 1614515df60667fb6e8f45302db13dc43ca896c7266c2e2846fd1a1da75b4054cbe14a27b8b3f7d71ae6398e2cf4d9e8e2a68af1c1fa6809a271c5b29574a023 SHA512 b703891824ec31e8ae29df27a11499579ab95789a838e893d5904e40aeba27b0ddc04836038d5b4c062d75ceed277d07e67eeb1b4e957ccf414f03786037d562
+AUX kwin-5.19.5-safe-removal-of-X11-event-filters.patch 5327 BLAKE2B fd2982a92f2a2bdbdb2e718fcb4e3293245470877aa3021eb0b8da66a5018e79a68bf34034689919a156e8c8de1f1686797c3e355cb96330dfcd559ab27d2e43 SHA512 ffeb77e0f718e06a605ffd82708228ab63161d449ec21067eafc9d34b119bfcb80d9bb608c1e7cacd1bda0786618c475a2cf7977b94e7475482caa281000debe
 DIST kwin-5.19.5.tar.xz 6260188 BLAKE2B bcf3c8afc00af0df8cddeb49396bd23df6178e379ac4c3ba3c547a2c602d309202a72136b69b83f729434fc5691ba24699cf3f44d47b2c033623bca5d551bdb1 SHA512 97ad0096066d99b4bba3089416a6d3744b6f83d82a004caa8762b420cad34cac4221b3535678d4c6f1bcb43c4d97db56be5ac68c4ac501dc168f4472a6c0dad5
-EBUILD kwin-5.18.5-r1.ebuild 3171 BLAKE2B abf91e2d96656acb472fde3ce1ae1247d72a4720427e2faae702a41a669d0cb2dd7db9b1b12ec0b5cf34edd27b3d494c700d9faa566435f0fb9b6ee75b08e133 SHA512 ebef4cfc82c7a4318739b9eff76c5ce32f526b451a67b5e2b0f44448dc4d3dfe837d069dfcafc3ad6cc31251071a41ef4e3e3ac89d330eea04d748fb9bd7ad8c
-EBUILD kwin-5.18.5-r3.ebuild 3280 BLAKE2B 8da770a19c7b40d1899c53a25e679d24037432fe7fb193bf99dc5eab2290f198462454f154120df9cbc2f89b1e60deff6bc106b1c006e4aa8ebe1e3f344847a6 SHA512 ce9379690dd33560d7dbdc2ee7a160781330fb1724b4f9a68eacbf1d32cdbd972e7e28cb4d1f608e96a75437a2568056ed213cf30e81a11bba8199dd248983f1
-EBUILD kwin-5.19.5.ebuild 3029 BLAKE2B 2f08a8e5f8e5b448204a39e6373b973dfafc74c5229d242f36eb09c5d68f78da73e1258a451c62902fa82f9ba6c8d361a79660056dbb29259d695fdf8701eb26 SHA512 ab60f7e29a73b7d0d8c1085353ade4732b0f1b038a3b97de75d8d25b326f0b80e3a2810f6f21025a2e37026da2fc668b08752201cceba00bc76a66045560c48e
-MISC metadata.xml 347 BLAKE2B 9288920f1da9d97be4ba082678abbd6c404efdd6d7c6b997015e38e7d1f36f2b6201bda92799af0ac02287e86d2525c0a7e783e7efd305ed67ff8b96715ffe59 SHA512 e9e82ec176a53e1bea1eb323c1d1daffdcf900f1787ae76fd3de0434ffb8ac77429131ebbfc11080a1771ed03195e7d98c98be2ebf6a444de95d6cd0eb539824
+DIST kwin-5.20.3.tar.xz 6329376 BLAKE2B 11dfb77c147f9033850fa4592ec3e4baec425a32c377869c427591aae8239ce86452660063dbf1fbfa7ec311b73fcece8e2512fc8ae5bb84bcf169d5f4452965 SHA512 a156ef06fad48402a98e13dbaeeddf0f84e74b969198be631a3519fd36216968914ff4dca90e74b9d7a15b2ee7479791822006e13046e6ad4f1463faeac759e1
+EBUILD kwin-5.19.5-r1.ebuild 3116 BLAKE2B 705a3a61df8bf2b0c1e334b7aba8690ad5478f64f2956b1e3c8a863b8ac0773b95d69b75c94d23f91af0e6562f071d2a3a642257f07f041c9bf59fb58d3b8072 SHA512 ef47a3b4851d18f6dcc4615f290b98c87ce16a9655f08efc42f1f993878229f04ad7e591741baac5fb17efeceff7dae33a918115f144319b1818819db96ea67b
+EBUILD kwin-5.20.3.ebuild 3374 BLAKE2B a87ab4235bada706974757ea02be652126f9dbfc9a0bd11085d4e91046cce28ad3c1d553216d737072d335473c39ee6e5f06af81561e8abc1de981b873f3ab36 SHA512 f988521d1bec7b8cf5089fb7953ea76cb8617bd36f0450528ffcdc2b2a42b4906df728ec36682ed5c10afbf7b6b6309c0f8a4fddad6c61172c37a4a182e648d9
+MISC metadata.xml 443 BLAKE2B e972639d031b3e32681af007b9d5daa44167bdbcb9b83ff557e7bcde84b588403240021f8880eb1cc852fbae37d9e8c5ffb392fa1aff19f2075d32876f5082af SHA512 cf0743ac8f3ed8a2ec354653cfbec6bbd5ef191227e46d5d56119f7c0b3ac5a388cfef44f7ce5f2ba9079f3eee897b29b52b726f4e99ee50e29cbb584ed19b3c
diff --git a/kde-plasma/kwin/files/kwin-5.18.5-dont-exec-QDialog.patch b/kde-plasma/kwin/files/kwin-5.18.5-dont-exec-QDialog.patch
deleted file mode 100644
index df65c32fb13a..000000000000
--- a/kde-plasma/kwin/files/kwin-5.18.5-dont-exec-QDialog.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 5ea54eda5d1f91428933d338ea8b950aea86d43a Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Wed, 6 May 2020 15:15:03 +0200
-Subject: [kcmkwin/kwindecoration] Don't exec() QDialog
-
-Using nested event loops with QML is always troublesome.
-
-BUG: 421053
-FIXED-IN: 5.18.6
-
-Differential Revision: https://phabricator.kde.org/D29473
----
- .../declarative-plugin/previewbridge.cpp           | 32 +++++++++++++++-------
- .../declarative-plugin/previewbridge.h             |  4 ++-
- .../kwindecoration/package/contents/ui/Themes.qml  |  3 +-
- 3 files changed, 27 insertions(+), 12 deletions(-)
-
-diff --git a/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp b/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp
-index bad4cc1..83a9bd9 100644
---- a/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp
-+++ b/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp
-@@ -36,7 +36,11 @@
- #include <QDialog>
- #include <QDialogButtonBox>
- #include <QPushButton>
-+#include <QQuickItem>
-+#include <QQuickRenderControl>
-+#include <QQuickWindow>
- #include <QVBoxLayout>
-+#include <QWindow>
- 
- namespace KDecoration2
- {
-@@ -173,15 +177,16 @@ DecorationButton *PreviewBridge::createButton(KDecoration2::Decoration *decorati
-     return m_factory->create<KDecoration2::DecorationButton>(QStringLiteral("button"), parent, QVariantList({QVariant::fromValue(type), QVariant::fromValue(decoration)}));
- }
- 
--void PreviewBridge::configure()
-+void PreviewBridge::configure(QQuickItem *ctx)
- {
-     if (!m_valid) {
-         return;
-     }
-     //setup the UI
--    QDialog dialog;
-+    QDialog *dialog = new QDialog();
-+    dialog->setAttribute(Qt::WA_DeleteOnClose);
-     if (m_lastCreatedClient) {
--        dialog.setWindowTitle(m_lastCreatedClient->caption());
-+        dialog->setWindowTitle(m_lastCreatedClient->caption());
-     }
- 
-     // create the KCModule through the plugintrader
-@@ -189,7 +194,7 @@ void PreviewBridge::configure()
-     if (!m_theme.isNull()) {
-         args.insert(QStringLiteral("theme"), m_theme);
-     }
--    KCModule *kcm = m_factory->create<KCModule>(QStringLiteral("kcmodule"), &dialog, QVariantList({args}));
-+    KCModule *kcm = m_factory->create<KCModule>(QStringLiteral("kcmodule"), dialog, QVariantList({args}));
-     if (!kcm) {
-         return;
-     }
-@@ -205,28 +210,35 @@ void PreviewBridge::configure()
-                                                           QStringLiteral("reloadConfig"));
-         QDBusConnection::sessionBus().send(message);
-     };
--    connect(&dialog, &QDialog::accepted, this, save);
-+    connect(dialog, &QDialog::accepted, this, save);
- 
-     QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok |
-                                                      QDialogButtonBox::Cancel |
-                                                      QDialogButtonBox::RestoreDefaults |
-                                                      QDialogButtonBox::Reset,
--                                                     &dialog);
-+                                                     dialog);
- 
-     QPushButton *reset = buttons->button(QDialogButtonBox::Reset);
-     reset->setEnabled(false);
-     // Here we connect our buttons with the dialog
--    connect(buttons, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
--    connect(buttons, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
-+    connect(buttons, &QDialogButtonBox::accepted, dialog, &QDialog::accept);
-+    connect(buttons, &QDialogButtonBox::rejected, dialog, &QDialog::reject);
-     connect(reset, &QPushButton::clicked, kcm, &KCModule::load);
-     auto changedSignal = static_cast<void(KCModule::*)(bool)>(&KCModule::changed);
-     connect(kcm, changedSignal, reset, &QPushButton::setEnabled);
-     connect(buttons->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, kcm, &KCModule::defaults);
- 
--    QVBoxLayout *layout = new QVBoxLayout(&dialog);
-+    QVBoxLayout *layout = new QVBoxLayout(dialog);
-     layout->addWidget(kcm);
-     layout->addWidget(buttons);
--    dialog.exec();
-+
-+    if (ctx->window()) {
-+        dialog->winId(); // so it creates windowHandle
-+        dialog->windowHandle()->setTransientParent(QQuickRenderControl::renderWindowFor(ctx->window()));
-+        dialog->setModal(true);
-+    }
-+
-+    dialog->show();
- }
- 
- BridgeItem::BridgeItem(QObject *parent)
-diff --git a/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h b/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h
-index 7e1d8f3..85fccbe 100644
---- a/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h
-+++ b/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h
-@@ -26,6 +26,8 @@
- #include <QList>
- #include <QPointer>
- 
-+class QQuickItem;
-+
- class KPluginFactory;
- 
- namespace KDecoration2
-@@ -70,7 +72,7 @@ public:
-     KDecoration2::DecorationButton *createButton(KDecoration2::Decoration *decoration, KDecoration2::DecorationButtonType type, QObject *parent = nullptr);
- 
- public Q_SLOTS:
--    void configure();
-+    void configure(QQuickItem *ctx);
- 
- Q_SIGNALS:
-     void pluginChanged();
-diff --git a/kcmkwin/kwindecoration/package/contents/ui/Themes.qml b/kcmkwin/kwindecoration/package/contents/ui/Themes.qml
-index 28e5899..1eeb4cd 100644
---- a/kcmkwin/kwindecoration/package/contents/ui/Themes.qml
-+++ b/kcmkwin/kwindecoration/package/contents/ui/Themes.qml
-@@ -40,6 +40,7 @@ KCM.GridView {
-     view.implicitCellWidth: Kirigami.Units.gridUnit * 18
- 
-     view.delegate: KCM.GridDelegate {
-+        id: delegate
-         text: model.display
- 
-         thumbnailAvailable: true
-@@ -101,7 +102,7 @@ KCM.GridView {
-                 onTriggered: {
-                     kcm.theme = index
-                     view.currentIndex = index
--                    bridgeItem.bridge.configure()
-+                    bridgeItem.bridge.configure(delegate)
-                 }
-             }
-         ]
--- 
-cgit v1.1
diff --git a/kde-plasma/kwin/files/kwin-5.18.5-mesa-21.patch b/kde-plasma/kwin/files/kwin-5.18.5-mesa-21.patch
deleted file mode 100644
index dc87b4045483..000000000000
--- a/kde-plasma/kwin/files/kwin-5.18.5-mesa-21.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From 2c76cc4784382b3df9b5413860d0793ea26cea31 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 29 May 2020 16:01:27 +0300
-Subject: [wayland] Fix misuse of EGL/eglmesaext.h
-
-The recommended way to get all EGL extension defines is to include
-EGL/eglext.h. EGL/eglmesaext.h is a private header that compositors
-should not use.
-
-BUG: 422131
----
- .../scenes/opengl/abstract_egl_backend.cpp         | 11 +---
- platformsupport/scenes/opengl/egl_dmabuf.cpp       | 41 +-----------
- platformsupport/scenes/opengl/kwineglext.h         | 76 ++++++++++++++++++++++
- 3 files changed, 78 insertions(+), 50 deletions(-)
- create mode 100644 platformsupport/scenes/opengl/kwineglext.h
-
-diff --git a/platformsupport/scenes/opengl/abstract_egl_backend.cpp b/platformsupport/scenes/opengl/abstract_egl_backend.cpp
-index 532ec27..e160ef3 100644
---- a/platformsupport/scenes/opengl/abstract_egl_backend.cpp
-+++ b/platformsupport/scenes/opengl/abstract_egl_backend.cpp
-@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *********************************************************************/
- #include "abstract_egl_backend.h"
- #include "egl_dmabuf.h"
-+#include "kwineglext.h"
- #include "texture.h"
- #include "composite.h"
- #include "egl_context_attribute_builder.h"
-@@ -49,16 +50,6 @@ eglBindWaylandDisplayWL_func eglBindWaylandDisplayWL = nullptr;
- eglUnbindWaylandDisplayWL_func eglUnbindWaylandDisplayWL = nullptr;
- eglQueryWaylandBufferWL_func eglQueryWaylandBufferWL = nullptr;
- 
--#ifndef EGL_WAYLAND_BUFFER_WL
--#define EGL_WAYLAND_BUFFER_WL                   0x31D5
--#endif
--#ifndef EGL_WAYLAND_PLANE_WL
--#define EGL_WAYLAND_PLANE_WL                    0x31D6
--#endif
--#ifndef EGL_WAYLAND_Y_INVERTED_WL
--#define EGL_WAYLAND_Y_INVERTED_WL               0x31DB
--#endif
--
- AbstractEglBackend::AbstractEglBackend()
-     : QObject(nullptr)
-     , OpenGLBackend()
-diff --git a/platformsupport/scenes/opengl/egl_dmabuf.cpp b/platformsupport/scenes/opengl/egl_dmabuf.cpp
-index 3f75bc7..753f15e 100644
---- a/platformsupport/scenes/opengl/egl_dmabuf.cpp
-+++ b/platformsupport/scenes/opengl/egl_dmabuf.cpp
-@@ -21,10 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include "egl_dmabuf.h"
- 
- #include "drm_fourcc.h"
-+#include "kwineglext.h"
- #include "../../../wayland_server.h"
- 
- #include <unistd.h>
--#include <EGL/eglmesaext.h>
- 
- namespace KWin
- {
-@@ -34,45 +34,6 @@ typedef EGLBoolean (*eglQueryDmaBufModifiersEXT_func) (EGLDisplay dpy, EGLint fo
- eglQueryDmaBufFormatsEXT_func eglQueryDmaBufFormatsEXT = nullptr;
- eglQueryDmaBufModifiersEXT_func eglQueryDmaBufModifiersEXT = nullptr;
- 
--#ifndef EGL_EXT_image_dma_buf_import
--#define EGL_LINUX_DMA_BUF_EXT                     0x3270
--#define EGL_LINUX_DRM_FOURCC_EXT                  0x3271
--#define EGL_DMA_BUF_PLANE0_FD_EXT                 0x3272
--#define EGL_DMA_BUF_PLANE0_OFFSET_EXT             0x3273
--#define EGL_DMA_BUF_PLANE0_PITCH_EXT              0x3274
--#define EGL_DMA_BUF_PLANE1_FD_EXT                 0x3275
--#define EGL_DMA_BUF_PLANE1_OFFSET_EXT             0x3276
--#define EGL_DMA_BUF_PLANE1_PITCH_EXT              0x3277
--#define EGL_DMA_BUF_PLANE2_FD_EXT                 0x3278
--#define EGL_DMA_BUF_PLANE2_OFFSET_EXT             0x3279
--#define EGL_DMA_BUF_PLANE2_PITCH_EXT              0x327A
--#define EGL_YUV_COLOR_SPACE_HINT_EXT              0x327B
--#define EGL_SAMPLE_RANGE_HINT_EXT                 0x327C
--#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D
--#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT   0x327E
--#define EGL_ITU_REC601_EXT                        0x327F
--#define EGL_ITU_REC709_EXT                        0x3280
--#define EGL_ITU_REC2020_EXT                       0x3281
--#define EGL_YUV_FULL_RANGE_EXT                    0x3282
--#define EGL_YUV_NARROW_RANGE_EXT                  0x3283
--#define EGL_YUV_CHROMA_SITING_0_EXT               0x3284
--#define EGL_YUV_CHROMA_SITING_0_5_EXT             0x3285
--#endif // EGL_EXT_image_dma_buf_import
--
--#ifndef EGL_EXT_image_dma_buf_import_modifiers
--#define EGL_DMA_BUF_PLANE3_FD_EXT                 0x3440
--#define EGL_DMA_BUF_PLANE3_OFFSET_EXT             0x3441
--#define EGL_DMA_BUF_PLANE3_PITCH_EXT              0x3442
--#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT        0x3443
--#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT        0x3444
--#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT        0x3445
--#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT        0x3446
--#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT        0x3447
--#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT        0x3448
--#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT        0x3449
--#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT        0x344A
--#endif // EGL_EXT_image_dma_buf_import_modifiers
--
- struct YuvPlane
- {
-     int widthDivisor;
-diff --git a/platformsupport/scenes/opengl/kwineglext.h b/platformsupport/scenes/opengl/kwineglext.h
-new file mode 100644
-index 0000000..834701b
---- /dev/null
-+++ b/platformsupport/scenes/opengl/kwineglext.h
-@@ -0,0 +1,76 @@
-+/********************************************************************
-+ KWin - the KDE window manager
-+ This file is part of the KDE project.
-+
-+Copyright (C) 2018 Fredrik Höglund <fredrik@kde.org>
-+Copyright (C) 2020 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or
-+(at your option) any later version.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+*********************************************************************/
-+
-+#ifndef KWINEGLEXT_H
-+#define KWINEGLEXT_H
-+
-+#include <EGL/eglext.h>
-+
-+#ifndef EGL_WL_bind_wayland_display
-+#define EGL_WAYLAND_BUFFER_WL                     0x31D5
-+#define EGL_WAYLAND_PLANE_WL                      0x31D6
-+#define EGL_TEXTURE_Y_U_V_WL                      0x31D7
-+#define EGL_TEXTURE_Y_UV_WL                       0x31D8
-+#define EGL_TEXTURE_Y_XUXV_WL                     0x31D9
-+#define EGL_TEXTURE_EXTERNAL_WL                   0x31DA
-+#define EGL_WAYLAND_Y_INVERTED_WL                 0x31DB
-+#endif // EGL_WL_bind_wayland_display
-+
-+#ifndef EGL_EXT_image_dma_buf_import
-+#define EGL_LINUX_DMA_BUF_EXT                     0x3270
-+#define EGL_LINUX_DRM_FOURCC_EXT                  0x3271
-+#define EGL_DMA_BUF_PLANE0_FD_EXT                 0x3272
-+#define EGL_DMA_BUF_PLANE0_OFFSET_EXT             0x3273
-+#define EGL_DMA_BUF_PLANE0_PITCH_EXT              0x3274
-+#define EGL_DMA_BUF_PLANE1_FD_EXT                 0x3275
-+#define EGL_DMA_BUF_PLANE1_OFFSET_EXT             0x3276
-+#define EGL_DMA_BUF_PLANE1_PITCH_EXT              0x3277
-+#define EGL_DMA_BUF_PLANE2_FD_EXT                 0x3278
-+#define EGL_DMA_BUF_PLANE2_OFFSET_EXT             0x3279
-+#define EGL_DMA_BUF_PLANE2_PITCH_EXT              0x327A
-+#define EGL_YUV_COLOR_SPACE_HINT_EXT              0x327B
-+#define EGL_SAMPLE_RANGE_HINT_EXT                 0x327C
-+#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D
-+#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT   0x327E
-+#define EGL_ITU_REC601_EXT                        0x327F
-+#define EGL_ITU_REC709_EXT                        0x3280
-+#define EGL_ITU_REC2020_EXT                       0x3281
-+#define EGL_YUV_FULL_RANGE_EXT                    0x3282
-+#define EGL_YUV_NARROW_RANGE_EXT                  0x3283
-+#define EGL_YUV_CHROMA_SITING_0_EXT               0x3284
-+#define EGL_YUV_CHROMA_SITING_0_5_EXT             0x3285
-+#endif // EGL_EXT_image_dma_buf_import
-+
-+#ifndef EGL_EXT_image_dma_buf_import_modifiers
-+#define EGL_DMA_BUF_PLANE3_FD_EXT                 0x3440
-+#define EGL_DMA_BUF_PLANE3_OFFSET_EXT             0x3441
-+#define EGL_DMA_BUF_PLANE3_PITCH_EXT              0x3442
-+#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT        0x3443
-+#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT        0x3444
-+#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT        0x3445
-+#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT        0x3446
-+#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT        0x3447
-+#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT        0x3448
-+#define EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT        0x3449
-+#define EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT        0x344A
-+#endif // EGL_EXT_image_dma_buf_import_modifiers
-+
-+#endif // KWINEGLEXT_H
--- 
-cgit v1.1
-
diff --git a/kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch b/kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch
deleted file mode 100644
index eb8f6617026c..000000000000
--- a/kde-plasma/kwin/files/kwin-5.18.5-qt-5.15.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ec602e0c2a676aed0707c7fb7edfe964516dbc77 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Sun, 7 Jun 2020 18:05:21 +0200
-Subject: [PATCH] Fix the Plastik decoration with Qt 5.15
-
-The trick in qmldir no longer works with Qt 5.15, so use a more reliable
-approach. This way works with Qt 5.15 and also on previous versions of Qt.
----
- .../kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp | 3 ++-
- plugins/kdecorations/aurorae/themes/plastik/code/qmldir        | 3 ---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
-index 25d11251f..4304dcdc1 100644
---- a/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
-+++ b/plugins/kdecorations/aurorae/themes/plastik/code/plastikplugin.cpp
-@@ -20,7 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- void PlastikPlugin::registerTypes(const char *uri)
- {
--    Q_UNUSED(uri)
-+    // Need to register something to tell Qt that it loaded (QTBUG-84571)
-+    qmlRegisterModule(uri, 1, 0);
- }
- 
- void PlastikPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
-index 49a4b402d..aa7bf16b3 100644
---- a/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
-+++ b/plugins/kdecorations/aurorae/themes/plastik/code/qmldir
-@@ -1,5 +1,2 @@
- module org.kde.kwin.decorations.plastik
- plugin plastikplugin
--
--# we need to have at least one element of Qt is not able to find the plugin *shrug*
--Foo 1.0 Foo.qml
--- 
-2.27.0
-
diff --git a/kde-plasma/kwin/files/kwin-5.18.5-wayland-lockscreen-greeter.patch b/kde-plasma/kwin/files/kwin-5.18.5-wayland-lockscreen-greeter.patch
deleted file mode 100644
index ac4b9d24c8e1..000000000000
--- a/kde-plasma/kwin/files/kwin-5.18.5-wayland-lockscreen-greeter.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 6f8b8efb338117ee197092e46b25b489b612257d Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 8 May 2020 11:26:27 +0300
-Subject: [wayland] Place lockscreen greeter above other windows
-
-Summary: BUG: 420802
-
-Reviewers: #kwin, davidedmundson
-
-Reviewed By: #kwin, davidedmundson
-
-Subscribers: apol, kwin
-
-Tags: #kwin
-
-Differential Revision: https://phabricator.kde.org/D29523
----
- abstract_client.cpp                  |  2 ++
- autotests/integration/lockscreen.cpp | 19 +++++++++++++++++++
- 2 files changed, 21 insertions(+)
-
-diff --git a/abstract_client.cpp b/abstract_client.cpp
-index ca6c422..48918e7 100644
---- a/abstract_client.cpp
-+++ b/abstract_client.cpp
-@@ -275,6 +275,8 @@ Layer AbstractClient::belongsToLayer() const
-     // Since the desktop is also activated, nothing should be in the ActiveLayer, though
-     if (isInternal())
-         return UnmanagedLayer;
-+    if (isLockScreen())
-+        return UnmanagedLayer;
-     if (isDesktop())
-         return workspace()->showingDesktop() ? AboveLayer : DesktopLayer;
-     if (isSplash())          // no damn annoying splashscreens
-diff --git a/autotests/integration/lockscreen.cpp b/autotests/integration/lockscreen.cpp
-index e258540..82cac09 100644
---- a/autotests/integration/lockscreen.cpp
-+++ b/autotests/integration/lockscreen.cpp
-@@ -62,6 +62,7 @@ private Q_SLOTS:
-     void initTestCase();
-     void init();
-     void cleanup();
-+    void testStackingOrder();
-     void testPointer();
-     void testPointerButton();
-     void testPointerAxis();
-@@ -223,6 +224,24 @@ void LockScreenTest::cleanup()
-     Test::destroyWaylandConnection();
- }
- 
-+void LockScreenTest::testStackingOrder()
-+{
-+    // This test verifies that the lockscreen greeter is placed above other windows.
-+
-+    QSignalSpy clientAddedSpy(waylandServer(), &WaylandServer::shellClientAdded);
-+    QVERIFY(clientAddedSpy.isValid());
-+
-+    LOCK
-+    QVERIFY(clientAddedSpy.wait());
-+
-+    AbstractClient *client = clientAddedSpy.first().first().value<AbstractClient *>();
-+    QVERIFY(client);
-+    QVERIFY(client->isLockScreen());
-+    QCOMPARE(client->layer(), UnmanagedLayer);
-+
-+    UNLOCK
-+}
-+
- void LockScreenTest::testPointer()
- {
-     using namespace KWayland::Client;
--- 
-cgit v1.1
diff --git a/kde-plasma/kwin/files/kwin-5.19.5-safe-removal-of-X11-event-filters.patch b/kde-plasma/kwin/files/kwin-5.19.5-safe-removal-of-X11-event-filters.patch
new file mode 100644
index 000000000000..7eeccf6e8c5f
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.19.5-safe-removal-of-X11-event-filters.patch
@@ -0,0 +1,162 @@
+From c5880833d94330d022c4b6fc84c175aadeaf9632 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Tue, 22 Sep 2020 08:53:17 +0000
+Subject: [PATCH] x11: Make removal of X11 event filters safe
+
+If an X11 event filter has been activated and it unregisters another X11
+event filter, then the window manager may crash because the foreach macro
+in Workspace::workspaceEvent() makes a copy of m_genericEventFilters or
+m_eventFilters and we can call the event() method for an already defunct
+filter.
+
+With this change, X11 event filters can be safely removed and installed
+at any particular moment.
+
+BUG: 423319
+
+
+(cherry picked from commit a433fb08a3a9255802405a17dd4c8270c68fcb25)
+---
+ events.cpp    | 52 +++++++++++++++++++++++++++++++++++++++++----------
+ workspace.cpp | 10 ++++++++++
+ workspace.h   | 17 +++++++++++++++--
+ 3 files changed, 67 insertions(+), 12 deletions(-)
+
+diff --git a/events.cpp b/events.cpp
+index eb3572d13..2e8885d76 100644
+--- a/events.cpp
++++ b/events.cpp
+@@ -165,18 +165,34 @@ QVector<QByteArray> s_xcbEerrors({
+ 
+ void Workspace::registerEventFilter(X11EventFilter *filter)
+ {
+-    if (filter->isGenericEvent())
+-        m_genericEventFilters.append(filter);
+-    else
+-        m_eventFilters.append(filter);
++    if (filter->isGenericEvent()) {
++        m_genericEventFilters.append(new X11EventFilterContainer(filter));
++    } else {
++        m_eventFilters.append(new X11EventFilterContainer(filter));
++    }
++}
++
++static X11EventFilterContainer *takeEventFilter(X11EventFilter *eventFilter,
++                                                QList<QPointer<X11EventFilterContainer>> &list)
++{
++    for (int i = 0; i < list.count(); ++i) {
++        X11EventFilterContainer *container = list.at(i);
++        if (container->filter() == eventFilter) {
++            return list.takeAt(i);
++        }
++    }
++    return nullptr;
+ }
+ 
+ void Workspace::unregisterEventFilter(X11EventFilter *filter)
+ {
+-    if (filter->isGenericEvent())
+-        m_genericEventFilters.removeOne(filter);
+-    else
+-        m_eventFilters.removeOne(filter);
++    X11EventFilterContainer *container = nullptr;
++    if (filter->isGenericEvent()) {
++        container = takeEventFilter(filter, m_genericEventFilters);
++    } else {
++        container = takeEventFilter(filter, m_eventFilters);
++    }
++    delete container;
+ }
+ 
+ 
+@@ -219,13 +235,29 @@ bool Workspace::workspaceEvent(xcb_generic_event_t *e)
+     if (eventType == XCB_GE_GENERIC) {
+         xcb_ge_generic_event_t *ge = reinterpret_cast<xcb_ge_generic_event_t *>(e);
+ 
+-        foreach (X11EventFilter *filter, m_genericEventFilters) {
++        // We need to make a shadow copy of the event filter list because an activated event
++        // filter may mutate it by removing or installing another event filter.
++        const auto eventFilters = m_genericEventFilters;
++
++        for (X11EventFilterContainer *container : eventFilters) {
++            if (!container) {
++                continue;
++            }
++            X11EventFilter *filter = container->filter();
+             if (filter->extension() == ge->extension && filter->genericEventTypes().contains(ge->event_type) && filter->event(e)) {
+                 return true;
+             }
+         }
+     } else {
+-        foreach (X11EventFilter *filter, m_eventFilters) {
++        // We need to make a shadow copy of the event filter list because an activated event
++        // filter may mutate it by removing or installing another event filter.
++        const auto eventFilters = m_eventFilters;
++
++        for (X11EventFilterContainer *container : eventFilters) {
++            if (!container) {
++                continue;
++            }
++            X11EventFilter *filter = container->filter();
+             if (filter->eventTypes().contains(eventType) && filter->event(e)) {
+                 return true;
+             }
+diff --git a/workspace.cpp b/workspace.cpp
+index a87a622e9..fd3634b16 100644
+--- a/workspace.cpp
++++ b/workspace.cpp
+@@ -66,6 +66,16 @@ namespace KWin
+ extern int screen_number;
+ extern bool is_multihead;
+ 
++X11EventFilterContainer::X11EventFilterContainer(X11EventFilter *filter)
++    : m_filter(filter)
++{
++}
++
++X11EventFilter *X11EventFilterContainer::filter() const
++{
++    return m_filter;
++}
++
+ ColorMapper::ColorMapper(QObject *parent)
+     : QObject(parent)
+     , m_default(kwinApp()->x11DefaultScreen()->default_colormap)
+diff --git a/workspace.h b/workspace.h
+index 489d7bae4..61fb215a8 100644
+--- a/workspace.h
++++ b/workspace.h
+@@ -55,6 +55,19 @@ class X11Client;
+ class X11EventFilter;
+ enum class Predicate;
+ 
++class X11EventFilterContainer : public QObject
++{
++    Q_OBJECT
++
++public:
++    explicit X11EventFilterContainer(X11EventFilter *filter);
++
++    X11EventFilter *filter() const;
++
++private:
++    X11EventFilter *m_filter;
++};
++
+ class KWIN_EXPORT Workspace : public QObject
+ {
+     Q_OBJECT
+@@ -654,8 +667,8 @@ private:
+ 
+     QScopedPointer<KillWindow> m_windowKiller;
+ 
+-    QList<X11EventFilter *> m_eventFilters;
+-    QList<X11EventFilter *> m_genericEventFilters;
++    QList<QPointer<X11EventFilterContainer>> m_eventFilters;
++    QList<QPointer<X11EventFilterContainer>> m_genericEventFilters;
+     QScopedPointer<X11EventFilter> m_movingClientFilter;
+     QScopedPointer<X11EventFilter> m_syncAlarmFilter;
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/kwin/kwin-5.18.5-r1.ebuild b/kde-plasma/kwin/kwin-5.18.5-r1.ebuild
deleted file mode 100644
index 33ac47b0ae2a..000000000000
--- a/kde-plasma/kwin/kwin-5.18.5-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="caps gles2-only multimedia"
-
-COMMON_DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=]
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsensors-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-libs/libinput-1.9
-	>=dev-libs/wayland-1.2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libepoxy
-	media-libs/mesa[egl,gbm,wayland,X(+)]
-	virtual/libudev:=
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	# in Plasma/5.18
-	"${FILESDIR}/${P}-dont-exec-QDialog.patch" # KDE-bug 421053
-	"${FILESDIR}/${P}-wayland-lockscreen-greeter.patch" # KDE-bug 420802
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kwin/kwin-5.19.5.ebuild b/kde-plasma/kwin/kwin-5.19.5-r1.ebuild
index 5ae8f73e4421..fc1182510000 100644
--- a/kde-plasma/kwin/kwin-5.19.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.19.5-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="caps gles2-only multimedia"
 
 COMMON_DEPEND="
@@ -95,6 +95,10 @@ PDEPEND="
 
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-safe-removal-of-X11-event-filters.patch # KDE-Bug 423319
+)
+
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
diff --git a/kde-plasma/kwin/kwin-5.18.5-r3.ebuild b/kde-plasma/kwin/kwin-5.20.3.ebuild
index ed5d1d1f83c3..da2325921b7c 100644
--- a/kde-plasma/kwin/kwin-5.18.5-r3.ebuild
+++ b/kde-plasma/kwin/kwin-5.20.3.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="optional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,10 +16,10 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="caps gles2-only multimedia"
+IUSE="accessibility caps gles2-only multimedia screencast"
 
 COMMON_DEPEND="
-	>=dev-libs/libinput-1.9
+	>=dev-libs/libinput-1.14
 	>=dev-libs/wayland-1.2
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
@@ -41,7 +41,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
@@ -56,6 +55,7 @@ COMMON_DEPEND="
 	>=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/libepoxy
@@ -72,14 +72,18 @@ COMMON_DEPEND="
 	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] )
+	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}
@@ -93,25 +97,20 @@ PDEPEND="
 
 RESTRICT+=" test"
 
-PATCHES=(
-	# in Plasma/5.18
-	"${FILESDIR}/${P}-dont-exec-QDialog.patch" # KDE-bug 421053
-	"${FILESDIR}/${P}-wayland-lockscreen-greeter.patch" # KDE-bug 420802
-	"${FILESDIR}/${P}-mesa-21.patch" # KDE-bug 422131
-	"${FILESDIR}/${P}-qt-5.15.patch" # Plastik deco issue
-)
-
 src_prepare() {
 	ecm_src_prepare
 	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
 
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
+	# 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)
 	)
 
diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml
index 9b1b37b6a988..24eb99364154 100644
--- a/kde-plasma/kwin/metadata.xml
+++ b/kde-plasma/kwin/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="multimedia">Enable effect video button in desktop effects KCM</flag>
+		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 958607da664b..7178a162c52f 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,5 @@
-DIST kwrited-5.18.5.tar.xz 20236 BLAKE2B 3dad52dd60ad24dda97165332bd2a6182ac3fd9aef57b2f3e90ece0cc899617d99e84d696d3647c84197d088f383eaa9c96e88367abc310e1bdff81e0c57f842 SHA512 2c28ba26228394989524b46e68cd2783eff5c412ccfdaf12947976bde6a2ba732e696c3d8af666f87cf67062c75485fb0ed01f58ff3d727fedf8d440ddfd4f84
 DIST kwrited-5.19.5.tar.xz 20208 BLAKE2B 76a5ddb2c9e4e3e47f1deb65c077634715dd1853a879573ce6be259d5cfcfb9ce7bd68b5967fa006e84f34dafdaf82ee18c9154ab28bcf49d152edc6816e7b10 SHA512 c5beb32da7ea08d944d603db9f5af6356b7742be9408f8d5e540d2e782c54d0642f93a784420a931ce807f980fc6aed0135d54e8cb03f88831ac7c0404dc7136
-EBUILD kwrited-5.18.5.ebuild 623 BLAKE2B 00ae1b0954de469354d8d4b73a5e29b73faa93811021d8269b3d599274ce632c6fd52d2b82bd7dd2f810b040e9d57fe2c6536d801a190072b78f7aca811d5830 SHA512 98da6e9ef2033c63328eac9b52033cbab5018f164b80c3921b9701a0e41b738e8aec2092be6a467f576431c9ac8f3ed102c1e3404d2ab604da1d9ff5d3022a99
-EBUILD kwrited-5.19.5.ebuild 626 BLAKE2B e7c7facc0386556a7c389ac28ec750bffd37569578954deb60fdd9c8cd6d1c1ce4140acbdaab861e0f4e93b0d534a0df0ff1291f3e60ec2773ff074ff8e7aabd SHA512 8eee14d7509489d65e900af351b7724d67aac9762c78ad7effd19299ff2b17c9238af88c3b6e2d1e4e43797d7c18477ae0ca045c1078588217b4692e3c423430
+DIST kwrited-5.20.3.tar.xz 20448 BLAKE2B c2eed7f8ed4f9d5ca4c2e48ff2c57d36fb2abb44b0ec37888d9ba937c7a977b054f9b777a29ec9c2b8625b9d56ed785f28e315e15f500b19bbc6ac381d806cd9 SHA512 1d138449f8c7e2e835359510b3ea173e18656f42ae3d5c3790565d251440fc202f3e7e2db9dec04d9d51c3b6cbc425864def5b52d346b64477ff5ff9340bebcd
+EBUILD kwrited-5.19.5.ebuild 623 BLAKE2B bcc2a84195ee3c1bc321b9a4ddb0815812fcde9713ddbd5ca74579316232039099099b7e25c7a052ea7b5b7d3f50c236eb8c5ef63cd4081ec0b3449ab7dfb364 SHA512 40f2fcfaf5a4dac3327142348c4373636d1f0f920a1b975a4e924f070284d73ba52539d7e74d468b1d2aeff197a688aaba9f84685d9db08aeb0a483e823b2449
+EBUILD kwrited-5.20.3.ebuild 595 BLAKE2B c0be4c542449a99b308e5b839cab1fdba794a6e98ee1d4584dd11535e461af6d56bcc0792aead373aa8c2d30283502c11845d153c46e8abb4bf838d4be06f1a8 SHA512 db337652d01ca796797229455b3fe8cb65fde1e5bd37107268c1a44d0f229b5adc30b2293f18d114612ac2834542a5540c26b4cc68160b59ffca14c05ce9be89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.19.5.ebuild b/kde-plasma/kwrited/kwrited-5.19.5.ebuild
index 317eed10e3d4..b324563b7fdc 100644
--- a/kde-plasma/kwrited/kwrited-5.19.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwrited/kwrited-5.18.5.ebuild b/kde-plasma/kwrited/kwrited-5.20.3.ebuild
index 659686c1f1f5..adb7f26f7156 100644
--- a/kde-plasma/kwrited/kwrited-5.18.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.20.3.ebuild
@@ -3,25 +3,24 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 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"
+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
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index fa5b70aa86d2..7abe2e8954af 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
-DIST libkscreen-5.18.5.tar.xz 85532 BLAKE2B eb9c85c88888dc82486cce8cd55c06cc9c180ac84a9ebd005cbbeb26233bccd3a48daadbff42cff33c92bf871c89bd84c5f291210bbf7768c7ad7b45641d7a0a SHA512 8fc36bfd5aeb94fada51be1895ff2cf1b9fa98332f1795ac5e9d5339a35d87a24ed15c1f44af85205198c584eb411191f72ef8de370d1f97476d75db1458cb00
 DIST libkscreen-5.19.5.tar.xz 85468 BLAKE2B be5d055092395e53e252e879d4bfb5177e45e1b5df96cd53bff81a0cf88b10f84dd1a0b7445bc1073357c98040afc62334aa433e20d5afe3f21f73b3e3ea5cae SHA512 5bc462ee9e322bbdbd375003b962b868a6c6dfff6344e61d39e04644fbb7f409a337116df1c274a664f633b176dfd69af992d3e0e290fa85dbe529cbe1a1e87f
-EBUILD libkscreen-5.18.5.ebuild 606 BLAKE2B d4d29ae7fe2ace3772cfc632ca430cd06cd14cbe1a5407be22ef0992c4daa8b589714166863ce59506bf5503e05ed902e539e3e579c31aabfb78e2322974e215 SHA512 22931f06aa1ae659ef952558df3b2bce5a33fecbf2992fc19023ed379627c899c1e29768c2eec9656ac743cb3232c0b644691e50fc860b05c737948645fbdf79
-EBUILD libkscreen-5.19.5.ebuild 650 BLAKE2B 937f645d48672b78f40fe7f4b2713979b2f367248e6c2a2e7c7e87e51e75acd4bcad59e2afbd446f1a05b3726338fdde8862b5d2714606467106634cf15d5b35 SHA512 4b81dcef7fbb89673f3cfec223b104b165febba71bdf098f91acb54aa8851f9f6133705620a3d83a426835983da37e490889f452d8bcf8a2805a4cd3ae5e10fc
+DIST libkscreen-5.20.3.tar.xz 85576 BLAKE2B 62a00c504cbdf23bbcc6f568d58a9ccea4febf1080f8d9fba1a214e5a94b4fcd73238bdc289afbe9b94d53eb163e2fc1a1bdba424671906a4f5a4652ceda8ebc SHA512 6bcecbdcb7723e3b5a0b9bd49c2108fe8407fd7166a5ad5fd27bf2102825b7ac25fc86dc0b8f5d6b4cd770acd35c0c44b8d75d711a397832fb8819842a9892e4
+EBUILD libkscreen-5.19.5.ebuild 647 BLAKE2B f3aceb4ea5508d25b411deb683820f455f278efabb70b8d800a1cb10f457aa51b979f99cf55db6527be3c8356788eef78e5c35df9994dcff3cf7bacb8d9e0e49 SHA512 596a327c444c5cbf52b0860ed63d1b54a00133d52006b83bd79feccba4f3690a0a92b12be9430b9415d6ac77ea76adc249dfec822b557e8baca152cc3a8c8776
+EBUILD libkscreen-5.20.3.ebuild 650 BLAKE2B 68116e9df2250691073d2cf5caa3903d6740b1af9d98a77ba3defc960e0f8d44d0929ce54cc708356ef6ae0d20abbe487e06a73bac1ebb4827e6cd52d4a6e0c1 SHA512 0ad44399177b321399c4b5c77cf3efc3bd4b537eb4c73bb58d7517b5b11cb935e7fb4fdc747cba39999c19c87d1492724e9e05f3636bb55c11c08944896173de
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
index 9872ec9801c7..f1338d76cf04 100644
--- a/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.19.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/libkscreen/libkscreen-5.18.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.20.3.ebuild
index 49b247ec7ab8..443dbf38e962 100644
--- a/kde-plasma/libkscreen/libkscreen-5.18.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.20.3.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_QTHELP="true"
 ECM_TEST="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,13 +15,14 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
 	>=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
 "
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 60eff31da2eb..bd7a894aa5dc 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,7 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
 AUX libksysguard-5.18.90-unused-dep.patch 3054 BLAKE2B 9d48130d6754fd02a570ea91a17cc35fdb20a14b89e8408d041c983a4893dcf1fe3d35751ccacba845bcb4a8a5a230e0a78b722ba0a7cf720d2123abfdb6b78e SHA512 caf4a646361f3011a5926ae0ba7b10ab6b31bb01d8a5bead676735021096117492f531e8cd9d09dbfbfcfdc83b1d4d94d327c1766928fa6a7684989b967ba354
-DIST libksysguard-5.18.5.tar.xz 610320 BLAKE2B c644bfa216ae851eb1520b9135add670ecbc4733be7bde27437a876141ca9f37c3531a78c347e7c00149e1d1f287a680954c3e885cfdc0838398626d6ed3d651 SHA512 a648d0db1378165188187db9de78f816b1dfe647ce7e7ea2d505bc04c5008d2c24b2a113bc73c4fc4b3ddf467682ea3b306286f4bffa2c750918112892d78fb3
 DIST libksysguard-5.19.5.tar.xz 674900 BLAKE2B 88408494360921bff732ba535a932b2a17d8faba9a0cd231754dda6116ce52d8cb6ed32f89f05e16091b54a378d3d50e5e46feff1e27b46260f3803ca78b9855 SHA512 8e723eff1e50195005a91dd558df0ddce956c33478c00e177f1eae4d9997ea8332d86bb8fae1eb2d18bfe3bdceefa31fe4211dfcf4bb1c463d347ced33e75348
-EBUILD libksysguard-5.18.5.ebuild 1532 BLAKE2B bd23ce39743bd0d5f085771371fbe3bf352f0ca0b25191fdce0f3a4b3e638cfc9f3a757d3d5206ba528637bcda4a71f938fa0e5127d847328acfc8636d2d7ad8 SHA512 0987e280ae69e5ba924eb0de04d7163e652122d7e5d59dfa14ce0d5bbb1f09e761126a6f8f2b7c4eda99bae2640c0919ae7f3be9930cdae038758f0883f65772
-EBUILD libksysguard-5.19.5.ebuild 1713 BLAKE2B eea2b1a658a3a7554668d2c767ccb75cbcb0ecb31acaf6db7860f960b68228022dbe52668701a0e2dac0201fd44dcdf1d203abcac0f780cb8aac50641b9baf5a SHA512 a4002ac5f0f57808d8a8809c049ce6d9ece900f0965546c36da677f06ca5434e6f28f8d768d2cc6bcf3000e061ec2c8b6e8eec5ceb2d8c5efb328dde72273a9a
-MISC metadata.xml 466 BLAKE2B 4d12ced01f42a13382548c25539307e9293aeb4ee00653b4fd0405b439a883c36b3e0cfc336610618a57b53ba4ecf318466c51c4fcf16f3ae7f53776c7b7eacf SHA512 2c31b0f8ba65eb8ef8656f6f687a51ad6d5b406ae17ca1fddb5751f49553b7a804223237aa379b84a867ebc59f7c22893037ccf3b059dddbc7f80bb26b3d2b82
+DIST libksysguard-5.20.3.tar.xz 694116 BLAKE2B 0b9baf9dcbeb8328d7380ac16b746c4e1676aa774444cf3b47b9f80de5fbbe30e01b2341cf5b80acd0484a77cb23af6691e14c443626e0dec30469a5d874642d SHA512 cad47e70de732a891ca63adc6716c9edac63384c1610f5f59687f2f073914e2881549ce54cff16166b0ffc9997926161ca7c5bc8b2cc3585f30eab45be739c26
+EBUILD libksysguard-5.19.5.ebuild 1710 BLAKE2B a0671e4ba5b7e5c6db8b933a7a48b3b5330fd2e6810b43135e90712577f2f265bef1be40bccce65f856e0fe40d9174cb26695a7cab10e3f25a9e09e176abba09 SHA512 9a4c63e759fae3557a467fa9222b0dcb6c12f39399c842a50d75134fe3482c0bd9f4f33cbcd684f55940dc36a8322620cc5085c177d832115b4976234d5f35eb
+EBUILD libksysguard-5.20.3.ebuild 1692 BLAKE2B e3944aab2514da446d3ac22d33830de181ae7a4109abab82fc6f0f28a7ff64f731c13c3ba7910d11c663f2fd90ed347907d8473a946b904fc0f6751a4e686192 SHA512 a8b8a542cbf6733d5eef8fa150f5de40061e1f4d47ada0b8ca1305e883df6852297b7fc78e6525f56c85bb06696ebc5bc2f75c7cc4a7c919b740312128548f6f
+MISC metadata.xml 542 BLAKE2B ff3326f819a0324fdc3ab339c3172f91d1fabd5eae8faffdb3b3bcbaab2a73fb3882e57db5fb6bdb669b5ff3338fc8b3ccc63b771255e527c7a64f0cac0d3cc9 SHA512 ea5d493aa7e05db1b63db2556ff3cae361aee8a18fd2688871cba9882f91b8dbf7897b91ddce16b2acf0b12efe100e8db0754fd86126a7c1d95b6cee02b576c9
diff --git a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
index 9277c11547e5..cf0bfe42b844 100644
--- a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="webengine X"
 
 RDEPEND="
diff --git a/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.20.3.ebuild
index a4a569627298..3509adbb00c8 100644
--- a/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.20.3.ebuild
@@ -3,21 +3,23 @@
 
 EAPI=7
 
+ECM_DESIGNERPLUGIN="true"
 ECM_TEST="true"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
-SLOT="5/8"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="minimal webengine X"
+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
@@ -26,7 +28,11 @@ RDEPEND="
 	>=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
@@ -41,8 +47,8 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
+	!<kde-plasma/plasma-workspace-5.18.80:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	!minimal? ( >=kde-frameworks/plasma-${KFMIN}:5 )
 	X? ( x11-base/xorg-proto )
 "
 
@@ -50,7 +56,6 @@ PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package !minimal KF5Plasma)
 		$(cmake_use_find_package webengine Qt5WebChannel)
 		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
 		$(cmake_use_find_package X X11)
diff --git a/kde-plasma/libksysguard/metadata.xml b/kde-plasma/libksysguard/metadata.xml
index fffdaaa4785a..b9f39f2d0ec8 100644
--- a/kde-plasma/libksysguard/metadata.xml
+++ b/kde-plasma/libksysguard/metadata.xml
@@ -9,6 +9,7 @@
 		<subslots>Reflects ABI compatibility by soname version</subslots>
 	</slots>
 	<use>
+		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="webengine">Enable display of detailed memory information using <pkg>dev-qt/qtwebengine</pkg>.</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 0700e61fabd0..c471d1207073 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,7 +1,7 @@
-AUX libkworkspace-5.16.80-standalone.patch 4815 BLAKE2B 8269cba2d49020e643ae7aca211d9ecf2c38a8abf5c87cdb2185c80cb67824be1a3b79da67cd267e917c8d9ee3b67eef37b58b2845a6383d98c322b3ca90e4e9 SHA512 20bc3f75521e548311b2126ce40e59ce61e0beb85a0ce643e2b31e3a82ce3deb578e2b4049f5524d81129c4872661303bff9011623f0d8436358b3790115efa5
 AUX libkworkspace-5.18.80-standalone.patch 5188 BLAKE2B 5635ef59e36581aee87689dcc3b2b9acc66eb37de12b084f249c6f80ae18d727b830cdf7b2e9795ad4ecb956cce431ed25b4ff0b9b3be02a09c835f182f49fdb SHA512 02b36fc91b10b0dc38cd57f3e138cfab51994a31edf73727762ec92a6e8fd1d786724cc3591956d337f6cc46b87596004909503e0a21a52115828b594bb0cca4
-DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
+AUX libkworkspace-5.19.80-standalone.patch 4989 BLAKE2B 6487cb2071b4ac026966d23cfe5dd6ca8e3ddab77cffb08d51b5266e3a9ea16f74a90d987fc1b86891a65b40bcbacc3fd9dc865c79e08206cd0ac67cf7bb82cb SHA512 d86365f59cbd20979c9f7412f106c34eec26d3ce0361269e192c0310d3107fb2486eebc1fb7fc7bd331887a883ae5722259467b4edb0d23cb4355ab472f93c7f
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-EBUILD libkworkspace-5.18.5.ebuild 1454 BLAKE2B a885654deeaf4d2fec1735b188f42d48f5660df726f69e27ab721fba9f4abc01b5f01e18dca2ba68e2632cfcc2916a177940dc8190420ed6646b2bb685de8a44 SHA512 544539081c4274d1c58728a8c35ee312915ba61f3687c757c4acdc71d80ef52e1517e6f80a3862a2eeae7af69ec95f3ea89e425022e0f36c9f1f5af5e34bb23f
-EBUILD libkworkspace-5.19.5.ebuild 1492 BLAKE2B c9f03bae3d4a41d430bf626a0255b55413fce4c56d783f6a3c978e07dc5f56389fe44ae3c6269884b7a170d0a76310401dfc30c6e0c621516554888c1c2adfaf SHA512 394905164db563e9d5d4240988fa6133572c5efa9641861287600dfae2d2e3995c504e67a060c5dce1de5333758c2270036736f97979ca314972335943e1fcae
+DIST plasma-workspace-5.20.3.tar.xz 9031572 BLAKE2B 242286eef9d15b9dacec0dca3a7899c538141490611f932e0ebff59e1ea7a54cbad56e3bcad6e4a720b4f7610de2fc0e128288c3fe3d2b9e8255ffe16e0b86fa SHA512 c1daa19834ea7997a8e44fcb6ce9745d5bac56a0a4d99320e1e3e42e9cb5489aa36887e3c2bd8e385644d555d355211c9dba6c40edf2471478566c531a2d9c89
+EBUILD libkworkspace-5.19.5.ebuild 1489 BLAKE2B 53d3846cd030eea66ecc98dd65d644e5ea5898e985ed9f16e33f1de96be534d0c8f917ba62e84e284be001766acfcb2505988bd0c2f30cc13c2afef186c5904d SHA512 989aeacfcb48f10857cefe15a0959077a41f415a2bae4936f0e01bb219b3b3350cf70a16dccc28b405372992eb1b1c996f20600631af9a4cc5c54e20854b3a1b
+EBUILD libkworkspace-5.20.3.ebuild 1492 BLAKE2B 1d9776d1321806f785b3a1d992ae195425b41f0ee783a9c2a8078811b4cd3ef273f91bc1e89f49664f15db4ff020b1537713305ff55cb0135b4fabe2b6ebe03a SHA512 c7def611e9eab3457d0046b26711b022798b48393bfe5dd463dc456af510a6ea62a8536af203bb1047ab59f5c60b47841ecda66fddb942dd11fa7ac36b3e24cd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch
index ed0d29d759f9..8c8213d002dc 100644
--- a/kde-plasma/libkworkspace/files/libkworkspace-5.16.80-standalone.patch
+++ b/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch
@@ -1,14 +1,14 @@
-From 7e2bf26af99f5b242b2e4bb2ee5e62914d5d5861 Mon Sep 17 00:00:00 2001
+From 30d75ef4b3e75155e78924aa82aa9f368bb86f4f Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 10 Jul 2019 11:38:44 +0200
+Date: Sun, 2 Feb 2020 18:29:57 +0100
 Subject: [PATCH] libkworkspace: Allow standalone build
 
 ---
- CMakeLists.txt | 70 +++++++++++++++++++++++++++++++++---
- 1 file changed, 66 insertions(+), 4 deletions(-)
+ libkworkspace/CMakeLists.txt | 67 +++++++++++++++++++++++++++++++++++-
+ 1 file changed, 66 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3c4c47870..53bc780b5 100644
+index 7ba097a6e..66f70c0b6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,3 +1,56 @@
@@ -20,8 +20,8 @@ index 3c4c47870..53bc780b5 100644
 +
 +    cmake_minimum_required(VERSION 3.0)
 +
-+    set(QT_MIN_VERSION "5.12.0")
-+    set(KF5_MIN_VERSION "5.58.0")
++    set(QT_MIN_VERSION "5.14.0")
++    set(KF5_MIN_VERSION "5.71.0")
 +    find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
 +    find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 +    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -39,7 +39,7 @@ index 3c4c47870..53bc780b5 100644
 +    include(ECMMarkAsTest)
 +    include(GenerateExportHeader)
 +
-+    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem)
++    find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma WindowSystem)
 +
 +    find_package(KWinDBusInterface CONFIG REQUIRED)
 +    find_package(KScreenLocker 5.13.80 REQUIRED)
@@ -68,36 +68,33 @@ index 3c4c47870..53bc780b5 100644
  
  set(kworkspace_LIB_SRCS kdisplaymanager.cpp
                          kworkspace.cpp
-@@ -14,8 +67,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
+@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface)
  qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
  qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
 +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
 +qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
-+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
 +set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
 +else()
  qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
- qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface)
 +set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
-+set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
 +endif()
  
  set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
                              "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
-@@ -31,11 +92,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
+@@ -34,7 +95,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
  qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
  qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
  
 -set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
  qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
--
--set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
--
- qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
- 
  
-@@ -101,3 +158,8 @@ if(BUILD_TESTING)
+ add_library(kworkspace ${kworkspace_LIB_SRCS})
+@@ -100,3 +160,8 @@ if(BUILD_TESTING)
      add_subdirectory(autotests)
      add_subdirectory(tests)
  endif()
@@ -107,5 +104,5 @@ index 3c4c47870..53bc780b5 100644
 +    feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 +endif()
 -- 
-2.22.0
+2.27.0
 
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
index 56426b1fa6a7..ccb11d117c2b 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.20.3.ebuild
index cce15eca35b2..fa283d1fa3ce 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.20.3.ebuild
@@ -5,16 +5,16 @@ EAPI=7
 
 ECM_TEST="true"
 KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -22,6 +22,7 @@ COMMON_DEPEND="
 	>=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
@@ -39,7 +40,7 @@ RDEPEND="${COMMON_DEPEND}
 
 S="${S}/${PN}"
 
-PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" )
 
 src_prepare() {
 	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 62770dae948e..033b2afa11d4 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,6 +1,6 @@
 AUX milou-5.19.80-disable-manual-tests.patch 849 BLAKE2B 96f6148e384bcaa62cd7748bb695c86dec1d12b93252a5deda724ccee92b72ab9cdb132848746771dd4ee539eb8ba6f83681c410b28c1a203cde50a0a36b7ffc SHA512 c5dd9078754ef0dabe5704df18423ddc273c0ac0d7a685cc3df949588202bc18dd3542925e67dba868074e2e4bb5ad06ca4c6d8efec91d19af6fbea2642d6d2b
-DIST milou-5.18.5.tar.xz 64264 BLAKE2B e4dba1cded6c5b833f35086b3cc943e4bfa4a0a6df530eb43aba7efbc40ea48aad8c88a2221546e7fdcc411c136232af84b7ab6a45d99233369c4a2c628f56d4 SHA512 3c1d0b032e8f26a637aed8067d919d95bcbf033e0b494bc9a2a0295d000773ac3900903dca96eb32d3fc1b831884e3435ab91a26c9cd179548c3b2cd0377577d
 DIST milou-5.19.5.tar.xz 64612 BLAKE2B 588e5b98d5a1aa061dfe09d9566c68904c882a7a4120e3fadaed60fa1f372013d966511693ee44bb67d6b554e44d287374784ed02b25c04a0b7b06fd34240fa1 SHA512 c480d22ec7f6be8031af13b23914add05d331b017c1d4d2a193a47f31cad1ede0bfa833a9368d0ba9c35cf5b0f97e23d15307ae45569d8bd9d7fde305d17b913
-EBUILD milou-5.18.5.ebuild 842 BLAKE2B db01ebcc996229b0918aeaebb5b58b798fc342f50eb5b4dc4d5c1e2d906a7171fd40ce1faf228ae04aed8611888086674d83f9ee3a4c48de2be24bf6bad09565 SHA512 965bdebf6546e32453e842dffef2b8b2f2ffd47d6eb314051a7f94f401542a1eed8b1e6eddfc26934607068eefca3c22768396aab649618b422da378193c9081
-EBUILD milou-5.19.5.ebuild 916 BLAKE2B 5b52df96804f3e4e54a5da2bd747c19c5dc02870dd490a7510e2468d3b1da0806e0b912183ec2e969c24d82b6745cdceebd523693a83098a9adfd0720272dd2d SHA512 75bcec4ec9b08877ed6588e3b87d772785f8126e68e86af2422564036434df0ab1ceda5e0bde7f8b666ab9f0294d0bc37fcd30e0b998f1954d43d43b41fccc1f
+DIST milou-5.20.3.tar.xz 55368 BLAKE2B 80c852229e5310e388d41024ece730ab5de4a6997f83452db87078c84efbadd660c19c5d2bf01377e3d4222ffc4a75d9755493a898de501049d1ac088de86748 SHA512 1e7ce2cb01343032171654bcdca53b63ad02ea6be616461764ef3994d05600cd972940fefafdf41636e86ffda2081da51c7e5988078d35b77938b981eecce298
+EBUILD milou-5.19.5.ebuild 913 BLAKE2B e69c781c56921e660e6c1d730405646ac7ef0c97a1ab6b58b296bd3cfac21ea9f5052d2ea832e248d38bb71117b3b16f76738996d34a5729f8ca9ed8c0281e3b SHA512 0c4aa58903ea695871d3f2b755a339fca2f549f92c9417f4817ae49a0760b3b24b4c8404a991fc6670bdb05da45b9f4e9819a7df45ddc5b9e4fd75b8d084d916
+EBUILD milou-5.20.3.ebuild 916 BLAKE2B fc350e844d1c9323b939a6e35406ca82620aaa320855847c823dec3ffae3bd790a9cdbebd55b1d86b48e48e9b137856252c809f2752316efb606b4ae9e4cab3d SHA512 7aada9245a06fb90b483d1c0f9e1f2c72e7d1105ad697d8195e71e61c6e4dba4b7f1e73866b930088451ad46ed97e0ad36e1e0e01eb95e40e941f25d6a8dc844
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.19.5.ebuild b/kde-plasma/milou/milou-5.19.5.ebuild
index 7dbe1e1668f3..724be14a7ba4 100644
--- a/kde-plasma/milou/milou-5.19.5.ebuild
+++ b/kde-plasma/milou/milou-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/milou/milou-5.18.5.ebuild b/kde-plasma/milou/milou-5.20.3.ebuild
index e11a7e39587b..f320720f61d8 100644
--- a/kde-plasma/milou/milou-5.18.5.ebuild
+++ b/kde-plasma/milou/milou-5.20.3.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-ECM_TEST="forceoptional-recursive"
-KFMIN=5.66.0
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Dedicated search application built on top of Baloo"
@@ -14,10 +14,13 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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
@@ -26,8 +29,7 @@ DEPEND="
 	>=kde-frameworks/krunner-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.19.80-disable-manual-tests.patch" ) # bug 732584
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index efc1b14ad35a..f1af4f9816d5 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,5 @@
-DIST oxygen-5.18.5.tar.xz 4471212 BLAKE2B 72839684b00bd9382475c26dec2d4ff73b8f84318a326c12e4fc25f4452b731c23f853b1eace2d2257df5e82ddfb104fcd70231b7431546902384288438147dd SHA512 e965e8edbf94d2bd2241202030960615286c454c02bedfbca29670c9dacf55b5f34a8dda1ec3ef9f18f4bb864ff8721acaf559f14cfc1c22e7b5385865cec579
 DIST oxygen-5.19.5.tar.xz 4462408 BLAKE2B 94a284ed12f6f1d2b04518c9dd6e891ee78c3959c39a82a339e58dddfde442e9bf2ad0a1296dea2f511a3e099fe61deea570f0f0a9b01ccff50e3ff8cd2d45be SHA512 53eec62c875dfb94d6b757e2b37b0ac23756d16ad4841cc6d7d9992cd2feaf8d7fba35987cd75f265563783dac013df509f7261033d169b8dca5e545e0eb03f4
-EBUILD oxygen-5.18.5.ebuild 1363 BLAKE2B c5fed27ea231e1a9bacd0cbaf9e14df7b5af1ab99e800b673804d05388ad62dbc24e6519fc2e14d00ab5357172861a98bf0ce19fc1082c2d54ae94706cced55d SHA512 851cd0fe3d8377280fd78f5c9a20a777ba13ad5afed901aa81f2b201f41b1276237256d3837fafc64ac5889e6e13fe5df4007159738ebdde6f23ba1a32b88dbc
-EBUILD oxygen-5.19.5.ebuild 1366 BLAKE2B 4c8a368a641d59cf5b91d40db8aee8748fb4a24606c9e10676d0a5d12a46ccb8031e597c05292a4008d46d72419fb44e9ed326746365e7580dc0573f25968172 SHA512 54fe1e91535318cfeaad53e019e70dc151313a8058b824f83c68fb0e4c63143d4008a1f6dfce17f680b5f1282f0908693eb74d936705f6ce9c56a9b5ec9e9382
+DIST oxygen-5.20.3.tar.xz 4470124 BLAKE2B f1b4abfbd2bb83d32e5e36243c4876a67d12c4974226d85207155acaf46005df5c723d5711f6c908b84e2fc1a5d79a13ce832882bdf350cb1332dc07ac5bf398 SHA512 d96290bb8430972223cf32298307a274e1d4f1f01086b7521adca5950f44ad915bdbc9c4b32ffda55981a7a989e28bd08a00f2e46e0403a75d55529e51901587
+EBUILD oxygen-5.19.5.ebuild 1363 BLAKE2B 4d06fb8b263bbee235363ce1f1f7daf24565395eb15843e8ea70782425fc25edfc41ea3c7c68b2d59fc56ff4ca6d15114f39973e9b73a31fd72b5d99c606dfc8 SHA512 e1675ceb9f884c4efffe6f2e759901c6c03ec0d31e93b90547163ffd8297fca278d5bc855dd61146d2772949a39abccc4cefac9e34cb8315e450537b10126b9a
+EBUILD oxygen-5.20.3.ebuild 1366 BLAKE2B e77a2bdf296a31b8aedbab51d1c5e24aa12d50986382194bb0052fa234c0756dff846f01c9177fe45aef71a0c496ac25304912bd0077e71eb72e076f866bc9de SHA512 f5b553851b79ddd5a2dacf4b6f915df16aad80858cf0d331e87f666cd6702fc506fc89afbc04533e27116545d7e23d5397c7608a9711149ac605752e56d0f6c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.19.5.ebuild b/kde-plasma/oxygen/oxygen-5.19.5.ebuild
index 2b1e26d0f9be..f856859339e9 100644
--- a/kde-plasma/oxygen/oxygen-5.19.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="wayland"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/oxygen/oxygen-5.18.5.ebuild b/kde-plasma/oxygen/oxygen-5.20.3.ebuild
index b446528ecc51..633b06070b40 100644
--- a/kde-plasma/oxygen/oxygen-5.18.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.20.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Oxygen visual style for the Plasma desktop"
@@ -13,10 +13,15 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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
@@ -28,11 +33,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
 	x11-libs/libxcb
 	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
 "
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 01b078367403..9b420b34406c 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-browser-integration-5.18.5.tar.xz 156428 BLAKE2B 9f83e33c871ea59fc73ed6dbf26e137f5dabfa4bb2403d71a0621cc0c41b1a15b461631b6ab864649780fe50c54f9428394716d8d5055453b51616c393daea96 SHA512 096bfc0940fa3a40fe5145078fe801e2436779ac3333e953a68f7a68d3d592e3978606b70f1678c83a0748221e4d992ce14e0cb72c671f242d13db41390e8730
 DIST plasma-browser-integration-5.19.5.tar.xz 176780 BLAKE2B f46d8434a957d52ecf3b475c08b106705df2c4486b85b7365b7ddf7144d2cae993787c53397ed0e91c0cd3210f9f746a22d61df08a5bd4d1d5eb58605572b452 SHA512 c7334c4ab4ab3e0e1e93715257995fa7b16103a61eb40877b3e859f75b781e27456f96d5fef409284d0f584335f723b30a5a0bee0a06ffb9cea9012cb158b9e1
-EBUILD plasma-browser-integration-5.18.5.ebuild 967 BLAKE2B 9cd19e00f7845e16fd4dbcac7752f182210a1986d02f3796bd26488319848c724267783538b6ea0636629e12e18cfcf8bdbea1347376b99d3286bb7195508388 SHA512 bc98bfc39553fbd53c65c8ef5f419e779cd5029d536a8494efdb27a177a522aac224e3a351d27a5392cc466e31398d7651916696df860a802a7cbb524e050746
-EBUILD plasma-browser-integration-5.19.5.ebuild 970 BLAKE2B 63f0c5c6363fbdd2ec2d1092831cdfeb6b80a35474bcb80a6816eedf7e054a69f7a418b734c914063f93b8dd91720c56eec6ac2808458d3e81e9657f91446579 SHA512 0ce6fae685be666cf8c1584f6d87530dc16cc67f4ce9bf0d1a82e095985f179e1bc5ee527f2af6c0f930f765e18dea67b04481e9df28c145fa3b455805e37c16
+DIST plasma-browser-integration-5.20.3.tar.xz 192904 BLAKE2B 33e1e3915fa9b5cca3b38359b6e1cd360fb4b690f117dd20e62039c6f69bf7271fb7d7960b96648eb87f419d49ecec5fe6493e57b85bc102a2162e193ef697c1 SHA512 ec9f869f789b08144bf937fd83ff914922c2ecfa905cd80ddb920d88d82239074c33f8341a77bceb790d5b1a02163afee6b1e7ef8949aa9ba700e5195e6001f3
+EBUILD plasma-browser-integration-5.19.5.ebuild 967 BLAKE2B 30c98708554e9764c6cb5b6b9b5c4c510faf386ae7b419e15a0035d42a22f7df51ca9008467312a0b4fd30029ae979d081060b5e86ad6697c85425e27b4a7c20 SHA512 f2fc528476cb303fb288dc59d9edc5a7c65b8795d6c1ef1a7ff5f0c3dd8ecfc9009460ddc6c3830c147bd16a2478c50dec669b2a6f4fd81b58eca9eb57b67734
+EBUILD plasma-browser-integration-5.20.3.ebuild 970 BLAKE2B 17478331b3b6685039a026148f8a8cd1f8dea1756f3c41096ae90b2bb933e185656fc92a9ce785011718d0e8de024b8da84d71574a74344576002822a9ff6d85 SHA512 ae6b6cc2df7bf711cb5c26dcfe0135be8f78eb9b6b1d35b1adaad629ff2442431f64200ca899f364cdc57725eecaa846d8f207d87dcaf5a27b03627f1639c438
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
index b01f00762889..91ada7c65102 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensi
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.3.ebuild
index bc8d467ed23c..07e07c66f12c 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.3.ebuild
@@ -3,19 +3,22 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 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"
+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
@@ -26,9 +29,6 @@ DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/krunner-${KFMIN}:5
 	>=kde-frameworks/purpose-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index c9af113e7ffa..a8c35a9ca566 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,15 +1,7 @@
-AUX plasma-desktop-5.18.4.1-synaptics-header.patch 821 BLAKE2B 96cbad72391a1d361b009b25362980c8b0ec3e583368ffc4d599b73289e6e6228afc65d08236d704af8878c6b21a9bd1a15f3fad952855d88bc660f73feb9bf4 SHA512 02cf404a9bce33e689f40597d35afb1ca3625e7caaf775a50ed70217bd8034f842001a16e1084bf81bba9dff0361a4e57a6e08853beb7d90216bf1519d305516
-AUX plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch 1058 BLAKE2B 668605a0994577bef4eb2308846d8f2e403b6546f22f9d5c05f83717abd5e27e137b199376927367227d0cad593b3d7bef859ec3791a3013bca46c930a27d459 SHA512 386c35e1f77f68ce81013d7fa7ecbe8f240ffd16507dd501eb4f9950902d21cfcc7d239b4210ac5b700a9ed59fa45799daf3ac2a5d53251a02b940df53841b28
-AUX plasma-desktop-5.18.5-animate-column-moves.patch 1133 BLAKE2B 20ae4b0e2188483a8a391ef58865b25c0d6d45019c3a3cfd9f93264b8713a9165a1316f4634909964c7348e1fe6c22ace385a7a74d33aa455fe61209d9276959 SHA512 dcedab90dd0e6cebef4a87a8a8aab3163ed268dd3d5c3223b2bba09edafc184ea8dfd04de202458c1f9789f78580b949976a51fd75e37bfb2e4097968be26703
-AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf5158c33ad58e275a926ea441a90008f8e2a7fc1c175e2b38e72f06d754b131a47f1cf5ef3d2268630816b1a60090c9bab44198ff37b0 SHA512 f81e84c56ddd5591ba59beb1d12654403bef5fd1bb6c51f8d6c404e36ca47cc7fa82a575892627be8aed465253830d3e76c2c89ed6db8ea858b9d705df08184b
-AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac
-AUX plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch 6390 BLAKE2B fb0f4c70c94dc583745f92d14f4cb479d71da7c115f58d187ae6931c2dd3435abcfe9c2b773fc851f44fe605f47e2242d801da18a23f7943c025a901da8f28ee SHA512 d5f3820ee21422d46112bd9635bd65ce11068f9cf3bb14cd23c0050f35256b09344d934534794685997e8daeaae709c81e53b5b6ad54e7ecd709c6e5624be040
-AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f
 AUX plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch 980 BLAKE2B b7b9cb993d7209182f92fa1924e28b66aadeca88eab3ceb98db1edea10c9d2fe65128cf0f019791478a270d645d6bbd9115a9a9372c6d4e63c8806b5bc06029f SHA512 e184cfaec2910a7389309e43c1f550c48de6b2c6c23a522a1c8bd5f6087fc57b2f3533e6b862d5801aa97f1eee8cc22ea0c4e415b44bef873f612ee039aefdb0
-DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
 DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
+DIST plasma-desktop-5.20.3.tar.xz 15887428 BLAKE2B 198b84ee3c4458e2b0b89e2133175fcbe831ef996195e5a99a6a3820e3aa9419a83ddbce66efaf04613e31645d17155f9be798e2f00af3f14e4b9be0c4618e18 SHA512 e639db19e9bee488ed798c4027cfccf2402597f3bab7f114cb21d24f02710a6129b270d8bdec07d8c0d22d82f9123ea3b39edb304e31f8c7530277b08103acc0
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
-EBUILD plasma-desktop-5.18.5-r1.ebuild 4865 BLAKE2B 87cf5b0e69bda73c0241cb0059e92b2344a87e625479201b683f20edc96f295dc5e80dfc46b234b5a513721d368c53d26d7df56425a434ee41adad44dc46dec5 SHA512 3290f48cf99c6810874e8c152d171770e57ee8d1400a2acb8d67046dab374c33c2ef2d454464e642b0a1f372742f8d79c9f26af2c4f49be31aab7640386edf46
-EBUILD plasma-desktop-5.18.5-r2.ebuild 4935 BLAKE2B 1334ac02567ae7992a6a8b7f7b94cf54348df407dbe4ef5130dd76bf2df43bcf66949105dfd23ac49aecfd55d63fbdea1026edf43d48d9fc5966fc0ead46ed89 SHA512 a5686e7f768aa87e67b6abbcb20478954027e63d5cea5cd9d545e9ac5699ec1be029d8badad7250b00aab12621b005c196a0b8d64c43b15252e13caaa4c51534
-EBUILD plasma-desktop-5.19.5.ebuild 4717 BLAKE2B 6a1fe126b3d55789ed56d0c1c3c1074793d18a2971b91d5960ac0346f626be2e9d934e9571ba9d9cd52e3e95b5ce62c08bcb940c792f51bf4a12e0d5ff5ed33f SHA512 80430feece9661d318b53258e63e28c10d6c39690c37354d7f05f0918e4e6193ec887f43cb816dac15e881103327a538f512bacab63212d594bb5cf32e1eb721
-MISC metadata.xml 540 BLAKE2B 3953467f0fea68209d7b5cbb5f5d23bc1b1aadf0e88ec5dfc28d688f7d68e560fda165330da32940bbf43d82f6f7bc178451977870cf3e2e69f4159e4c2018d8 SHA512 5d48a9f5bd4e990a52eaa894e3572bfa66d966a0665b495a5539484cb29f6a2a4f81193c80556cf712a76e3661ac575bc582276be22acc3817e7758e727065a1
+EBUILD plasma-desktop-5.19.5.ebuild 4714 BLAKE2B 907055b17edd13e279b51463352301b5397b34b189d060f53df1f1394004a726a3127923736df58bc134833aff3cd157fbc95ccca73a4b5b12b0dbaf0728d10d SHA512 66229eab5329c3fdc40018d036dc8bd2d7882a087729c4ea81be2288a1dfe0235a70aad78bbf29ec81fb34ff4d0d5b19f7ba7c2527df62fbd4beb5ee2a0eeb95
+EBUILD plasma-desktop-5.20.3.ebuild 4793 BLAKE2B b772fd355e085abfce81860ef47e3fc9509fa0895f3c12686f9100f35f9045d5197c8c27080d4645f5789d6899926bd80043691663cdbec7db07b96481ff6ac5 SHA512 b7ee5193f07b719f7b3a531fb7290e6a73824b4dd80084e10c29f4416cc42bdf9cab57061b49d60041643d91f364552d6c2ef82e7ff34fd944eb8f802b52ba63
+MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
deleted file mode 100644
index 181e89e7db38..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-synaptics-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From eb7bedd400d854e430808ae469164dfed24b1550 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 24 Apr 2020 18:55:30 +0200
-Subject: [PATCH 2/2] synapticstouchpad.cpp: Drop synaptics-properties.h parent
- dir from include
-
----
- kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-index d2f41d70b..3eb3171ee 100644
---- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-+++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
-@@ -53,7 +53,7 @@
- 
- #include <stddef.h>
- #include <limits.h>
--#include <xorg/synaptics-properties.h>
-+#include <synaptics-properties.h>
- 
- #define SYN_MAX_BUTTONS 12
- 
--- 
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch
deleted file mode 100644
index 17db7fc5b516..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2c46f28170c785f04fa396803037a608c8077025 Mon Sep 17 00:00:00 2001
-From: Matej Mrenica <matejm98mthw@gmail.com>
-Date: Wed, 6 May 2020 07:50:01 -0600
-Subject: Fix blurry icons in KColorSchemeEditor
-
-Summary:
-When using fractional scaling, bottom icons are blurred. This patch fixes the issue.
-
-BUG: 418165
-
-Test Plan:
-No side effects.
-
-Before:
-{F8289358}
-After:
-{F8289369}
-
-Reviewers: #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29481
----
- kcms/colors/editor/kcolorschemeeditor.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kcms/colors/editor/kcolorschemeeditor.cpp b/kcms/colors/editor/kcolorschemeeditor.cpp
-index 774d66e..03caa51 100644
---- a/kcms/colors/editor/kcolorschemeeditor.cpp
-+++ b/kcms/colors/editor/kcolorschemeeditor.cpp
-@@ -28,6 +28,8 @@
- 
- int main(int argc, char* argv[])
- {
-+    // Fixes blurry icons with fractional scaling
-+    QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-     QApplication app(argc, argv);
- 
-     KAboutData aboutData(
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
deleted file mode 100644
index d7603e434a69..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3a6795548fd755121084b6a77f9de23bece8f534 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 17 Jan 2020 14:41:47 +0000
-Subject: [widgetexplorer] Animate column moves
-
-Test Plan:
-Search for something in the second column
-Now it doesn't jump
-
-Reviewers: #plasma, ngraham
-
-Reviewed By: ngraham
-
-Subscribers: ngraham, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D26699
----
- desktoppackage/contents/explorer/WidgetExplorer.qml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
-index 1d98e59..56a0c22 100644
---- a/desktoppackage/contents/explorer/WidgetExplorer.qml
-+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
-@@ -326,7 +326,7 @@ Item {
-             //moved due to filtering
-             displaced: Transition {
-                 NumberAnimation {
--                    properties: "y"
-+                    properties: "x,y"
-                     duration: units.shortDuration * 3
-                 }
-             }
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch
deleted file mode 100644
index 115d52423fbf..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-findxorgserver.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 82e7a6b68d81ca2be0fdc3fc13cd5ca5f5e03e81 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 7 May 2020 16:18:13 +0200
-Subject: [PATCH] Add FindXorgServer.cmake and use it for touchpad KCM
-
-Summary:
-x11 backend of the touchpad KCM uses xserver-properties.h that is part of
-xorg-server package. As XORG_INCLUDE_DIRS seems to be empty, so far, it was
-relying on Synaptics_INCLUDE_DIRS implicitly and worked only if the header
-happened to be in the same directory as Synaptics' which is the case most of
-the time.
-
-FindXorgServer.cmake is just a copy of FindXorgLibinput, adapted accordingly.
-
-Test Plan:
-Pointed Synaptics_INCLUDE_DIRS somewhere else than /usr/include/xorg and build
-succeeded.
-
-Reviewers: #plasma, zzag
-
-Reviewed By: #plasma, zzag
-
-Subscribers: broulik, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29514
----
- CMakeLists.txt                     |  4 +++
- cmake/modules/FindXorgServer.cmake | 45 ++++++++++++++++++++++++++++++
- kcms/CMakeLists.txt                |  2 +-
- kcms/touchpad/src/backends/x11.cmake   |  2 +-
- 4 files changed, 51 insertions(+), 2 deletions(-)
- create mode 100644 cmake/modules/FindXorgServer.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fbdd95433..64e8bbd60 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -133,6 +133,10 @@ find_package(Synaptics)
- set_package_properties(Synaptics PROPERTIES TYPE OPTIONAL)
- add_feature_info("Synaptics" SYNAPTICS_FOUND "Synaptics libraries needed for touchpad KCM")
- 
-+find_package(XorgServer)
-+set_package_properties(XorgServer PROPERTIES TYPE OPTIONAL)
-+add_feature_info("XorgServer" XORGSERVER_FOUND "XServer header needed for touchpad KCM (X11 backend)")
-+
- find_package(XorgLibinput)
- set_package_properties(XorgLibinput PROPERTIES TYPE OPTIONAL)
- add_feature_info("XorgLibinput" XORGLIBINPUT_FOUND "Libinput driver headers needed for mouse and touchpad KCM")
-diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
-new file mode 100644
-index 000000000..5248c6d25
---- /dev/null
-+++ b/cmake/modules/FindXorgServer.cmake
-@@ -0,0 +1,45 @@
-+# - Find xorg-server's headers.
-+# This module defines the following variables:
-+#
-+#  XORGSERVER_FOUND        - true if xserver was found
-+#  XORGSERVER_INCLUDE_DIRS - include path for xserver
-+#  There are no libraries, just a header file
-+#
-+# Copyright (c) 2020 Andreas Sturmlechner <asturm@gentoo.org>
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+# 1. Redistributions of source code must retain the above copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the above copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. Neither the name of the University nor the names of its contributors
-+#    may be used to endorse or promote products derived from this software
-+#    without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+# SUCH DAMAGE.
-+
-+find_package(PkgConfig)
-+pkg_check_modules(PC_XORGSERVER xorg-server)
-+
-+find_path(XORGSERVER_INCLUDE_DIRS
-+    NAMES xserver-properties.h
-+    HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
-+
-+mark_as_advanced(XORGSERVER_INCLUDE_DIRS)
-diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
-index 7ab966e8e..ce730f537 100644
---- a/kcms/CMakeLists.txt
-+++ b/kcms/CMakeLists.txt
-@@ -58,7 +58,7 @@ if(X11_Xcursor_FOUND)
-     add_subdirectory(cursortheme)
- endif()
- 
--if (SYNAPTICS_FOUND AND X11_Xinput_FOUND)
-+if (XORGSERVER_FOUND AND SYNAPTICS_FOUND AND X11_Xinput_FOUND)
-     add_subdirectory(touchpad)
- endif()
- 
-diff --git a/kcms/touchpad/src/backends/x11.cmake b/kcms/touchpad/src/backends/x11.cmake
-index 9248eff7c..8a584e939 100644
---- a/kcms/touchpad/src/backends/x11.cmake
-+++ b/kcms/touchpad/src/backends/x11.cmake
-@@ -11,7 +11,7 @@ endif()
- include_directories(${X11_Xinput_INCLUDE_PATH}
-                     ${X11_X11_INCLUDE_PATH}
-                     ${Synaptics_INCLUDE_DIRS}
--                    ${XORG_INCLUDE_DIRS}
-+                    ${XORGSERVER_INCLUDE_DIRS}
- )
- 
- SET(backend_SRCS
--- 
-2.26.2
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
deleted file mode 100644
index cc39c1e46488..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 977665254990892411c74e8a04a8fdb10ef68547 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 17 Jan 2020 14:41:42 +0000
-Subject: [widgetexplorer] Fix animate in animation
-
-Summary:
-The animation in comes in from offscreen on the left.
-
-"to: 0" was correct when we had one column. With the 2 column view it
-means we animate two items on top of each other and jump when the
-animation completes. We want to animate to the final position the item
-will end up in.
-
-It bugs me more than it probably should.
-
-Test Plan:
-Search for "asdfasdfsadfsadf"
-Remove search
-Animation now looks ok, instead of horrific
-
-Reviewers: #plasma, ngraham
-
-Reviewed By: ngraham
-
-Subscribers: ngraham, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D26698
----
- desktoppackage/contents/explorer/WidgetExplorer.qml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
-index b7bbce8..1d98e59 100644
---- a/desktoppackage/contents/explorer/WidgetExplorer.qml
-+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
-@@ -305,9 +305,7 @@ Item {
-                 NumberAnimation {
-                     properties: "x"
-                     from: -list.width
--                    to: 0
-                     duration: units.shortDuration * 3
--
-                 }
-             }
- 
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch
deleted file mode 100644
index bae49609e52f..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From e5e5f5ed51aadfac99bfbdf3d2db5be16a12443b Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Mon, 10 Aug 2020 13:50:36 +0200
-Subject: [PATCH] kcm_fonts: Make the font selection dialog select the correct
- "Regular"-like style
-
-Due to KConfig dropping QFont styleName property (for "Regular"-like font
-styles, see [1] for more details), the font selection dialog invoked by the
-KCM could end up selecting the wrong style; this change sets the appropriate
-"Regular" style on the QFont object before invoking the font selection dialog
-to fix/workaround the issue.
-
-Note that in Plasma master branch the issue is handled differently, since
-we switched from QFontDialog to KFontChooserDialog (the latter has that
-logic built-in).
-
-[1] https://phabricator.kde.org/D27735
-
-CCBUG: 420287
----
- kcms/fonts/fonts.cpp                          | 61 +++++++++++++++++--
- kcms/fonts/fonts.h                            |  1 +
- kcms/fonts/package/contents/ui/FontWidget.qml |  7 +--
- kcms/fonts/package/contents/ui/main.qml       |  4 +-
- 4 files changed, 61 insertions(+), 12 deletions(-)
-
-diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
-index f771f6e51..c2ccdf777 100644
---- a/kcms/fonts/fonts.cpp
-+++ b/kcms/fonts/fonts.cpp
-@@ -53,23 +53,50 @@
- /**** DLL Interface ****/
- K_PLUGIN_FACTORY_WITH_JSON(KFontsFactory, "kcm_fonts.json", registerPlugin<KFonts>();)
- 
-+// If the styleName property is empty, then we want to set it to
-+// the "Regular"-like style provided by the font, so that the font
-+// selection dialog selects the correct style from the available styles
-+// list; for more details see:
-+// https://phabricator.kde.org/D27735 and https://phabricator.kde.org/D27785
-+static QFont setRegularFontStyle(const QFont &font)
-+{
-+    if (!(font.styleName().isEmpty() && font.weight() == QFont::Normal)) {
-+        return font;
-+    }
-+
-+    QFont f(font);
-+    QFontDatabase fdb;
-+    const QStringList styles = fdb.styles(f.family());
-+    for (const QString &s : styles) {
-+        if (s == QLatin1String("Regular")
-+            || s == QLatin1String("Normal")
-+            || s == QLatin1String("Book")
-+            || s == QLatin1String("Roman")) {
-+            f.setStyleName(s);
-+            return f;
-+        }
-+    }
-+    return font;
-+}
-+
- //from KFontRequester
- // Determine if the font with given properties is available on the system,
- // otherwise find and return the best fitting combination.
- static QFont nearestExistingFont(const QFont &font)
- {
--    QFontDatabase dbase;
-+    QFont _font = setRegularFontStyle(font);
- 
-+    QFontDatabase dbase;
-     // Initialize font data according to given font object.
--    QString family = font.family();
--    QString style = dbase.styleString(font);
--    qreal size = font.pointSizeF();
-+    QString family = _font.family();
-+    QString style = dbase.styleString(_font);
-+    qreal size = _font.pointSizeF();
- 
-     // Check if the family exists.
-     const QStringList families = dbase.families();
-     if (!families.contains(family)) {
-         // Chose another family.
--        family = QFontInfo(font).family(); // the nearest match
-+        family = QFontInfo(_font).family(); // the nearest match
-         if (!families.contains(family)) {
-             family = families.count() ? families.at(0) : QStringLiteral("fixed");
-         }
-@@ -614,6 +641,30 @@ bool KFonts::isDefaults() const
-     return m_fontAASettings->isDefaults();
- }
- 
-+void KFonts::adjustFont(const QFont &font, const QString &category)
-+{
-+    QFont _font = setRegularFontStyle(font);
-+
-+    bool ok = false;
-+    QFont selFont = QFontDialog::getFont(&ok, _font, nullptr, i18n("Select Font"));
-+
-+    if (ok && !m_settings->isImmutable(category)) {
-+        if (category == QLatin1String("font")) {
-+            m_settings->setFont(selFont);
-+        } else if (category == QLatin1String("menuFont")) {
-+            m_settings->setMenuFont(selFont);
-+        } else if (category == QLatin1String("toolBarFont")) {
-+            m_settings->setToolBarFont(selFont);
-+        } else if (category == QLatin1String("activeFont")) {
-+            m_settings->setActiveFont(selFont);
-+        } else if (category == QLatin1String("smallestReadableFont")) {
-+            m_settings->setSmallestReadableFont(selFont);
-+        } else if (category == QLatin1String("fixed")) {
-+            m_settings->setFixed(selFont);
-+        }
-+    }
-+}
-+
- void KFonts::adjustAllFonts()
- {
-     QFont font = m_settings->font();
-diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h
-index 51ed2ab60..5959e1995 100644
---- a/kcms/fonts/fonts.h
-+++ b/kcms/fonts/fonts.h
-@@ -153,6 +153,7 @@ public Q_SLOTS:
-     void save() override;
-     void defaults() override;
-     Q_INVOKABLE void adjustAllFonts();
-+    Q_INVOKABLE void adjustFont(const QFont &font, const QString &category);
- 
- Q_SIGNALS:
-     void fontsHaveChanged();
-diff --git a/kcms/fonts/package/contents/ui/FontWidget.qml b/kcms/fonts/package/contents/ui/FontWidget.qml
-index b62dd3bf4..5a6be5128 100644
---- a/kcms/fonts/package/contents/ui/FontWidget.qml
-+++ b/kcms/fonts/package/contents/ui/FontWidget.qml
-@@ -57,11 +57,8 @@ FocusScope {
-             Kirigami.MnemonicData.enabled: false
-             focus: true
-             onClicked: {
--                fontDialog.adjustAllFonts = false;
--                fontDialog.currentCategory = root.category
--                fontDialog.font = root.font;
--                fontDialog.currentFont = root.font;
--                fontDialog.open()
-+                fontDialog.adjustAllFonts = false
-+                kcm.adjustFont(root.font, root.category)
-             }
-             QtControls.ToolTip {
-                 visible: parent.hovered
-diff --git a/kcms/fonts/package/contents/ui/main.qml b/kcms/fonts/package/contents/ui/main.qml
-index 4a99c043a..e51fb21ba 100644
---- a/kcms/fonts/package/contents/ui/main.qml
-+++ b/kcms/fonts/package/contents/ui/main.qml
-@@ -264,9 +264,9 @@ KCM.SimpleKCM {
-                 property bool adjustAllFonts: false
-                 onAccepted: {
-                     if (adjustAllFonts) {
--                        kcm.adjustAllFonts(font);
-+                        kcm.adjustAllFonts()
-                     } else {
--                        kcm.fontsSettings[currentCategory] = font;
-+                        kcm.adjustFont(font, currentCategory)
-                     }
-                 }
-             }
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
deleted file mode 100644
index 593665a53c58..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From f3bbc0ba0e34ea1b34b106228c02d85865ed904a Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 24 Mar 2020 08:15:12 -0600
-Subject: Stop multiplying duration values
-
-Summary:
-After D28144, some animations are now too long because they were inappropriately
-multiplying a duration value. That's no longer necessary, so let's remove the
-multiplication.
-
-Depends on D28144
-
-Test Plan: Various things that were a bit too slow before feel just right now
-
-Reviewers: #vdg, #plasma
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D28239
----
- applets/taskmanager/package/contents/ui/Task.qml             | 2 +-
- applets/taskmanager/package/contents/ui/TaskList.qml         | 2 +-
- desktoppackage/contents/configuration/PanelConfiguration.qml | 4 ++--
- desktoppackage/contents/explorer/WidgetExplorer.qml          | 6 +++---
- toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml       | 6 +++---
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/applets/taskmanager/package/contents/ui/Task.qml b/applets/taskmanager/package/contents/ui/Task.qml
-index 2bf8b88..9683fab 100644
---- a/applets/taskmanager/package/contents/ui/Task.qml
-+++ b/applets/taskmanager/package/contents/ui/Task.qml
-@@ -293,7 +293,7 @@ MouseArea {
-         Timer {
-             id: timer
- 
--            interval: units.longDuration * 2
-+            interval: units.longDuration
-             repeat: false
- 
-             onTriggered: {
-diff --git a/applets/taskmanager/package/contents/ui/TaskList.qml b/applets/taskmanager/package/contents/ui/TaskList.qml
-index 594420b..6d6bc45 100644
---- a/applets/taskmanager/package/contents/ui/TaskList.qml
-+++ b/applets/taskmanager/package/contents/ui/TaskList.qml
-@@ -34,7 +34,7 @@ Flow {
-             NumberAnimation {
-                 properties: "x, y"
-                 easing.type: Easing.OutQuad
--                duration: units.longDuration * 2
-+                duration: units.longDuration
-             }
- 
-             PropertyAction { target: taskList; property: "animating"; value: false }
-diff --git a/desktoppackage/contents/configuration/PanelConfiguration.qml b/desktoppackage/contents/configuration/PanelConfiguration.qml
-index 0e11a96..33e3fbc 100644
---- a/desktoppackage/contents/configuration/PanelConfiguration.qml
-+++ b/desktoppackage/contents/configuration/PanelConfiguration.qml
-@@ -103,7 +103,7 @@ PlasmaCore.FrameSvgItem {
-                     return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - panel.distance
-                 }
-             }
--            duration: units.shortDuration * 3
-+            duration: units.shortDuration
-         }
- 
-         NumberAnimation {
-@@ -122,7 +122,7 @@ PlasmaCore.FrameSvgItem {
-                     return panel.screenGeometry.y + panel.screenGeometry.height - panel.height - configDialog.height - panel.distance
-                 }
-             }
--            duration: units.shortDuration * 3
-+            duration: units.shortDuration
-         }
-     }
- //END Animations
-diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
-index 1648708..e26cc40 100644
---- a/desktoppackage/contents/explorer/WidgetExplorer.qml
-+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
-@@ -306,7 +306,7 @@ Item {
-                 NumberAnimation {
-                     properties: "x"
-                     from: -list.width
--                    duration: units.shortDuration * 3
-+                    duration: units.shortDuration
-                 }
-             }
- 
-@@ -315,7 +315,7 @@ Item {
-                 NumberAnimation {
-                     properties: "x"
-                     to: list.width
--                    duration: units.shortDuration * 3
-+                    duration: units.shortDuration
-                 }
-             }
- 
-@@ -328,7 +328,7 @@ Item {
-             displaced: Transition {
-                 NumberAnimation {
-                     properties: "x,y"
--                    duration: units.shortDuration * 3
-+                    duration: units.shortDuration
-                 }
-             }
- 
-diff --git a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
-index 06524c3..eb6b190 100644
---- a/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
-+++ b/toolboxes/desktoptoolbox/contents/ui/ToolBoxButton.qml
-@@ -54,14 +54,14 @@ Item {
-     }
-     Behavior on rotation {
-         NumberAnimation {
--            duration: units.shortDuration * 3;
-+            duration: units.shortDuration;
-             easing.type: Easing.InOutExpo;
-         }
-         enabled: visible
-     }
-     Behavior on x {
-         NumberAnimation {
--            duration: units.shortDuration * 3;
-+            duration: units.shortDuration;
-             easing.type: Easing.InOutExpo;
-         }
-         enabled: visible
-@@ -69,7 +69,7 @@ Item {
-     }
-     Behavior on y {
-         NumberAnimation {
--            duration: units.shortDuration * 3;
-+            duration: units.shortDuration;
-             easing.type: Easing.InOutExpo;
-         }
-         enabled: visible
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml
index 49d2b2bec6af..e50b5d2d8301 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -8,6 +8,8 @@
 	<use>
 		<flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
+		<flag name="kaccounts">Build the OpenDesktop integration plugin</flag>
+		<flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild
deleted file mode 100644
index 5fa672f9e019..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma desktop"
-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="+fontconfig ibus scim +semantic-desktop"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
-	"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-
-	"${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
-	"${FILESDIR}/${P}-fix-fonts-kcm-w-kf-5.68.patch" # in Plasma/5.18
-
-	# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backports):
-	# https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
-	"${FILESDIR}/${P}-fix-animate-in-animation.patch"
-	"${FILESDIR}/${P}-animate-column-moves.patch"
-	"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package fontconfig Fontconfig)
-		-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 ibus IBus)
-		$(cmake_use_find_package scim SCIM)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# 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-desktop/plasma-desktop-5.19.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
index da3b4ac5fc3f..c3f9e924568f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.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 +fontconfig ibus scim +semantic-desktop"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.3.ebuild
index 9e8cddfd2285..898aae1b2615 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.20.3.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -17,9 +17,10 @@ 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="+fontconfig ibus scim +semantic-desktop"
+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
@@ -48,7 +49,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/kded-${KFMIN}:5
 	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kemoticons-${KFMIN}:5
 	>=kde-frameworks/kglobalaccel-${KFMIN}:5
 	>=kde-frameworks/kguiaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
@@ -63,7 +63,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kparts-${KFMIN}:5
 	>=kde-frameworks/krunner-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
@@ -72,19 +71,18 @@ COMMON_DEPEND="
 	>=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[qt5(+)]
+	>=media-libs/phonon-4.11.0
 	x11-libs/libX11
-	x11-libs/libXcursor
 	x11-libs/libXfixes
 	x11-libs/libXi
 	x11-libs/libxcb[xkb]
 	x11-libs/libxkbfile
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
+	emoji? (
+		app-i18n/ibus[emoji]
+		dev-libs/glib:2
+		media-fonts/noto-emoji
 	)
 	ibus? (
 		app-i18n/ibus
@@ -93,15 +91,20 @@ COMMON_DEPEND="
 		x11-libs/libxcb
 		x11-libs/xcb-util-keysyms
 	)
+	kaccounts? (
+		kde-apps/kaccounts-integration:5
+		net-libs/accounts-qt
+	)
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
 "
 RDEPEND="${COMMON_DEPEND}
+	!<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
@@ -111,34 +114,39 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-plasma/oxygen-${PVCUT}:5
 	sys-apps/util-linux
 	x11-apps/setxkbmap
-	!<kde-plasma/kdeplasma-addons-5.15.80
+	kaccounts? ( net-libs/signon-oauth2 )
+	policykit? ( sys-apps/accountsservice )
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
-	"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+)
 
-	"${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
+src_prepare() {
+	ecm_src_prepare
 
-	# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backports):
-	# https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
-	"${FILESDIR}/${P}-fix-animate-in-animation.patch"
-	"${FILESDIR}/${P}-animate-column-moves.patch"
-	"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
-)
+	use policykit || cmake_run_in kcms cmake_comment_add_subdirectory users
+
+	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=(
-		$(cmake_use_find_package fontconfig Fontconfig)
 		-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 ibus IBus)
+		$(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
 }
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
new file mode 100644
index 000000000000..74d2991579d6
--- /dev/null
+++ b/kde-plasma/plasma-disks/Manifest
@@ -0,0 +1,3 @@
+DIST plasma-disks-5.20.3.tar.xz 63712 BLAKE2B b19d9bc8d486a59b4c7be0912eb4fa90432a90bcb5cca00fc5c30b991edf8d1e61a50c3b278034b0bc45a0438a792f3fe6457881f556096cd4e9206548aa1114 SHA512 4bbeb1cde7e635838b2f08dde62dad414179b4ace32b3f9eeb957f420318770937ae8b242cd5e322568649949d09296824ba471b7c836ea50b0181e2debe6249
+EBUILD plasma-disks-5.20.3.ebuild 1033 BLAKE2B 745e6b705f8cb2b6e9567e263f71733674139f8b92115e048ae6b4b08723e9dd0078ce50a7d7cfbb73adbf1b2c654b26e88da3f978eda149026fe232bbd9f4d2 SHA512 b8fd4bdc59be6ac379ef6809ff9126692c8c064d3bedf02c22539325583e65a754575e434a685e780ecbab36b6078285c46e46f3fb989b7ee098b6548f0efcb1
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-disks/metadata.xml b/kde-plasma/plasma-disks/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-plasma/plasma-disks/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-disks/plasma-disks-5.20.3.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.20.3.ebuild
new file mode 100644
index 000000000000..bdbde2c0668a
--- /dev/null
+++ b/kde-plasma/plasma-disks/plasma-disks-5.20.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="true"
+KFMIN=5.74.0
+QTMIN=5.15.1
+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-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index b1c6e08d6440..caca579ed925 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-integration-5.19.5-use-standard-kde-shortcut-for-move-to-trash.patch 1327 BLAKE2B 6a9f02c1fb516bb7d3c5bf261ab4b6b6ea1f4a225df1db8f564b25ec6205db89060451362a18d0facf32637a6af6b25c8101b28f0095970e7a1135f6f8fe5f3a SHA512 f38145990ac03799724d7f579ba98baa0078b4cc07805ad5d12b6266ab0bdf3c4dd4999151d0005b0217430197cef74514b330ee1ac14b9530d63e9c8364ed00
-DIST plasma-integration-5.18.5.tar.xz 57656 BLAKE2B 3cf445f5d84de07e82369a3057a0ac390961634f8926d3491ca8dd0d603d4e4ff9e7487b69c1fbea44a4296c8960f4e3ef677e1bfd183154a36799fc95dbf3c8 SHA512 d217c49555ee17e3b18d006368ec7aa4d8585c05070bcf3a3c7e471b1c7dc830080d0405209979d8a27c7c2fc2adcd3d248e595f43f0b4a2928683f93c6d4b48
 DIST plasma-integration-5.19.5.tar.xz 57464 BLAKE2B ef5ec9f849087ae738a1ff1de14a77994b4486f89b632777caa8e0aad67cad8553bdf1d0553893361ab4c11ddba0caf32464cb49f08047cf2d40375f789c166e SHA512 9e17e1720e5d5c1d3cada3f1eb891d27fd189eb65378c2e0be6547c79d93d5df2f785a3c67d35a4a374d320b118ad3b7d3fb7d968a7f5b629e505d21c83cfe36
-EBUILD plasma-integration-5.18.5.ebuild 1235 BLAKE2B f1f0e5a637021d9d0ae8c0c3b6680a1f4ac63c8e2e4203bb8936f8693839bde3fa9f7e28082b5a4dca7c2dcabca95f7f18f0bb694e60d79421f10286c4446db5 SHA512 4877687f7608f7a8a1c24e6c8823ef4670ec5307996dcfec8e6682be227bb8e06a29e2c456d1e30f711d76f89855e70250904d3a602f2cbf2e9d45bb93e34dfd
-EBUILD plasma-integration-5.19.5-r1.ebuild 1320 BLAKE2B 3c50f0efd871c28c18900847e8982231059fb9a66f91669030e0ccaeba9c0b3f790d5261884af7344e03a6b12393aa7f8e3f26be4b97d2139dbdb4a67e57970b SHA512 7bd2a4d97e23f5124fe795eda494fb1e56e89de5b651e7577e1f9300007774a49537358bdb178e6f04ca213e6d4c7af54dc6c3a4d1fd3c0bf79a384b8b8b4c42
+DIST plasma-integration-5.20.3.tar.xz 59664 BLAKE2B d14ebc27edc211a285316b02e9b40962e27199be6b9bc285491945956fe523568f0e1576fae5468cfa09b3ccb7c6b919f7d955bba89292750d4518d9d9aad0b6 SHA512 277848ad4e4fd4579bc4a2f6dd7af59d710fd1f283b9d9c8286d6ee6b26fc9af5694bc84488afa52413b00043c855eeb334f3619cb3e7f16135dcf25a4e5c961
+EBUILD plasma-integration-5.19.5-r1.ebuild 1317 BLAKE2B 36dd356ae7cff604d68f8199171dcf88382b391f64f688b19468230b69769e92d59347f4eda807cafc0feb51bf976b09198715a7b679bad1b0a99587e8a23b0b SHA512 faf6475f6332ab198978c91c6348f64eb2b7af87584aa3b48c4db2ef341145e11215e8a9b588e05c5ebc9d8d16bf8d7f16699f1debd07ef3a2655b6c86c80860
+EBUILD plasma-integration-5.20.3.ebuild 1238 BLAKE2B 4bc0c443b23651f83f23fac9a0a8766c0db73d3bd5e33ce8b6d90c289fd6f0289c97c1e26762c55d9fe709f7e3482886c4d46fa13e2be098377f181bf35d81db SHA512 6f1b8b4c1e46b224d9cd26fa4548649decb890590530b04e555ead72676e8e15218b149110a4c527063a91a13419bf13d7cead2fdbfbf07c411d2eaee663a303
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
index 51a301c73ca7..ad56b885e448 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.19.5-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.20.3.ebuild
index f7f300f1c4a7..06aad18a2813 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.20.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -13,10 +13,15 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 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
@@ -31,11 +36,6 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-plasma/breeze-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
 	x11-libs/libXcursor
 	x11-libs/libxcb
 "
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index ca18c507d419..f44324d322cd 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,3 @@
-EBUILD plasma-meta-5.18.5.ebuild 3591 BLAKE2B 8a189ae651e7eb5d2125c92697f61ed6bd150b482b4d288d31d8be2446743c6d7e5b0dd141bb38d261f03ebf623c0cbde3b8da6906f8cdf9291220c2ff07057d SHA512 7868fc98b37b36b51c855d9a97873b1221527fcc75232892c3414ea2304812be60f1d880970cc8cc10e96d151127f06a6dfd223f070be4b1a7715461c3077782
-EBUILD plasma-meta-5.19.5.ebuild 3631 BLAKE2B fbc29c98605d6a9ce6833f1a9add0d944d439bbb9850f0cd11a8c1347b21bde98f177342c912cd6fecef8fda0b34c98c05f8455f1f930a6a523e20e2f7eaa376 SHA512 1a46721aa039b51c97d80f7ee47fff3cef6d74f56ad2ab79164864b862a063424e1c5f7186e5c4b66aca11e85e8d0b97df9c5e48b85d568eade65893c63bd3c2
-MISC metadata.xml 1963 BLAKE2B 0273adb85723495addae8367af9da0ceb907cf86aa0bf4fbf6289aa291b1b19ecd66f191ee12d62427a5316f0f75d831ee2c0ac0d2b246812a52c476aa95fbb2 SHA512 18f5c9bd29f79478e7c976ff4ab4194de3256e4d7da75cf83fd7c8b4af02d39a4ccc1d85cf672529e17f3cb84fb7ab1226d452d5b669d055e88764d2f8b6e6c9
+EBUILD plasma-meta-5.19.5.ebuild 3628 BLAKE2B 7e7eac543cb2e77d257927652c969e78e289897377e56b6524d247153145a16fe5c7bf8e339c9e40c26017e44fe102b7f2ab381c6cbb93062b94daec682de5fd SHA512 1e044042c5a6dfad973c4fc2d52038545f1b00dcc2d3a27b4dfd2b79f3e518e4c2ceb3ab231dafecc77a8329fa2e503a122dbf94b85890360701995b9494a8c5
+EBUILD plasma-meta-5.20.3.ebuild 3649 BLAKE2B bdead8e70896bc26f4e929216264c3bf8ea2dbba259da499eb6f78f7193ead0088850a66a65beb4a691527b2e69f5cd57c80b38aea7bd853d7e01def4184024d SHA512 d10566d000fa287e80ef15ffb1d495cb978805e60419a84f636fb7775f013f9034e7733bde7a610d70245e3544b818fe6fd81be4f4b48ad1776af70082555241
+MISC metadata.xml 1978 BLAKE2B 4ea42f2c1a260bd6aeab7edcfc0d66bf10a7bd7624e7e8d679747cdd84d0cbfece968ce19ae0f31cc5746280f50e335ed46cc5d57fd85b4da66db941bdfe9447 SHA512 7ff4b7d77a372710105a10b71594e88e6f3e86908feb6d15ac47939e93e2235f3a482b3c1a2a77bbbe63c5de97438fa17a93784e8b45fee0281316d8f9e74f5b
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 544a90543cbf..85111e032741 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -11,7 +11,6 @@
 		<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="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking</flag>
 		<flag name="grub">Pull in Breeze theme for <pkg>sys-boot/grub</pkg></flag>
 		<flag name="gtk">Enable Breeze widget style and system settings module for GTK+</flag>
 		<flag name="kwallet">Enable support for KWallet auto-unlocking via <pkg>kde-plasma/kwallet-pam</pkg></flag>
@@ -21,6 +20,7 @@
 		<flag name="qrcode">Enable support for easy WiFi network sharing using QR codes with <pkg>kde-plasma/plasma-nm</pkg></flag>
 		<flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and system settings module</flag>
 		<flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg> for Plasma development</flag>
+		<flag name="smart">Pull in <pkg>kde-plasma/plasma-disks</pkg> for disk health monitoring</flag>
 		<flag name="thunderbolt">Pull in <pkg>kde-plasma/plasma-thunderbolt</pkg> control center module</flag>
 		<flag name="wallpapers">Install wallpapers for the Plasma Workspace</flag>
 	</use>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
index 719e0524dbb6..18a7aeba6379 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.19.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="bluetooth +browser-integration crypt +desktop-portal discover
 +display-manager +elogind grub gtk +handbook +kwallet +legacy-systray
 +networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.20.3.ebuild
index 6cec1857bb3b..8a124750b41d 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.20.3.ebuild
@@ -8,12 +8,12 @@ HOMEPAGE="https://kde.org/plasma-desktop"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="bluetooth +browser-integration crypt +desktop-portal discover
-+display-manager elogind grub gtk +handbook +kwallet +legacy-systray
-+networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="bluetooth +browser-integration crypt +desktop-portal discover +display-manager
++elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager
+plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( elogind systemd )"
 
 RDEPEND="
 	>=kde-plasma/breeze-${PV}:${SLOT}
@@ -31,6 +31,7 @@ RDEPEND="
 	>=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}
@@ -43,7 +44,6 @@ RDEPEND="
 	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
 	>=kde-plasma/powerdevil-${PV}:${SLOT}
 	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	>=kde-plasma/user-manager-${PV}:${SLOT}
 	sys-apps/dbus[elogind?,systemd?]
 	sys-auth/polkit[elogind?,systemd?]
 	sys-fs/udisks:2[elogind?,systemd?]
@@ -63,6 +63,7 @@ RDEPEND="
 	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} )
@@ -78,13 +79,13 @@ RDEPEND="
 	)
 	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
-	use elogind || use systemd || return
 	ewarn "An existing installation of sys-auth/consolekit was detected even though"
 	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
 	ewarn "There can only be one session manager at runtime, otherwise random issues"
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 21fec3eb90bd..d6397351d2f8 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,7 +1,6 @@
-AUX plasma-nm-5.18.5-missing-wireguard-icon.patch 1698 BLAKE2B 37bb63676905746999df50b87e5575d4ec1207dec37848e18216123760d84b577327c20346ede1dba263975253db6bcccfbf4b91167f59aa173b08baffb7e542 SHA512 485e56c592da9f30e5acc94f9f2e8af66989e70aa74ae0b4756dd4e7008729fa1eb1d43dd329983565366937eb7a057a74741b8b456db462cf7f7af00ed1b841
 AUX plasma-nm-5.19.2-fix-inline-password-field.patch 1458 BLAKE2B b169f54b842e38fb077a793778c9a923e2a5df906abd0c29edee7d5279cd81555617b0b70d50953724737d0aa068618bbff9eb341eb3d9fc542cbdcd982db3a5 SHA512 90be93b2a95cd2a69e7d8083d33b7c0ea11a4b09e4396e853f6147b304dc60635274a21ec91e23637c6045813586b6ef52b670d273c1bf29b5abe3a48ed65b39
-DIST plasma-nm-5.18.5.tar.xz 828008 BLAKE2B 557a31d5a0e7886be90e62be3f5328baf4a8bbfeb3e9decf1f2f106f33bef7e64fb886b94691faab57119f231b6bbcff58514d795df75f858ca9c8ea8c1af9a7 SHA512 8f785f257f274fb9384bf2afbe4231a057c46706483e26dd2270a93a6fc97e6198916ff119d258a67d4f8bb73facb0ff67412f43e5fa66812962edb64331db4a
 DIST plasma-nm-5.19.5.tar.xz 855504 BLAKE2B a2437794d9de5a0fda6328dd0e352fad956710cef06f9bc2d6590dbde7f2eb469d051db6fc4ce647fe59bf95e48e6e6c9ff68e512a2992abe183ab309112f94d SHA512 2fdd42e7c9bba0b069e0ca39f8ef996b36a807a4065172a816023c32d5d24869bf92c577c9cc5a08bb9e8b13c628b7cbd8346d17dc1e6814c931f7f7ec9439a7
-EBUILD plasma-nm-5.18.5-r1.ebuild 2368 BLAKE2B 6bb2e5feb6f4182e620ae1f410639b9794ba2e175bf053dc74d5efde0db63cfcf13e5b4595c387acacb68c4675c296e74c8de2d9c28c078bb7e263cd33fa4861 SHA512 1825154c7bd0d60f70cc4fe02ef3b1f5b82a9533c56f9bd19ae53d31b2a1c3576e098fffe83b5d8a778765c27b19065643327ba71823e129285d2eb40d6ec078
-EBUILD plasma-nm-5.19.5.ebuild 2414 BLAKE2B e887240665a330f987c214e6745cd0a52abbc1145743c668e47c335f003c644ea44f6495936afcf533d3ea5efcbbbdd7b730397ab31e527ed43017e4a314b218 SHA512 4ae74be9e55e095beb24d99ec45d398dc7984329f3ab9b536e75ce9387d5cf9a1187593311417abe924b7f2dbf5b82d152ed597ef11847213ca95c9a5c1d9abf
+DIST plasma-nm-5.20.3.tar.xz 859028 BLAKE2B 3a53572b5049c0e5cacb48a577cc6492d2b7098b7a903fee5f670943f95047871dfbb45ee25f6246cc155249abd5732cc047608e6440b3ebec05f5f6db801343 SHA512 9f98aba2897d7f2fbae155b4460a870476995df5ba7f4599f53e223681847613fa9eb2ef848ebc421612262a82277d4406372a68b064bcd98a6ebf7962b598b8
+EBUILD plasma-nm-5.19.5.ebuild 2411 BLAKE2B face78008487cde60f4c07d53389a3fd99e83e4bfe79ae04bb1c2bffb76c4ae22cbbb08fde8738d1b758551477e325604025515640c01b260b4351c0321c3e81 SHA512 2a79e85fa7901df76e16761bbc63bb9f4183df4940a765196a4e7ba793d3e1f8c43de960ba3061e470f13fefc7817de2139a1ade6b7834344f3885fb3d3b9364
+EBUILD plasma-nm-5.20.3.ebuild 2323 BLAKE2B d9879dffd379f5cc6e49008b86a58d91763bcaffde9d72fa2ccfbb2f0b45576fd0842b906c825a60e957d406f049e852ba865746ae06b4f924f28a4b9dfe1c5b SHA512 1839dafb727e6d322c558a40e08ec2657d7184adf68120c81dd83de811f576dfc237c677b8aa0c5ff4b60b3eb30718a8df44e67f8cca2d85cf1f3799b6816962
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch
deleted file mode 100644
index 85902e504096..000000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From da52d01788f5f07aa60ed7a6f21d7943a2e0c8d3 Mon Sep 17 00:00:00 2001
-From: Bruce Anderson <banderson19com@san.rr.com>
-Date: Wed, 6 May 2020 08:03:11 +0200
-Subject: Icon in system tray missing when WireGuard connection active on
- startup
-
-Summary:
-If a WireGuard connection is made prior to start of the
-plasma-nm applet, no icon is displayed in the system tray.
-
-BUG: 420983
-
-Test Plan:
-1. Setup a Wired connection to autostart
-2. Setup a WireGuard connection which uses the Wired
-   connection and set to autostart
-3. Logout and login to start a new Plasma session
-4. Verify that the standard Wired connection icon with a
-   padlock symbol on it is shown in the system tray
-
-Reviewers: jgrulich
-
-Reviewed By: jgrulich
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29469
----
- libs/declarative/connectionicon.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libs/declarative/connectionicon.cpp b/libs/declarative/connectionicon.cpp
-index cefe6df..58c0cce 100644
---- a/libs/declarative/connectionicon.cpp
-+++ b/libs/declarative/connectionicon.cpp
-@@ -317,7 +317,9 @@ void ConnectionIcon::setIcons()
- 
-     // Set icon based on the current primary connection if the activating connection is virtual
-     // since we're not setting icons for virtual connections
--    if (!connection || (connection && UiUtils::isConnectionTypeVirtual(connection->type()))) {
-+    if (!connection
-+        || (connection && UiUtils::isConnectionTypeVirtual(connection->type()))
-+        || connection->type() == NetworkManager::ConnectionSettings::WireGuard) {
-         connection = NetworkManager::primaryConnection();
-     }
- 
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
index 703e7f5bf82f..69089da378c5 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.20.3.ebuild
index fd1c44fe031f..dec9064ff778 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.20.3.ebuild
@@ -4,20 +4,20 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
+	>=app-crypt/qca-2.3.0:2
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -44,8 +44,8 @@ DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	net-misc/networkmanager[teamd=]
 	modemmanager? (
-		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
 		>=dev-qt/qtxml-${QTMIN}:5
+		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
 		net-misc/mobile-broadband-provider-info
 	)
 	openconnect? (
@@ -57,11 +57,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-missing-wireguard-icon.patch" ) # in Plasma/5.18
-
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index f8acc62f7071..7ce8601f7c70 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-pa-5.18.5.tar.xz 105148 BLAKE2B 19b79ead20bc54d6f1e8f515980590f402c00a3c3e82841c66e8cece4f9bb90e87a7a5bf0c02afaf5e7bbfa3715c418301926120d4cd69d94d4c3dc54b8de0cd SHA512 fff3049d4879e4f6fe428985dd14f91fa6bac8fe2e7c696ee1424d610038f61fd7eda2621bfd2c2643529956f7986b59c9eead1ceb79e1cfb1397fa52b470376
 DIST plasma-pa-5.19.5.tar.xz 108156 BLAKE2B cbbb50c102d77b4eddb865daddb432e4ec1e7b27d033ecbd87c0bb8d64b565eebc206d4c13b197ea4f5bff4693e4ef9c9e3570e21fc177adc58f478683269603 SHA512 90d9faf8ab2f4fc7ecdc3e4fa84276ef6c7fc3abc2b2b7a0407e9f001c10330aa98a89ee68602c5378e4e46eec89a88c55e1e01dc2d755e613e4f584234331b6
-EBUILD plasma-pa-5.18.5.ebuild 921 BLAKE2B f91d1a72122c2e6f7e2615c64fec080bb8bd2ea9e1430f87b831af844bd925ef2be813d0a610f5ba6bea709978a71e74c9b2d5beac57224a87323cd5ecf07c78 SHA512 b22214bda000bb3eff9743e3f7f8dd5b2b73b7bdf932aefe34fd38309e8f212929bd36b5c3f775ffcda459e7b2841ab96cfcaa7f19f8cd8ca164a183358ac9f3
-EBUILD plasma-pa-5.19.5.ebuild 900 BLAKE2B d888296da9d7e934594c4309fe1dd2a0c1795adbc2029a034b45b0c369ff310fbf5f5c08fc442ba73e32646ea8372ab4c19c55ea33b5dcad04ccb9405a048151 SHA512 f5c8c601b3e0099608651a31e8e2d877e89908bdd3e71bc150b9e89eeccfe9481070256df53d492a9eecb53404725f76280cb67ac2ee7dde86c715d1cc729b6e
+DIST plasma-pa-5.20.3.tar.xz 114148 BLAKE2B 2aadab265c75a364485d3d993bc5019e4f42635bf7c9195b48014e570cfa9a87f050d6dee5c810b1b1e6a8a09e3b8747cef3a0d37887754a67d89f3dd7f639b4 SHA512 fff348cd08e1258c215f5a0c515412541451a4717017910f694a48dcbac86e19b24441f6f8adacd9926a6e77ee831197c568dc8b6f9656d4a5faece9f7ce5ac2
+EBUILD plasma-pa-5.19.5.ebuild 897 BLAKE2B fce148bd7d433d3655a74cdf735b139bf59f22721e7e14f1b559bc649f2420fc64713728c7a185fe33c9c828ae1943419da48e3a32f88064750ff77e2302d215 SHA512 b639dff3b9b9e559b10d39574ab5dbe4898886993e1ea49fcc291bcc76e1555c519643a5de9caad1c7b4f756bc7b700f7d704180e019891806ad3ede250e605b
+EBUILD plasma-pa-5.20.3.ebuild 916 BLAKE2B ec6f12c7c978b4ff7f976b0f18260890e39e00e9bcd6a7e2e36f408557e24971cbf77f9033c32668a0e1b39b67bfd1bad17872ca385f7d53804e4de58bec2f56 SHA512 79e075b7c78b2bf473b9b6c4d75fe12ef27811c6ca0956b4c20bddbcbe854fa845c8dc0ab32d14f11cd2f3696e9fcc353dc2e1df43a4427f4813416779905ff7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
index f4478c556980..224c7bd36a81 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.20.3.ebuild
index b5f98dfc02f5..82ec97ebd772 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.20.3.ebuild
@@ -4,35 +4,37 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 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"
+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
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/glib:2
 	media-libs/libcanberra
 	media-sound/pulseaudio
 "
 RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	media-libs/libcanberra
+	>=kde-frameworks/kirigami-${KFMIN}:5
 	x11-themes/sound-theme-freedesktop
 "
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_bogus_dep Qt5 Widgets
+}
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 910b7e3dd9cf..4d9c0cf7256a 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-sdk-5.18.5.tar.xz 263084 BLAKE2B 575235302ade4bc1bcfdcef33f9fd3cc4175d4362aaabd2a3bc8e7d7235d90f3c2f81c8b499e486c0f68e029b298e4879707ebb1d23052230c2403e825d5943e SHA512 1051aa84d70d7a02d3392d3b1628b1fb4d4b666efca6e34f0688dc0015b983527039bd52140cf17f947f2d266cacb63aab7c9b547e6679a0aab094e74c1783a1
 DIST plasma-sdk-5.19.5.tar.xz 263576 BLAKE2B 4752ba4423930bac21893140f397595dc1b5fe9238b054043a7b961756d762a11bd50d806c779e59dd512c2ca304c38bb72ebc1d811d89bb46746cc7f0528dc4 SHA512 66ca604bd27a7c48f8127f04e43c0093c098820e099c944cf7e4715ee0703175761ce6e4be270ffd78b0b1a87fbb2a8e7f670010df0032c4148bcf4275fc32f6
-EBUILD plasma-sdk-5.18.5.ebuild 1254 BLAKE2B 85b6ae2b9ca81257af4d98c697d33ddb57e5a62caf9f7f24afb4b35b6ba614f2920b39c0d0434fabce334802eef716262f4ffda8a9f183688bd36b66923befc6 SHA512 a2840b282743e897f7c5d0e67564a7310cdc622fee4187580e99578c63a5a9e86acb9af405895f29f6effdc4818c0b3526e406b6c0a0a0ac09d6ad3f7db14e76
-EBUILD plasma-sdk-5.19.5.ebuild 1257 BLAKE2B 8edde770e063b00e10bbe3416443e243a7f0daeec52005d95e2f2abbdb9196f4dd785f1b3b61a1efe184790d9006b45aa8f2e5ecee3dcf91987711222a4de7c8 SHA512 6ed16630ccfa5d2f5eb12b31682874a1975fbd39bc092a62df1ee9a8b671742ff6f96099f9eb18efe8e9de54a70d40c0104e48ef41746080a73679b5d65c20be
+DIST plasma-sdk-5.20.3.tar.xz 267000 BLAKE2B 5b9e55f372b05769c5fae2a918e614741d6b7ee715beafbdfd779f25dd0ab1cbab559091a25486a40512c093d07d4016ae94457d7e876bc98186b50da3140d51 SHA512 de0efdabe2db6e6cee8fa143657c5f60d8e6c1d621900d2316ee823e29e8ace907ff541309ac7bfa87405369f781338af5462036c47e10ddf8009eef76c22d03
+EBUILD plasma-sdk-5.19.5.ebuild 1254 BLAKE2B b441d03b8efc4a4313ff64fbd2043d88686aa560f34dbf5ca5e11e7a63987edbb7a528baa80f0c6189b7f5ebb308e8c60830095d8d38ac1639d2d63584bd2aaa SHA512 68a3725ad4cbf259512d135ae2c13829442e5dff5b8f40deb8ac21ac164187798a4a9ba7950281b4c811441d6f68d5479287c8f762484f1d492a9bcc8111e5e4
+EBUILD plasma-sdk-5.20.3.ebuild 1257 BLAKE2B 85d81b6033ffc9aec7bb3f1054f439457ba9e978c0fe89e164f5025900a36156e2846bee49c17ba7ce2472263564e609a77b253bc9c55e31776d4b3465039b4b SHA512 494a02f5bcfe6ea8bc37c334c5e44494ff9761970c5f21677a7272f2bab9305dce7d66203917c68471323b71cc94e382ff20e6b3b638c971149d96fc514c3917
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
index bf138a7edf9d..9aa04126da84 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.19.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.20.3.ebuild
index 445a30894149..aa5ac8634f13 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="optional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
new file mode 100644
index 000000000000..8fbacc9450ca
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -0,0 +1,3 @@
+DIST plasma-systemmonitor-5.20.0.tar.xz 105596 BLAKE2B 93a5feb8fba244580e65b55633d803e14051b476f3ee5fde617285c61a84be7b22c5c09f4a14e0e7b9b3c88a45868c9f8c5c72e8cfd4488add192e9e1ceeb594 SHA512 56c6a5fe4646aaa2fc76c30f28362252308516b06132501efeb9905097a5c895250076b09ef2bdb7a9f4ad77435c622bd4b3f1ad5b69116f6654b3046829f2a0
+EBUILD plasma-systemmonitor-5.20.0.ebuild 1176 BLAKE2B 5e1b2a4600975208b9ac268f5bc9c46d63437b1dd17ea340a5d89ce8c86f868ce59de3e258753118350428840164ca3eda23cc5442443b6a4ab4ce8f1ad4f000 SHA512 39541d11aa506f3ce8de96b808d57dec0ca1d3d14ccf70d0b65f12fb6874f3af17c277129e989bf837218a12c2c2fcb1844e37044d22901c78e196289a0ebb48
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-systemmonitor/metadata.xml b/kde-plasma/plasma-systemmonitor/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/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-systemmonitor/plasma-systemmonitor-5.20.0.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0.ebuild
new file mode 100644
index 000000000000..71730279591e
--- /dev/null
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.74.0
+QTMIN=5.15.1
+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"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64"
+fi
+
+LICENSE="|| ( GPL-3 GPL-2 )"
+SLOT="5"
+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:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
+"
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index dee5206a035f..2fb31145e69e 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-thunderbolt-5.18.5.tar.xz 51248 BLAKE2B e87339f2d81bfcfb60e02284e1e57aa17b1a01844cd4e0157b3b10b1bee4d4de5b02378b15c750977350a768f2c5c2f01e629405c358afcbad0765d1c7943598 SHA512 4768a69abc474b9daa2c3f880ef12829ce4804a44b4502b31e083802a5ba4406ac52001fb397415958cd52d7f76aa7dc54f8945665957a8a5557ca93e345ff76
 DIST plasma-thunderbolt-5.19.5.tar.xz 51300 BLAKE2B c0a9b3665d58ac57c4e4fc71670edaf402d69e8477e0b74875df2d4d666ea8f1c1ce2d0b950f5f20950a431837d651a545f8df19412b60332e0b5d3b08beaa5b SHA512 34c0cb7495b03eaf4f84426fbb6ab2a8b3b336fa1a7f32014231f302c3f1a0e061462e32ded86dab713aa2b602ba5311da3a45e0352f63f59d6e503c1eb7905e
-EBUILD plasma-thunderbolt-5.18.5.ebuild 776 BLAKE2B b25cc92413af7084f906f1e2fb7c6d504274667b34a06277b864ce0fe050d14da49319621a2117a2ea55102a5f2b820d2d39307a10c0d3fb4cfee9bafa17685b SHA512 e68c4c104dea6c3de072b40790526b39ecacbae0c1663d756711429c9e7cf91de2e305c1438c9c03894ee0816f49676317906d3a749f278bd5bb39cea52ecf26
-EBUILD plasma-thunderbolt-5.19.5.ebuild 892 BLAKE2B 16e2623e4c34962e716b49b61173e22659b1ee928fdb651ab42b0bb004c3e5cffec5af4b25242557bb62d0f54bcb74e23e4e76a2c941fa8227f5f62cdb6092d2 SHA512 a539c5f34c1f89f4e710079382e1a572a38f24ca256ef6554c70af6bb4b2c643d7a3dbb9d05a50f88963fd975447107d27b7645504b9a00c8ee2a86a10c52bab
+DIST plasma-thunderbolt-5.20.3.tar.xz 56344 BLAKE2B b6d39dd01d4dd4eced36b980ca19e3dcdbf248f6244d1b977f57b448cfd661794d5886602e4c5fe38171dc05a7ac62b24bb61a1471af53fdee78177f80a1341b SHA512 081aafc9982d9e3087d5587e7fbd9a6cd694e88fb7c985d60ba3330a21f71390ab445b652fe5b73ab6655264d32e4a2c2f26298033e316c67094965d658087cf
+EBUILD plasma-thunderbolt-5.19.5.ebuild 890 BLAKE2B 5df170041f9c01861849b9274c79d71a2104d57df8736c868445c167a90df77e5e981b358ef49fd7793d426570af2b020d3abf0416b324f02d481964281041e7 SHA512 4140970ca8d0a2bf023fd9c6d249cf43a813bccd7f4f3ed7c751abb1489e82bc293cdc32ef02ddfc9e79ce7f6567ad10f47b3aca97cb23ee0014632201f53a6e
+EBUILD plasma-thunderbolt-5.20.3.ebuild 892 BLAKE2B 1ed1565791eeff09c5166f3e01ff721a265fed18b8169b5798304d6f58aaff6f223b79383f3190f4d87650d88f99708ebea469e5f607451825e9a27c2c0aea19 SHA512 e47232f16fa7d45de91de77f6a1f5728a698582dd163ac9a75eb6e02ecf4206571d4c4115fbe9605776326d6fbeca4602430c517bf0e61ace46b3e2840a2e92a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.5.ebuild
index 0c999324c345..5a8370f3b0db 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.3.ebuild
index ba958e8362cf..cbbcdebcf9b0 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
@@ -18,16 +18,21 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 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
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
 	sys-apps/bolt
 "
+
+# tests require DBus
+RESTRICT+=" test"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index 15a5890cb6d9..d76c0bd3a352 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,6 +1,6 @@
 AUX plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1928 BLAKE2B c7fc121bd0956d00f51831e92f7178f134cd777f50529a9f3269ee7248e2c984f44285b870f57b7e8252c3a7a74affcd0b0d5bcea8948d6e9e0c1c68c3e536cb SHA512 2dfeaa620444df7d6f5a36c9a4957c9783b8f37c2c75576a21712558b81f7b027f5753aa5b62560045476e26de822f0047d3670c8b3560d8f1606ed169b0e6c9
-DIST plasma-vault-5.18.5.tar.xz 136900 BLAKE2B 29b538760dbfae8cb83d820d51101bbf27436e46cff034fbc9b7541998ed6bc1870435d7fac9894b7bf105e173121e791c9d387a3c5c9476dfddc3a4b335e072 SHA512 66fcd87dee7e696aa0f5fa41adcb41134bb0da1ee9920f51057ee8729f8d88052b28f4e422795fc229767b7861226d1386086748afb356f4cb7281c1da4af7e8
 DIST plasma-vault-5.19.5.tar.xz 145448 BLAKE2B 3b9dff74ab3c7120d9fe1c40007333d514d6773602941987bed55b977c46f7e2b8a27c125c258030a5da638c30e83186d0097ca553e437c2efc13e390b7471db SHA512 d2c00601dae41b924ffb174a7fca9b508ff6e6ae052dd72fa2d9b6767718b4d40a25a7b7c9131f197d25e113c23d74df36829634ce8d83d4a76355aa66ce5771
-EBUILD plasma-vault-5.18.5.ebuild 1229 BLAKE2B 3820124d691b0eb7422dd9967facc5c0a500e1bca599c5c295dc521a0d9d5e546b1613015679307cf0c65a5db0f92a6b60d396ed5f2c40f4cadaf3dea1b7d13f SHA512 7459542ca31413e9b88f3f9fb096757a5d699dda153839610d9b74a24f60ede9523715b267c76031502e6e48f2b809482a3577e774ed4c316780ad048c064a11
-EBUILD plasma-vault-5.19.5.ebuild 1409 BLAKE2B 463baae97983909241ca50a5be6d8b0276c2bafca10097d8632ed612b6136a8b18f8449f3749f7188342dc1d49441d8753b01d32f861795ef4d9705e1f4f3a8a SHA512 18b0ff5ff7efe2050bde7daea81f14d19a929c5ad78dff0805851ad0b18033778e9e06c5a61abb5208660b9faa3f2c00a7483909393643b46ed674aac2f874e3
+DIST plasma-vault-5.20.3.tar.xz 158264 BLAKE2B 91138c250e308b6fa45025c7736f79cb47000fc7efc71616b60a266d64d272b6ab17f73a3fa1b3f321d99c468b58a8ff4964e123700bed5930779d377cd3f9e9 SHA512 47cb0e8f2ba64b3598fee8da7e458bfbe622b5eebdff4c47cf838ca83d96aac7a969b1d97d964aeee5589c688e662bb6c17f1be9687db5bad4b57b221793345a
+EBUILD plasma-vault-5.19.5.ebuild 1406 BLAKE2B cca54b9f66bade1812e2419327ab7a7fe5a553c69d1bb4e872dbbde0fee3ec957547b25683141ab1a7a43b7aa35465e7aec518ce859e5d54e830fd759b1fae8f SHA512 6a5faa085e8fb38d80d1d861e62bedeeda9f76705357d15ac66aa7b37c6d9eb96f6a648e47d6219492eb4bab8161bf212e70f5cdb81100c60392a323c438aab9
+EBUILD plasma-vault-5.20.3.ebuild 1277 BLAKE2B 541600310cea567ad2997f6d6b2a586b42ffc3a37bba25e489aebfed1f07fb99aa22aedd9f6ab6f8e6ff6985c0186680b1ea76e7dc74b2391eee89e455e35c5e SHA512 8c1018fff12f1a59f5e1e9225846ffcdfb453fa23374eb2a713b9cc891c4984a888ec52e3fff0899a19bdac3f9e899e844b6462344976886d3ff042ad29b2f80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
index 37a1e44d6e92..8d48bdb0e505 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.20.3.ebuild
index ca9ff36158a9..56435c6d9bfb 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.20.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Plasma applet and services for creating encrypted vaults"
@@ -13,10 +13,14 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~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
@@ -28,13 +32,10 @@ DEPEND="
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
 "
 
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 56de15496e5b..3e34a8fe9e18 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,5 @@
-DIST plasma-workspace-wallpapers-5.18.5.tar.xz 37110292 BLAKE2B 34dcfad8d3d47a32b63a3d002cd3ce4c59a4b5127002df4c5a39c7df4296890ef59713fbe4c52693ce728aa7a349ffbf3c133a28699f314791e485b28cbdda95 SHA512 75d5042fd955849cb67b1f7711b2e3e63d03ece7aacd4fc88bcd8c8652ca40a62351c1666b9c86275d1b495fa73d0089e8046dc1f65fc6fb23d9010ddc6f514e
 DIST plasma-workspace-wallpapers-5.19.5.tar.xz 41824532 BLAKE2B 08b90cd0869e5935320a00fe7687c6a15a3978bcf3288e8e37f48dcef53baaf84921f573949f8dbeeaac2f5861151a4625520fd6a89de264e150918955d39da9 SHA512 79723d50f47412d4904effddbb641d75675a66f517e70164bf55f89e31cbb8246ea1617f90e4cd8e1c5ec169332187586443ead7bc2721b0df85a693ada9287f
-EBUILD plasma-workspace-wallpapers-5.18.5.ebuild 348 BLAKE2B c449bc49a75155acc1348de26718af57f8bcc58c75effd5102f471f4b6acfd43a969d4a4cca058d3aea144dcc3d8dd133f22b52ff20ef2f10b5e73d53ca642a9 SHA512 0b1b68aa9a5b5c0f2b4964f71b1ff59f2cb2f1f6a542f6c3182b8ec838ee3d6778d5bbc99b665363a7e68a1247fac50d8c17184f90e1e0a99427a3b718c39412
-EBUILD plasma-workspace-wallpapers-5.19.5.ebuild 351 BLAKE2B ebcadb1a2f7539dd43ee5132dfd359b39f2d2004b6b513c8f51f25480f65f626b2eded11361bcf1d9dec3d2607ae17e7e4b074c0efac898f2fba6c5c3514ae9e SHA512 4ccb55e72e0b523a380f4d4c1aa94c36d10b7487705987d5677308208d33732f7b3a4029f62400dad65a185eeff0b39e65be6d33fcac9c5a3ec0273cea4c8f1b
+DIST plasma-workspace-wallpapers-5.20.3.tar.xz 45931672 BLAKE2B b631f041405a32eb7db395cf7e517f69f18388aaa00397c5cc194077c9cf6ac59b993d1611de9da7ae17285cfaa5f77fd8d5b65cc8ccf8047d158bbd18d34c3e SHA512 33f05cb189b285b554d4834fe554a371649d25af400998d1ebb6f1b0010c097eb482deedb5bf7c6ca6c865456ff03e137e196afb8f21c296dc46f5315d7197df
+EBUILD plasma-workspace-wallpapers-5.19.5.ebuild 348 BLAKE2B c449bc49a75155acc1348de26718af57f8bcc58c75effd5102f471f4b6acfd43a969d4a4cca058d3aea144dcc3d8dd133f22b52ff20ef2f10b5e73d53ca642a9 SHA512 0b1b68aa9a5b5c0f2b4964f71b1ff59f2cb2f1f6a542f6c3182b8ec838ee3d6778d5bbc99b665363a7e68a1247fac50d8c17184f90e1e0a99427a3b718c39412
+EBUILD plasma-workspace-wallpapers-5.20.3.ebuild 351 BLAKE2B ebcadb1a2f7539dd43ee5132dfd359b39f2d2004b6b513c8f51f25480f65f626b2eded11361bcf1d9dec3d2607ae17e7e4b074c0efac898f2fba6c5c3514ae9e SHA512 4ccb55e72e0b523a380f4d4c1aa94c36d10b7487705987d5677308208d33732f7b3a4029f62400dad65a185eeff0b39e65be6d33fcac9c5a3ec0273cea4c8f1b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
index 0fe9c7985bde..56aeacaf1b52 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.19.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.3.ebuild
index 56aeacaf1b52..0fe9c7985bde 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 57a9539b6e9c..b32e6ecd2c9e 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,13 +1,12 @@
 AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
-AUX plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch 3503 BLAKE2B 360e27d03d8429d7d2b1c11f9b40ac0049108ab0461e9428cb5f2fe67241708190796d3a60a503e0ab1903dee61c27dfe7d2a187e36032518632a4966fe10215 SHA512 f7367acf43a4c3aed20ee42853fb0657f64182222a208511f97657b734a430eb8d24c6cf10b6a276ae3313d791938905abbc33387adc272725addc606a86f482
-AUX plasma-workspace-5.18.5-stop-multiplying-duration-values.patch 3899 BLAKE2B 434e8c1df5bac91b68085258641194a9ced7fbbaa35f7a97bc29a1921d00dd59c0a39fed948325d7d686c075514c9621391b1000869bd93de266cb179f538b6d SHA512 24927936b7940bf181c05a87a95e4b6d87f1658b9ab94cb980f0fc697b4cbd2fdbf8a7a141413c1bad6d040408ff24b419a44a3a404bc02accfaf9d9250cb110
 AUX plasma-workspace-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch 1780 BLAKE2B 1462650fed75b2b33c945e34281cfec1304f9d325a41deeeea5d0030d5469f270e7d2c50cab3b897298229f9c285c335c37f9a5d330d8a19e15da7711a403b50 SHA512 c7fb22f77a8841450c1c6c3f448401bfa29f5ca4bd58d30674dae29b7acc8db9ac367f4eac2cd1dc151893dea526c167744ae2a52d08797d0e8bba8486224bbc
 AUX plasma-workspace-5.19.5-gpsd-3.21.patch 997 BLAKE2B 034a08a4c524ce7b4be4d41ba945f049d03e30e4810fa107d2f7198913476a90aef0e9e0fa381413f94bd1725a4694a07eeafa147b31e2baa2810257ee0e608c SHA512 6d8eadea96bb388a64704e1b1c30190cd06b0c872b084a8b6e16f1c510fd619dd2e64ae0b9c65b39e3c020a312a451a73a8ba241b3c8575870528e97c59d46fd
+AUX plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch 1608 BLAKE2B 1d6b2679d7f41863f83c69a2d11791b972275f7e9b838bc8a252c8ed4661f5774d6b43c019d9c4653f7f9af407b154869378d6845fec878972b6bd59e4fdbfa8 SHA512 08971de678b6e4c9148c4f55b44eb64870a639c9b0ecbeacdcea3565e9204f720205fd9707cc52c3284d94c0228d3f2e1464a70551582af4d49e95172f64f390
 AUX plasma-workspace-5.19.5-login-button-size.patch 2035 BLAKE2B 57618eda7a8d5071501998c9b420bfb007acd181df81068a2982fd2d40ba18398876177f221203de8daa4c53c4ec00260cb85a9f8f10c3bbe5d2f9449d9bf831 SHA512 16ae3fc015318d24c8e01adfabff4b304c98292854b805384328c47c7823d7749ad52eeb6acccc1ae9f2a2d4547929a4039e4174ab58db87de6c864b91d0f135
-DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-EBUILD plasma-workspace-5.18.5-r1.ebuild 7241 BLAKE2B 7a1ea14452de71a0d514f8ad75f489ea9a9b549517cc1c51b91cf319c91de6988869fe9b1c962cf0f79a64129464f98410e5e63198c828bb2d0c8f61e739a775 SHA512 8e91e8b6e377aafd493fc6a1b64a797f6ac4a0433f9feeab945e1c48b6146e54fa625720b0995b00f4cf88f49e85af5818234c2088413eb024d65567eb4b6fe2
-EBUILD plasma-workspace-5.19.5-r1.ebuild 7020 BLAKE2B 8e3928bebc84ffb54d82143359c422d50dd2e5b3ddaa1e57e6d910b2645c77b0226e6d60a29f74f8638f85e2e82213d131bae3facaa547fc992786d7b065c2d4 SHA512 9a6f86a031d0509147aa6afadac64869e116042d77be04d61773415579b88ac885c31111eceb334e92a60d734bab7c0069baae619888a92acda7871696d06420
-MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
+DIST plasma-workspace-5.20.3.tar.xz 9031572 BLAKE2B 242286eef9d15b9dacec0dca3a7899c538141490611f932e0ebff59e1ea7a54cbad56e3bcad6e4a720b4f7610de2fc0e128288c3fe3d2b9e8255ffe16e0b86fa SHA512 c1daa19834ea7997a8e44fcb6ce9745d5bac56a0a4d99320e1e3e42e9cb5489aa36887e3c2bd8e385644d555d355211c9dba6c40edf2471478566c531a2d9c89
+EBUILD plasma-workspace-5.19.5-r2.ebuild 7161 BLAKE2B 616371d4525a652790da41eb4e8f126f35f73b200bb90cec0715b2194b249dd9b0db638c93b40c042a261268c87c22d8ae95324790592f2841c43629c3c9d0d1 SHA512 6e757950dd26c93fdec581dcb8a04eaf5b090d9d12843a8309a142e278e3cbd2278a170616a48dd72ac64ce6face681d72ee48b2bec407f14f3537319564c149
+EBUILD plasma-workspace-5.20.3.ebuild 5955 BLAKE2B 1638d4c45b99755ab7e7b060e77870637c7c88266d7664f1507a386dc7a035475095b3ea6cc4d51130c818105fbfd5033af43014a495af5eb9b147326a5a836d SHA512 3e3204e35fd23be45a809394bd8f5185e7008c8a8dfc21c1fad2f1fc0db9a232ddd6ede5ccd67d4cb67ce74e5afce0d493e5e80404c520d8fe76183244681eb1
+MISC metadata.xml 848 BLAKE2B 60b6be066ec5e396d88f6e57774e7bde6e9906de72b808d7e4887fde6f8fdd4e99667e30e244602e92c10aa8950d583adf78b6e122b4a9dc60a7a538aa69663b SHA512 77e385066c166cb8a43b531e0e079f39004d645364237d1ead4a26816297edec7283cf551310f1c0643692eb8794bce74a949b00b049f140da2e2f7a6fb2689a
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
deleted file mode 100644
index 7cbe139a1669..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 68601675d13bdf44248991a56e888093e58c56c3 Mon Sep 17 00:00:00 2001
-From: Filip Fila <filipfila.kde@gmail.com>
-Date: Wed, 13 May 2020 18:08:27 +0200
-Subject: [sddm-theme] Prevent the logo from leaking in after a fadeout
-
-Summary:
-Even when the vendor logo is turned off it can be briefly seen when the login screen changes from the fadeout state back into normal.
-
-Comments in other code say that "OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)" so this patch replaces it with NumberAnimation.
-
-There's also a minor fix included - placing the drop shadow sooner in the hierarchy because it should be drawn underneath an object, not in front of it.
-
-Test Plan:
-Reduce the fadeout time to something small and then:
-
-`sddm-greeter --test-mode --theme /usr/share/sddm/themes/breeze`
-
-Reviewers: ngraham, cblack, #plasma, mart
-
-Reviewed By: ngraham, #plasma, mart
-
-Subscribers: mart, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D29351
----
- sddm-theme/Main.qml | 44 +++++++++++++++++++++++---------------------
- 1 file changed, 23 insertions(+), 21 deletions(-)
-
-diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml
-index 6746238..9910e7f 100644
---- a/sddm-theme/Main.qml
-+++ b/sddm-theme/Main.qml
-@@ -411,26 +411,6 @@ PlasmaCore.ColorScope {
-             }
-         }
- 
--        Image {
--            id: logo
--            visible: config.showlogo == "shown"
--            source: config.logo
--            anchors.horizontalCenter: parent.horizontalCenter
--            anchors.bottom: footer.top
--            anchors.bottomMargin: units.largeSpacing
--            asynchronous: true
--            sourceSize.height: height
--            opacity: loginScreenRoot.uiVisible ? 0 : 1
--            fillMode: Image.PreserveAspectFit
--            height: Math.round(units.gridUnit * 3.5)
--            Behavior on opacity {
--                OpacityAnimator {
--                    duration: units.longDuration
--                    easing.type: Easing.InOutQuad
--                }
--            }
--        }
--
-         DropShadow {
-             id: logoShadow
-             anchors.fill: logo
-@@ -444,7 +424,29 @@ PlasmaCore.ColorScope {
-             color: "black" // matches Breeze window decoration and desktopcontainment
-             opacity: loginScreenRoot.uiVisible ? 0 : 1
-             Behavior on opacity {
--                OpacityAnimator {
-+                //OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
-+                NumberAnimation {
-+                    duration: units.longDuration
-+                    easing.type: Easing.InOutQuad
-+                }
-+            }
-+        }
-+
-+        Image {
-+            id: logo
-+            visible: config.showlogo == "shown"
-+            source: config.logo
-+            anchors.horizontalCenter: parent.horizontalCenter
-+            anchors.bottom: footer.top
-+            anchors.bottomMargin: units.largeSpacing
-+            asynchronous: true
-+            sourceSize.height: height
-+            opacity: loginScreenRoot.uiVisible ? 0 : 1
-+            fillMode: Image.PreserveAspectFit
-+            height: Math.round(units.gridUnit * 3.5)
-+            Behavior on opacity {
-+                // OpacityAnimator when starting from 0 is buggy (it shows one frame with opacity 1)"
-+                NumberAnimation {
-                     duration: units.longDuration
-                     easing.type: Easing.InOutQuad
-                 }
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
deleted file mode 100644
index 83539c14c043..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 2958702524348e9e4fcbdf490be731e92b353dad Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Tue, 24 Mar 2020 08:10:54 -0600
-Subject: Stop multiplying duration values
-
-Summary:
-After D28144, some animations are now too long because they were inappropriately
-multiplying a duration value. That's no longer necessary, so let's remove the
-multiplication.
-
-Depends on D28144
-
-Test Plan: Various things that were a bit too slow before feel just right now
-
-Reviewers: #vdg, #plasma, cblack
-
-Reviewed By: #vdg, #plasma, cblack
-
-Subscribers: cblack, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D28238
----
- applets/devicenotifier/package/contents/ui/FullRepresentation.qml | 2 +-
- applets/systemtray/package/contents/ui/ExpanderArrow.qml          | 2 +-
- lookandfeel/contents/components/ActionButton.qml                  | 4 ++--
- lookandfeel/contents/components/UserDelegate.qml                  | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
-index d15e47c..80b9c73 100644
---- a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
-+++ b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml
-@@ -225,7 +225,7 @@ MouseArea {
-                     popupIconTimer.restart()
-                 }
-             }
--            Behavior on height { NumberAnimation { duration: units.shortDuration * 3 } }
-+            Behavior on height { NumberAnimation { duration: units.shortDuration } }
-         }
-     }
- }
-diff --git a/applets/systemtray/package/contents/ui/ExpanderArrow.qml b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
-index 9baf654..729f56b 100644
---- a/applets/systemtray/package/contents/ui/ExpanderArrow.qml
-+++ b/applets/systemtray/package/contents/ui/ExpanderArrow.qml
-@@ -37,7 +37,7 @@ PlasmaCore.ToolTipArea {
-         anchors.fill: parent
-         onClicked: root.expanded = !root.expanded
- 
--        readonly property int arrowAnimationDuration: units.shortDuration * 3
-+        readonly property int arrowAnimationDuration: units.shortDuration
- 
-         PlasmaCore.Svg {
-             id: arrowSvg
-diff --git a/lookandfeel/contents/components/ActionButton.qml b/lookandfeel/contents/components/ActionButton.qml
-index 9fbd2a8..7a66c56 100644
---- a/lookandfeel/contents/components/ActionButton.qml
-+++ b/lookandfeel/contents/components/ActionButton.qml
-@@ -44,7 +44,7 @@ Item {
-     opacity: activeFocus || containsMouse ? 1 : 0.85
-         Behavior on opacity {
-             PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
--                duration: units.longDuration * 2
-+                duration: units.longDuration
-                 easing.type: Easing.InOutQuad
-             }
-     }
-@@ -59,7 +59,7 @@ Item {
-         opacity: activeFocus || containsMouse ? (softwareRendering ? 0.8 : 0.15) : (softwareRendering ? 0.6 : 0)
-         Behavior on opacity {
-                 PropertyAnimation { // OpacityAnimator makes it turn black at random intervals
--                    duration: units.longDuration * 3
-+                    duration: units.longDuration
-                     easing.type: Easing.InOutQuad
-                 }
-         }
-diff --git a/lookandfeel/contents/components/UserDelegate.qml b/lookandfeel/contents/components/UserDelegate.qml
-index 8882e39..cdb55f1 100644
---- a/lookandfeel/contents/components/UserDelegate.qml
-+++ b/lookandfeel/contents/components/UserDelegate.qml
-@@ -72,7 +72,7 @@ Item {
-         Behavior on width { 
-             PropertyAnimation {
-                 from: faceSize
--                duration: units.longDuration * 2;
-+                duration: units.longDuration;
-             }
-         }
-         width: isCurrent ? faceSize : faceSize - units.largeSpacing
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
new file mode 100644
index 000000000000..21e335315907
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.5-guard-against-no-virtual-desktops.patch
@@ -0,0 +1,46 @@
+From 5cb38daedbfa5ef26a47d82d197c96230a004b0f Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 30 Sep 2020 08:56:16 +0000
+Subject: [PATCH] [containmentactions] Guard against having no virtual desktops
+
+It can apparently happen that virtual desktops is empty at a given point
+in time. Potentially due to other bugs on the system.
+
+Calls to desktopIds.at(N) will fail.
+
+BUG: 427106
+
+
+(cherry picked from commit 2441c82a2a92535ccc0a9643715427eb362c98e8)
+---
+ containmentactions/switchdesktop/desktop.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/containmentactions/switchdesktop/desktop.cpp b/containmentactions/switchdesktop/desktop.cpp
+index 809543a49..dda78c584 100644
+--- a/containmentactions/switchdesktop/desktop.cpp
++++ b/containmentactions/switchdesktop/desktop.cpp
+@@ -85,6 +85,10 @@ void SwitchDesktop::switchTo()
+ void SwitchDesktop::performNextAction()
+ {
+     const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
++    if (desktopIds.isEmpty()) {
++        return;
++    }
++
+     const QVariant &currentDesktop = m_virtualDesktopInfo->currentDesktop();
+     const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
+ 
+@@ -100,6 +104,9 @@ void SwitchDesktop::performNextAction()
+ void SwitchDesktop::performPreviousAction()
+ {
+     const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds();
++    if (desktopIds.isEmpty()) {
++        return;
++    }
+     const QVariant &currentDesktop = m_virtualDesktopInfo->currentDesktop();
+     const int currentDesktopIndex = desktopIds.indexOf(currentDesktop);
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index 81b172506439..b52b6b485856 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="geolocation">Enables dataengine providing location information</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag>
+		<flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag>
 		<flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.ebuild
index 232540bdbe82..472f6c66c2de 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.19.5-r2.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 geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
@@ -128,6 +128,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
 	"${FILESDIR}/${P}-gpsd-3.21.patch" # bug 742392
 	"${FILESDIR}/${P}-login-button-size.patch"
+	"${FILESDIR}/${P}-guard-against-no-virtual-desktops.patch" # KDE-Bug #427106
 )
 
 RESTRICT+=" test"
@@ -216,6 +217,7 @@ pkg_postinst () {
 		rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
 		elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
 	fi
+	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"
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.3.ebuild
index a47bf9b9589e..f0d127a1c238 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.20.3.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -15,18 +15,21 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
 
-# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+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
@@ -67,19 +70,21 @@ COMMON_DEPEND="
 	>=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/kscreenlocker-${PVCUT}:5
 	>=kde-plasma/kwin-${PVCUT}:5
 	>=kde-plasma/libkscreen-${PVCUT}:5
 	>=kde-plasma/libksysguard-${PVCUT}:5
 	>=kde-plasma/libkworkspace-${PVCUT}:5
-	media-libs/phonon[qt5(+)]
+	>=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
@@ -87,16 +92,27 @@ COMMON_DEPEND="
 	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:= )
-	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
+	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
@@ -106,9 +122,9 @@ RDEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-apps/kio-extras-19.04.3:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
 	>=kde-frameworks/kdesu-${KFMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kquickcharts-${KFMIN}:5
 	>=kde-plasma/ksysguard-${PVCUT}:5
 	>=kde-plasma/milou-${PVCUT}:5
 	>=kde-plasma/plasma-integration-${PVCUT}:5
@@ -118,65 +134,30 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xsetroot
 	systemd? ( sys-apps/dbus[user-session] )
 	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.16.80:5
+	!<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" # downstream patch
-
-	"${FILESDIR}/${P}-sddm-theme-prevent-logo-leaking.patch" # in Plasma/5.18
-
-	# Fix animation duration w/ KDE Frameworks 5.70 (Plasma/5.19 backport):
-	# https://pointieststick.com/2020/05/10/why-the-animations-in-your-plasma-5-18-feel-slow-now-and-when-it-will-be-fixed/
-	"${FILESDIR}/${P}-stop-multiplying-duration-values.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
 
 RESTRICT+=" test"
 
-pkg_setup() {
-	ecm_pkg_setup
-
-	local md5
-	local srcfile=/etc/plasma/XX/10-agent-XX.sh
-	local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
-
-	if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
-		if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
-			elog "Copying to ${newdir}/env/10-agent-startup.sh..."
-			cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
-		fi
-	fi
-
-	if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
-		md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
-		if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
-			elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
-			elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
-			cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
-		fi
-	fi
-}
-
 src_prepare() {
 	ecm_src_prepare
 
-	if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
-		cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
-	fi
-	if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
-		cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
-	fi
-
 	cmake_comment_add_subdirectory libkworkspace
 	# delete colliding libkworkspace translations
 	if [[ ${KDE_BUILD_TYPE} = release ]]; then
 		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
 	fi
+
+	# 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() {
@@ -184,9 +165,9 @@ src_configure() {
 		-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 qrcode KF5Prison)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
@@ -201,25 +182,18 @@ src_install() {
 
 	# default startup and shutdown scripts
 	insinto /etc/xdg/plasma-workspace/env
-	doins "${T}"/10-agent-startup.sh
+	doins "${FILESDIR}"/10-agent-startup.sh
 
 	insinto /etc/xdg/plasma-workspace/shutdown
-	doins "${T}"/10-agent-shutdown.sh
+	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 scripts
-	if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
-	fi
-	if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
-		rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-	fi
+	# 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"
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 89923725e5a6..cbbddab6cf82 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,5 @@
-DIST plymouth-kcm-5.18.5.tar.xz 41872 BLAKE2B 29e9f8e56478140c0f4d54d297c9efdc33d2f20b18d9e1b1f16640c1abd1a2f5b6033ebf3053384dda6380d2a51c476842fa8587d402cba2e9bc0f98d6d44823 SHA512 ab9c883d4ed23315e925884662c72b42b350a1938b7dcf24dc30e0486fdd4c4449dcdc30abc45b3007d586e07998c96834918d2e91fcda3163c0f9f5b62c37cf
 DIST plymouth-kcm-5.19.5.tar.xz 41680 BLAKE2B d9a7a0c5d512322d0a9074e810fd8ebbdc2308985f471280c9c862f71aef77270fc39c9a6a4b4b2e8691c78501496fb101cd288b4b39b638cfc2f8f518ca50b5 SHA512 fbcebcec7ee4c69491b6425c5cac09801a26310ff15bc252bb66bdf8e322734c0d1551b97a4eb3e725e08e70010a0a4949560e2c5a58f61d1aa004620c8ac6cc
-EBUILD plymouth-kcm-5.18.5.ebuild 958 BLAKE2B 21ee959fc8ec20b11b30b272728d545f94a78c85ed6ec54cac60f2d2b2b9611d34e116b75d362f574e6ec80ef8d1c68436a46306a3e91ee7a3796ea444286b68 SHA512 9af21656b05c7c475b25fd37040987bd4c020b226d6660cbe05ff529eecd5b79280b8facf5d1a7804c8b1055f5bd24b250a66545860b2d2d757022812b469695
-EBUILD plymouth-kcm-5.19.5.ebuild 961 BLAKE2B 349df58bafa9fae8168a20cc7b7eff73125f8719d7d9cc62ec0b279686dec90c670b53884acf9ef29bed4191f97c206dca1ff617690e6c2bea636a8ac6368a62 SHA512 04a5ff6fe5a8ff80f438ce244ee54c9e4db99c37c6bc97e5388dc5d5c8741ceeeb6954beb4864567b4d7656e1ba1bd0dd87ada53edc1ff7b67568bf4425ba439
+DIST plymouth-kcm-5.20.3.tar.xz 43076 BLAKE2B a308b822565aaeceb32dc2130e9c282d6f9364a9d0faf726a0e663ac10890b27d7f483108d8c08e41d2b9293b4e6f548082a89791962b7bd28446678e6fe5e98 SHA512 6a64deba7eabfd01b17ec997be7abc330d1121ac8c919628bfabaf88eb3e92928d5e7150c13d1a809f2866eec0a73626c1e8def08709f1073560e88d1a79f6e3
+EBUILD plymouth-kcm-5.19.5.ebuild 958 BLAKE2B 78e51aee8b32d3ae877e2302461c7d27b4acc64a5f96b88de213d58bafb2bf1ee5e5167e01c0ad0e1a1657a504f6cf4602b0190e56fb1a2af8d7a704dffca324 SHA512 a919680546d045c374efaa5ed77bcc2242a106022a66f9fbd8bac4b7139e4ef0a472ff10f0b206dc12c32b9505054ddbd442da4c9448a8276bf9faca9e534e4a
+EBUILD plymouth-kcm-5.20.3.ebuild 961 BLAKE2B 051cd3223d00cecef5e3891441f57b527ecee2bb5f368fb184304fb8a2b24848254318c134c3b5c87b06229d6d163b2e124857455d990610774b09c2a9949070 SHA512 29c21f4fd735541770ab756d173bf9bc4240c813bb2a04385e5c2c4123acbe0c3774f90ea76a05bf62cb58b2d9e6e73717bc1d5ef6f81918e8f6ed17d5074a38
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
index fd5acd82925d..01b5e879921a 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.3.ebuild
index b10b03c30f97..543bb572e1f2 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 BOGUS=1
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma control module for Plymouth"
@@ -14,10 +14,14 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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
@@ -27,10 +31,6 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	sys-boot/plymouth
 "
 RDEPEND="${DEPEND}
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 8039e381dda0..c3a1f41fe5e3 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,5 @@
-DIST polkit-kde-agent-1-5.18.5.tar.xz 44592 BLAKE2B c9fe8bdc719bf5719358ff2633a143690114f5d6aafa2321cc02e15f1ffcdb78bff0666e05f4a028d504d6fec85e40c7b18489782fa6dc10db71e45bb8d343a9 SHA512 d9441e2379b665aa28d79451e5390a22f7a06f946020fb8c498352b0202a7ecbf7ca2e8dfccc7ee390d51ad441aeb6d818610d0d2e6a753e63326e4c350aba30
 DIST polkit-kde-agent-1-5.19.5.tar.xz 44824 BLAKE2B 117b1ccd5ec5ec38ec45edd45c33671b30fbea7bf53a444e9e172cad4d88d0165c60e59d9664348422f11930ddb089f574af03eea743c10e85b036702dc7ed3d SHA512 f0e27056af864535c533a2bedbe2445f9e1648789150eac16031a1486f6676f8a4c929fee5f8cfbd7e48a904045f6c2d283083b33bbb823a2da27549d42090a5
-EBUILD polkit-kde-agent-5.18.5.ebuild 805 BLAKE2B 3eafa464c89ff32e66657919a6993be2c96fc57e43001ebee550d1946b97705fa2bac08c905b5900e9d7b80187215a55b3d76c6b0b324d7c219de729ffcd360a SHA512 b0f4bb931f111dce6bc76a0a46848de76b46af967c1dc4a9c14c197d59a4ff46b546dfc151cc0c40d26f59fe6e08cdded592d566ef013c2980a190d8e206dc59
-EBUILD polkit-kde-agent-5.19.5.ebuild 800 BLAKE2B 7413ef78cf81b71dcd7ad02a5bd3b6da3b1377c061a49e1b8409a52928c63a34e9beccf03c315bfb7534f93af50b1d3cc0f3a7441dcd198af4d2f4aa1cf5c5e7 SHA512 d2d71531febfee2b3ed0966ba4be99285449b96e59f2c601cdc054d2b46d092b208d5cb0ca06d9058402c0bcdc3e188fdda8c5be8655e65b3b06ce75e288ffc1
+DIST polkit-kde-agent-1-5.20.3.tar.xz 44608 BLAKE2B 891dea94747a2f6b6cd1dcf2cedd57fa02088bf9300450d6937892a1af320407cbed10ef05ad49f228f8ce2f16e25d9891d03687677bc6a4ce2495d8db55763f SHA512 9ad06af2aa2d14c752bc804f86789276a8e194352ce7df1ea1dd9eb718b0c20787e6b84ee0f2fb6f761ae3439f82501fb35c3a96077cf02f1621ff0f4a36ff22
+EBUILD polkit-kde-agent-5.19.5.ebuild 797 BLAKE2B 6dbe80ef5baa4ad5176045b9826863eba32332d96492c475a38b0d0cc4439605dfe01b7834bf5cb9d181cdcc99b8195c407bb2dc4e590757ad465ae877619c69 SHA512 4b83db76c503e0f790cba85edb4e5c8f9090553f49efc0d5ac668c2fe4247e0c65ada2a2993723e71a24f8ac1b6b30f0a75979e9893b9cf8cac363606013d9d4
+EBUILD polkit-kde-agent-5.20.3.ebuild 800 BLAKE2B 3dd1ef7e5024989577655a572921146520efd5382ee3678e7568019913da09a841e5e6acc56ae872dc34b2ebb82ee763cff4c0c4feb2d1985e7407b3fce94d5a SHA512 7e0bf47937a8a8add3c329472639e9f174cd6312fb36a2ed6c0362d7a5117061fd2b1b602b7dcf30d87629e86337dc72d39209b7cca0a74a38abd62ce754c695
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
index 34da3ca5f717..d46955297ea3 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.3.ebuild
index e2e80ae0f5b2..e23f14ac408d 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 KDE_ORG_NAME="${PN}-1"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="PolKit agent module for KDE Plasma"
@@ -14,10 +14,13 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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
@@ -25,9 +28,6 @@ DEPEND="
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
+	>=sys-auth/polkit-qt-0.113.0
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index 3ead3c9f4eca..836fe43cc57e 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,8 +1,6 @@
-AUX powerdevil-5.18.5-fix-powermgmt-inhibition.patch 3326 BLAKE2B 56eed72622b6432f3e823ef0cfe9f99d963ab7563fdcf95655072551d45d32a0dec83c5d125ea804a0749225c62f1f02e9d4df546acd3df225a7439d75b0cbaf SHA512 8713a906e70f5c11e8da95258c7db130ec8f81031813203472fb7696076296e59085fcb7b704152937efd7829a9bea7d4c9e1b3d60e3ac976d810d06f0a35941
 AUX powerdevil-5.19.4-ddcutil-0.9.9.patch 975 BLAKE2B b151f0109b4ee804359c63171df3020334f8410baaa4f24155d9f478540254645866eabb594040f334ae811d2bb6c4016cb5c175a64626aafd229babe312e391 SHA512 d1bfb6d7b16b80077989af9bf7600d063c5811d1fa115ce8985099022b468bacd54a4cd41283766780eb5734dc3d8d26798c9d74f5aa7f2bc003aa76b7c131ad
-DIST powerdevil-5.18.5.tar.xz 597492 BLAKE2B 510d523b470f281c1b71902a6e2938d5566b3a653909d4b08d75cdfa190bd2f2a2a0befa7f71b3af331f1511733502690d58c2fed13262da82381eae66605885 SHA512 b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3
 DIST powerdevil-5.19.5.tar.xz 600388 BLAKE2B 0b99c229b576d8a033187dd81a0f6f199ff991f9c1eb4c6856a77a7ddd269ddf1ce50a76ea71821487be11593f5740a7d66a2af3e6b6c1f983a5e87bfc008b9b SHA512 5f1b1e8fdcd996769024a4f008527960fc91af32862047fdd13674ddb6925fd7b1a024a5c45182d14be32aa0bb8ba1bc694476061e480bcdfb3bdcb65d60cb16
-EBUILD powerdevil-5.18.5-r1.ebuild 1955 BLAKE2B dd399d4215373ca4e4ddcd8746d0d2f809bec25f3ab771723eded65fa3a9513780d50e33b8f808651e9059ff11ad595a15a19bb6f9f7f42f26bdd7d8d3071e4f SHA512 a6b9381c04af9a398640dfcb3c2752f94d1c7b35c6d04b232ff66b0ff8c58172d85376d71d35d151526298bac19dae53b55e53f6f8e815eb5f28292dacd91432
-EBUILD powerdevil-5.18.5.ebuild 1872 BLAKE2B 46ab9c544e709262b937789c9e04a04aeeb6ab849d79590f9e75a6cb558f9cdcac31e9961e17da24ef19ec3fa67e92cacd1438ec0943603de314d9832c3771b8 SHA512 612c2b81b1b6ee6b76c6d9d82ef0046f6ee007702c6870540dcd3b560e1f72dc42e4ba2df3d70396ba1f279b92beec234ed6e82fdf304ce6a40e47400ef91871
-EBUILD powerdevil-5.19.5.ebuild 1948 BLAKE2B bb192efbe6dee836219db8377f1db9cf5d2953b158964e766accab5b690c17e773c484fd50917db07a52086bc16cd7522693162061839475f71f4181be9251ee SHA512 f86ad662ab07ea2a023fe0382b481119a3315e3e22ce96f1c081199a13790b8d5a9012923ce209dc84184fa63f48ff67cc51b9340cce717b91554d4164c1c5fe
+DIST powerdevil-5.20.3.tar.xz 609300 BLAKE2B df64f234c68abb5145263e6f2d7089d9780a62aa1aafb4cac6e74f0d65f5ee6dfcac7f2c442d34e4e468380098ab67cdd806550be7dd6e6154d091d1669d8ff8 SHA512 5fce022b73e38bbf6098de86b8ede2bffd571cce9985f18f57c2ddc1e2a2e3bd8d1fe4ced9461f17f68b4b68a39e0b6210a75d86f7f41abc916362ebd25279c4
+EBUILD powerdevil-5.19.5.ebuild 1945 BLAKE2B 764373c637212f2bbe811f850f6963980c0f4675b5ee34ed93defe6d63cc2eb19c83286c311c77b55701b6df34ff34953bd2f479a19572dbf395bf4077c76b81 SHA512 cfb3119edd15b9d212b1296d761bf4cf6e07cc59b21ea5406674e877177d21e7a644ccd62d211a8384954a678d2f7c4c91d8e4715c44a40545243537515b4f1e
+EBUILD powerdevil-5.20.3.ebuild 1947 BLAKE2B d67cbe9ffadd9ff582870e0c7908811107f1d3184647d0d6719679c88bb4f02dba0466a23dbcf442b627234576519a679021f37527412329731d63f87a26b0e2 SHA512 95167af47d29051ab417f8b4589580479a1d33a01eebb714068071dae67d4c9ae6dfbe2a5161856036b3ec6f229300fd775ec46726178f8234d98b2475c03aeb
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch b/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
deleted file mode 100644
index cb6e27b7a977..000000000000
--- a/kde-plasma/powerdevil/files/powerdevil-5.18.5-fix-powermgmt-inhibition.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From d21102cc6c7a4db204a29f376ce5eb316ef57a6e Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Fri, 19 Jun 2020 19:51:06 +0200
-Subject: [PATCH] Watch DBus service right away to discard pending inhibitions
- reliably
-
-PowerDevil delays applying a power management inhibition by 5 seconds to avoid brief inhibitions
-to e.g. wake up the screen and similar.
-However, when an inhibition was posted and the process then quit, we would then still
-enforce the inhibition as it wasn't explicitly revoked.
-Fix this by always watching the inhibition sender and remove it from pending when the
-service goes away.
-
-BUG: 423131
-FIXED-IN: 5.18.6
----
- daemon/powerdevilpolicyagent.cpp | 26 ++++++++++++--------------
- 1 file changed, 12 insertions(+), 14 deletions(-)
-
-diff --git a/daemon/powerdevilpolicyagent.cpp b/daemon/powerdevilpolicyagent.cpp
-index a7d92dfd..2c2b1152 100644
---- a/daemon/powerdevilpolicyagent.cpp
-+++ b/daemon/powerdevilpolicyagent.cpp
-@@ -513,6 +513,11 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
- 
-     const int cookie = m_lastCookie; // when the Timer below fires, m_lastCookie might be different already
- 
-+    if (!m_busWatcher.isNull() && !service.isEmpty()) {
-+        m_cookieToBusService.insert(cookie, service);
-+        m_busWatcher.data()->addWatchedService(service);
-+    }
-+
-     m_pendingInhibitions.append(cookie);
- 
-     qCDebug(POWERDEVIL) << "Scheduling inhibition from" << service << appName << "with cookie"
-@@ -532,11 +537,6 @@ uint PolicyAgent::addInhibitionWithExplicitDBusService(uint types, const QString
- 
-         m_cookieToAppName.insert(cookie, qMakePair<QString, QString>(appName, reason));
- 
--        if (!m_busWatcher.isNull() && !service.isEmpty()) {
--            m_cookieToBusService.insert(cookie, service);
--            m_busWatcher.data()->addWatchedService(service);
--        }
--
-         addInhibitionTypeHelper(cookie, static_cast< PolicyAgent::RequiredPolicies >(types));
- 
-         Q_EMIT InhibitionsChanged({ {qMakePair(appName, reason)} }, {});
-@@ -596,22 +596,20 @@ void PolicyAgent::ReleaseInhibition(uint cookie)
- {
-     qCDebug(POWERDEVIL) << "Releasing inhibition with cookie " << cookie;
- 
--    if (m_pendingInhibitions.contains(cookie)) {
-+    QString service = m_cookieToBusService.take(cookie);
-+    if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
-+        // no cookies from service left
-+        m_busWatcher.data()->removeWatchedService(service);
-+    }
-+
-+    if (m_pendingInhibitions.removeOne(cookie)) {
-         qCDebug(POWERDEVIL) << "It was only scheduled for inhibition but not enforced yet, just discarding it";
--        m_pendingInhibitions.removeOne(cookie);
-         return;
-     }
- 
-     Q_EMIT InhibitionsChanged(QList<InhibitionInfo>(), { {m_cookieToAppName.value(cookie).first} });
-     m_cookieToAppName.remove(cookie);
- 
--
--    QString service = m_cookieToBusService.take(cookie);
--    if (!m_busWatcher.isNull() && !service.isEmpty() && !m_cookieToBusService.key(service)) {
--        // no cookies from service left
--        m_busWatcher.data()->removeWatchedService(service);
--    }
--
-     // Look through all of the inhibition types
-     bool notify = false;
-     if (m_typesToCookie[ChangeProfile].contains(cookie)) {
--- 
-GitLab
-
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
deleted file mode 100644
index da5ea9b9b346..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="brightness-control +wireless"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil )
-	wireless? (
-		>=kde-frameworks/bluez-qt-${KFMIN}:5
-		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=sys-power/upower-0.9.23
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake_use_find_package wireless KF5BluezQt)
-		$(cmake_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
index 11f984743646..e2c03a38d2cc 100644
--- a/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.19.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="brightness-control +wireless"
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild b/kde-plasma/powerdevil/powerdevil-5.20.3.ebuild
index 79f0394f5fe1..4bd73a392c96 100644
--- a/kde-plasma/powerdevil/powerdevil-5.18.5-r1.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Power management for KDE Plasma Shell"
@@ -15,9 +15,13 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="brightness-control +wireless"
+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
@@ -39,13 +43,10 @@ DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-plasma/libkscreen-${PVCUT}:5
 	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
 	virtual/libudev:=
 	x11-libs/libxcb
 	brightness-control? ( app-misc/ddcutil )
+	caps? ( sys-libs/libcap )
 	wireless? (
 		>=kde-frameworks/bluez-qt-${KFMIN}:5
 		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
@@ -56,11 +57,10 @@ RDEPEND="${DEPEND}
 	>=sys-power/upower-0.9.23
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-powermgmt-inhibition.patch" ) # KDE-Bug 423131
-
 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)
 	)
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 66f8c937f2ee..f53b4e4feaba 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,5 @@
-DIST sddm-kcm-5.18.5.tar.xz 62184 BLAKE2B d4d55383540882eefafd39cdc65b2f686e271f7e3bfa1f2859b2de55a46a25f03db3413533b74d73782415decbd2dd84fc6f2c9ed517381e55b0917929832c99 SHA512 614cb8780549592ffc8f4f310aca7bcdb68b04b847118d77308b039711c81aee7a9c04726d0e2002b3c00a06c09465752a8886374a286574dfb7aeaa0919089c
 DIST sddm-kcm-5.19.5.tar.xz 62468 BLAKE2B e02a9c839cfaeb8d90a9bb317a6025be9d65399963a4ffbff562572bcf722d499cd20e007f13614f609ffce75322ee6b834b0cc760dd59d35952bbde22d85ecc SHA512 5eb79696addcb08e8c6eb95960a43cfd7ec5013a7948d67b025430fd09ad20917a71e903b5a2b0b0f1d47e7dbce7473cfa69dd143b9c6b2f4fbb8828cdd86704
-EBUILD sddm-kcm-5.18.5.ebuild 912 BLAKE2B d6782262b8cba1070aa63505619974da1511c983549e6a4a7aea9c7931dd8ba08378a9aa8563c62cfb8a9a3866229d28bdfe40193dd94879da287dddc9f0a4e5 SHA512 f66add63329fe686ef76e203db0698242eff2a1419b191305beaa38bf2bed68071ceef78e45fef52050bd5cce92d8b267f35b14c6ee0e999e517e3ed75a27a8f
-EBUILD sddm-kcm-5.19.5.ebuild 915 BLAKE2B 46bd6c9ea6f3a2d6d7b61a7331294a15e8123b54feea9862512c810efa4958a4f1480a86de31c7a5c003df493764da3a7d5b1d7df870ce099ea755162680ca47 SHA512 678c569f562b7874bff3cd05286e1728f7b7d78ce3f957b7f9c1b35f13ba9b630816dd34bb9814e9dba55712a62ffdeac70fb7d4df0c1823a0d2f294f8ff25f1
+DIST sddm-kcm-5.20.3.tar.xz 64612 BLAKE2B b4048ccc4587f1a3ec037ab0a297998a5a68c0357ba2dbdee758181bb7e4f3f4288360719288d2ad79b72029bd5a0c8050a97f6961d6fc44ca015a2276574621 SHA512 69a8ecc3c3b51d7e1eab63bd7f7b63df677846d0295fe51d6de73b5af981d1b380781fd70ef32812d3c86a5ae67a9513607581158ee9b4d336b070031f118841
+EBUILD sddm-kcm-5.19.5.ebuild 912 BLAKE2B be1a56103d4842a9677d7e123d05f0dcfb67ed81029d78cb105c09e12b1d3c32c17536da667dc8a728db3e90e75172e6d62424d9848600e2cf878488413db263 SHA512 753d2993319ff3e41a74c578cd92813c38dc4fdf8af10a015ec6882a3fade54d4201242e568823307ac212e7177720314c17065b1c8fce32b0603e016738c7bb
+EBUILD sddm-kcm-5.20.3.ebuild 915 BLAKE2B b028c3273e362f70b6ef9343b7d26d6c1f1ba9c06638cd04e5377bc7b4d7a4b87421fadc2d66e849205f433bafcd0a8e228cc78e2eddbec8a1493ae07bfdc594 SHA512 11beca814a270d2e6963d4f01be8858ca29103ab33b1e596efcc4519d8c6a6bd75cc146ddf9be2d86251fdaff53d1529e69185607aa8b17cc872118f0fa51e36
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
index ce6fe26694e8..c5aa154aac7d 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.19.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.20.3.ebuild
index 2fe831b8abab..fb47d52771be 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.20.3.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma control module for SDDM"
@@ -13,10 +13,13 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+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/kconfig-${KFMIN}:5
@@ -26,9 +29,6 @@ DEPEND="
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 0337a4b19588..6490394892b0 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
-DIST systemsettings-5.18.5.tar.xz 178252 BLAKE2B ac8ec0ddb6eb54cf6133f1616284d41afbb630fd97ac55cc6eb68846c3a7e9028ecc2caed41c35f624235a74e28d810a81196ed3d6891cb0ff1387ff4bf45f32 SHA512 b6b9184570f188878daca140bd81ee13d47ba867eac5289b67295de9918205e5ebc7f7d644968fbbd9d9dfe1395cae6bd29f7ba4c4aa9a82f85b912693ae4e6a
 DIST systemsettings-5.19.5.tar.xz 183360 BLAKE2B dc8eb9b466f2f86405175e29e7abf54a243e64022222f5e8a370d17bedcf44a5b35e760b0f2f9a7da67a5845d68a77049d7d2ba405f2574b4676a42fea0b0676 SHA512 381aa73e5bc195f2c05cf4df904a031f8415fffb99eaf33414604bdb623e8618c66ffa2e5b108b7838f5d9cb83cec578cefa4e414d9d7fa3fe258c864e1568fb
-EBUILD systemsettings-5.18.5.ebuild 1825 BLAKE2B 59492e2f140213e274061c6a5decb4c0e0e5cd4858e3d43a39588aa214f7012039c21e738989efef2165055008d37f90e2f2cf3fe20615e424c94ef06f12971f SHA512 b3edc87210717f0e4354d2d0ac359aac653913f52bbf7d32a9cb884399ea4b931b1936c26589b3262ca54e52305837d55fcbe7b1b0614de56bcf9a119cdfe08c
-EBUILD systemsettings-5.19.5.ebuild 1701 BLAKE2B a101f0a3f1f645ac90f1bfcc6cc9d59a645a0786cf713a4b496b31bda531efe8eb7da8286f16da9de70b14fcd30afd1cb8beaadbacc55428d6e5567aa88c4268 SHA512 b0ff6fd9b9a7192dec31f71cb09ded35badfe876a52973c2bb696d576ccff3ee8571c41f273294beff1102623baee1d6a4bb391033b9bee84c0cd4eaa0403434
+DIST systemsettings-5.20.3.tar.xz 193692 BLAKE2B 98d1b40fe455d667159c4b9711d6e2610b3ea9fb6de3ce70dffdd26748b940e48313a0f902cb7a71c2311553f890f759d538f5f0edb2820563025031e3149e63 SHA512 5041f55a9715c86061c68ac689a63d426b4c543b38127291bb7f9b46b062514a93d0962821d5e8e3eb8895a8be1d7404e3cb8bdbb10ff0dcb3f71e4fa1d16eac
+EBUILD systemsettings-5.19.5.ebuild 1698 BLAKE2B 4963706de0bb6d75e70bfba760302c92b1929c1bb1a4b7321de2adbf98e751b3f5e4e4cd8a2b1132ca0feb584a2011fdc18a3faa4467624dc64caf23da0ccc60 SHA512 68ce3c2eca46848c3301ae2881f8c7a75a1290aec1c9ff3be43c1461a577013d3c7dd707f5c8429c64d6783c41ba0e8848a3f401947b24c8d6a20cf013a2d7db
+EBUILD systemsettings-5.20.3.ebuild 1706 BLAKE2B f35e33dd6a42d64e57b45944eac960f41a14ed6ca6ac6e9fe800041c1b6e88847345a231e3245edae49f182a01b0f6c09e171fa9d519c9f4da5da8e927c251e2 SHA512 341c37061857e2d7aa95e1f4f95c2f72b7e8ab2b68947949b3f0d6a1f088df0a2aa9c24a8cc5a77309be3df90748e505f35420ecbecfab3f8c73748967714387
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
index 30491d104eb9..f14cde3ad190 100644
--- a/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.19.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.20.3.ebuild
index 0f5b48d3d7d3..3bcf15f96ed2 100644
--- a/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.20.3.ebuild
@@ -4,19 +4,23 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
+QTMIN=5.15.1
+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"
+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
@@ -28,6 +32,7 @@ DEPEND="
 	>=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
@@ -39,29 +44,16 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}
-	!kde-misc/systemd-kcm
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
 
-src_prepare() {
-	ecm_src_prepare
-
-	# FIXME: hangs in chroot; similar to bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
-		-i CMakeLists.txt || die
-}
-
 pkg_postinst() {
-	ecm_pkg_postinst
-
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version kde-plasma/kde-gtk-config || \
-			elog "Install kde-plasma/kde-gtk-config to configure looks for GTK+."
+		elog "Optional dependencies:"
+		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
 	fi
+	ecm_pkg_postinst
 }
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 2a30f4e93406..25ceacf45562 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,3 @@
-DIST user-manager-5.18.5.tar.xz 2165888 BLAKE2B 011f40ce9cf18b9bc35c33ed56de416eca8ca6320f07ab725631ec335d58c2103425326c2c2e7d95385e0a70eda4b59419284dfe1d48259da45dfdc4dc04ba08 SHA512 fd3f26f1f95782e4e2ca04e92adc38953d026db9e840f823be38f66f9c790a9e154255dd821358f62c624194be8b4867354292df25289092ceaf87ce590cc9a8
 DIST user-manager-5.19.5.tar.xz 9930268 BLAKE2B 62ad7d6ae0847ee53e6529428c5ea52840a92d32b512c24310da98a50d78a0706c617b210129c4b9abc8da947edcc0d2c90b3962697eb64ba2b6457648cc58df SHA512 de892a390f8843a4b81e5cb357fcab20b8fcb2a55f0dd83ce551a5eac3c07b80688af0a87ed44630827ebc1060b21371b19936a726f23cfb38fa298e8b162bd1
-EBUILD user-manager-5.18.5.ebuild 830 BLAKE2B 898ba4ca8eaf9707001ff3fa1c2862880c73c9932835b505ac7babacca39a7edefb9e89600d287eaf7b9c292b1f20eae7b9313e036bfebde69cf7db201b58d8b SHA512 063f2bd3657fe1156c21241d323d9cc5e591169db53130ecc42e2f45bd3820906458d555013cfce9790db6bad644213629b2218c0b5304d471e13efcb094daa6
-EBUILD user-manager-5.19.5.ebuild 833 BLAKE2B 20a3e12daeccec9dab2d54c3a4d8150dbe1213c714d182aa867c1ceee83ce4f02239da0f44300fb371fe036d2947ede1e58a7830215e51dc738f0b25610a66c1 SHA512 11eca4d39024041e35cef3d3f4f49b801cb880d42abd0f76e6c8d5b8f779fcea178a9b6c45c217f5ef682d32df51ebca55790c6b81bcd6ef9ab918ace0934be2
+EBUILD user-manager-5.19.5.ebuild 830 BLAKE2B 36f3a6f34a5c43ba4f87670afa68d306c1934bbdf9be872aa367e9e1ab7223377996dbcc321af71fd7b1eb2373006c99e737265f42dd524b71b9e2f4e857a514 SHA512 3647de8d236cfb4f1293f9e401c354d0f0a26c7ffdacd5fd4ebdfbc8bdc12a4237533af23b29929c501a83b4f2dff72dc55e8df91ff3a8ffdf8f4ae55245ca8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.18.5.ebuild b/kde-plasma/user-manager/user-manager-5.18.5.ebuild
deleted file mode 100644
index 9c51358e83b2..000000000000
--- a/kde-plasma/user-manager/user-manager-5.18.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}
-	sys-apps/accountsservice
-"
diff --git a/kde-plasma/user-manager/user-manager-5.19.5.ebuild b/kde-plasma/user-manager/user-manager-5.19.5.ebuild
index e9b4a07a6bd4..280dbedb3e7c 100644
--- a/kde-plasma/user-manager/user-manager-5.19.5.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Simple system settings module to manage the users of your system"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 966932672aeb..17cdbc881cf3 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,5 @@
-DIST xdg-desktop-portal-kde-5.18.5.tar.xz 65068 BLAKE2B 0455aafc8e9c0544bbb5df398ca80fa395391d5205e4e1a88a09e0f8bd399bfd5c5d56ef5b2cae8892cd48e4ddaf1c49dd583e04a0157204c646d3833005690f SHA512 2380250e4d159b69a518e6cffc0f9310386683d7d852ac9b5d6c63390ccf95f325197d3a6e27482b17602d0ce7e69bd12262dceaf178ce93a81f7ad6f95d7f6a
 DIST xdg-desktop-portal-kde-5.19.5.tar.xz 76348 BLAKE2B d3205542ec76bd6c9fa4ae5076d0716c1f201f8c90aeeb61dfcaf9010ada0b21a3e80cff70089077646059d56d19033f8ae887b34c9f30c54b8190d559df0a09 SHA512 5d82e5a1553e9fcb471895e356a23915cbad1215ae1fff5fa6fac6f1673af4c406171131222a88a13eee847dc0d99f8bab00dac1849dfa6844b1672ae7545bb7
-EBUILD xdg-desktop-portal-kde-5.18.5.ebuild 1310 BLAKE2B 21540d4659f2e56546b591e55aad777ac7f404cb506e223a2704855d231f64c7744627d4676d57d0d429b6084082b26769e8ddf25f017a546febc7c469e38b33 SHA512 9a32516c5a495ef62b2b668bca6cb0903ade52a91814df05fcb711b82f5f24816025b7e338a74ccba8dddf372cf6f1652a669c4713aab0793e3e25ee5245ed5f
-EBUILD xdg-desktop-portal-kde-5.19.5.ebuild 1216 BLAKE2B 8e9afd719ed8fca209edd4c44675835bef1d050141d53dbecb2cd81ca98f0f70dba1599cdd126ff5b87a719cb1a5833ec8417027f98625e1e3e3683d142ddb27 SHA512 a5339462675f046e8bfe440026f53e062833ee4323c33e43cfcc943e9291f70304b95e3fc7009d69a3d14d043e1180f764b391d561650474361af491fd8cec75
+DIST xdg-desktop-portal-kde-5.20.3.tar.xz 81764 BLAKE2B 2a95be9ae24d535a241beeb6260359763f3102f03ee80f812e8d8ce32bad69ea1a2c859b0b1823a30fcdcc104e818e41c3a91bceecbfad6a17518df517113eec SHA512 7543e1231c2f78db01852add1ee42846254a1bec2bc61d4eac0901e8376034cf60590dee10706c71462269a9e075fdf5451349984575a2e7baed63d9e8ac21ca
+EBUILD xdg-desktop-portal-kde-5.19.5.ebuild 1213 BLAKE2B 3a9514d45be2e1b59d30cb76b0057e291829a1aaac7cd8f2832f5719ab9585272185b4b064eca40f23f3a3295c562e296ca505eb9b75640e8f7cd1801a704ec4 SHA512 425f92eeaf6ab77c520df2dc69ed3bd7a1e5be79dba8afce0f656ff138c94772d63d71be4731420aa2c65ac4dd3f515f72536be6c1ee8b54b04110ec53775398
+EBUILD xdg-desktop-portal-kde-5.20.3.ebuild 1101 BLAKE2B 7e436fa86845de8bad31ed063be178dde63fcccc20dba74fdb14a1fec459d5168b6d1127dc67ff051affd175cc15b34cf01560be064bd7df7c92fa3670549f15 SHA512 287b119f135d79085a5dfee4898e7d92af4cc537210f443acc5dbaac53a8f98ce28c308a96194c830151eba501b6fed105ac5846ace7210ceaf3960fd328d057
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
index d5c931956e5f..ccd6c0f879a8 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.19.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="screencast"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.3.ebuild
index cfa74d3b881c..0401c0d06978 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.3.ebuild
@@ -3,19 +3,26 @@
 
 EAPI=7
 
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="screencast"
+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
@@ -24,30 +31,12 @@ COMMON_DEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	screencast? (
-		media-libs/libepoxy
-		media-libs/mesa[gbm]
-		media-video/pipewire:=
-	)
 "
 DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwayland-${KFMIN}:5
+	>=dev-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[screencast?]
+	sys-apps/xdg-desktop-portal
 "
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package screencast PipeWire)
-		$(cmake_use_find_package screencast GBM)
-		$(cmake_use_find_package screencast Epoxy)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 762d0e91917d..a21751f6d207 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,6 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
-DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
 DIST plasma-workspace-5.19.5.tar.xz 5682264 BLAKE2B 435ea4c73fe50fb78911efb607f1a22ce6fe4a8f089b90b44374e7932d4f0111069dbce0168eedb61de09affdae3549563365bf85b4bbafb33fc69fad6b343e8 SHA512 4cab64c1f817f391a61ae15e37bf1fc936ddd3fb3b234e281a3e5750b67dab05c1c156789446096cbde719bf972e876757c1c5ae78adde4e85f3591fa8df5df9
-EBUILD xembed-sni-proxy-5.18.5.ebuild 1045 BLAKE2B 7bd18d0916a8b9bf85c558043162a446f94860769f32cd741919a535ff3227170e2ee1afd9edbc48f98c99e4acfef71788c3e6f85dd1be035a494d930639f4f4 SHA512 bf1bfc4583de9178b0d525662baaaebe96cc600b90761c1c6516a8e2b1a757f5afae3edcf986486b63cc2c4849850d8720e97763488a3092c2acc98c1979b582
-EBUILD xembed-sni-proxy-5.19.5-r1.ebuild 1051 BLAKE2B 398df67eb6637498b178814e6f9d3758c8084e6b51a848db25149552ba1b0453566ccda0e0e8990dea974a8c69f7934796f749030fa225f663b3810258d7172f SHA512 f4894e4c28ed7227b101da7a00c3c6dacfe2281aa6f642d847a15ce677142a3a2514f3ab4343773054fbe21054009850e30f4e1b9cb9064ba323a1b5416be357
+DIST plasma-workspace-5.20.3.tar.xz 9031572 BLAKE2B 242286eef9d15b9dacec0dca3a7899c538141490611f932e0ebff59e1ea7a54cbad56e3bcad6e4a720b4f7610de2fc0e128288c3fe3d2b9e8255ffe16e0b86fa SHA512 c1daa19834ea7997a8e44fcb6ce9745d5bac56a0a4d99320e1e3e42e9cb5489aa36887e3c2bd8e385644d555d355211c9dba6c40edf2471478566c531a2d9c89
+EBUILD xembed-sni-proxy-5.19.5-r1.ebuild 1048 BLAKE2B 2335a894410e71d1d7e46696ad9365008f99c4275e99c44c379a57099c8ab6c3d06f2d88c0d48d5bacaecd08a830875370f016c9eda77ea2e2ed294341c64e01 SHA512 43fc124032ccbca8f033373fde1b4432e0caf762d03d476f909c4e4732d2e2dcb4f9144e1fd3f4e1724249fc066e3e98b860b51c2f088c3bb9a8b37f9513ca42
+EBUILD xembed-sni-proxy-5.20.3.ebuild 1051 BLAKE2B f99017bd0b55e90934c714135dab5027543bed0b07c820ca881c221606fcfabcb7b042b6364285e48d8d29e9ef95f4d19de0c292a97c313e92c481fe08971303 SHA512 ff9fd892696ed233aac336d0ea0b9b210c35a109b1390258ba88fa8fdf3edc566615846d39a6b9eba4f5e964568e391d27147e69b290e4697db66c82be9c3523
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
index 401e6208f8c8..22ed031a9156 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.19.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sn
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.3.ebuild
index 4879c278a1ef..7fbf12903ee7 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.3.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 inherit cmake kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sn
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
@@ -22,7 +22,7 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtx11extras-${QTMIN}:5
 	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
 	x11-libs/libxcb
 	x11-libs/libXtst
 	x11-libs/xcb-util-image
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /kde-plasma
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)