gentoo resync : 30.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-30 11:44:06 +0100
commit: f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree: 8bfecb640b7b6403d7a3d662d923eed630033da7 /kde-plasma
parent: 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)
162 files changed, 996 insertions, 2936 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 46a987d919a4..e862e38d9f06 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 79eaad033d50..9601651f95c4 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,3 @@
-DIST bluedevil-5.17.5.tar.xz 160996 BLAKE2B 57ad3e69ed6addeb96bc4969bb8d37f738c03960b43921421f35af5c4f6d230f92160875c1b0f2ca201d2d3ad5227df1e5d6626b251cbec4659845847c93ce7c SHA512 b20616e4e9fbbe144b7ce0b3c4e1a72d543deaa018ab3fc4ed93d04d613102a29743b33060140d648ca756f87094f682768142752ac9ffe9d2ec6ed08a7e9b1a
 DIST bluedevil-5.18.5.tar.xz 168016 BLAKE2B 06460bd1b40f70b7b6f3641ee3921819ee7c2137af906afb8ebc5a9ea3b3161bb8494b930eae95a18ec6aa8ce6191500421499a944fd9dbc9041a9a48a3a1492 SHA512 4e5e55626d02a7ae820a43e760397e3b221749cd940569d180a67adba141f9afce418f1cb07c9fb1e607757461317a76343b5c6b86b3940a96711be9b4b66323
-EBUILD bluedevil-5.17.5.ebuild 1062 BLAKE2B 535665ffa4e68858d67457d12dfd024ce6347ea8f0901aae3a0e5a12ff846f3441e87197c24fb1b2440815581153f90ae1cdc813442f4ab50a50730586b25636 SHA512 1626985aaffdb47ef114343eb82610a8526a680ee4e30365bda1ea3867a780a38ec7c7171c6e97570fdd3470d9e1b99fcb6482536040452d8a90b1be8ac5c61e
-EBUILD bluedevil-5.18.5.ebuild 1066 BLAKE2B e41848e6caaf189d1af6e471cce289a27871dd28e63e42b32c74f086a9e36c59b42b00e4072318d12654b1e7d79074f675097c326e6643a14ea04e59266f1335 SHA512 9999d68c65c3e700fbde313becc183c3ebb65e4bca8cdff2ea193f7403fc2fc3dd018d31d768c2bbfebff2a6f215d7210386552951fed85178274e547016ea8e
+EBUILD bluedevil-5.18.5.ebuild 1068 BLAKE2B f17fc8d025089aac350637564beaae3469673c38b538ffc97af05d20b458cc6a571973bcffd5220c8aeacaf672a8c80eda649f039813a5e0b401a1a6f08f473d SHA512 255d07652fc437a7d1c1569c69d4b27a38162481cde4518694e5768df90bd9dd50e2136ed3769ff0e8a923ae38f20ad1387dcec05e3270ceaceef8471c3e7486
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/bluedevil/bluedevil-5.17.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.17.5.ebuild
deleted file mode 100644
index d480a7cd51c4..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.17.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://cgit.kde.org/bluedevil.git"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/bluez-qt-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild
index dd47c0e87222..77b72cd6649c 100644
--- a/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.18.5.ebuild
@@ -9,11 +9,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://cgit.kde.org/bluedevil.git"
+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/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 4503e3d34496..9dbeafc60bc2 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-grub-5.17.5.tar.xz 3140888 BLAKE2B 628d01a6eeb3844f5251906e9c99fdf83bd03cfce03cee16a77e4b1ba1dcb9d80bea4c785b2406cdb241119dcad5f4534c452221d01927b2427fa0fb25915584 SHA512 27de91fb3c645c8a4a041bcf9be70887b430aaa5972ce550ae4624f3d1ae738e7e8f9fed074f2073e1c399aee3dcce1b5ff611f683b2fcf7ade60c37b0f6f633
 DIST breeze-grub-5.18.5.tar.xz 3138804 BLAKE2B 236f590f19df0a8faf28bef3dfc0a555434902ff284a978576d67e0f7f2076f42d3cca8283d3b979cc3d7afddd1b50a2cde09dd3a23056798d7a6ad7c6db9635 SHA512 969154c602cbd7b334dd48550eb53cbffce16b355aaf971c6b5b372ac43b42aba507bc0e972f0de0051f34b75c80ac295b4f3ef8e64d5762b56a7d0a8d216d69
-EBUILD breeze-grub-5.17.5.ebuild 401 BLAKE2B b40427f0cebd7be07839cd83567eca442698d69810c7cbc3e8ce420715978a4976efd2c5f0ae7bd584e6631bf9063c23a5286f10ee93e08ffcef4a56c8b9c75f SHA512 4eb3b349876f9bd17ab398d50b3990388ccbed8c07849c66476eb20c8b93199601e7d8266e25f238c3bc9eaef9d44b1b8de24e08e47344d6c5ea45cb0fe6376d
-EBUILD breeze-grub-5.18.5.ebuild 404 BLAKE2B bc692ae35e7e3ca4229fa86aeec89731c7c6692f3cb0c0464d9335bea80dca0bdbcb7d748cbb63089a6f342a42275f10cafd99e91412edb931bd6fc95eb98fd6 SHA512 a61aa0cef0893e0e419e35b909ebf10befcc0524d063e6fe038607d7de9f97517070273facb24e9f85b2c91a6609795638404679e9091f3c5be5ae06acaadd66
+EBUILD breeze-grub-5.18.5.ebuild 401 BLAKE2B b40427f0cebd7be07839cd83567eca442698d69810c7cbc3e8ce420715978a4976efd2c5f0ae7bd584e6631bf9063c23a5286f10ee93e08ffcef4a56c8b9c75f SHA512 4eb3b349876f9bd17ab398d50b3990388ccbed8c07849c66476eb20c8b93199601e7d8266e25f238c3bc9eaef9d44b1b8de24e08e47344d6c5ea45cb0fe6376d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.17.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.17.5.ebuild
deleted file mode 100644
index 4c4e78b0a1a6..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.17.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-inherit kde.org
-
-DESCRIPTION="Breeze theme for GRUB"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_prepare() { default; }
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild
index 6ba651f29041..4c4e78b0a1a6 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.18.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.18.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-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 03633288d676..12da43271231 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,6 +1,4 @@
 AUX breeze-gtk-5.16.5-cmake-pre-3.16.patch 542 BLAKE2B 58af50232fc314cbab7f6d47a54bf87b2be75757354f0ad7fbf65e36822774dc96a3d7928360b1c27c7819e7d55253db73f5f883cddbdaf89ca62e94cf1732c1 SHA512 9065680b040447fa84d4f100bf5ed7fdde2631c53ab777abac238d9a319c33d40ac1f111ec942c9f32721363fd80e71514e405cb0dc429e07b80dbbb4233c0fe
-DIST breeze-gtk-5.17.5.tar.xz 44424 BLAKE2B be93a92d77fbf42ac1ae9af0c40d77d32194c07906b008e5196181c78c37fd92788ce8020bb6a5c69a5391fb82c8e84394852287a1392f3f24f048891f272a23 SHA512 022ffc78ccb0e60819fb92444ce3396c5367e2557290980d67da27aedf10102f80ed4a6a61ca962e873a5ce053c8529be49179a811fab88202f5be118311dd31
 DIST breeze-gtk-5.18.5.tar.xz 42396 BLAKE2B bbfe9cd57c438ad1b1cb144b0393ee45d0ed0aeebb34b38e557e2950d7e0d8ec950c1404eb2e17fad7421becf6486cbd6d2c44b414fde62f27076f4fa2419791 SHA512 3dea9af26cd18dc0388c76c070c5a375054b6a03ffa97e298341924fd909e2dcc49a7c7b431b36a158c1012ce6f9d48f98ef84fc6cda0965d9a24ab18c7c0951
-EBUILD breeze-gtk-5.17.5.ebuild 1010 BLAKE2B 5b9d1ebbad19366de64aa295753e0e31fea0553aa82b0303076d44bbdb4eb4ae8348ea5a1a48558aa2b28e6681baec72bddd02507f3a80c5beff0b930e57305a SHA512 86eea15bc0b562d7fac1e665df3ce278f5924e4d0a8b365ecb7de7d2a66ae8b707a378efb63f935e358130d134a9356b976887b1bd550a8724efe859e394a716
-EBUILD breeze-gtk-5.18.5.ebuild 1014 BLAKE2B 44e4cfe4f3d555c6d5b35f2d540dc41a632eb602b9a9907fd39a37d4c516926893e4c490e505653cddd0e3fc1e51668f92df7f2b3cae56832de08c71129c42c9 SHA512 1a8f10becc1bff47dc764d1fc06bb691c5870b3509c1ee8f14759d6ec519c90ddce6b2cf6fac7e1e06753d24117572c1f3ae2e6e932476f5140090eb1f767805
+EBUILD breeze-gtk-5.18.5.ebuild 1016 BLAKE2B ac9c25e163e1200f10fe3aa526e25acdd9ed5e71e933cffde1ce5a62201316e73a750d9376634dc4953e117fce62ca945c7b16a66f31dc18324e2c44af236d20 SHA512 64ab23938f10d4b5136412b58f2f6ef532d4bb36dac4081222eb852c149de9c38253e8a42e50ac0e8a6edcfd546f25b1e15409db628c8197c9ee836253e9feee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.17.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.17.5.ebuild
deleted file mode 100644
index 34828811a0f4..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.17.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org python-any-r1
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/sassc
-	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
-	>=kde-plasma/breeze-${PVCUT}:5
-"
-
-python_check_deps() {
-	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		eapply "${FILESDIR}"/${PN}-5.16.5-cmake-pre-3.16.patch
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	if has_version "<dev-util/cmake-3.16_rc1"; then
-		mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	fi
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild
index da547ee9b70b..6e585bb20700 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.18.5.ebuild
@@ -8,11 +8,11 @@ PVCUT=$(ver_cut 1-3)
 inherit ecm kde.org python-any-r1
 
 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://cgit.kde.org/breeze-gtk.git"
+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-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 4da434e64247..7b5b4a929142 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-plymouth-5.17.5.tar.xz 105628 BLAKE2B bb0999dd5f2829d41708912c97d4ac4ab1d4954d80e1a7d89b5cacee705c2545de6a9903c015857687c8d69841471667bbc806d1630fed0a3e53724ee240a404 SHA512 85a028f9c248a80c1cd78646006197db6308633cacbc26fa931f525019b4a978c50c15355a8de0ec824a806be3af02d7edbaaad8288348c6a146d2cbbdc5970a
 DIST breeze-plymouth-5.18.5.tar.xz 105672 BLAKE2B 6aceead2db0c977951cdd8e6d93314276fd920846e77a0ac5a9e195937b5ec116f3c2be371096d77dfaa9546bd2b44516ef8ae42ddd2aa6760684cc693418b3f SHA512 45206a6c99047b8b68fd5806dce608ddc09c4208c7966ef276bd7096949ad05138ffea2d6272e5c5ed5985ebbde9bfb7ce8b8a1074f56286dd3e1b840937b98d
-EBUILD breeze-plymouth-5.17.5.ebuild 515 BLAKE2B df0025f7f1cdbf38451efe17ea4a5d81b899dec5194915c888a978761f9903627ca94e7b6148aa98ea9d3060802a369e6a54dd29e02dfcdcaf7e74b466126156 SHA512 24184a5c84a97c77302feec03661269239dc394e5f46cf0c393fcc7d7aef201ddf17381248f6edd1d853103e041fd62c149688ad04ed619a542c131e8dfed0f6
-EBUILD breeze-plymouth-5.18.5.ebuild 518 BLAKE2B 87e49ac0bdb506cf54d547a07e16e9a05d0801cc358f0c5aeb2179ed49a1fec97923dfdad82e5e6b5b3db52e9545e08c4fed8afcfb0789f94da8907a5f500fcb SHA512 2a737195cb0b237550faab8270d9cb8cbe3abea4790eeadf64f105006a1e51e96c537c0aa132fb762f76b86d8db22d926d08b7a71930583ef944efe9d3a0ac27
+EBUILD breeze-plymouth-5.18.5.ebuild 515 BLAKE2B f41afede696bf0558e5a4a3b68e754031be382d6e0cbe0a483cb5da96741f87559dd1a4bbe91d7e2c85ef6be781c1f52ae236473de3288ba6ed34d2b02baa896 SHA512 a546c2747432ad3612603933b9142a001f7acbf7c6d4a45b9670b69bf9be342fbb98207ba451c478ac70570c0512ed4634e364c5bae51432e14b91e9e7476c0e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.5.ebuild
deleted file mode 100644
index d494fcfe4dbf..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Breeze theme for Plymouth"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
-DEPEND="sys-boot/plymouth"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	cmake_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild
index 9ac3d9978b8f..38f5b1cecc42 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.18.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/Manifest b/kde-plasma/breeze/Manifest
index cff53adae942..69bbcfe84f3e 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-5.17.5.tar.xz 16582504 BLAKE2B 2f1bce5eaf2a2fff3d2eef2162c393f49db27b9636f21caa581b523a6128bfa33985398242230ea33d61b2291bc9aedaa36705f94869a8a50d8523c54e7e22f9 SHA512 b31032d6a2722b108d3571cb283af1aeca214661bb74c9435f6333a9ca5b19e5ff69c1e43dc00e9aced936d1fe87177a0dc19cdf6b29ffc7886225510b467df3
 DIST breeze-5.18.5.tar.xz 21583276 BLAKE2B abd1afc0fcfde8a7b72923824908cdc18124ae2e544446a7923e1a6a88ed89876bdac127867a8c33473d0e0c83b360450fafa1c3f72fa938837de03b157de055 SHA512 d4797d9ecabd1d1bcaa483722c255f1a79aad5d15bca0daee571eced2e5c295e39ed8cd6039fca39d9e1a1456bd823f30fd332b2811a04df2b2e3663a04abff5
-EBUILD breeze-5.17.5.ebuild 1409 BLAKE2B c65d441a72bec4ff3cce43ec58c9bd7cc729f8f6be95da66a6f4395676efe83408044bbec06e9cf231c7eab6bb94b63384032ccd833da832e817fa30b9beb30a SHA512 ce22bac6d3e7bae3df8aebd5f99c7ddc9253d070aa20e008b5a9604407816e503356d6d8a91129d6433072073a7ebb543cc2fc418545ea609d80d8c17f34b994
-EBUILD breeze-5.18.5.ebuild 1413 BLAKE2B cc43aa17fdad3f0477309ca0fcd18892d7e66c1c80d487558838896b58bd5789ac890ad759ee1dd544f16d13bba031f665612fea4cdb9b3222b12587c80f03e7 SHA512 478dfd0c4dff60ecaa2a5e98ca8a00183ccb10bebd4b1273c03dae8fc512f2dd706a1338e15b72476b5a9d7cee9cd3054e1ca2c7636e3abd51ff8734b29df3fa
+EBUILD breeze-5.18.5.ebuild 1415 BLAKE2B acd856b73e24e7f705e4fb74bc9cdd68425d1954c8c318d71549558c145442428d86878526295f16dde5fe7dc57ae73d6c24e73fff32783cb14fdfb39627d157 SHA512 c08c90f4da1e1a49f18379111592ab9456827e5231e7c07e4695927b676c0f77e72a21482ea2a5879a6c2a5a87a55db5292a6e68bfc41c57390891f3e1292e22
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/breeze/breeze-5.17.5.ebuild b/kde-plasma/breeze/breeze-5.17.5.ebuild
deleted file mode 100644
index 97518dc417d7..000000000000
--- a/kde-plasma/breeze/breeze-5.17.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/breeze.git"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="wayland X"
-
-# drop qtwidgets subslot operator when QT_MINIMAL >= 5.13.0
-RDEPEND="
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5=
-	sci-libs/fftw:3.0=
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kpackage-${KFMIN}:5
-"
-PDEPEND="
-	>=kde-frameworks/breeze-icons-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X XCB)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.18.5.ebuild b/kde-plasma/breeze/breeze-5.18.5.ebuild
index 84ee6ad4ff97..cff25bbce754 100644
--- a/kde-plasma/breeze/breeze-5.18.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.18.5.ebuild
@@ -9,11 +9,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/breeze.git"
+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
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 67a5e40ad94e..f79d97712655 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,5 +1,3 @@
-DIST discover-5.17.5.tar.xz 10449596 BLAKE2B 473a93fb66183253c814932e86be7d5a5f454a6146cd202cb2b43d60223f8e15370622b3eb572c27ce041c8fbd9f095ce9733ffa5464d386bdd419cd80db2e75 SHA512 8d8d6675a894f1f50094021f93d38b7bc6d2927fb8434c002e816c1c322ca25134cd73a1b9fce22bb07ae091ccfb156c22399896f47ef1223b8233febb45f866
 DIST discover-5.18.5.tar.xz 10475624 BLAKE2B 0085fbc4bc0225863fed7d0a01d21d512d283ba5d3289840a3ea6c423ca876121a90065220918e088b7652580cfb79d30a5f01e445374931f3a1279e27485417 SHA512 6ae578815d54ccb770d4d113ec04f0e75c4b93cb1b4a1d636009072da83721e440a4fe817613f1b676c852cf2fb3ee1bb7192c60b174753578449e0bdfee7195
-EBUILD discover-5.17.5.ebuild 1890 BLAKE2B f9d2cdf3353a5ffa4a354e2581b0dcec2437ed0d41a1c11a911eaa0181b1e6af28d361a5e70385b0049be721055e826f7889c2c32fe7a66ee5a04a1d0bf1014a SHA512 d179b2a47a5cba53aaacee961bd6ac80ed69b564bc18309a706a45d281ca241307a3008f6f6175a307cebd3e2437ac5ebd84bd81506cd2780bbbc1a3ffb6ca70
-EBUILD discover-5.18.5.ebuild 1997 BLAKE2B 4a06546aaccf4ebe33d1f336cf9078664ca17500ba9cbf955eb28551ee3a6791246b1042d007effa4c1e08ea8920fb54bef664d89175ab34d7728a735881db79 SHA512 75ba6f719ebc767010d3d2f2714fd938a435c786ece464b7c80edad06116563e47d0285599b73c18bf9e865c657de6798667ebff5d94144c0d833d5f553f7775
+EBUILD discover-5.18.5.ebuild 1994 BLAKE2B 40ea5ec9b64f4ee9055f5db4140b0c0062dd1d206433914b0d7ed892d6694e5b9b296ef733362f6efe21ea38c9ec982fe3a55941db6c8f315a2e856fb943bea1 SHA512 13460232c4219a5e52f0fa97a47bb461fdaeb26e09addaef3ab4dd5ddd599afa87edaafdeae938659adad4770e929cb473220c1a09cd234a063deef8cbf012a8
 MISC metadata.xml 364 BLAKE2B 4ed8b5937febc1af9515c186ab7eefbfb7d7520c8befc9a6397e6bc69bb355715e1a1b536909a7966962d0791a7a272c5591facee0901256862322d2d984a4f0 SHA512 27da3a4431c2f81e442980f8044f93276f7c4e005d5fc2dc92ebc6ec008fa25a441b03185426587f6357da764262c305cbbf998de2fe6c82b3f56a903d88e15b
diff --git a/kde-plasma/discover/discover-5.17.5.ebuild b/kde-plasma/discover/discover-5.17.5.ebuild
deleted file mode 100644
index d8983c40a409..000000000000
--- a/kde-plasma/discover/discover-5.17.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+firmware"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	firmware? ( sys-apps/fwupd )
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# we don't need it with PackageKitBackend off
-	ecm_punt_bogus_dep KF5 Archive
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DBUILD_FlatpakBackend=OFF
-		-DBUILD_FwupdBackend=$(usex firmware)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/discover/discover-5.18.5.ebuild b/kde-plasma/discover/discover-5.18.5.ebuild
index d576b1e64597..d5c4806e78ef 100644
--- a/kde-plasma/discover/discover-5.18.5.ebuild
+++ b/kde-plasma/discover/discover-5.18.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/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index dc195cb086d8..e9d9063b1337 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,4 @@
-DIST drkonqi-5.17.5.tar.xz 740416 BLAKE2B 01b22252e5d9c3d88fb960387f681f38480dddaa79ec319074aefdb95867fd9a71efb1ef2bf9278de15e876265db4aca5f530de1968ea849be60c64e68a4346d SHA512 73ba55c8f5223580c2638c3ad5d12be86703a02639ed5a34b077205f1cbc927efb13cb88ee84ea23e58b8d5bc87b368bbcfb702fb0e8f76722dca39981b30ff0
+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
-EBUILD drkonqi-5.17.5.ebuild 1592 BLAKE2B 0697f8b592626fea0700f82513050b638e8b1abe0981593edbf7b4980ee1fb1247e1c36adaf07122949b136a7ca6522b5f21aa6585e761c6086a8f13bb3df987 SHA512 6293d6af9a0650a589ec4eaa07c5e496df2b446a5c998110462b669a5412376a66a52295ffabef90455a378ee0e8e0e3ac497050ae4b64fb2d3452bc4efc3e9b
-EBUILD drkonqi-5.18.5.ebuild 1638 BLAKE2B 3b1d4d1414311e618817fe90c74c5fce8d6798033973c53babd9c2d175aab21e6b86147e9cf2db04eb2bb913b262a77c87cb8e1e8309f05d010ead9c3b474137 SHA512 0bba9d72ba0760341a7e75a0aeda3f2bee1692a8f41efd705d12a9b0327504d0a8ead7cc97bcfa1edd25084c6f2793993258f92807bba7e96fd6351fc81bb562
+EBUILD drkonqi-5.18.5-r2.ebuild 1683 BLAKE2B f0edb1519a89f54fcae1960d4bdb68beb1a02a708a3f1608204179711e33644a656ab353b1e8901b9947c8124852fa5a1bc9d70fdd510cc87daef86c489c6807 SHA512 4027d7640d8706c79acb24245425dfb9542ca0814bf5462edfee89f9ed91586fe99c5dd6d58fafbd490d17851c4bf9b824e1442cdcad60a2188810dccc41147d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild
deleted file mode 100644
index ba398dcf3616..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.17.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="X"
-
-RDEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	if ! has_version "sys-devel/gdb"; then
-		elog "For more usability consider installing the following package:"
-		elog "    sys-devel/gdb - Easier debugging support"
-	fi
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.18.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.18.5-r2.ebuild
index c808e156a986..03342eff8d10 100644
--- a/kde-plasma/drkonqi/drkonqi-5.18.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.18.5-r2.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="
@@ -35,13 +35,16 @@ RDEPEND="
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlrpcclient-${KFMIN}:5
 	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
+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
new file mode 100644
index 000000000000..6ce33a7198ab
--- /dev/null
+++ b/kde-plasma/drkonqi/files/drkonqi-5.18.5-init-bools-w-false.patch
@@ -0,0 +1,50 @@
+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 f2c2990d6808..723351d5167f 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,3 @@
-DIST kactivitymanagerd-5.17.5.tar.xz 86660 BLAKE2B dfa615796556aeade9206c98180072348e587c72930de2f1cc6c12101879dedaa46485251a136c5a85dfd9a92c96b899edf6c0fef263cdc46a047bd7a3e1bff0 SHA512 584094f45abb922f15dc9b4db2da3cc624087b1524e3e161a4f4cc91425c534c37281d2a46e642320519baa389b69d7843a19b0720788b9795df9a24d0478ccf
 DIST kactivitymanagerd-5.18.5.tar.xz 86988 BLAKE2B b87b6f96d60d1d5f77d052c79f45559c5826f83a35f4a64b98b486bdd90daf4b31d05ac9f1f84d628d7651b1a76fb9bebaddea09f15d055b6924a80c44e9a334 SHA512 2ee59f78cc948fe11577373ea69f895efcaa7d4f239362d3e060382c3be0f67511a0baa64a404c1e0e53d5777775afba60f49e58476c70dcdef6c63358ca4dbc
-EBUILD kactivitymanagerd-5.17.5.ebuild 908 BLAKE2B e13038b673a8b9ab1f52641a4e5ae9b4eaf7a9778ef6fae6cea8e5af4db49df05fab26f098bde487b5f41cfb4ccd5030be66cf9148b3c8f89b85cd5a4f209262 SHA512 1ead9f33a3a9cd61983c9cc9844f100406a0531a8c621f71838cb998daecffee346828620249a01109b2c8268e3a925367718432b062c13fc00cbd578d9245da
-EBUILD kactivitymanagerd-5.18.5.ebuild 912 BLAKE2B 7a50fbef0f0aed2108f9468cde0572a07b46dd1405f4e75df2b8fc9d2dd93fc69c0369a696f0e259fab6c49d035fc8b2071a868269c014998ce4130d4e6708ee SHA512 e3b76b8da01797b339b9bf9b1e6e09ef4331ccb237ee428aced1b582beb8807319953688dc8d7666b0010e8ac9d247fddb73595a0f8d13c58d44d127816c7ef0
+EBUILD kactivitymanagerd-5.18.5.ebuild 909 BLAKE2B 186668843d8dd45c3e02ff06babde90bbf84b790703232bdbe71bee67232f8bb04bac8d66e18911385f8d438afb7a453e2a74588dbc3c295486404394cbb6741 SHA512 c401c84644ef4b046a71715e1c9f55ea6fc58137258b6cb8b8c63211d79e720faa988ee26bf9dc14e2db38d0e5600b878f3a7f3ae46555af747dca7d3ce9fe13
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.5.ebuild
deleted file mode 100644
index d8f7ca69f069..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.17.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild
index 5c762c5cbcf4..74f742a83866 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.18.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/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index a53bba7bf176..8222bfc09d68 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,4 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
-DIST kde-cli-tools-5.17.5.tar.xz 590264 BLAKE2B 6758b9e153a5f87fe903fdae4587e16f5c61eaae043a7ff370bae5b1f596afbaa63bcddbd1439eac8776f20356b96589a86d87ffe7311cb54973035fda17e517 SHA512 65c1fb474abc193eb1ca3cf230865edc795e5df85d9daac7ca594a507e729db6dddb50dcfe4b7caad19f87b4a752d793c8ca590101b59a2a16ec7b079cf524e8
 DIST kde-cli-tools-5.18.5.tar.xz 592020 BLAKE2B 6a35db9d2e68d6ceeaad72553e5d295e54d053b624b1803080dc123451b804250ca0881d6c70b626dddb75ae48b6db398cec5b9c48a25cdd87d18e03873ff612 SHA512 c73695a1ecb81b9222e213f0e98c37354560e32dc56fe8e5ebe1665f7f86a88326bd7a32f4b66d2a73826c9d684f5410306ef5e6660751601c77eae0c6f16d4c
-EBUILD kde-cli-tools-5.17.5.ebuild 1717 BLAKE2B fbbf5cc288670eeb977917acde56f9ca38b1e105b564be239f598c2e4c58c56f934dac3688d79fc0ea31df57a5dab09f142985fc6982e7f9d9c63fd332cb6dc2 SHA512 471d5acedf75a4cdb81a377da4d1211ee2741b3570638e7aff1c43fc695aa3e969d08428bea80baef6d2f90fe1bd266a24052a70fcd4b79a2882a463d4b6fb5c
-EBUILD kde-cli-tools-5.18.5.ebuild 1721 BLAKE2B 68df33959798013c1ff536d5d83c072ebab7d97337de9c266227a48597e96796108b7eb2e20ba03792c44186ad965f8402f3c8582865dcc8f0d1bee94a7eb981 SHA512 6f6ea725ce0a48accd8576fa11f9bef2a7a2416c9f454c078b79797cb118c6032ab3a267910aec04a403284d220afa90c9a3e0bdcde0888b1090d54918deed52
+EBUILD kde-cli-tools-5.18.5.ebuild 1723 BLAKE2B 6024fb092f668527899e80160ff9072ac44d417f4243ff9d0e6c42928c3a97a4120e3bd44a5b203825bf69b7fb925d19d06104142664cd03b71343bad4935fbf SHA512 629c9d412e063ff0783b9b931c49b15b9c18b54478ce38d8404c1aad478c2e067d1d102b50048e2a5019b370b2a902ede2e791ae4adae52b48859011f963b82f
 MISC metadata.xml 353 BLAKE2B ad99c3e645ceea1f0949334a63ba4e567b6572630f5e54f709d5d33915a6c7c027a2091f6bb9dfdaf1881e918361ad374dc78938b515245fe95bf260b77f933b SHA512 c8f393c7d9659412f4c2f5fe866ddc7bfe61af2d4202bc6d03aa70d895416a6aaedb7ed024bec03ab951264810d1804e48221a98306f5f41f89722c9664ef609
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.5.ebuild
deleted file mode 100644
index 887fd4b9b354..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.17.5.ebuild
+++ /dev/null
@@ -1,69 +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="optional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	kdesu? ( sys-apps/dbus[X] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kdesu KF5Su)
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild
index 3010997fe7fa..30926bcc804a 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.18.5.ebuild
@@ -12,11 +12,11 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://cgit.kde.org/kde-cli-tools.git"
+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-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 69d94c64fe86..c0c53eaee9bd 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,3 @@
-DIST kde-gtk-config-5.17.5.tar.xz 155340 BLAKE2B 10363865751489a16dfc62924694b0b47aa05c7e097a512822ae54026bacd4cf167cdff0e7c7d29e7a7aba8dffb757fa176f60fec62df8aedb0d51f9da7b9fcb SHA512 29cea96d6f7471717ecb2f48df5e19a96c7730c9f47157dc01c236d11253547aba57f5cb30cbb08659af53dba81160ff1982f9ed2908aaec91940365eb625201
 DIST kde-gtk-config-5.18.5.tar.xz 24688 BLAKE2B 3c51e37b1df8c9a48d766158b166b5177727b51c3a5c59435a8b280383af5de74574396272c2900b7a801d8ff0c97dee39e84737f032dde11fd0b2ba2d89f5dd SHA512 2ef81b454789136692fead9af2b8d7383805ed5cf91f9f781e637f65cbc293b9ac03be7583f5b5848c4db956da4212027c5b54a878c3796ff975292deef9aa84
-EBUILD kde-gtk-config-5.17.5.ebuild 1391 BLAKE2B e678358433859095040517ca72d3eff2d89ec7c4e1f52c339cce8e74a1108d31443a7dcbc7c607226086a2aa182baa6bec4b16d46f6dbc534064b67ad5bec306 SHA512 800e70c2b4e65ddb5c93f1a8c580bf99de5a4e772c4b1ba1cb6b7fb2ed085fd8b3aea734f15cae77fd24b2ba77bfbc328de717faf03fa91b6a0ba25ca814c437
-EBUILD kde-gtk-config-5.18.5.ebuild 1105 BLAKE2B bf25380b6a624852105fc9a1fe5d470bd4deefcdb74489bd0f090dbf5c3b397c9f7270196cd9e3ecc22af72379426e9ef12cdf5b8025b463243296c89b3b507a SHA512 ba575329ed533f97c6d6da15de5f2d4e468adf0efd043fb37023a482e9987098b95e35fef766c335c8d1fc4991838cb8fab1f41b1d44a53991f7d58fd7779895
+EBUILD kde-gtk-config-5.18.5.ebuild 1107 BLAKE2B 060f075b7c0a977800f69d8a03fde17eac20393675f41823639c415f9cdf6372b4712485600845b6769d9a8fd716de638118416af68d227bff12c50eca8dd6b0 SHA512 01d0f342aa3940290b552a06558c06ecc358463e4f498ef4fc07fc7cb0d8ccd27d79f8b7cbb88413a6f5df9d57386b2ae83c9742731b2e71571e8c663de6dd8e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.5.ebuild
deleted file mode 100644
index c783d157d3da..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.17.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/glib:2
-	gnome-base/gsettings-desktop-schemas
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libXcursor
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild
index 1cdc9e44ed17..584df58ceeb5 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.18.5.ebuild
@@ -10,11 +10,11 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma"
-HOMEPAGE="https://cgit.kde.org/kde-gtk-config.git"
+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/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 322acb4ddff8..2e9dec2c6c3b 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,3 @@
-DIST kdecoration-5.17.5.tar.xz 43256 BLAKE2B 6ae568d7f0e2ce70ac119e61a25c599da91702bdd5bbcf5f54f2d045c3ffe4b55ff7554bd65378d9209c7464001e88308598ba47eb1ec272be80793265ec4e07 SHA512 16a46ec6b4db366f501dc72a70c1867f7acc77bae68a13db406cd72d3587a851504eed8bcf8f6c3f908598c1d6d0061ad61e4226b98ad95f4871f828626f332b
 DIST kdecoration-5.18.5.tar.xz 43884 BLAKE2B fb1ed23440ac6e1813bb02e9d714e4a6d85587c92f7d379d9c05c981469fee8d73351d38b9fedee84b8b016b5e0aa44074dcd666adf7e8fe511870f264b01131 SHA512 ecbeeea7e2239999995facee481794bb35da359b3e64c0b4e10dd7b0d18d8cd43a6a13ff216ed963cd7f59a78b0b190ab994e6d30f7b84572a8cf69a74abb164
-EBUILD kdecoration-5.17.5.ebuild 478 BLAKE2B f85c9d265599ab5e066f1376a65606ccce0fe3a6562f690b7f53a9f8ff8be1d07bff32c1041d660040fec08540884db31bbff0922c1b609eaf91440be9f48651 SHA512 42fd161fb16f39322e5f7bcb5e024207ea70ba82e7852bfdd5feccc08eeccb4e021573068b9e61c327837a9661a87208e7d8d3c127520f7764a03bb9574a2518
-EBUILD kdecoration-5.18.5.ebuild 482 BLAKE2B 993a902c572dd2a2853bcf0e038725898294f853cfbf623a4186877b331287f5c55d4e0dfb40772686fd5d9a8759e9d7e0ee6f244c08a863a193d02da5cbbf47 SHA512 1656ac9b4729db23de2e428042ad8c35b46780ca3d877e6ad7d49c166bc85312f7cc2bc8a15fb0f5b02b2d41f75de0320f8b5a44847987c24f5b4c877ff64326
+EBUILD kdecoration-5.18.5.ebuild 479 BLAKE2B 4f8ea237078478db8e5e2e20e0db3c21adc7711a81d71e893c37cb01257c9089e0f1dd91a9891ea441ec32fb37b7da194cd3ea29dd6a22137d6b73c7d9ae6c24 SHA512 65dd0c311fb15f02cc0bc6f419a37cf9c0be4aca2f285083a9d0b27df820a65c848bf5ffba6df2519a4b9d7bd999e4ab48f4e9e5b4e9d86424a5eae2ba08ff0c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kdecoration/kdecoration-5.17.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.17.5.ebuild
deleted file mode 100644
index 84428b2b733a..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.17.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plugin based library to create window decorations"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild
index 0bf22cdaf7e0..180cd3e093e2 100644
--- a/kde-plasma/kdecoration/kdecoration-5.18.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.18.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/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index a986fb41f2d7..43f641d107f4 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,5 +1,3 @@
-DIST kdeplasma-addons-5.17.5.tar.xz 605648 BLAKE2B b6792d6723fc71564f9e583b3a0af8a45e06480150e7369e35dae0168a4eb254d91c268e1cd73064658b53373fd4933c7c7fe9473b904bc291fac4021e93d50c SHA512 ea836cdc99f583448d4b272b6d6b1e98c4926127307ac966dff779236ec10401af627958994dbc22959a13db9b67bf1b4ae05e911491eea874a2ce210c37b2d5
 DIST kdeplasma-addons-5.18.5.tar.xz 623872 BLAKE2B 684c9e569575024fe96d6043a91e6a810db69205e3867db9840442b901c120db4f0dacb09540a145f5ae90b5fc6fcd934e26a3d4435e9d23eb374f4e5ca1e391 SHA512 7baa84335af5afc1af2cd47134863961df7a43c719bdde180754aa0b5a83975c3d5fb79435b523589751029f0fbb1751fae90db5db8e42c995c9dd24578cbeb6
-EBUILD kdeplasma-addons-5.17.5.ebuild 1751 BLAKE2B f0a9a4ea7d68e986da6c105dcd2f598b0331ed4d0fb8dab5bff54467f8c318e8416e7bed886d6b8255769a72cc46ed8c379175f551cef031073be3184c2ba1fb SHA512 ce499f5275e81dc8e7c44cdd95285cd307316047b164a2aed1398c26f27da8f1f13b706e314886a1f869f3173257c00e1be7e01ae990e35d42067f590728c463
-EBUILD kdeplasma-addons-5.18.5.ebuild 1755 BLAKE2B 4cddc4b254b865016bdade8dbb9a601f0a04c60cb10ef8d145bcb5b21d485adba1833f309cd6e949275d6a044c43b0c5bdd32108bfc0072f22ce91cce6ba87e8 SHA512 28b04832355018ddf5c347a932ed4c30214ea10f4f519a176ccbeb28c57a10264210c9e3c969062ba4cceed936cd94b9401276c94fbe32c6f4ee18c743ca7bcf
+EBUILD kdeplasma-addons-5.18.5.ebuild 1752 BLAKE2B 010e42c867df1157c15996b23f68cbaf268508a53842c76caff7831975f60c9a3099798e9579167bd093584d690390ce9d43524ec3e7aba12a7c3d94c70ec2f4 SHA512 253c8e7abef4701ba3ec136ea225a4c181491056cf66ff3a4114522a041d6bcf36bd14da939d3e3979d793de50e845207dd4f9453b0a5d9335668373f79c479c
 MISC metadata.xml 465 BLAKE2B 94fe9737b3b632b7c4cb0907ebe49ada7f7216ed88f5132f0b24f5f0b9532993744f9167c775a265bfe827d6b4d430c3949d82da49af275c286003f1d6f25bbc SHA512 c4800f7c56aad0ee306380ddc0f09f39c48565320d38349fa3d3a11e466b40bf35d2bc593fa70c3768dc940f635319ad848724f0ae537d12fa680e24d83110a8
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild
deleted file mode 100644
index 5793ced92fd0..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.17.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Extra Plasma applets and engines"
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="share webengine"
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kross-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild
index 18a7b7492842..e17cb42f9487 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.18.5.ebuild
@@ -12,7 +12,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="share webengine"
 
 DEPEND="
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index e51ec37b431c..17c3457c190e 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,3 @@
-DIST kgamma5-5.17.5.tar.xz 80304 BLAKE2B 7e2b66c84e0589740d329ea9c8d575f071b60ef25fe8bfe9ce90256a999a461d2c21faecb78a612895fbfdc4ba8486baf7e3260982d1c16f0752c03cd83c20d7 SHA512 cf89d538b4b74c8121f9ff15fcf01cdcc09a3a9e9fca7750e831aec5206c0ed31e917da787bf313d03860b86de2d2715cb96b5ef00bf68043121a6e7d0e7a290
 DIST kgamma5-5.18.5.tar.xz 80720 BLAKE2B 7dfc4f96389aa0004b6db92b03eed051a2c2651210069f9f86f6c430ad3d095b16296083c4d57524de092afb2306b841fdfd7166c6805f70761f9af55cf8bdb1 SHA512 a6d242293468eb702600334361bc1299823235b059df64ecc6b2a6219f7801a1fb7ac7f13e71475d877ac03623d72043a6c35c31531fda97af883265deca735c
-EBUILD kgamma-5.17.5.ebuild 676 BLAKE2B 4a5a1162c945d66c4fc25554f545e4c31f00c14d920afce11aa958be0c01b499998cffd1d350aacf414d9ad9af9114fd63dc1a90229875e0d7c4dc37dbaed341 SHA512 4a409f1d1b8a449816b4a5dccf058206a285047ebf835cbd4647909b9fe5330c23e86b3a2759fb8f338c930e0919f63f65f8cd6724842a885759b587d8bf2aa6
-EBUILD kgamma-5.18.5.ebuild 680 BLAKE2B b70d0f768a9edb970194679e5d1afc766d0d12f08c304d5af810ed694ee543e4d0aa1c794d5ed7f8738edfddae9f02dce8f2666de5b0f711f169dcf9fc81d58b SHA512 32acca0b1121aee336030f86df4af6ef9cbf228f615946b36de045c921ebde67275caed4354df65c6e1b62026afe1ddc4191f6c4dfd36811ca5eded41e17b0d5
+EBUILD kgamma-5.18.5.ebuild 677 BLAKE2B d7dbd83318e6dc2d34d74b8389d41aaddaac1867ea15e84c2d7c677c6cfe7b3cc9c36c4d36b09ab77afc1f27b05cbaa419759ba37b7c8b7de59603767851e936 SHA512 96da9c6f596b496a9bd957fc74a34bb2f3daec9e7bd9ad307c748c4482e44a99df081bacda1044df36ba46b7084fad949063569259dac0f3a6e8be008eaf53cf
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kgamma/kgamma-5.17.5.ebuild b/kde-plasma/kgamma/kgamma-5.17.5.ebuild
deleted file mode 100644
index 464b431e681d..000000000000
--- a/kde-plasma/kgamma/kgamma-5.17.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="${PN}5"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Screen gamma values kcontrol module"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/kgamma/kgamma-5.18.5.ebuild b/kde-plasma/kgamma/kgamma-5.18.5.ebuild
index afd05d6c3b4f..4e47514a459c 100644
--- a/kde-plasma/kgamma/kgamma-5.18.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.18.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/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 993381de66c3..13a212cee1fc 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,3 @@
-DIST khotkeys-5.17.5.tar.xz 1853632 BLAKE2B dea94dd9c53a0c6d9f6b08a258a69b8e7dc3e64207ecc32429bcaab494dc99ac6d11428ab3886bc47f54444a54731cf784765be6dbaa19220fa6b1da31348697 SHA512 772e743860db25fcd9953de987d86f2eb1d463fa8f517add7f67426ff868c6b943dc515c23936bd803a680884e73a081e3226037b5f02080244b401b1c1211c1
 DIST khotkeys-5.18.5.tar.xz 1854812 BLAKE2B cec0db1fa589ddca9515e19fcff6dba580c7567ec381c2961e5211fc830398f4f3a29f9e67f8e7821096d5052f710357ffcec3517b8893930629c356590757b3 SHA512 67e5d904127764e89d4a5c5d1c5fcc6ff0070d2a298f1032189dd3e9e17246482431ae651869d157625fc81caedee2a897947a6cb0bbe7508b5d76c61f5fca85
-EBUILD khotkeys-5.17.5.ebuild 1345 BLAKE2B fb569c48289a603465daba056bb67304ba10d0415250ee8a1c353e05fc84ed60db349a8f9b056d873a2185434f5fbd4251224b792acb9e4db842711699c10fcf SHA512 1f9a0cac1d2941c5f1e73ec9cd6d82f2f53f7de908a9ef8e7c1035d93a87f76a901494ae2dbf07ad5db398973c249064c59de8c329a4944e17d4f85a4e096e6c
-EBUILD khotkeys-5.18.5.ebuild 1349 BLAKE2B 38895c342c1f1323f09b1fdad2b9c789bd92ac70efd82bfdbf0550c898c86e7903d0133cb4a9974a690e4ad7e3ac9f534785b5761de0d09bac6c3f2353ff0559 SHA512 1d842aba168c37bc90cb862ac1bd16f9c9d2e52c702e30fec20838272113cd6c9dcc5ab101697247749f07b469d34237166eca9cc404e7d392232a48e80a6890
+EBUILD khotkeys-5.18.5.ebuild 1346 BLAKE2B a48049323571b5962e3478b014d90e7e90d5df0d151a33c66839cbe98cb6a081e5b51fae3ae1d376c30af659210e3e159c35b429daf5a161766f3278ba82b8e2 SHA512 8e6e833dde654a7516f3c81e1c059835e99868ece482c7c992eb17275a57896b23636dbfb7ccb97025a29ea4311acb4a6ab0ab3336c3b8d38c805aa9f7c55667
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/khotkeys/khotkeys-5.17.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.17.5.ebuild
deleted file mode 100644
index 97d4a5f8755f..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.17.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild
index 9259113b2f86..8eb1ab7b9a1a 100644
--- a/kde-plasma/khotkeys/khotkeys-5.18.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.18.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/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index ae3db769f4a9..241b9e490493 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,5 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.17.5.tar.xz 1343896 BLAKE2B 0db47b3ed5f937c7701b52b194be71c6ccf474d5a1ede18864f32b1e374972cbd2e15f26b99f30fe4feba6adb153d87a05c5ccc5feb2bdd36ccc4086eda6f688 SHA512 4f759cc614061e128d57dbbcaa3253fdcda3ab96f3149085c320a0fe826f93b19a35c4b642e5ae9726c0e049ea7a4f8b6490575aeefb22b57b2c4ad8c0f1cbf7
 DIST kinfocenter-5.18.5.tar.xz 1256744 BLAKE2B d67951273bece9cd106a3d10857b18d005e6bc03faec8e9749b2111016c318c4c518611bb50240a01395b59838a47a6ce24df06ab870092aa425f04854fdf3ad SHA512 c9896870a92b3349c262698c4902b98f6aa12523c1757890367d1e277954b0ac7b040bbff0095f7a6abf47e6a31b008070e3a461713c7cf4a591617b76c37886
-EBUILD kinfocenter-5.17.5-r1.ebuild 2774 BLAKE2B b37297c3e770cfc6343d7783213dec052073bb81a50e760b926de14194616192bfded78b573d720c9da5b70a41518e5ce7bafd23118b96aab76a12157d066c4b SHA512 f0e97080c3555e06122aa2bff3f412258877674b1a556ee383ac2058fedf6cb5d527db280176c72e66935cfac122e025e23fedda6197e682f726f4b5b7ad2355
-EBUILD kinfocenter-5.18.5.ebuild 2840 BLAKE2B a7f5a6c1173aa291bfa0bc45177f1df6e6a7c7311f493b0ceeee6cf9502f21f6c2ed3057a61b101a95f5bdfe378671444eaf4b3f6ca9b88fb9e5ca02e7720bb1 SHA512 a27e1980460e91851ff3f047e9cdeffb88dbad0b74d1b124bf51036e960103d648eba5abd3a39b7d44b1324a1dc6699feaf3cad976b874f3e9077e1ded1305fc
+EBUILD kinfocenter-5.18.5.ebuild 2837 BLAKE2B 4d8a032e2c3bd1c6b21110d3eb0268d1303c20a66c4d85eab8c1edf5770f9fcd580046307397a254bb41b038e69cc777f7c93eccc55cfa33a48a3c7438ef8b58 SHA512 7544ecb8264e79e29a8fb8541461c0af09bf099fc94e7f7c45d22fb3db3d8c6cb9c7ac2d936b5cbf34c61e5b860e1c0a3e024a70c398c9824c0a241741d1f2df
 MISC metadata.xml 320 BLAKE2B a0e83642729b42cf0f6e8b5aad1937770df05aa01ea26d98a215a9a4f7534388f6b6992d1d8e7e4bb2b90007778d755f6b789fd80f1da316a99486a9ae35f9ec SHA512 5530f3ad6ccb8e826c297d0ed4c9d9197e73bd79ad428050f4c1ddd1c09136f34d1e8c48b1b87a5594369568647ea70972c78c6f1eb4b2936113646a858e6c2c
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.5-r1.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.5-r1.ebuild
deleted file mode 100644
index aff078e79908..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.17.5-r1.ebuild
+++ /dev/null
@@ -1,102 +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.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://userbase.kde.org/KInfoCenter"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="gles2-only ieee1394 +opengl +pci wayland"
-
-REQUIRED_USE="wayland? ( || ( gles2-only opengl ) )"
-
-BDEPEND=">=dev-util/cmake-3.14.3"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	x11-libs/libX11
-	gles2-only? ( media-libs/mesa[gles2] )
-	ieee1394? ( sys-libs/libraw1394 )
-	opengl? (
-		!gles2-only? ( media-libs/glu )
-	)
-	pci? ( sys-apps/pciutils )
-	wayland? (
-		>=kde-frameworks/kwayland-${KFMIN}:5
-		media-libs/mesa[egl]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package ieee1394 RAW1394)
-		$(cmake_use_find_package pci PCIUTILS)
-		$(cmake_use_find_package wayland EGL)
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-
-	if has_version "dev-qt/qtgui[gles2-only]"; then
-		mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) )
-	else
-		mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) )
-	fi
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# TODO: Make this fully obsolete by /etc/os-release
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "net-fs/nfs-utils" || \
-			elog "Installing net-fs/nfs-utils will enable the NFS information module."
-
-		has_version "net-fs/samba" || \
-			elog "Installing net-fs/samba will enable the Samba status information module."
-	fi
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
index bcdac815889d..12f0d193f407 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.18.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.18.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/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 88d84b615d9b..1f1bcb359f1e 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,3 @@
-DIST kmenuedit-5.17.5.tar.xz 815568 BLAKE2B 07c667dab13b6ee6af5beb10fca4aad9485b815e4ce4a06b19a4851085bf074d38c4c4ccd36a928c06f753f541e76040be18b301ad95cf8d6358fb5c363ab7c4 SHA512 a48652b234834b004c3ecbc8706ee8c3594896d4e5fa29407aeaab10c37575f29539e37117b2765fdf9a9d93db2b062b88b71466ca7b3a1b7e10eb1b2c96b0e4
 DIST kmenuedit-5.18.5.tar.xz 813952 BLAKE2B d5c58ffa7cf3813955f9f87f119c11333215fcffb3b3dcdfc7e601839233d4611b3e0359c3313b4035d957d5890229d57109ab7b4929fe860b7b9c997d1f9d72 SHA512 647aed82a3190e2c27bac4e50eec681684dac08c6f3f7e8e0d2d02b8667e58b367a35a66b830083037570999655652a94f26ae063e253ceedd0db1df00ef834f
-EBUILD kmenuedit-5.17.5.ebuild 1252 BLAKE2B 8fa9d68988c8993f7a7b10f95b54532b77dcb78bc7265cf516e427f42e795512cb082f66006a99bd211e977f4bc82f1d0dedbeb2772758e42f77fd6b98b823dd SHA512 393ac285fb032a2f6cb4912cc41bf4ba53a6b87891017282ec8685e02631bbfcd4ccf66e0c9bec96ce67e56eb6af1bb689f9c59b4237b93e9f81f0f7bf232ca5
-EBUILD kmenuedit-5.18.5.ebuild 1094 BLAKE2B abd30e7c5ec27714ca16872b3795fea4dc0198ee2dec5c91af0b1f8684b3b7565748af6fb2cb9df43559613f025ff7569b7f840370ed758141c53eae2bb8d11c SHA512 0c97721a408774e475c39fc31ca896d98d873f59c937f1cdc19d4cbac5a6c24514e770c9a2bf35d495926fd2d3407ba1f3b07f5b8dd70eacd7f787b33a9354fb
-MISC metadata.xml 328 BLAKE2B cc8d80521bd21c44133754342167f505138a6950cddbb2ebd25a8c5d33aed81ae968049931a5a0b959e7cdf70625e41e0d7e2ea87658d628a1b35da5203d955c SHA512 9286db1913899ebcf8b0da8ae3ebd12b760e2b3631399538210ff9d4b15c7b62e28fd138e75689c5bd03a5d6ee4e412036ac7f10a45a56bee9cb04184036a2e9
+EBUILD kmenuedit-5.18.5.ebuild 1096 BLAKE2B 896a8ad423a24adedc31aec1a314f4c0bc14634689704f7a19e412e918564397aab2310d77249d9231a8ee93ba9fa738f48d648259ccd300f174e2791325091a SHA512 a1584982a98dba6ecbdd3a3b447e900fd658ca3731846ddf0f9da36f8abb4825cc6a5fbc2487ee33bfb0641b5cbfc88ee5b8533580615e6c3ce129406bd24e34
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.17.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.17.5.ebuild
deleted file mode 100644
index 61f461337de5..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.17.5.ebuild
+++ /dev/null
@@ -1,49 +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.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+hotkeys"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	hotkeys? ( >=kde-plasma/khotkeys-${PVCUT}:5 )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package hotkeys KHotKeysDBusInterface)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild
index 7ad3a0f55a07..29af3fe52040 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.18.5.ebuild
@@ -9,11 +9,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://cgit.kde.org/kmenuedit.git"
+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/metadata.xml b/kde-plasma/kmenuedit/metadata.xml
index 18e3c3d1492c..2fdbf33d963d 100644
--- a/kde-plasma/kmenuedit/metadata.xml
+++ b/kde-plasma/kmenuedit/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="hotkeys">Enable support for hotkey editing</flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 151daf4ab208..96830788131b 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,5 +1,3 @@
-DIST kscreen-5.17.5.tar.xz 100672 BLAKE2B 02c3f52d6cd457ee7e9343790aaf6ba87227e4b8499b3c5fd1920c5140b59a60b81a9202ebbde05db4705d25b2ae949e44247b63e32a645616ad2bffe7b2c6c2 SHA512 3a0abdeb8aa4ffde8a3aefee71292916ea1331ff91292976cb94b6def068d012ead4fe1aae3c6ad9353423a701cfaaa051f0455897fd80693a3281a33fe3d332
 DIST kscreen-5.18.5.tar.xz 113256 BLAKE2B c4cde78164cf3b344fa2ff7905a37cbbf0f32bf3cb527a1e54493cd6f831e617ab85d80d15a489690c503e7f4fd35bb8350f4d1edd6149b3c3e21f52df0286de SHA512 310e9f1b2a46d4d81b78a2567e4b183847e22eeb08d1912748968c7cbd77bce7622aa51b1931144e732c1fac6bc3e7827c2db0d9d539e31e642b9d7c0827b36e
-EBUILD kscreen-5.17.5.ebuild 1189 BLAKE2B dc47850d5b869999bec75f178f1e9d253628b187c7fc7838c85bb7380501a99fdca48724a998defc14beb270c00295fc1931986dea1a698240928c2951690b5d SHA512 10824b79407dda5095cdf40fcc06f7486624698e57b19556476f8c91cc50483b52113054e488a07a9517ba879c9b5a33b528a1d2ae74188ee9222a3f3133ea81
-EBUILD kscreen-5.18.5.ebuild 1223 BLAKE2B b4d7a17afc81170d3eba2f371d18447876772bd60a617b4257dc1b55ba5b739284d29125a2e27dcbaa2f8cd712f026ff3a8614ae1877dc8beda2838bec87b432 SHA512 fca6cd067ff0b5faa76563a875dc9943c929d5aea5f9139f015008216f95615bfe17b7924a73236ac31047fbef14fd1a54fc7ef1e8fdfe6be5795b129bd0a73d
+EBUILD kscreen-5.18.5.ebuild 1225 BLAKE2B e45dc9247578442c7fe08721baaddc265f0de50e93183d71eb3511d149830f333f8173a13e70927ebf69850896847e397c07313dbe8b2e852ed020a17e5003dc SHA512 353a602e69e79f14527ab39257988de7c47bf85fa38052564677528accbd1c042e9a1680f59afa8e3f8afdfaa83e5b2aa897f028dae1e05ad611c0edf2f525d6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreen/kscreen-5.17.5.ebuild b/kde-plasma/kscreen/kscreen-5.17.5.ebuild
deleted file mode 100644
index 51b118384570..000000000000
--- a/kde-plasma/kscreen/kscreen-5.17.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://cgit.kde.org/kscreen.git"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-"
-
-# bug #580440, last checked 5.6.3
-RESTRICT+=" test"
diff --git a/kde-plasma/kscreen/kscreen-5.18.5.ebuild b/kde-plasma/kscreen/kscreen-5.18.5.ebuild
index 9ac37b817e10..a425a4922273 100644
--- a/kde-plasma/kscreen/kscreen-5.18.5.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.18.5.ebuild
@@ -10,11 +10,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma screen management"
-HOMEPAGE="https://cgit.kde.org/kscreen.git"
+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/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index cdc72ef0d558..be9e7a3f46d7 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.17.5.tar.xz 123744 BLAKE2B 2b2472d5cd99402930a3003e1a8daa07cd40b7501648e4007c947e55b9e130f8336d267409c5c60d2d4d2544ec4b8aa6e1acca287296407781d44c5c22ff8519 SHA512 152a310d8e3256da1b08b7b0d0a9e2be826a18d3c9ede61bfc764efed02e66e11f209edf953c9098a378e1566d3a7ee1013f733f205f66543174ec0994750248
 DIST kscreenlocker-5.18.5.tar.xz 125144 BLAKE2B a4d4a570edbb6994eb42390c42a1193ebc7776c28483b9edb7ab4935c18be3e042459a9919216547a275e5c02794ac468364e1a65cfd62beb17a2f09b34cb659 SHA512 27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47
-EBUILD kscreenlocker-5.17.5.ebuild 2351 BLAKE2B a1a2dd24667f101f52b39cdd385a19a9e1cd879141a94f946e912f2612c8c6ba29eac8d0ecf1228c8491c199766fcebaba131342d84d25ea61e09269bc4aceaf SHA512 876a7306cab4587f4135d54a96c2156fd419a2ce70482e3fae7c95ee23ccb55f471c40412ac2f2c32c091f17a9a097de2c580fec7ca0890e83d37deb7f12ccd0
-EBUILD kscreenlocker-5.18.5.ebuild 2355 BLAKE2B 0f875d5ad5ae63bc41cf205be1ed5feac9b9a52bf3e7c1bb13e101cc9a9c491581570c9a3f63143183e7a8a4304c035fc64ef1335d31c08c4fb71692b0fdd757 SHA512 82c751688e8199ff2330845ecb97a440744d59bf6bec9314479b11bba7cd1ca1205a7b66f389013d1b6053642cd963300cd18a487c51486663182381a83c8442
+EBUILD kscreenlocker-5.18.5.ebuild 2352 BLAKE2B f28abd967b9d6fafb6a7c145d6cdcea966815165073f955c4fccfeaa70a134df0afe54da10a78b8dd8c0793bbe14d3fe6c94eebc18ac8d915ff635d5e7fc5b8c SHA512 e11ded96c0973a085cea50109e3206f8295633bd9b9710514d97499c2ca0b6e8497b73afcb5fcbc9d2eddbfae885ebee2ed0b12bdb69115c4b99b66e4cd7f94b
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.17.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.17.5.ebuild
deleted file mode 100644
index 29d56bdcdf12..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.17.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit +pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
-
-RDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	consolekit? ( sys-auth/consolekit )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
-			-i greeter/CMakeLists.txt || die
-	fi
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	ecm_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package consolekit loginctl)
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-		$(cmake_use_find_package seccomp Seccomp)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	if ! use pam; then
-		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
index 5e66c8cd5e94..81e224ad8d76 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.18.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="consolekit +pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index ff67151ea7b3..58c492bac2b7 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,4 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
-DIST ksshaskpass-5.17.5.tar.xz 21372 BLAKE2B 134a533570b75d66cff195819d41b782b67e0f308d6b36efdd7ca223cfb8994baf29506e3cfc34c6786d35eedf792ed6519b40b0f39360468465c76a197c8362 SHA512 c3a6d5b914c13cdd2ca94a237168702729755ba51e036bef1fb5f09f9e7d1c01c176ba14f225c5ae3781434e8fcc047dd250f9da8d3704da09e9712819a5948a
 DIST ksshaskpass-5.18.5.tar.xz 22148 BLAKE2B 31521b28a840bfbb14cdef2484dde8908a0ffbeda5d54663243bd93a070d77d72019b5436f0a4f838e7c8b9f60992b06636e181b6ced51d17a13ba4f7c3918b6 SHA512 8cf75491c04537cdbab11613dc0f9317631c282e4f371664164dc0936d08f744a39777b696b772e05b06ef1257d42f7ae29abfbbd022e661073fdf880fe63fcf
-EBUILD ksshaskpass-5.17.5.ebuild 2195 BLAKE2B fb94b578370e42ac3ab4420c58201126575986d9faa7b71d3f52c12610b3f43ca6785cb4f20836209df55f1babf90609f2abb4cdb8b9e06682cb3fc0347f017d SHA512 310da434efcac7046f0012842852dca460b405ca71c27ef42d74c5ec2db05e97f402af868b21dfe27491de37d30109015d97987e8307f52e9c4b21828a33f78a
-EBUILD ksshaskpass-5.18.5.ebuild 2198 BLAKE2B 42b81e9e07ba059296aabff56f2ed002ac9ffe2c7e2843a32d6fd2ee117133ed20191885489178d91fc7dc21f1865e29a7f8772fa19210c334cd5f3491d0507d SHA512 5a523c2f1357658cbfca5ad354781a3cfcdd3855ef9fa6f624d8dc2910df3c62122c2b2c183d3a92b67a5af5c2dbe3796c45f898cbbd1ce5dae179a3c776a8c1
+EBUILD ksshaskpass-5.18.5.ebuild 2200 BLAKE2B d61278bda981d6764b8472b12884bf4c6685d788eddbeab0acb76d1d7da7460040abbb73a88c092947b14ef303d730e27ccffadccba946676ac36476474692b9 SHA512 411797a3eaaf443b8236fa3f87124224baf03b91ab806bb56b238660529b0ea14e772afc4cdda82b9d5e13fddb7ba4e116ad97fbb97e64f922d62617fe5d90a9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild
deleted file mode 100644
index 415b305a28bd..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	local srcfile=/etc/plasma/startup/05-ksshaskpass.sh
-	local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh
-	if [[ -f "${EROOT}"${srcfile} ]]; then
-		local md5=$(md5sum "${EROOT}"${srcfile})
-		if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then
-			elog "Existing modified "${EPREFIX}"${srcfile} detected."
-			elog "Copying to "${EPREFIX}"${newfile}..."
-			cp -v "${EROOT}"${srcfile} "${T}"/ || die
-		fi
-	fi
-}
-
-src_prepare() {
-	ecm_src_prepare
-	if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then
-		cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die
-	fi
-}
-
-src_install() {
-	ecm_src_install
-
-	insinto /etc/xdg/plasma-workspace/env/
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "In order to have ssh-agent start with Plasma 5,"
-	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and uncomment the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-	elog "to properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
-
-	# Clean up pre-5.17.4 script
-	if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then
-		rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die
-		elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh"
-	fi
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
index cf1f23b87d8f..7555b875998c 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.18.5.ebuild
@@ -9,11 +9,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration"
-HOMEPAGE="https://cgit.kde.org/ksshaskpass.git"
+HOMEPAGE="https://invent.kde.org/plasma/ksshaskpass"
 
 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/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index 7a3758e3a2a5..ce663ef6e7b8 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,3 @@
-DIST ksysguard-5.17.5.tar.xz 515292 BLAKE2B 216a52db86ea02b0c2e6a4e291ba41e5bfd4833732fc1d027ffdba45e20f688ecc9299646be8b81e010abe3602467f48a33f75278646c6a33359c55216e0b482 SHA512 65c66d469487fafec4eec80ab9fb55e48520d87742b64819eeadd659d7ad43b87f647ef3031aa73f348d5716aa416089012bfb125d44fed01f3fec836d5ef549
 DIST ksysguard-5.18.5.tar.xz 517648 BLAKE2B b50623c28a3884adc5db326d7b0745c558f02e1f515efa9a5d591948026447f427e08cb72805d7f1c8821cdb0038c894e4322520cf2630656e464da6f69af401 SHA512 2cfb82caef5d074b945f0a7478b32af86d49e174d4d294dfe6a54acdb0b1d335e151828a4f239b52cf767ba04d9e93bf1632f2a37e2b1d611128543e0e0008a3
-EBUILD ksysguard-5.17.5.ebuild 1393 BLAKE2B 225343498f2ee3aaf542cc50d8b802b5b06ad8300af3fd8d3aa16aaa5de02911e0c590ceba1f0422f065a210ea7dc1bb141a7d22d913d5b853e161ca6aef1810 SHA512 5aa4602f7883f829454052b3014237a5bc972b49f4e223119505e3d5ce99a9b10e5feb3acbe9ac6bc4942f3f92684a45508f150af2e0505c721bc15ddac3b8c2
-EBUILD ksysguard-5.18.5.ebuild 1396 BLAKE2B df62b7ba1728299ec17f49ad4e65bb7b745ad0602184eee50681dbbb805b5ae2b6f3cf918cc7d4b38be681121237b152f8b69f7aee9426cba109d6fd262da755 SHA512 d1a5c8ca987c71fe6fb65a9935f467b922b7dc4bc46c808114a2a1f6bada97325d34599cc67123edcf5bb03b8e2d7ab69a7865094c027487432cdfa47d05b438
+EBUILD ksysguard-5.18.5.ebuild 1393 BLAKE2B 9252e8b44a28642a7f25d46e402e091850761f287aaf9fe85353ead5d60ac43ebc24cbeed8ea0aedd5708911224e7211f302e766711b6279de51bba55b364c50 SHA512 d5b2f2a5d1581b86bb86824848ad4e492335a3d079779136e8e94cd7ad5e2437ba9b605e56ec35fdb3e7d6d264271b5085cf5bd26903dd8d3d1dc9075bd38f84
 MISC metadata.xml 373 BLAKE2B 8d97f1bf96cb523b2832ca4bbb01ee86cf1d13b0b1b75809046da8601254283fa079361c1cf55708c851a08fb31b27beb8cf2df24ea9e14e4c32b8ca0692a7f9 SHA512 c1df9a56aba68a93ceae7cb2b9ea9216c40b6f619263cd8025cde82264206019a6b9d0eecb24f3a798d4f6e1a772752ceec500827e96caf8f050b0b132b08051
diff --git a/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild
deleted file mode 100644
index 9f99cdfeaec8..000000000000
--- a/kde-plasma/ksysguard/ksysguard-5.17.5.ebuild
+++ /dev/null
@@ -1,55 +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.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Network-enabled task manager and system monitor"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="lm-sensors pcap"
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5[-minimal(-)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	pcap? (
-		net-libs/libpcap
-		sys-libs/libcap
-	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package pcap libpcap)
-		$(cmake_use_find_package lm-sensors Sensors)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild
index a15e75cfb1d7..66cea4f4b33c 100644
--- a/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.18.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"
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 9e9ef4b405e0..2be32f9db39e 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,3 @@
-DIST kwallet-pam-5.17.5.tar.xz 19712 BLAKE2B 2166498cddaabf55ea77312b96e863fe666afffe976507aa4f1c1421f7182c8db195d55b7462d3355acadb4cf2008792983712ec286811d22348ccdcc6cbfbbc SHA512 3a15ad62cb59aca1165c3159572669e5a44a2f1bb6aee51937b4d970a4eb901f7fbee74ed874ad20d65e3adb4009e143954dda1ee31ccd223c3a1b3208da6436
 DIST kwallet-pam-5.18.5.tar.xz 19800 BLAKE2B 695fb89d1a54bfc44b06bee4881ae357a42c82b6506a6ed7966c30bb28137ee379ac1beb9391982c15ac63e95c0a1bbba2e0950ee89e050a2ceaf296b98958d4 SHA512 050b3ca66f3b078bb7bccb4a3b7750787bf22d18af60972969f83141b99eac4441fa08d48022278cfe28c8f96f7a1d9ca346f155d8ddbdb60b17bc9c142521cc
-EBUILD kwallet-pam-5.17.5.ebuild 718 BLAKE2B 2f274a6696d1e53fcacb25ff5cb4441c5cd4d693c63e477beea48519be25686124a1591ee0d96fd3d3c07ed65364b94441739b6a6ba32d790b75383705b8bb00 SHA512 fe97264a4255b72db29e7824744b052388c3eeedf8c0ba16c859c943392e41d4c5f51916ca26e2cbd590837a5b663ad80ada3c2f8168dc3affd58aea631f1832
-EBUILD kwallet-pam-5.18.5.ebuild 734 BLAKE2B bf23b213b83f85af722545316e902fc7059fe946de16ee273115bfd69d0fe38401c63513bd26e5be9f550baf0e60dad2d72e74caea36da7b52443858cda90c44 SHA512 2b4d473074823e78889a78e4872deb1f35eed905e9487a7f141174bbe18818ebd271c3ff9e332702c55d86cdc52ec0b11c342afd0e249621e45eb5e9a04a7ac3
+EBUILD kwallet-pam-5.18.5.ebuild 731 BLAKE2B e538e72a2a41b9af859f889eb338b22b2655dcba2243b4af5db9a91f0558856ab4a8166116acf0b119593fa3ddf307cb07bb55477cb0c73bd5b8bfa5d766ae19 SHA512 e142c7fa4b65c1540180371e4644bba6a6d49e214bc02336e1edf44c9ae7a0a1571ed3b9f4f69e788205893c60c306bf3f096750904842a33087fa9e61d0b4fe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.17.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.17.5.ebuild
deleted file mode 100644
index e6016a2823a6..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.17.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="KWallet PAM module to not enter password again"
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	dev-libs/libgcrypt:0=
-	sys-libs/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild
index 849263d4d766..78a943d40ffe 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.18.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.18.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/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index c47f756bb8e5..1603e52f2ace 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,3 @@
-DIST kwayland-integration-5.17.5.tar.xz 20184 BLAKE2B 4597ae60ddc805745d519cfe7959c9d423a01ff41d3c3565600d807943950cb1008265d8cb685ee038be0950af7a2237e4de78d4574aad3aba816cb09419a21e SHA512 50ac96f4ed957ed264e8f700dc9bdb71ce04cb4a6385c2316890171943c4b7a23ebba08eb7047eebd99ad7c6d485f440c8ae7375c040088ddfffbf7f5824634c
 DIST kwayland-integration-5.18.5.tar.xz 20496 BLAKE2B 74d2396b475a462710fe28f1ee710935a927579e852bd7105785159309ba745acddf527b4ee335ef0e233fd4a43404778af88cbc50e0413d393896d9eed2d299 SHA512 65d87f1e9e9c957e9e9e73dc04da65e23d0c12cb93eb52c86912f4b15a360d6848cc26edbb97be3444c9a5d7a16ade1aebf2d241d4d1a1530aaa5523d1e9f9b1
-EBUILD kwayland-integration-5.17.5.ebuild 694 BLAKE2B f871a50214960bdda0cdd4e11e490f2a73aca3cbc1562b316ff15144542305dab53629a2ac6ceced00cec167f68521d3d9d6d247cbb0d6ea0041d9be56717997 SHA512 5c7abc39f88c7124e88fe7e5fcd88fd104661780951f6500d7c07cef420c4a1d1682408e7a41989c3fd36f644e448213988b1e4e5fe87163cd89757ef57da02b
-EBUILD kwayland-integration-5.18.5.ebuild 697 BLAKE2B fc08999b237dcf6f32869b539901900af7f4a2e97d53c2f4d3adf20f94dcca66cc76d07dec4ef0de9c0c40db2a4d31da50d7a82affbb96e426c65020ac60c382 SHA512 521c85e668974788b1a97592baf4f04658312fef90e080259b4c2db1de95201c29c15101c598af161f3bc46fcf4b4d6b1f8dab2098f1fabfb8aa5b263cc72146
+EBUILD kwayland-integration-5.18.5.ebuild 699 BLAKE2B fc20b6e47204ce57593ae3ec743ed702ea0bbdc0e29ec265d3b6102f65f539e5834ad2ea36fd1ebba581c7e6a9ed93ff29c00f59c894ec899f52767263a10763 SHA512 8974af9f97437d0249fde1b2ad429032e787c13a76f68b18f29e395d299f2742c86ddd600f9a43d33b843222f32a28b56e555cb3ab4da6a4fa3ac85212304fce
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.17.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.17.5.ebuild
deleted file mode 100644
index c5c18bebb272..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.17.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bug 668872
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild
index c23dadc1b568..a3aeee586daa 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.18.5.ebuild
@@ -10,11 +10,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://cgit.kde.org/kwayland-integration.git"
+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/kwin/Manifest b/kde-plasma/kwin/Manifest
index 95563ffad1dc..7dad8cb6151e 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,6 +1,6 @@
 AUX kwin-5.16.80-gstreamer-optional.patch 963 BLAKE2B 7a65b1e36ba1261cd97c9cca8cca39a03f932ef23780c9d5f1104bdac665744dd03878a5b7f1ccc20dccab42facb8d97474c31548b602db0debb27e5490ac76e SHA512 2b1de2ceeeed51bcc691273caea969243ef08ced929030daa94c0f19bad2fb31a507e3efbb9018833a8bd3b66850380dfbefb9018fa39e00664a1295b9482183
-DIST kwin-5.17.5.tar.xz 6251468 BLAKE2B 52e2c11e6164d0c1da49f818e842fdbfdea599460204ada2fdd5f1f09cb230d4c1fe96e8c00a85d8c9518af7cfcbefc584d0223701448b5afc009af5cf01e0cd SHA512 67e1f7044579b7c1ef7feacf92910f449c7eb5f6ca3ada3e1ff5820f811c1b4a168690b74a163659c84c9daf0094144b5584f287fefeaff8effab48bab7258f7
+AUX kwin-5.18.5-dont-exec-QDialog.patch 5916 BLAKE2B a8506ca70519c5f4a0d57ee26b76897f292d2d62cfe72b04084a8f098c543db7c431cd0d7c86a5689a064b86bda3223ea200aa803605aa6708a3bc037498ecd3 SHA512 ea9b4715ae677f22f46d0ef8661b9f8c75b27eadab928307dad0093e9f60592f9866dcb38d84794e621b3304690d5226a139d172411dd75155088701090eeba9
+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
-EBUILD kwin-5.17.5-r1.ebuild 3008 BLAKE2B 379173f5f8d92fe4657383dbf537188f81a6b0ee5732d967b3970f97a095e5a9bb056f12f65fb12546d1d71af005b22ab70c4c9ece2fe9520b5a445ddcb47010 SHA512 ada392af0be05ac08ec8c6275ea78d76946231b16890538d12a64965ff4f8303b8e8d4e32b83bf0445eaf75f4169b345a5ffac359e40697cfd475d1f392b8b86
-EBUILD kwin-5.18.5.ebuild 3012 BLAKE2B dc839920a16255c3198d3bcbf69697164f49cdcd957a21cec9a58fd3ae8bb31dc3e62effd70568e912d45d26feb9a7f2d50a8c0c516080efb931a6587568352d SHA512 efac2ffd57ee4c3fb9b004aafb7a7a7c92ea53fba6d808fe1278baef50718dc0eb74a5ffa9638ca662da89859ea7352b35e2257c583e95feaf189b825c6a16bc
+EBUILD kwin-5.18.5-r1.ebuild 3171 BLAKE2B abf91e2d96656acb472fde3ce1ae1247d72a4720427e2faae702a41a669d0cb2dd7db9b1b12ec0b5cf34edd27b3d494c700d9faa566435f0fb9b6ee75b08e133 SHA512 ebef4cfc82c7a4318739b9eff76c5ce32f526b451a67b5e2b0f44448dc4d3dfe837d069dfcafc3ad6cc31251071a41ef4e3e3ac89d330eea04d748fb9bd7ad8c
 MISC metadata.xml 347 BLAKE2B 9288920f1da9d97be4ba082678abbd6c404efdd6d7c6b997015e38e7d1f36f2b6201bda92799af0ac02287e86d2525c0a7e783e7efd305ed67ff8b96715ffe59 SHA512 e9e82ec176a53e1bea1eb323c1d1daffdcf900f1787ae76fd3de0434ffb8ac77429131ebbfc11080a1771ed03195e7d98c98be2ebf6a444de95d6cd0eb539824
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
new file mode 100644
index 000000000000..df65c32fb13a
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.18.5-dont-exec-QDialog.patch
@@ -0,0 +1,149 @@
+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-wayland-lockscreen-greeter.patch b/kde-plasma/kwin/files/kwin-5.18.5-wayland-lockscreen-greeter.patch
new file mode 100644
index 000000000000..ac4b9d24c8e1
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.18.5-wayland-lockscreen-greeter.patch
@@ -0,0 +1,73 @@
+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/kwin-5.17.5-r1.ebuild b/kde-plasma/kwin/kwin-5.18.5-r1.ebuild
index 27859ed33e22..33ac47b0ae2a 100644
--- a/kde-plasma/kwin/kwin-5.17.5-r1.ebuild
+++ b/kde-plasma/kwin/kwin-5.18.5-r1.ebuild
@@ -5,13 +5,14 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="optional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
+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"
@@ -59,7 +60,6 @@ COMMON_DEPEND="
 	media-libs/freetype
 	media-libs/libepoxy
 	media-libs/mesa[egl,gbm,wayland,X(+)]
-	gles2-only? ( media-libs/mesa[gles2] )
 	virtual/libudev:=
 	x11-libs/libICE
 	x11-libs/libSM
@@ -73,6 +73,7 @@ COMMON_DEPEND="
 	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
@@ -92,6 +93,12 @@ 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
+)
+
 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.ebuild b/kde-plasma/kwin/kwin-5.18.5.ebuild
deleted file mode 100644
index a66ce81e1bc2..000000000000
--- a/kde-plasma/kwin/kwin-5.18.5.ebuild
+++ /dev/null
@@ -1,111 +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"
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.16.80-gstreamer-optional.patch"
-
-	# Access violations, bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*QtMultimedia/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package caps Libcap)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 5883e393e685..ec913b311165 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,3 @@
-DIST kwrited-5.17.5.tar.xz 20080 BLAKE2B f9947b9d9c3350b7c08037a30c14b35e5f5d53339f99df5ef53703fc7c53b739a2e168e1581a2ae1007606590edde56d20adf07c711f2680e3dd045f6838f682 SHA512 b317860d6a9307ef9e24e48a538b7f1c8834133f03d306592bb5bdd855149f31195a4de7e46db2edeb3f26b5b608c7b16fbb46a5eeaf6b482eca14073f89b32c
 DIST kwrited-5.18.5.tar.xz 20236 BLAKE2B 3dad52dd60ad24dda97165332bd2a6182ac3fd9aef57b2f3e90ece0cc899617d99e84d696d3647c84197d088f383eaa9c96e88367abc310e1bdff81e0c57f842 SHA512 2c28ba26228394989524b46e68cd2783eff5c412ccfdaf12947976bde6a2ba732e696c3d8af666f87cf67062c75485fb0ed01f58ff3d727fedf8d440ddfd4f84
-EBUILD kwrited-5.17.5.ebuild 622 BLAKE2B 884005c18b75faa9ae21c435cf52b5c2ae96b13ea4bb69880fef3b2bf382582052d1ace654de78203fdb0edbeb6eb450cd4a261ed406c1dbe8541190f323cbfa SHA512 17128dcbc9eb342ddcc49d1397916ad57a4dd0eb0f129fc86cdbc5e508c303a4896800b9b30f9bdfe397ca86a47edea2f946365f3e9a8a46c48e71df19aa20fa
-EBUILD kwrited-5.18.5.ebuild 626 BLAKE2B 29ec3ac62a708619d24d46758932131efb0a66c277989b9a2f4880082221f38f1b06db99285c2720a21dab0a6b106ca0a47077651b26b7fbae4ae66b7282ec68 SHA512 588a3fd569607be5dc2aa8285251b15d14f74f15f33b0065a5569b652a975f55497db6fdb49355983144b5141f9ddf93d17bb8ba5561cec178bc297a18a566dc
+EBUILD kwrited-5.18.5.ebuild 623 BLAKE2B 00ae1b0954de469354d8d4b73a5e29b73faa93811021d8269b3d599274ce632c6fd52d2b82bd7dd2f810b040e9d57fe2c6536d801a190072b78f7aca811d5830 SHA512 98da6e9ef2033c63328eac9b52033cbab5018f164b80c3921b9701a0e41b738e8aec2092be6a467f576431c9ac8f3ed102c1e3404d2ab604da1d9ff5d3022a99
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kwrited/kwrited-5.17.5.ebuild b/kde-plasma/kwrited/kwrited-5.17.5.ebuild
deleted file mode 100644
index 0e3d527b4b8e..000000000000
--- a/kde-plasma/kwrited/kwrited-5.17.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwrited/kwrited-5.18.5.ebuild b/kde-plasma/kwrited/kwrited-5.18.5.ebuild
index 2582c33d16b5..659686c1f1f5 100644
--- a/kde-plasma/kwrited/kwrited-5.18.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.18.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/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 48d9b4b505d1..7da319f32d97 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,3 @@
-DIST libkscreen-5.17.5.tar.xz 83028 BLAKE2B a224c25d51e705b7f08dd3fa7c96d77680dc9289d35d696f00396e9b9ae1aaa3aa737d026a5dc9f6e54601562d21c79d09b6cb7d0f4694b303ddf1ef5fd758be SHA512 6ddc96e7213097513de955fc1c1b53ca947c325102079d83ce110dcd21c95c6e9e5b0be9c9a2f95f03e0eabf965d42e83a278806d11dc46e5915d906adc9a96b
 DIST libkscreen-5.18.5.tar.xz 85532 BLAKE2B eb9c85c88888dc82486cce8cd55c06cc9c180ac84a9ebd005cbbeb26233bccd3a48daadbff42cff33c92bf871c89bd84c5f291210bbf7768c7ad7b45641d7a0a SHA512 8fc36bfd5aeb94fada51be1895ff2cf1b9fa98332f1795ac5e9d5339a35d87a24ed15c1f44af85205198c584eb411191f72ef8de370d1f97476d75db1458cb00
-EBUILD libkscreen-5.17.5.ebuild 605 BLAKE2B 608c40af5019ac78625410de14ac9a8cb8dc80880d23716412c57665eefce5d536a1a888b4f7e31d919754e1f50b88fbd7747ba1d5405bc9eacacc323040f770 SHA512 7265d4e20ec8b9d24e78a91ff0f01305dc45b7fdb4f486b3e7a09e4c20a9f820668caae7002f3e6178bf0b1741f3d29c31c26bf30c553f24ccf976c8830c639b
-EBUILD libkscreen-5.18.5.ebuild 609 BLAKE2B eb0a5737260d70e636e5c629860e224a910db2db746584d8b520d9b778575d4d059914e8dd85ca73b5feca0bcbd93289967281b7c587588219e15d6c1ef2d43e SHA512 375aaac66c3ab8759cafd9dacf8fb8157fbcb905ce90410ea8b827a44a14eb67e58969304fd9757a75f8dadfaf0e62039e1d5c67ef357a80481b130569ed9029
+EBUILD libkscreen-5.18.5.ebuild 606 BLAKE2B d4d29ae7fe2ace3772cfc632ca430cd06cd14cbe1a5407be22ef0992c4daa8b589714166863ce59506bf5503e05ed902e539e3e579c31aabfb78e2322974e215 SHA512 22931f06aa1ae659ef952558df3b2bce5a33fecbf2992fc19023ed379627c899c1e29768c2eec9656ac743cb3232c0b644691e50fc860b05c737948645fbdf79
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.17.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.17.5.ebuild
deleted file mode 100644
index 60b6e6baf77b..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.17.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma screen management library"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}"
-
-# requires running session
-RESTRICT+=" test"
diff --git a/kde-plasma/libkscreen/libkscreen-5.18.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.18.5.ebuild
index 1d4fad5fb6f2..49b247ec7ab8 100644
--- a/kde-plasma/libkscreen/libkscreen-5.18.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.18.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/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 8129232c9448..487e558d7473 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,6 +1,4 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
-DIST libksysguard-5.17.5.tar.xz 605628 BLAKE2B 6c10b1299a1408f508a183a869468580ab705f35b20d6086118641e57c0ea87706e3d2c6812e9829c920fc03d472ce33df9c863c0b3359db7266506b142b7220 SHA512 15e12044bca64b5019c30e3e009a4533b03a19627e2ca8ce6e0fffe3c6554f57ae7b86d82be18d92edd7c6abfff9d123462915f44ec33f796f7e6b8b3e2491ba
 DIST libksysguard-5.18.5.tar.xz 610320 BLAKE2B c644bfa216ae851eb1520b9135add670ecbc4733be7bde27437a876141ca9f37c3531a78c347e7c00149e1d1f287a680954c3e885cfdc0838398626d6ed3d651 SHA512 a648d0db1378165188187db9de78f816b1dfe647ce7e7ea2d505bc04c5008d2c24b2a113bc73c4fc4b3ddf467682ea3b306286f4bffa2c750918112892d78fb3
-EBUILD libksysguard-5.17.5.ebuild 1474 BLAKE2B b6f0c08a54cd113395a32511e8c7794cc7c0c4afb680410760f5bcb8672e1978923d7e8e9af7c5f813973faa4dcc2e95f16092a189a6a64cea33627ed2fc4b87 SHA512 2ec98251ac838addb4a25b3ecda0ec38a11e8c00b01cfff3913189c2e4ba72de6642fee76b41b2797ba0ea9d07bad23766f468ab091ab18813f7d73d13fa97fe
-EBUILD libksysguard-5.18.5.ebuild 1535 BLAKE2B a5760cb9cd73e263201d77867f63bcd5ca52993137242c163bedac40dc4127a603d0d02630a1301d04835f6e5cb39f91954a1d200ce27225db3ca24ffc4f9a69 SHA512 a2bd666aa1cbc031a8c31d67b012bd7feac3660d916703ea50eb34f8d353919961317f684c5907677d02182b6ab3fafb9fd89703456edacc3e78429c3ba398a7
+EBUILD libksysguard-5.18.5.ebuild 1532 BLAKE2B bd23ce39743bd0d5f085771371fbe3bf352f0ca0b25191fdce0f3a4b3e638cfc9f3a757d3d5206ba528637bcda4a71f938fa0e5127d847328acfc8636d2d7ad8 SHA512 0987e280ae69e5ba924eb0de04d7163e652122d7e5d59dfa14ce0d5bbb1f09e761126a6f8f2b7c4eda99bae2640c0919ae7f3be9930cdae038758f0883f65772
 MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86
diff --git a/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild
deleted file mode 100644
index 4a5508fe8451..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="minimal webengine X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwebchannel-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	sys-libs/zlib
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	!minimal? ( >=kde-frameworks/plasma-${KFMIN}:5 )
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package !minimal KF5Plasma)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	LC_NUMERIC="C" ecm_src_test # bug 695514
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
index 01dc3bb8624d..a4a569627298 100644
--- a/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="minimal webengine X"
 
 RDEPEND="
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 71382cb62335..30a8afcb12df 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,6 +1,4 @@
 AUX libkworkspace-5.16.80-standalone.patch 4815 BLAKE2B 8269cba2d49020e643ae7aca211d9ecf2c38a8abf5c87cdb2185c80cb67824be1a3b79da67cd267e917c8d9ee3b67eef37b58b2845a6383d98c322b3ca90e4e9 SHA512 20bc3f75521e548311b2126ce40e59ce61e0beb85a0ce643e2b31e3a82ce3deb578e2b4049f5524d81129c4872661303bff9011623f0d8436358b3790115efa5
-DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-EBUILD libkworkspace-5.17.5.ebuild 1454 BLAKE2B 429d9b54828ef40aa70f9bb56da715533c9a8025013237f6bf985fabb0f2daa8e83db74126f5ff49bfdf7fcfd7b87a9a627b95a78a9a87351fc7e9c2327b2055 SHA512 732fea12c0760ad494ee4d3da87c45de526569afedad0e9c03a1554ace0207742349787e29d6aa63a7cb9dec889bd60713c2dc1b7dc9a7a03d7219441ccbcd8c
-EBUILD libkworkspace-5.18.5.ebuild 1457 BLAKE2B 970ed6585ff62205b83aefa1fa23b5efadcfc89f8acb77b87a34ff86124f3e045d49eed323af132ee68e5015e2956758869d11351cea9eee405891c39ed45e18 SHA512 013a56866df22b5b99ff7133ff2c792631cfb30949d34ab0d6a4178b653cb75a02ccbd9a0cbcdd2a18e3533244979931c827e9eb45f061145d829dfa3fd3be51
+EBUILD libkworkspace-5.18.5.ebuild 1454 BLAKE2B a885654deeaf4d2fec1735b188f42d48f5660df726f69e27ab721fba9f4abc01b5f01e18dca2ba68e2632cfcc2916a177940dc8190420ed6646b2bb685de8a44 SHA512 544539081c4274d1c58728a8c35ee312915ba61f3687c757c4acdc71d80ef52e1517e6f80a3862a2eeae7af69ec95f3ea89e425022e0f36c9f1f5af5e34bb23f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.17.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.17.5.ebuild
deleted file mode 100644
index 35332002324d..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.17.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-plasma/kwin-${PVCUT}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.16.80-standalone.patch" )
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-	ecm_src_prepare
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		cat >> CMakeLists.txt <<- _EOF_ || die
-			ki18n_install(po)
-		_EOF_
-	fi
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild
index 51ebb58c4a8c..cce15eca35b2 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.18.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.18.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/milou/Manifest b/kde-plasma/milou/Manifest
index a83e1726dc36..582207b30a45 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,3 @@
-DIST milou-5.17.5.tar.xz 63276 BLAKE2B e3d32791c5f2d8e74d00cd9cb6be1d2f4512253117cb15c935524f531465a1834faf3e58ef864abcdfbea0e3271d2289094073643729e43749789c68d9e8cad6 SHA512 f8be011264ea7a49c2ee899d57e42555382846f4ff448214b520264ddc9609da779421b8a74f6974de26fc0bc0357c5ee4d5344dadeeec9522d952e6dbceb579
 DIST milou-5.18.5.tar.xz 64264 BLAKE2B e4dba1cded6c5b833f35086b3cc943e4bfa4a0a6df530eb43aba7efbc40ea48aad8c88a2221546e7fdcc411c136232af84b7ab6a45d99233369c4a2c628f56d4 SHA512 3c1d0b032e8f26a637aed8067d919d95bcbf033e0b494bc9a2a0295d000773ac3900903dca96eb32d3fc1b831884e3435ab91a26c9cd179548c3b2cd0377577d
-EBUILD milou-5.17.5.ebuild 837 BLAKE2B 1a8279e2a76797c8fb610efec75df8c17dbab192ee2a1d3da4d47daa3b58b55ef265b25e5a3a95ef8d6eb674678d72a06e1d2658f7f33151f99e01bb74a250fe SHA512 4bd6ce3ed034cf57863bb929fbc26befcecbdce2254af816de121dab1e60a39fa08c25ab457f40578fa620c287de08c258d2d6fb5d2462ddeed86c9b4e3f55a0
-EBUILD milou-5.18.5.ebuild 840 BLAKE2B 09716e4d769837435cdaca2141a0394fa466d92661c6edb759a5e03609a55a03e1d44e48d06dea27c269ab3641a427d8ed92b60a11b459d4a9149b0673e26036 SHA512 135caec752d0125250bd30d9c54633bdb461a00f738c37d2893f57ac7d6250a3b75c4d9fabdcfff2db0ea2ad802ab5aa6abba8d568d4951ff06771f4b6344131
+EBUILD milou-5.18.5.ebuild 842 BLAKE2B db01ebcc996229b0918aeaebb5b58b798fc342f50eb5b4dc4d5c1e2d906a7171fd40ce1faf228ae04aed8611888086674d83f9ee3a4c48de2be24bf6bad09565 SHA512 965bdebf6546e32453e842dffef2b8b2f2ffd47d6eb314051a7f94f401542a1eed8b1e6eddfc26934607068eefca3c22768396aab649618b422da378193c9081
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/milou/milou-5.17.5.ebuild b/kde-plasma/milou/milou-5.17.5.ebuild
deleted file mode 100644
index c59ace0ac0c1..000000000000
--- a/kde-plasma/milou/milou-5.17.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://cgit.kde.org/milou.git"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/milou/milou-5.18.5.ebuild b/kde-plasma/milou/milou-5.18.5.ebuild
index 3f9556f47b21..e11a7e39587b 100644
--- a/kde-plasma/milou/milou-5.18.5.ebuild
+++ b/kde-plasma/milou/milou-5.18.5.ebuild
@@ -10,11 +10,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://cgit.kde.org/milou.git"
+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/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index 732057e63d67..786b2a4dbd0b 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,3 @@
-DIST oxygen-5.17.5.tar.xz 4470600 BLAKE2B 7dfcc26a05c479c30e10223a5af063fd5580fee375d62e3261cf79cfb41fffc63af299af0690b48a2417f4562f1526f84cdd1debf53193085062f719b944d1bc SHA512 59a49c3718d7332640ff5f8ffee6afe665dfedb8504728d80a7672859429739a7926296b462e457f2fac5b98a892d51b32202db8f0ea75dcea61138449f79ab3
 DIST oxygen-5.18.5.tar.xz 4471212 BLAKE2B 72839684b00bd9382475c26dec2d4ff73b8f84318a326c12e4fc25f4452b731c23f853b1eace2d2257df5e82ddfb104fcd70231b7431546902384288438147dd SHA512 e965e8edbf94d2bd2241202030960615286c454c02bedfbca29670c9dacf55b5f34a8dda1ec3ef9f18f4bb864ff8721acaf559f14cfc1c22e7b5385865cec579
-EBUILD oxygen-5.17.5.ebuild 1357 BLAKE2B 206fac33689e01d77bad4a9702d96dc464af8c2edd1e14ad02ebbfcbf906c62a7f8bffe3e4e7dc928bab4384f747efb135e94bf40bd73dd3b582272b15892e2c SHA512 0d9ca94475b9cd7a775d38728a16ad33f0dea1af9ce20e41cd11f441da60fe0f55138173f69fcf7ed77ca158d17e68e676c54c63d43bd5aee16694eed815b6ef
-EBUILD oxygen-5.18.5.ebuild 1361 BLAKE2B aa5255e88abc5d8d7672e3276263e7c38571ed75e48e69caa2813386a022d7c04e8e716ab33825fd0a0b345d62ce2c5116ddc036cf96128287d6289841aea93a SHA512 106e137d22a11a17d8fe9d815ee5e4749a6490ecfce99c5aada51c9dd98cae074d623a69e8fef74ea11bcd5ee67cadccfc1b7340b62d358650222d18cd25dced
+EBUILD oxygen-5.18.5.ebuild 1363 BLAKE2B c5fed27ea231e1a9bacd0cbaf9e14df7b5af1ab99e800b673804d05388ad62dbc24e6519fc2e14d00ab5357172861a98bf0ce19fc1082c2d54ae94706cced55d SHA512 851cd0fe3d8377280fd78f5c9a20a777ba13ad5afed901aa81f2b201f41b1276237256d3837fafc64ac5889e6e13fe5df4007159738ebdde6f23ba1a32b88dbc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/oxygen/oxygen-5.17.5.ebuild b/kde-plasma/oxygen/oxygen-5.17.5.ebuild
deleted file mode 100644
index 4ea68b8ec15d..000000000000
--- a/kde-plasma/oxygen/oxygen-5.17.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/oxygen.git"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="wayland"
-
-COMMON_DEPEND="
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libxcb
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/plasma-desktop-5.16.80
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.18.5.ebuild b/kde-plasma/oxygen/oxygen-5.18.5.ebuild
index 4c77767f6b20..b446528ecc51 100644
--- a/kde-plasma/oxygen/oxygen-5.18.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.18.5.ebuild
@@ -9,11 +9,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://cgit.kde.org/oxygen.git"
+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/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 21bba261d38f..834b0aa04a99 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-browser-integration-5.17.5.tar.xz 147220 BLAKE2B e995dfdefdfc4ec8decc5d957e900b02ad756458623824d4c81a375540f5956765118cd85cd4814783596f7573dfbd357db0c75085cdbd4db6d9a8384d540620 SHA512 5387838cc22dd78a21da5c9d0ab3529878e107b5f06d21252bf2a93119171d20180920cda28cd5e1c5b780db1cdd0d63b206e3d988f088c8e5d1d14c08ddb5f0
 DIST plasma-browser-integration-5.18.5.tar.xz 156428 BLAKE2B 9f83e33c871ea59fc73ed6dbf26e137f5dabfa4bb2403d71a0621cc0c41b1a15b461631b6ab864649780fe50c54f9428394716d8d5055453b51616c393daea96 SHA512 096bfc0940fa3a40fe5145078fe801e2436779ac3333e953a68f7a68d3d592e3978606b70f1678c83a0748221e4d992ce14e0cb72c671f242d13db41390e8730
-EBUILD plasma-browser-integration-5.17.5.ebuild 967 BLAKE2B 9f573bceaedc7ef771e98c4f8547fe5a4e3617baaa5f2befbf8529b9ae59d573a810f2e506d7576ebe7caa44f3f2dc800d80e60d81630cdc3e61144ed572d730 SHA512 61ef9c2a98a2afd6ee12eecc981a871ae4aadbd4f37ab4d06e6906cb2f95ed0f2465ff31c9be4c2d367fe5d312716b867193706ac194dcd13468975e02eef034
-EBUILD plasma-browser-integration-5.18.5.ebuild 970 BLAKE2B d9b9ab31d36c56fda42ee84eb2688355b7b7fe3ee1e20def0cd8ae39dfb7569624b4c8bc6fb5a657d5597e7e2e23d7d54943317fb6e613c64964d8f636038f7c SHA512 10a21d984e1458de1998ac7ff21f83fdbd9cf2890f74aad5b9853ccbb4bc4a87da19e1a36a40d956a41f26b07fa6ec965844813f32221012559ff6c377993ac2
+EBUILD plasma-browser-integration-5.18.5.ebuild 967 BLAKE2B 9cd19e00f7845e16fd4dbcac7752f182210a1986d02f3796bd26488319848c724267783538b6ea0636629e12e18cfcf8bdbea1347376b99d3286bb7195508388 SHA512 bc98bfc39553fbd53c65c8ef5f419e779cd5029d536a8494efdb27a177a522aac224e3a351d27a5392cc466e31398d7651916696df860a802a7cbb524e050746
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.5.ebuild
deleted file mode 100644
index 977e96d1b340..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.17.5.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild
index 4d2d15d9ea73..bc8d467ed23c 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.18.5.ebuild
@@ -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-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 5d8e2835d118..ca887e1e033e 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,13 +1,11 @@
-AUX plasma-desktop-5.17.5-revert-activities-jagginess.patch 1214 BLAKE2B 3d6517a6020639a5f0f7720d22e45c985a95553bb62a2d365d219ff05d18eed5c105c17c54b21eb114e85b2012dead46f1e928d1082b7b1387d813e75144f775 SHA512 c7910def604e6a6cf23d11d50c33f585d67a7e539cdfc2d4a81449e46eb4e823fe63e484f5cdb535f4fdec0fcc6be805ede703b74b22b88f4dc941593b6f4fa3
 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-override-include-dirs.patch 3334 BLAKE2B f715aba5b555d7adec73748233398337b18e70e3ae069ee0ca48b3ea661ba386ef81d5f34f851b6b6b68e945ee6ea200f17ed58ac057b603a8460c53bb8f1c9c SHA512 3aa585f2c51d7efd77503fbb49cb516d4d92ece3f8c163edb96c8e45a7f8e64d55e6c7c3956127841b4c48126857308b950fc06f9ac52821463fa04322c50822
-DIST evdev-properties.h-425ed601 3662 BLAKE2B e538376a81fe519eb43c739a842111e449643deef968398181e948e9cbc0d71b280ae35386c1076f06e0d315ec1a0fbda883cf43d41e752564e1e9d921285189 SHA512 7a7425787d94c7d7f22c0870976af523c82d2b4c2c14dfa56e969a23a02bf97ed73b268790d4e59bc575a094e9d90c0c90d84af116f02583a360d1c70d6dbcd7
-DIST libinput-properties.h-e52daf20 9255 BLAKE2B 05e002dec267e5019ea37fbbb862f0786c671773021f246d0e925b7850ee063c64fcad216db0d03f5561848852bfcf699b197e42e4d4ae8a0d1a9c9c213cad52 SHA512 20e00e7c8df2126dbabca969d5a5df2c5aff9d4b7d5d08a8676d9b2ff90cc422c979e253f6f0d98f1df55c66de98bfd9bb81645c223b1fdf5dfc044912d8216e
-DIST plasma-desktop-5.17.5.tar.xz 9448300 BLAKE2B 2599c77527d4210f442c51b7bc8465fd35be83c711f1fcd9a31a6206475319035aac7962320bb47f74bd89d7a70e0ab46b866dfd5424d23d9934806a2b03d3f5 SHA512 c910be6bf63091f14f190e8fbfbd0039aa175d30f7a6870dbd99ffc3ff49a0f77e63e2d3fc9319dab1c650b15108cdaefee470eddab1213afe8d3a149ac64dd4
+AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac
+AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f
 DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
-DIST synaptics-properties.h-383355fa 5932 BLAKE2B 5108697e861f0de8c6fdafa731f819411e09881801c32fc1d3f5d8a2cf360655fd551dd3ec858195c056d6666863947441cebea6f119f37e2cb65321c85cc902 SHA512 91065cbdc64da46dfa19ef93e939bf4e4773ecf740a228551e4bc38dc83dd84f83db6f2dfd1f1be2108dd54416752285298dfe5a447a28891ca194463d9354ae
-DIST xserver-properties.h-d511a301 9515 BLAKE2B ff660a01266ef52ca01189040cec71efabeb683604621dc435e0a65de58919fea92ad9e14839c538132df74aaa395d1f63e75120d8361420c20072b7ba0152fc SHA512 916c05e13798a538b7dc9c46d77764aa65c582d6c513702ad18f10560eb71605f1bafd08a4eff6c86adff51d5a007185b2cdc71a07af138c82130f1fd9c28f2d
-EBUILD plasma-desktop-5.17.5-r1.ebuild 4071 BLAKE2B 8710be965b9fa342a9c8d4331181cf4ccb1f258fccff4cd19ce2b17a6e0c79a3ef3ef79a5bee41e11ba19a9334c800c57723b18089211111ca5879bc0d2b216a SHA512 669dd8f639d8b7c36b4cd45268972935c18dfe8a274c532100573d65d20d714dedce1c2d4879a543dfc1534827e1a9ab1d1ecca39c7036ef25d4f753ebfd838a
-EBUILD plasma-desktop-5.18.5.ebuild 5597 BLAKE2B 94551323951fba190ecf92d133d9c06f8abd22aa5d552dc97034ce27e2330d6137643ed8fa9fea0421077dbe52754c6c91b74260e9d5960c8bbe5f802fb5e8c0 SHA512 0cc26d88f21646abf3858865def961b8c43a0d9075bbcebef408d24c84d49b9d3184ec83f7f795af42eae0ea390ccf4886241a26af6ef6f6323d1c00b0108259
-MISC metadata.xml 514 BLAKE2B 31b846e6675005788e3041e22365385edcb4ac253db87f15a048b7d3a0cbe61494ce7a3e495444ef9c9bd3455e566d7a89664a8969041b22a3474eb4e99d1397 SHA512 a14dbd159795a2982ba81c0856f2f058664b807a3c26afe9371e4be3ccb5bb0b8a48c086fd580549c35006821304df4c22ad3a1c7e43d5fda4a37688044fb99d
+DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
+EBUILD plasma-desktop-5.18.5-r1.ebuild 4868 BLAKE2B 473b0603ce3954570fc675f48229b7dbead2211a3d686ad3e3cf09a33b86f8a699948f054a8a88f784fd46119cabed4748f84b4c9000444b8144e45968f0dbea SHA512 25181e9d3352bf852bb1dbebbb616fddea612b61d38c019df12f07ac2ecf0f89c1a19478bbc15002e63cf23444b8d965e66d37ab8f75747c5b6bfb2e64664a13
+EBUILD plasma-desktop-5.18.5.ebuild 4512 BLAKE2B 1e139447f604f0aa4ca1041a742b5137fa934508675a1ad14ae3f584fbd45df8bd0d62f9c1806b9a8dc43cf4f68d2456faed8bb71359932c71ff2746a4b02dfa SHA512 4fe5864070bbcf16283e2fa821b02e56674304b836511662a21e60a6ae4e6be84f6727f8d7ce41f28f6284cbc28a5420c5a4866299c12b591feb493e705d28bb
+MISC metadata.xml 418 BLAKE2B f68267099811af01f47317ec163041980f834d34a61f6eb5584969e1172b9fa819a635664a1ec8ec49496a42fe0b27ed0cb0de34485e866836719aa185e2d37e SHA512 537579f9f3c1fe8b457826637da7b8fb5ea46986f2a71d28fb2de29fe010d5b08596059bb59160e36f346ba2fea4df18ad16896c27561528e2e9fef139e64ec5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch
deleted file mode 100644
index fac8bab91b6b..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.17.5-revert-activities-jagginess.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1db4d07bb78858da7676720d13ee7c4f3bd8e6e0 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 12 Jan 2020 08:39:29 -0700
-Subject: Revert "[KCMs/Activities] Fix jagginess for activities list icons on
- high DPI systems"
-
-This reverts commit 567f71714faac305947573e307f486a9960cf1d1.
-
-The commit in question was pushed without review and should not have
-been. It worked fine for me in local testing but somehow was broken
-anyway. Sorry. :(
-
-BUG: 416158
----
- kcms/activities/qml/activitiesTab/ActivitiesView.qml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/kcms/activities/qml/activitiesTab/ActivitiesView.qml b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
-index 531ef9f..aac13a2 100644
---- a/kcms/activities/qml/activitiesTab/ActivitiesView.qml
-+++ b/kcms/activities/qml/activitiesTab/ActivitiesView.qml
-@@ -52,8 +52,6 @@ ColumnLayout {
-                         height: Kirigami.Units.iconSizes.medium
-                         width: height
-                         source: model.icon
--                        sourceSize.width: model.icon.width
--                        sourceSize.height: model.icon.height
-                     }
- 
-                     QQC2.Label {
--- 
-cgit v1.1
diff --git a/kde-plasma/plasma-desktop/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
new file mode 100644
index 000000000000..17db7fc5b516
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-KColorSchemeEditor-blurry-icons.patch
@@ -0,0 +1,44 @@
+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
new file mode 100644
index 000000000000..d7603e434a69
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-animate-column-moves.patch
@@ -0,0 +1,37 @@
+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-fix-animate-in-animation.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
new file mode 100644
index 000000000000..cc39c1e46488
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-fix-animate-in-animation.patch
@@ -0,0 +1,49 @@
+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-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
deleted file mode 100644
index ffbf2b644292..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 6971b5eac2088d263527b2b4a85bb08b1a2dc792 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 6 Apr 2020 00:41:07 +0200
-Subject: [PATCH] cmake modules: Allow include dir overrides for various input
- drivers
-
-FindEvdev - evdev-properties.h
-FindSynaptics - synaptics-properties.h
-FindXorgLibinput - libinput-properties.h
-FindXorgServer - xserver-properties.h
----
- cmake/modules/FindEvdev.cmake        | 4 ++++
- cmake/modules/FindSynaptics.cmake    | 4 ++++
- cmake/modules/FindXorgLibinput.cmake | 4 ++++
- cmake/modules/FindXorgServer.cmake   | 4 ++++
- 4 files changed, 16 insertions(+)
-
-diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake
-index 153128a90..c19c31a96 100644
---- a/cmake/modules/FindEvdev.cmake
-+++ b/cmake/modules/FindEvdev.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- 
-+if(NOT Evdev_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1)
- 
-@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS
-     HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR}
- )
- 
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS)
- 
-diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake
-index fb5f9bc3e..eb56965e0 100644
---- a/cmake/modules/FindSynaptics.cmake
-+++ b/cmake/modules/FindSynaptics.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- 
-+if(NOT Synaptics_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_SYNAPTICS xorg-synaptics)
- 
-@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS
-     HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR}
- )
- 
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS)
- 
-diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake
-index 1550751ae..5b7af5e79 100644
---- a/cmake/modules/FindXorgLibinput.cmake
-+++ b/cmake/modules/FindXorgLibinput.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- 
-+if(NOT XORGLIBINPUT_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_XORGLIBINPUT xorg-libinput)
- 
-@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS
-     HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR}
- )
- 
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS)
- 
-diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake
-index 5248c6d25..9de16dba0 100644
---- a/cmake/modules/FindXorgServer.cmake
-+++ b/cmake/modules/FindXorgServer.cmake
-@@ -31,6 +31,8 @@
- # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- # SUCH DAMAGE.
- 
-+if(NOT XORGSERVER_INCLUDE_DIRS)
-+
- find_package(PkgConfig)
- pkg_check_modules(PC_XORGSERVER xorg-server)
- 
-@@ -39,6 +41,8 @@ find_path(XORGSERVER_INCLUDE_DIRS
-     HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR}
- )
- 
-+endif()
-+
- include(FindPackageHandleStandardArgs)
- find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS)
- 
--- 
-2.26.2
-
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
new file mode 100644
index 000000000000..593665a53c58
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-stop-multiplying-duration-values.patch
@@ -0,0 +1,140 @@
+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 cf13ed12c3b9..52f99fa25fe2 100644
--- a/kde-plasma/plasma-desktop/metadata.xml
+++ b/kde-plasma/plasma-desktop/metadata.xml
@@ -7,8 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag>
-		<flag name="mouse">Enable mouse KCM</flag>
 		<flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag>
-		<flag name="touchpad">Enable touchpad KCM</flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
index 36d9ae8b74ae..0a0651b0385a 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.17.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5-r1.ebuild
@@ -5,19 +5,33 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
+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 +mouse scim +semantic-desktop touchpad"
+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
@@ -57,18 +71,8 @@ COMMON_DEPEND="
 	>=kde-frameworks/solid-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	>=kde-plasma/kwin-${PVCUT}:5
+	>=kde-plasma/libksysguard-${PVCUT}:5
 	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	media-libs/phonon[qt5(+)]
 	x11-libs/libX11
 	x11-libs/libXcursor
@@ -83,49 +87,57 @@ COMMON_DEPEND="
 		x11-libs/xcb-util-image
 	)
 	ibus? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
 		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 )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
 	x11-base/xorg-proto
 	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
 "
 RDEPEND="${COMMON_DEPEND}
+	>=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
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	sys-apps/util-linux
 	x11-apps/setxkbmap
 	!<kde-plasma/kdeplasma-addons-5.15.80
 "
 
-PATCHES=( "${FILESDIR}"/${P}-revert-activities-jagginess.patch )
+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
+
+	# 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 mouse Evdev)
-		$(cmake_use_find_package mouse XorgLibinput)
 		$(cmake_use_find_package scim SCIM)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package touchpad Synaptics)
 	)
 
 	ecm_src_configure
@@ -133,10 +145,11 @@ src_configure() {
 
 src_test() {
 	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# needs D-Bus, bug #634166
+	# 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)"
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
 	)
 
 	ecm_src_test
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
index 2560f8c7928d..78ba5b38ae68 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.5.ebuild
@@ -12,24 +12,12 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma desktop"
-
-# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs
-# just for 1 header each. touchpad also uses a header from xorg-server.
-SHA_EVDEV="425ed601"
-SHA_LIBINPUT="e52daf20"
-SHA_SYNAPTICS="383355fa"
-SHA_XSERVER="d511a301"
-XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"
-SRC_URI+="
-	${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV}
-	${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT}
-	${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS}
-	${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER}
-"
+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"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="+fontconfig ibus scim +semantic-desktop"
 
 COMMON_DEPEND="
@@ -129,29 +117,18 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-5.18.4.1-synaptics-header.patch" # in Plasma/5.19
 	"${FILESDIR}/${P}-findxorgserver.patch" # in Plasma/5.19
-	"${FILESDIR}/${P}-override-include-dirs.patch" # downstream patch
-)
+	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
 
-src_unpack() {
-	kde.org_src_unpack
-	mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir"
-	cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \
-		"${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev"
-	cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \
-		"${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput"
-	cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \
-		"${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics"
-	cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \
-		"${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver"
-}
+	"${FILESDIR}/${P}-KColorSchemeEditor-blurry-icons.patch" # in Plasma/5.18
+)
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package fontconfig Fontconfig)
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include
+		-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)
@@ -162,10 +139,11 @@ src_configure() {
 
 src_test() {
 	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# needs D-Bus, bug #634166
+	# 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)"
+		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
 	)
 
 	ecm_src_test
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 456f6f012e79..7517bb57cdc4 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-integration-5.17.5.tar.xz 56836 BLAKE2B aa22d2f362f07e33ca75ada88b05a93ee9bc6f2bb6e136d9a08526e54a1e68a5c7947e617085f068363f40d5748b9fdcb7a93ad57016dd6844718d843c01897f SHA512 9341ca525e1c02b0ee00d01221a68f683717f89c19408f5b94004fa13fb63fa7983609756ce64fd0b21301fb2a51a3e531c0b2bc1c46ca656dc41b08076baca2
 DIST plasma-integration-5.18.5.tar.xz 57656 BLAKE2B 3cf445f5d84de07e82369a3057a0ac390961634f8926d3491ca8dd0d603d4e4ff9e7487b69c1fbea44a4296c8960f4e3ef677e1bfd183154a36799fc95dbf3c8 SHA512 d217c49555ee17e3b18d006368ec7aa4d8585c05070bcf3a3c7e471b1c7dc830080d0405209979d8a27c7c2fc2adcd3d248e595f43f0b4a2928683f93c6d4b48
-EBUILD plasma-integration-5.17.5-r1.ebuild 1306 BLAKE2B fa1cef4c16b42503cdf668c5029242bd3df4e597844abed15d3b552b75e64a709458a7f871545f89244ce9b92339b12f999a0f65ecde5f2b17931a2c372665a9 SHA512 810e9037df1415f6e224a64b912c3db67e6dd72c1b25cf6e679799eb28e1cc0d42cf67685b0d8a00ca03690d0dccf1d943f39149abd33125e150a2e28f88bb8a
-EBUILD plasma-integration-5.18.5.ebuild 1238 BLAKE2B 92085aa9838e1425abe95611d8ef8de7098c6fc12f86fe5df12ad02405b45bb9aad64f19f59edeaf3d0a5d2b7f7a465e8a58b7ccbbaa06fc38659e2baf7bd62a SHA512 7828db79a3cecef55126d301d9e03ed6a073583981f618f08e7208bbab1d739a1a9a6ae7bec515847fd6e53e30817677de65456f7d20fe9980e32b681af28c3b
+EBUILD plasma-integration-5.18.5.ebuild 1235 BLAKE2B f1f0e5a637021d9d0ae8c0c3b6680a1f4ac63c8e2e4203bb8936f8693839bde3fa9f7e28082b5a4dca7c2dcabca95f7f18f0bb694e60d79421f10286c4446db5 SHA512 4877687f7608f7a8a1c24e6c8823ef4670ec5307996dcfec8e6682be227bb8e06a29e2c456d1e30f711d76f89855e70250904d3a602f2cbf2e9d45bb93e34dfd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.17.5-r1.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.17.5-r1.ebuild
deleted file mode 100644
index 812b0146b60a..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.17.5-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
-	|| (
-		>=dev-qt/qtgui-5.14.1:5[dbus]
-		<dev-qt/qtgui-5.14.0:5[dbus]
-	)
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
-
-# requires running kde environment
-RESTRICT+=" test"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild
index b69100326522..f7f300f1c4a7 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.18.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.18.5.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-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 41a278b7ac86..d0a6370d6e6e 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.17.5.ebuild 3963 BLAKE2B def2f279918fb1a11de64bac04d5736e462940bda0ec174a86b3b9d49e3edd8391dd3c7ea4e9ac300adf3589b534c1f791679bae2ecb8839fdc1ee67b6c156d9 SHA512 e2de63da15aabb94d081531f98ae76e90b11c589a8cf6ce0538372b471f3b74e54ce1ef83e90522517d1ea509dffe865b25f764edf9075bee7aaa3953c26c6e2
-EBUILD plasma-meta-5.18.5.ebuild 3593 BLAKE2B 01b0751515b222b6d0b846a1ebb763dc6f9823e42d4a730e37f2d03e7a72d29c41a1ffd3f82e25ab3bb62ec5b26ca8d79baf048eac336434699da3cc9dd7f341 SHA512 614fab51d1fd80955418bd602c64f42c31707e57b4fa77382699ae879ec9523f6274340118df8bdc60e117c33b092da542a41fac2c7f1b474728184bcc38a0dc
-MISC metadata.xml 2287 BLAKE2B 737ca5566ffbe9108ba08ca23d13a8545188205a2c83444ee9287794dcbf73abe85c51e1eefd50d041ffacc9d2c492fb89f9a5d784959bbdbb10f2948993f071 SHA512 2c3bd20504b63e55496e2560d38b8067028e6f86746fbc96e4e0dc3a038777a2fcde71f08dbd9e173ac8e32d5e18edbd00cc170cbaded96cb39740a3036f5cc8
+EBUILD plasma-meta-5.18.5.ebuild 3591 BLAKE2B 2bbb63bcbb24f978ebb1c45924f972a9a75ffeb0bcb057724da7ffbd1592b3568a7697f24dc243152d55d6bfe54d429c3cfadff2051b08eae57394ae707bae22 SHA512 aea46e2332c22dced31879348e8d8854f16e4150446a632bd7d51c6cccc8e928e8e54042821239550c1053349e2d9a3bd8841643ea9ae5789288c41a7c8dafa5
+MISC metadata.xml 1963 BLAKE2B 0273adb85723495addae8367af9da0ceb907cf86aa0bf4fbf6289aa291b1b19ecd66f191ee12d62427a5316f0f75d831ee2c0ac0d2b246812a52c476aa95fbb2 SHA512 18f5c9bd29f79478e7c976ff4ab4194de3256e4d7da75cf83fd7c8b4af02d39a4ccc1d85cf672529e17f3cb84fb7ab1226d452d5b669d055e88764d2f8b6e6c9
diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml
index 946d4ed97a21..544a90543cbf 100644
--- a/kde-plasma/plasma-meta/metadata.xml
+++ b/kde-plasma/plasma-meta/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="browser-integration">Enable integration with Chrome/Firefox with browser extensions</flag>
-		<flag name="consolekit">Enable <pkg>sys-auth/consolekit</pkg> support instead of logind session tracking</flag>
 		<flag name="crypt">Pull in <pkg>kde-plasma/plasma-vault</pkg> for encrypted vaults integration</flag>
 		<flag name="desktop-portal">Enable <pkg>sys-apps/xdg-desktop-portal</pkg> backend implementation for Plasma</flag>
 		<flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</flag>
@@ -17,9 +16,7 @@
 		<flag name="gtk">Enable Breeze widget style and system settings module for GTK+</flag>
 		<flag name="kwallet">Enable support for KWallet auto-unlocking via <pkg>kde-plasma/kwallet-pam</pkg></flag>
 		<flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag>
-		<flag name="pam">Enable support for kwallet auto-unlocking</flag>
 		<flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag>
-		<flag name="pm-utils">Enable support for suspend/resume with <pkg>sys-power/pm-utils</pkg> when using <pkg>sys-auth/consolekit</pkg></flag>
 		<flag name="pulseaudio">Install Plasma applet for PulseAudio volume management</flag>
 		<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>
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.17.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.17.5.ebuild
deleted file mode 100644
index 80afb66be17c..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.17.5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="bluetooth +browser-integration consolekit crypt +desktop-portal discover
-+display-manager elogind grub gtk +handbook +legacy-systray networkmanager pam
-plymouth +pm-utils pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
-
-REQUIRED_USE="?? ( consolekit elogind systemd )"
-
-RDEPEND="
-	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/drkonqi-${PV}:${SLOT}
-	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
-	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
-	>=kde-plasma/kdecoration-${PV}:${SLOT}
-	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
-	>=kde-plasma/kgamma-${PV}:${SLOT}
-	>=kde-plasma/khotkeys-${PV}:${SLOT}
-	>=kde-plasma/kinfocenter-${PV}:${SLOT}
-	>=kde-plasma/kmenuedit-${PV}:${SLOT}
-	>=kde-plasma/kscreen-${PV}:${SLOT}
-	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
-	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksysguard-${PV}:${SLOT}
-	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
-	>=kde-plasma/kwin-${PV}:${SLOT}
-	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}
-	>=kde-plasma/libksysguard-${PV}:${SLOT}
-	>=kde-plasma/milou-${PV}:${SLOT}
-	>=kde-plasma/oxygen-${PV}:${SLOT}
-	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
-	>=kde-plasma/plasma-integration-${PV}:${SLOT}
-	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
-	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
-	>=kde-plasma/powerdevil-${PV}:${SLOT}
-	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	>=kde-plasma/user-manager-${PV}:${SLOT}
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[elogind?,systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
-	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
-	consolekit? (
-		>=sys-auth/consolekit-1.0.1
-		pm-utils? ( sys-power/pm-utils )
-	)
-	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
-	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
-	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
-	display-manager? (
-		sddm? (
-			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
-			x11-misc/sddm[consolekit?,elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
-	gtk? (
-		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
-		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
-	)
-	handbook? ( kde-apps/khelpcenter:5 )
-	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
-	networkmanager? (
-		>=kde-plasma/plasma-nm-${PV}:${SLOT}
-		net-misc/networkmanager[consolekit?,elogind?,systemd?]
-		qrcode? ( kde-frameworks/prison[qml] )
-	)
-	pam? (
-		>=kde-plasma/kwallet-pam-${PV}:${SLOT}
-		sys-auth/pambase[consolekit?,elogind?,systemd?]
-	)
-	plymouth? (
-		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
-		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
-	)
-	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
-	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-"
-
-pkg_postinst() {
-	local i selected use_pkg_map=(
-		consolekit:sys-auth/consolekit
-		elogind:sys-auth/elogind
-		systemd:sys-apps/systemd
-	)
-	for i in ${use_pkg_map[@]}; do
-		use ${i%:*} && selected="${i%:*}"
-	done
-	for i in ${use_pkg_map[@]}; do
-		if ! use ${i%:*} && has_version ${i#*:}; then
-			ewarn "An existing installation of ${i#*:} was detected even though"
-			ewarn "${PN} was configured with USE ${selected} instead of ${i%:*}."
-			ewarn "There can only be one session manager at runtime, otherwise random issues"
-			ewarn "may occur. Please make sure USE ${i%:*} is nowhere enabled in make.conf"
-			ewarn "or package.use and remove ${i#*:} before raising bugs."
-			ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-		fi
-	done
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
index f76835939a3c..21f98aa79e0e 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.18.5.ebuild
@@ -8,10 +8,10 @@ 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"
++networkmanager plymouth pulseaudio qrcode +sddm sdk systemd thunderbolt +wallpapers"
 
 REQUIRED_USE="?? ( elogind systemd )"
 
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 5dd5a8b49781..45e88114c5fa 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,4 @@
-DIST plasma-nm-5.17.5.tar.xz 814376 BLAKE2B 757ac2a1ed3eb1263a0034f950d688194ad1a11e6b842208f12d8abbfabcc75461510312b3e63a166d691b538c276ed74c367eeb2122774d669915366e82695e SHA512 45792671afd3ae9b8cebcaed7588524f04234394c178055211a1896a8a3e5ffcf48229f65ec7815f1ef51076860bc4388d37de6b058c24e54f0772eb1c3111a3
+AUX plasma-nm-5.18.5-missing-wireguard-icon.patch 1698 BLAKE2B 37bb63676905746999df50b87e5575d4ec1207dec37848e18216123760d84b577327c20346ede1dba263975253db6bcccfbf4b91167f59aa173b08baffb7e542 SHA512 485e56c592da9f30e5acc94f9f2e8af66989e70aa74ae0b4756dd4e7008729fa1eb1d43dd329983565366937eb7a057a74741b8b456db462cf7f7af00ed1b841
 DIST plasma-nm-5.18.5.tar.xz 828008 BLAKE2B 557a31d5a0e7886be90e62be3f5328baf4a8bbfeb3e9decf1f2f106f33bef7e64fb886b94691faab57119f231b6bbcff58514d795df75f858ca9c8ea8c1af9a7 SHA512 8f785f257f274fb9384bf2afbe4231a057c46706483e26dd2270a93a6fc97e6198916ff119d258a67d4f8bb73facb0ff67412f43e5fa66812962edb64331db4a
-EBUILD plasma-nm-5.17.5.ebuild 2289 BLAKE2B b610535d9b7e84406b9e3ee979faac4e304ad48e7667a4d2ddedd3c27c351629125094fd8e9dd59f099a9d947b3197356945a5401407d0f53262dc8aa1557dcf SHA512 6674d13a28dbb14d4ee83e34885b37584ff9bda3764a655773840f548db6f61c0ce4d9368129abff95ca398d502ca9812a33083779d2ca766cc08a6726467893
-EBUILD plasma-nm-5.18.5.ebuild 2293 BLAKE2B 7178d50ebdbf38e1a021a30b96afdde4e3ac573d2fac2b75ea945678501bc8cca097f5ab1cf60f42cbdf5411c5b80224604055a45176116ccfb1cde9fb3efb63 SHA512 8a071a6ba739a43df2fe680c152d3f2dc251ab11732a62da3e3a4c45f7c9b89b928e71a49bb7a2caa1fb4d58d3880e7d842d8f1cdd9c1191230e06339dded699
+EBUILD plasma-nm-5.18.5-r1.ebuild 2368 BLAKE2B 6bb2e5feb6f4182e620ae1f410639b9794ba2e175bf053dc74d5efde0db63cfcf13e5b4595c387acacb68c4675c296e74c8de2d9c28c078bb7e263cd33fa4861 SHA512 1825154c7bd0d60f70cc4fe02ef3b1f5b82a9533c56f9bd19ae53d31b2a1c3576e098fffe83b5d8a778765c27b19065643327ba71823e129285d2eb40d6ec078
 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
new file mode 100644
index 000000000000..85902e504096
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.18.5-missing-wireguard-icon.patch
@@ -0,0 +1,50 @@
+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.17.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild
index d292c7177f7a..fd1c44fe031f 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.17.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.18.5-r1.ebuild
@@ -4,12 +4,13 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.64.0
+KFMIN=5.66.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma applet for NetworkManager"
+
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
@@ -59,6 +60,8 @@ RDEPEND="${DEPEND}
 	>=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-nm/plasma-nm-5.18.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.18.5.ebuild
deleted file mode 100644
index b54f6222850e..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.18.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.66.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
-		>=dev-qt/qtxml-${QTMIN}:5
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		net-vpn/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake_use_find_package openconnect OpenConnect)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 2645936b46c5..fffc87d7fc28 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-pa-5.17.5.tar.xz 104280 BLAKE2B 3f6c8679c1136ac6dcef6aa608f01846e8b3f5e1826aec14d808e5c7d87c899992912fb9b72730d6f1de146acfc171e3105015126d26ef3be6f9e0d818d913ef SHA512 6ccc5aff0a95e816ca517e39412fdfcecf39958e606695820684d1dfaf654f161ef256c45e31b0f41cb5ecc7a9d4c362c29716b532db375218dd0f994c0f0ca6
 DIST plasma-pa-5.18.5.tar.xz 105148 BLAKE2B 19b79ead20bc54d6f1e8f515980590f402c00a3c3e82841c66e8cece4f9bb90e87a7a5bf0c02afaf5e7bbfa3715c418301926120d4cd69d94d4c3dc54b8de0cd SHA512 fff3049d4879e4f6fe428985dd14f91fa6bac8fe2e7c696ee1424d610038f61fd7eda2621bfd2c2643529956f7986b59c9eead1ceb79e1cfb1397fa52b470376
-EBUILD plasma-pa-5.17.5.ebuild 920 BLAKE2B d8a6ef3958f2efe10d1ac4177029ff07e469c81edc45056c2173fc038959a7ce0ee82a1d54985fcd4722ec369b7166fb30160e614fc5a127b657bd493dc4d8b2 SHA512 14d36877fad348cbb5d0aca4a0a4ceb4b1c2935a35586faa574ed8f6c2349cac4f12c572c32c0ae58f022e254cb48fba76f887d1f60a3105de1ad7b3e004eb85
-EBUILD plasma-pa-5.18.5.ebuild 924 BLAKE2B 46196acfc12839f1db8250ffda188ff343cb6ac0df9a735d66945a0de081dc81ebccf5947b51c8ed30649e129a73a130ec41ebc027651e82c73822f3cf018c7b SHA512 ba99545f066ac4b859bac25304a5dfaf0382d915ebcecc433f5614c618ba84c3e0dbdd4bf38bbd757297630cd9c9fb142b66658c3a9736a0a34393782964a435
+EBUILD plasma-pa-5.18.5.ebuild 921 BLAKE2B f91d1a72122c2e6f7e2615c64fec080bb8bd2ea9e1430f87b831af844bd925ef2be813d0a610f5ba6bea709978a71e74c9b2d5beac57224a87323cd5ecf07c78 SHA512 b22214bda000bb3eff9743e3f7f8dd5b2b73b7bdf932aefe34fd38309e8f212929bd36b5c3f775ffcda459e7b2841ab96cfcaa7f19f8cd8ca164a183358ac9f3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.17.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.17.5.ebuild
deleted file mode 100644
index 52b344f3119c..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.17.5.ebuild
+++ /dev/null
@@ -1,37 +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.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	dev-libs/glib:2
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-RDEPEND="${DEPEND}
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	media-libs/libcanberra
-	x11-themes/sound-theme-freedesktop
-"
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild
index 8ed54fe8fe1b..b5f98dfc02f5 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.18.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.18.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-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 950f4af0b8a1..9af9d0949040 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-sdk-5.17.5.tar.xz 260124 BLAKE2B 51e0155a59c75af6e06d96a949c0fab5baae87c839ecc2cf4e9be448eb281126a3b4fd316f154aaece123815f59dd4957548611f8af5371955fd718913337074 SHA512 aa1f949daaeabc78c2ffffe78cf5a1bcdceada360b4c2f9ce37e4ada73ce849fae9bccca9ba944c33de9d0686428079c486089e99bbf70665e9dde2a038ee2ce
 DIST plasma-sdk-5.18.5.tar.xz 263084 BLAKE2B 575235302ade4bc1bcfdcef33f9fd3cc4175d4362aaabd2a3bc8e7d7235d90f3c2f81c8b499e486c0f68e029b298e4879707ebb1d23052230c2403e825d5943e SHA512 1051aa84d70d7a02d3392d3b1628b1fb4d4b666efca6e34f0688dc0015b983527039bd52140cf17f947f2d266cacb63aab7c9b547e6679a0aab094e74c1783a1
-EBUILD plasma-sdk-5.17.5.ebuild 1254 BLAKE2B 99f5136be42061c84139f9ff4da4ea392670b1b8a725bfd192b3e61037b1c1e74291bdad26dc6e2d76a089ae9303d88ee2e8c5a9c32f669a749c9091bb8ce20f SHA512 50bf770527133b573fc357e65d86c873c2dabde9dfd106f3f645da87dedc9574c4347c3374dfb72fa7a4a29c82a648e54d595ae2552e87d7008f93ee162fae53
-EBUILD plasma-sdk-5.18.5.ebuild 1257 BLAKE2B 3e1b650b816887484749e61b8fc6dfb8a8f7bf32d8cd64fbb46d50b998440b7a0b937d5f0343712fb2177b1e278a3ebcdda50a28d8c451b73789c0fcf405aef4 SHA512 3e1225060d5b6da1608f8f19b8e9e311aea23f553f61d484a10731202944a6a7e186ebcb2851d451c88ca5be594cbe2bf1e3542484e1eb41aba1b9b92c7db981
+EBUILD plasma-sdk-5.18.5.ebuild 1254 BLAKE2B 85b6ae2b9ca81257af4d98c697d33ddb57e5a62caf9f7f24afb4b35b6ba614f2920b39c0d0434fabce334802eef716262f4ffda8a9f183688bd36b66923befc6 SHA512 a2840b282743e897f7c5d0e67564a7310cdc622fee4187580e99578c63a5a9e86acb9af405895f29f6effdc4818c0b3526e406b6c0a0a0ac09d6ad3f7db14e76
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.17.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.17.5.ebuild
deleted file mode 100644
index 17d2c4544bf9..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.17.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="optional"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Useful applications for Plasma development"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild
index b3d1a3b9ad45..445a30894149 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.18.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.18.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-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 88c811694054..7bfec8da40c3 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-thunderbolt-5.17.5.tar.xz 48356 BLAKE2B 18579420fcd3d99b2c948ee48391914ae33001ac95e6ec8a83d6f04d6343d25c6682e954b7c5fd1978d48b32ae200c1ce08c5a6465a037320358246a7cdb9de8 SHA512 8287e20963a31af60dff75a659af455518d72813b7e04dfd5407de4bbcda422551a000fd3ff03b67d4a052dc0421058c8ae8c31c1a92d174277d6a02819f6f70
 DIST plasma-thunderbolt-5.18.5.tar.xz 51248 BLAKE2B e87339f2d81bfcfb60e02284e1e57aa17b1a01844cd4e0157b3b10b1bee4d4de5b02378b15c750977350a768f2c5c2f01e629405c358afcbad0765d1c7943598 SHA512 4768a69abc474b9daa2c3f880ef12829ce4804a44b4502b31e083802a5ba4406ac52001fb397415958cd52d7f76aa7dc54f8945665957a8a5557ca93e345ff76
-EBUILD plasma-thunderbolt-5.17.5.ebuild 771 BLAKE2B 2b9449ca11f2c946f6de69dfe4c0432237cb9e31b4d748bbf75906ed0eb0be9a23f317208a2498daaddfe54198bb5d131deabb685d44e2b40f6b49b559f14abc SHA512 4a02282641059e52570f176ba3812f12d218e35db037f4f67c3c034cc6f7ef551e29a783a4aa63c4f5f5a95b15280d1e6fab6a5816097d52e2139cc23bc2613d
-EBUILD plasma-thunderbolt-5.18.5.ebuild 771 BLAKE2B 917402e56d4109821ab5c7dabbfef8335e56d9ab3132c17a4bc3bc8ee79ff204835c1890635c0060009c9367472421853e543241fe74d0dd7a5af641a45625df SHA512 fae1c0ab7ca2c957ab0e37c4acf6acb0c9c823311c8e47a96038dc92e2333d2c989e611a954bb1d614ac2d3bd9f09f74a1e9ca0674b9631b128a8c7427e2955c
+EBUILD plasma-thunderbolt-5.18.5.ebuild 776 BLAKE2B b25cc92413af7084f906f1e2fb7c6d504274667b34a06277b864ce0fe050d14da49319621a2117a2ea55102a5f2b820d2d39307a10c0d3fb4cfee9bafa17685b SHA512 e68c4c104dea6c3de072b40790526b39ecacbae0c1663d756711429c9e7cf91de2e305c1438c9c03894ee0816f49676317906d3a749f278bd5bb39cea52ecf26
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.5.ebuild
deleted file mode 100644
index b7005f618469..000000000000
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.17.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
-HOMEPAGE="https://cgit.kde.org/plasma-thunderbolt.git"
-
-LICENSE="|| ( GPL-2 GPL-3+ )"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/bolt
-"
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild
index 03c59fa4845d..ba958e8362cf 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.18.5.ebuild
@@ -10,7 +10,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
-HOMEPAGE="https://cgit.kde.org/plasma-thunderbolt.git"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
 SLOT="5"
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index d06284562a68..72ad8f93cbb9 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-vault-5.17.5.tar.xz 129144 BLAKE2B 87cf670facbbea5808be8fe220a9218e02ddf3355459782977b098551ebfe18dd34c029243d666f9bb9c2262094808bdc71e77891c6b9f2907fb830e67603f2f SHA512 fe130942a31f815400f7bf61c5d822f272e32f0291bd94dfcb6b3c8317a33dd8cbf4e23724a6d670d1975511b5b9a22a75c08e918849c4910bac3a5197964383
 DIST plasma-vault-5.18.5.tar.xz 136900 BLAKE2B 29b538760dbfae8cb83d820d51101bbf27436e46cff034fbc9b7541998ed6bc1870435d7fac9894b7bf105e173121e791c9d387a3c5c9476dfddc3a4b335e072 SHA512 66fcd87dee7e696aa0f5fa41adcb41134bb0da1ee9920f51057ee8729f8d88052b28f4e422795fc229767b7861226d1386086748afb356f4cb7281c1da4af7e8
-EBUILD plasma-vault-5.17.5.ebuild 1229 BLAKE2B 9ad1a92652bdceca1746727e64de556368abfc84397d35db9193b0fc0294e82893fb873d5638d0bb66b3e7b80a69b98c2c4aa57f606ea6a3747931bbc0095ef7 SHA512 b65401c926d6a5424e2f24f5531dbb9cd0cd694d23ba72e4f5fb2f36faa132feb58ebc2e35f8a33fd17d628bab8c3e2e3492e30fc989510222973b009e107ca8
-EBUILD plasma-vault-5.18.5.ebuild 1232 BLAKE2B 1f39a82a78a2e8cdced0626ed991efd089b7f4edf8561d4db3fb7fc7d3bb66ff9acdfc76e64bb2a47fead27c4e8e15fd059d4c44d7e9c01ab574e21dfc8d0364 SHA512 90eaffe12bc1a7375eba7035307fde57be2fdc7712424efe15dae8770d9c0e9fcb240c2c5604a59ee9c6387c18cc9f72c5971e69479734cb979dc326297b7ae3
+EBUILD plasma-vault-5.18.5.ebuild 1229 BLAKE2B 3820124d691b0eb7422dd9967facc5c0a500e1bca599c5c295dc521a0d9d5e546b1613015679307cf0c65a5db0f92a6b60d396ed5f2c40f4cadaf3dea1b7d13f SHA512 7459542ca31413e9b88f3f9fb096757a5d699dda153839610d9b74a24f60ede9523715b267c76031502e6e48f2b809482a3577e774ed4c316780ad048c064a11
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.17.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.17.5.ebuild
deleted file mode 100644
index 14c0ffdc067f..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.17.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="networkmanager"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild
index ae5c9feab2c9..ca9ff36158a9 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.18.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.18.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-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 1a4b25f3e0c7..432d82aa91a9 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-workspace-wallpapers-5.17.5.tar.xz 34173344 BLAKE2B dce8cc422523c55b1b9fd33c139dd8597b0130ce1d7dcef9065421d1e5da24c5f2ef3ca176154aa21c39d81f3c5d53170a3e22697cbb84c3306de0271dcb134e SHA512 d1fbdd52632009a77d31e89105323d26edaad20e2083dca27acb0f7c796f534a7a3e4223659b7ccc522513eb7f7d3e4e200251626bda60475d53f9a095ce9fe6
 DIST plasma-workspace-wallpapers-5.18.5.tar.xz 37110292 BLAKE2B 34dcfad8d3d47a32b63a3d002cd3ce4c59a4b5127002df4c5a39c7df4296890ef59713fbe4c52693ce728aa7a349ffbf3c133a28699f314791e485b28cbdda95 SHA512 75d5042fd955849cb67b1f7711b2e3e63d03ece7aacd4fc88bcd8c8652ca40a62351c1666b9c86275d1b495fa73d0089e8046dc1f65fc6fb23d9010ddc6f514e
-EBUILD plasma-workspace-wallpapers-5.17.5.ebuild 348 BLAKE2B c449bc49a75155acc1348de26718af57f8bcc58c75effd5102f471f4b6acfd43a969d4a4cca058d3aea144dcc3d8dd133f22b52ff20ef2f10b5e73d53ca642a9 SHA512 0b1b68aa9a5b5c0f2b4964f71b1ff59f2cb2f1f6a542f6c3182b8ec838ee3d6778d5bbc99b665363a7e68a1247fac50d8c17184f90e1e0a99427a3b718c39412
-EBUILD plasma-workspace-wallpapers-5.18.5.ebuild 351 BLAKE2B ebcadb1a2f7539dd43ee5132dfd359b39f2d2004b6b513c8f51f25480f65f626b2eded11361bcf1d9dec3d2607ae17e7e4b074c0efac898f2fba6c5c3514ae9e SHA512 4ccb55e72e0b523a380f4d4c1aa94c36d10b7487705987d5677308208d33732f7b3a4029f62400dad65a185eeff0b39e65be6d33fcac9c5a3ec0273cea4c8f1b
+EBUILD plasma-workspace-wallpapers-5.18.5.ebuild 348 BLAKE2B c449bc49a75155acc1348de26718af57f8bcc58c75effd5102f471f4b6acfd43a969d4a4cca058d3aea144dcc3d8dd133f22b52ff20ef2f10b5e73d53ca642a9 SHA512 0b1b68aa9a5b5c0f2b4964f71b1ff59f2cb2f1f6a542f6c3182b8ec838ee3d6778d5bbc99b665363a7e68a1247fac50d8c17184f90e1e0a99427a3b718c39412
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.5.ebuild
deleted file mode 100644
index 56aeacaf1b52..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Wallpapers for the Plasma workspace"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtcore:5
-	kde-frameworks/extra-cmake-modules:5
-"
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild
index 0fe9c7985bde..56aeacaf1b52 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.18.5.ebuild
@@ -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 7f204eaa02a1..b2a7680e9754 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,10 +1,9 @@
 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.17.2-waylandsessionrename.patch 2568 BLAKE2B 45be5b7221f60e6e1f2d449887f348f0462458ea25cc0559b4a48ca9e3726cd241ea6d32d23f61cc0ee755e1e7d42bda1ac8dfd454bf55bb69b53f3d60c6df7e SHA512 f36882781987e85b76bc2d2ebabae355f26d9579fe194fa32c3425c0fb8d4cabb6f7f34e8596026e0cedba5f65fc0036f432d91f6a20bf689938717db1e4f235
-AUX plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch 1806 BLAKE2B f1c6d815035b55c7084d047b08837ee6769935a6c5def8225da3ded9ea988a228b033453399b5a51ce4203338751d1fc81380efc5d5b75df04521aa988a93bce SHA512 bc4939198fbbb0ccee339e7558805c49991cf66784d87d04a4cbc4d80ddccd05bffb00bb5d1bb9a6d6b57ed5961884e2c2bfd6c9a26fd5a32d33f6f776292663
-DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
+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
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-EBUILD plasma-workspace-5.17.5-r1.ebuild 6858 BLAKE2B 7115b9c493a4d5db004042b73eedfe0b91fbc88d100decf3cf94efb14c29ba6828896e7772bf0f1eeadd13419cd4f45b042f2fafc1021db4dbfaa60618c2834e SHA512 2df5bbbc37f0a370d857ae4f8295cca61409c63124f5f4a23f72fd834eb0d4706b7d9b5dc443e4ea7decf982198427af647bd7d28bcc788669c5707eaca09a10
-EBUILD plasma-workspace-5.18.5.ebuild 6894 BLAKE2B 5240f4375d20fa5f02d365b98b7a4359ccae30142f23cf748f68ff007c6cb620141d6b41df6cf19e985c9799269e0b412bda2b92f285199ebedf3b70540b2c6f SHA512 41b5490dcd371a47f6b07d5f452efe4310d67e652ca981c5c9c4fcdfd20d60d75c226060b7e956ed4e8679f815bd033eab87c341dcb4d9e0590dc1b0d4f397a5
+EBUILD plasma-workspace-5.18.5-r1.ebuild 7244 BLAKE2B 14e6f270b72f168e446df3fb8250ccfeb7b73432a2d723c24dde6848047d6290c1c6d51ec4e170877b34803f6e4aacc67c7ced1a37183b2e3386066bbde02ef5 SHA512 fa7287fe087844f55399406d01919438747020db920601d00696c6650feadada5468910d453e05e63ecbccfb19b50c736ce2e19d430660f85fada033bd854e51
+EBUILD plasma-workspace-5.18.5.ebuild 6987 BLAKE2B b17560d59293f948bbcca87a39f3770ec39a319d2d2f8b3df194a35191f068483d0c5e218594212fdaa4af5c954ae03f7fac454f9265bbc70badc681c06a4ca2 SHA512 4fab8614add4a4b0e457e0de49926e13b712a82dfdb4726c72ceaac104a7f1b509228194f5648411164e0dff4ec5283c44f0151b12d23a46a1e2a73203f53ba1
 MISC metadata.xml 752 BLAKE2B cd21241fe0de70e075d26290b647b72126b451e8da5f174c5b3616fe4c509fa7cc2beb090ad05e1eef6d4357ac5fa2b6c2425cc71403e0ff576611bf6916bbda SHA512 cc8629cb747580ae01c0fd102859055f93fd70b0d515e646e03e5d832447a0a4ae663f86cfa756b7c30ce7d49a29a513da8a243cfdfcfa1cff0f84234699097e
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
deleted file mode 100644
index 71d1ce4abb87..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 36bc9bfd9661f88039a8945688e07b0626b48610 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 15 Oct 2019 18:33:45 +0200
-Subject: [PATCH 1/2] Fix Name conflict between plasma.desktop and
- plasmawayland.desktop
-
-Summary:
-SDDM until 0.18.1 appends " (Wayland)" to the name of any session file it
-finds in wayland-sessions dir, and Plasma is relying on that behaviour to
-distinguish between its X11 and Wayland sessions. This leads to duplicate
-"Plasma" entries on any other DM not applying the same hack, e.g. lightdm,
-and users are lost without downstream patching.
-
-SDDM in 0.19 only appends " (Wayland)" in case the session name does
-not already end with this, to avoid duplicating it.
-
-CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409
-See also: https://github.com/sddm/sddm/pull/997
-
-Reviewers: #plasma, davidedmundson, fvogt, ngraham
-
-Reviewed By: #plasma, davidedmundson, fvogt, ngraham
-
-Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D22210
----
- login-sessions/plasmawayland.desktop.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/login-sessions/plasmawayland.desktop.cmake b/login-sessions/plasmawayland.desktop.cmake
-index 64f997ea4..3e9b46bc9 100644
---- a/login-sessions/plasmawayland.desktop.cmake
-+++ b/login-sessions/plasmawayland.desktop.cmake
-@@ -2,51 +2,7 @@
- Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
- TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland
- DesktopNames=KDE
--Name=Plasma
--Name[ar]=بلازما
--Name[bs]=Plazma
--Name[ca]=Plasma
--Name[ca@valencia]=Plasma
--Name[cs]=Plasma
--Name[da]=Plasma
--Name[de]=Plasma
--Name[el]=Plasma
--Name[en_GB]=Plasma
--Name[es]=Plasma
--Name[et]=Plasma
--Name[eu]=Plasma
--Name[fi]=Plasma
--Name[fr]=Plasma
--Name[gl]=Plasma
--Name[he]=פלזמה
--Name[hu]=Plasma
--Name[id]=Plasma
--Name[is]=Plasma
--Name[it]=Plasma
--Name[ja]=プラズマ
--Name[ko]=Plasma
--Name[lt]=Plasma
--Name[nb]=Plasma
--Name[nds]=Plasma
--Name[nl]=Plasma
--Name[nn]=Plasma
--Name[pa]=ਪਲਾਜ਼ਮਾ
--Name[pl]=Plazma
--Name[pt]=Plasma
--Name[pt_BR]=Plasma
--Name[ru]=Plasma
--Name[sk]=Plasma
--Name[sl]=Plasma
--Name[sr]=Плазма
--Name[sr@ijekavian]=Плазма
--Name[sr@ijekavianlatin]=Plasma
--Name[sr@latin]=Plasma
--Name[sv]=Plasma
--Name[tr]=Plama
--Name[uk]=Плазма
--Name[x-test]=xxPlasmaxx
--Name[zh_CN]=Plasma
--Name[zh_TW]=Plasma
-+Name=Plasma (Wayland)
- Comment=Plasma by KDE
- Comment[ar]=بلازما كدي
- Comment[bs]=Plazma od strane KDe
--- 
-2.23.0
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch
deleted file mode 100644
index 114e653df8e1..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ea66bff2af8466f2bb5acafcc43ac8f79b1f447f Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Tue, 21 Jan 2020 11:55:49 +0100
-Subject: Also disable automatic scaling on Qt >= 5.14
-
-Summary:
-Applications which set `Qt::AA_EnableHighDpiScaling` use the DPI of the monitor the window is on to calculate an additional scaling factor.
-Plasma sets `QT_SCREEN_SCALE_FACTORS` in the environment for manual specification of per-monitor scale, which combined with the automatic scaling may result in double scaling.
-To disable the automatic scaling, `QT_AUTO_SCREEN_SCALE_FACTOR=0` has to be set, even on Qt 5.14.
-
-As a side effect, this works around QTBUG-80967 as well.
-
-BUG: 415421
-
-Test Plan: On X11, with a >144dpi monitor and a scaling factor of 2 set manually, scaling was doubled previously. Now it works as expected.
-
-Reviewers: #plasma, apol, davidedmundson, fvogt
-
-Reviewed By: #plasma, davidedmundson, fvogt
-
-Subscribers: acooligan, fvogt, asturmlechner, dfaure, davidedmundson, anthonyfieroni, plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D26185
----
- startkde/startplasma.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index 8d88587..4a89878 100644
---- a/startkde/startplasma.cpp
-+++ b/startkde/startplasma.cpp
-@@ -222,11 +222,9 @@ void runEnvironmentScripts()
- 
- void setupPlasmaEnvironment()
- {
--#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-     //Manually disable auto scaling because we are scaling above
-     //otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us
-     qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "0");
--#endif
- 
-     qputenv("KDE_FULL_SESSION", "true");
-     qputenv("KDE_SESSION_VERSION", "5");
--- 
-cgit v1.1
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
new file mode 100644
index 000000000000..7cbe139a1669
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-sddm-theme-prevent-logo-leaking.patch
@@ -0,0 +1,94 @@
+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
new file mode 100644
index 000000000000..83539c14c043
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.18.5-stop-multiplying-duration-values.patch
@@ -0,0 +1,93 @@
+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/plasma-workspace-5.17.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
index 41f1e2d666a5..4662a7858bf0 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.64.0
+KFMIN=5.66.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
@@ -15,8 +15,8 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd telemetry"
 
 REQUIRED_USE="gps? ( geolocation )"
 
@@ -92,6 +92,7 @@ COMMON_DEPEND="
 	qalculate? ( sci-libs/libqalculate:= )
 	qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	telemetry? ( dev-libs/kuserfeedback:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
@@ -105,6 +106,7 @@ 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-plasma/ksysguard-${PVCUT}:5
@@ -123,9 +125,13 @@ PDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-	"${FILESDIR}/${PN}-5.17.2-waylandsessionrename.patch"
-	"${FILESDIR}/${P}-disable-autoscaling-on-qt-5.14.patch"
+	"${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"
 )
 
 RESTRICT+=" test"
@@ -182,6 +188,7 @@ src_configure() {
 		$(cmake_use_find_package qalculate Qalculate)
 		$(cmake_use_find_package qrcode KF5Prison)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 
 	use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
@@ -201,7 +208,7 @@ src_install() {
 	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
 }
 
-pkg_postinst() {
+pkg_postinst () {
 	ecm_pkg_postinst
 
 	# Clean up pre-5.17.4 scripts
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
index c71af205dabb..d4db44181265 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.18.5.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 )"
@@ -124,7 +124,11 @@ PDEPEND="
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" # downstream patch
+
+	"${FILESDIR}/${P}-sddm-theme-prevent-logo-leaking.patch" # in Plasma/5.18
+)
 
 RESTRICT+=" test"
 
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 5ec97d990fcd..2f27a59c1856 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST plymouth-kcm-5.17.5.tar.xz 40372 BLAKE2B a78f79960dd0623647be478fe37c9d15b7eb55c1a6cc2037fcb72d5d86ed0226860fc258850b7313bb75788580e0089f86656b97480c7b0d93c726ed6bb668ae SHA512 2751c89408538c58821d71aeda47c57584b647f006b7fcad0a67d0247a861523be6b3e253a2e3b32c9f0f3be0613385fef49bc2b68d8900f1e9e1be54e989494
 DIST plymouth-kcm-5.18.5.tar.xz 41872 BLAKE2B 29e9f8e56478140c0f4d54d297c9efdc33d2f20b18d9e1b1f16640c1abd1a2f5b6033ebf3053384dda6380d2a51c476842fa8587d402cba2e9bc0f98d6d44823 SHA512 ab9c883d4ed23315e925884662c72b42b350a1938b7dcf24dc30e0486fdd4c4449dcdc30abc45b3007d586e07998c96834918d2e91fcda3163c0f9f5b62c37cf
-EBUILD plymouth-kcm-5.17.5.ebuild 953 BLAKE2B 55fb8fae91eb57a7a792d2e9749241fb126dffbe18bc2a00441b64bff4b3ef62f965992640ace73739a72a28d46f5b450048a0c0b9db41e0db772ecfdf666650 SHA512 1caa8113e020582c336612dd478033de4d34d771ffde40ad9051e1a003bfe971eda4966f0e7277182311350588b4a05f03c12605d741eed669c6ec57b4707b04
-EBUILD plymouth-kcm-5.18.5.ebuild 956 BLAKE2B 19391b4d6e9feeae48aa6d9fedc076206d214be5697eabfd7e7a53080e82b29c9a30560f3ba20db375c292783bf0f26b0c3b10c23fd3e32472f321703637304b SHA512 fdee2de679378deced8d5ad85f719005ad1c41cc0bf5e256c327dac6d3466bc2d3664438448ce099867f97a9a38841cc999c59dc700f2b3b8cc5382a8790d981
+EBUILD plymouth-kcm-5.18.5.ebuild 958 BLAKE2B 21ee959fc8ec20b11b30b272728d545f94a78c85ed6ec54cac60f2d2b2b9611d34e116b75d362f574e6ec80ef8d1c68436a46306a3e91ee7a3796ea444286b68 SHA512 9af21656b05c7c475b25fd37040987bd4c020b226d6660cbe05ff529eecd5b79280b8facf5d1a7804c8b1055f5bd24b250a66545860b2d2d757022812b469695
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.5.ebuild
deleted file mode 100644
index b284411b35d9..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.17.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-BOGUS=1
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild
index f7cc90b1d829..b10b03c30f97 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.18.5.ebuild
@@ -10,11 +10,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://cgit.kde.org/plymouth-kcm.git"
+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/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index ff5f7b89e715..89c2dd281122 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,3 @@
-DIST polkit-kde-agent-1-5.17.5.tar.xz 43340 BLAKE2B 14f97204f9d93e4aca9d0f9bb98dfd7b74b03796958cf065bb4026a03489159ca45634b9db009c2a025fcf826a1ca8ad1f32e962047d56e0010b017b6569979c SHA512 0103449f58a82c07ae76e214a7fddcf29b034c5e9f73b6cf2d6b11e2e4510b1deba1a0cccc578304defb445e9012d40deca88c647b3727b83574f2eeb223894b
 DIST polkit-kde-agent-1-5.18.5.tar.xz 44592 BLAKE2B c9fe8bdc719bf5719358ff2633a143690114f5d6aafa2321cc02e15f1ffcdb78bff0666e05f4a028d504d6fec85e40c7b18489782fa6dc10db71e45bb8d343a9 SHA512 d9441e2379b665aa28d79451e5390a22f7a06f946020fb8c498352b0202a7ecbf7ca2e8dfccc7ee390d51ad441aeb6d818610d0d2e6a753e63326e4c350aba30
-EBUILD polkit-kde-agent-5.17.5.ebuild 804 BLAKE2B d15dee3acd107b7ae34c74b704ae757ccd86de366591ded0296d6cc702677042bb5e2f1cf798af3aa28d624f1c3bdac16febef9b34b53ddc197e34ffc2a48bb2 SHA512 e916086bb3d17282409db64f71daa14c0fa2a7da0af422f839e44441d8daaf1be7ad026a6979b95f88e328d4c9e5dce4e4f942be995118b2ff0b9354b1076a0c
-EBUILD polkit-kde-agent-5.18.5.ebuild 808 BLAKE2B c4f7c80466882c7d7198e4756a6c4212cbed1e63c227307e3288c20526a5dcf313532bfcaefc023779a14e6aa3c246855908f7273a28198c5ef3b21e48e26a0a SHA512 2129fe252644ff46c1314c7124573e0bfc362c1c965223dbe2f75a99f77790857cbc27014f4f7efde0fc5bdbd7081b5caace191b73000c7425106a2371319c5a
+EBUILD polkit-kde-agent-5.18.5.ebuild 805 BLAKE2B 3eafa464c89ff32e66657919a6993be2c96fc57e43001ebee550d1946b97705fa2bac08c905b5900e9d7b80187215a55b3d76c6b0b324d7c219de729ffcd360a SHA512 b0f4bb931f111dce6bc76a0a46848de76b46af967c1dc4a9c14c197d59a4ff46b546dfc151cc0c40d26f59fe6e08cdded592d566ef013c2980a190d8e206dc59
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.5.ebuild
deleted file mode 100644
index 91c9ed7757b2..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.17.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="${PN}-1"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://kde.org/"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=sys-auth/polkit-qt-0.112.0[qt5(+)]
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild
index a2677ec86c8c..e2e80ae0f5b2 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.18.5.ebuild
@@ -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/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index d4c2e8c608df..21ed4f4ce8d8 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,3 @@
-DIST powerdevil-5.17.5.tar.xz 593788 BLAKE2B 3bd0bd3c37ccbd0993beeb53f2a76f08ea84eb81811bb1f7da8f59d75f39a8f34ccc6d9b10fc93002a52d1b8a76b9dd35e3790643dfb7c1687c14ce914a0d66e SHA512 a763ea1811cfdb6978e3e4e26311a9ddeb2d11ea5a80eed6ab5e28361007526554750f41b4f8adbc44a2d1fc16324432fc4f25152441dd17eb81c80448c9820f
 DIST powerdevil-5.18.5.tar.xz 597492 BLAKE2B 510d523b470f281c1b71902a6e2938d5566b3a653909d4b08d75cdfa190bd2f2a2a0befa7f71b3af331f1511733502690d58c2fed13262da82381eae66605885 SHA512 b7054099cbf3e176591e4fff68ce1dbb7eb9d2f332a75bea3e2ad5954246f6d4d3b0018de101d8ca0df8c7cfa1988abaed40840466a503e09251e4af623fd3b3
-EBUILD powerdevil-5.17.5.ebuild 1866 BLAKE2B 8176c66e0a382e0f06ce40674761f858c06339a033660d8e16efbaec461317db36eb27a6e1ff6bfa8db8eecc9bd2ab610795ba78250f68e2d302802e19278574 SHA512 9894caedf59d444ee793f7532d7412ae3b1c4050a6633a87afd2369e7e3a74783a9a19a0020f0de2c6e3e25c1b5d3799e69a0d14dc5c340f9c91c0a05b329388
-EBUILD powerdevil-5.18.5.ebuild 1870 BLAKE2B 2b7dd5ffd7c6d3dfce117bcd5a127d277ea56c90570db3b926607a0d16feb99d1143e976ebaf6ecbb16ff4e4c2a977a2e2911defa3ade77f2de94967251f9379 SHA512 ac42def8486cf755ca47a9f1733e55652750245587d0e1067046727029ddb9e5d0c9c60ea66e31041737f90ff914bc4d74b792f2a0ba3d38806ce7b255ac58f0
+EBUILD powerdevil-5.18.5.ebuild 1872 BLAKE2B 46ab9c544e709262b937789c9e04a04aeeb6ab849d79590f9e75a6cb558f9cdcac31e9961e17da24ef19ec3fa67e92cacd1438ec0943603de314d9832c3771b8 SHA512 612c2b81b1b6ee6b76c6d9d82ef0046f6ee007702c6870540dcd3b560e1f72dc42e4ba2df3d70396ba1f279b92beec234ed6e82fdf304ce6a40e47400ef91871
 MISC metadata.xml 528 BLAKE2B 9548d3d1af958f0ad037e7df6f12a844c0e0ff51376512732b03520856914321e34ba95a533a003f581759f878b61393cf573e90d7818b8ddab71441d9a67f05 SHA512 72536e575abbe4fcc7e3320b3649f87d33dff3af231b54d06707802397963e373962df1d8ffda7c3975b298804ca2d42254d339531861e88590c44fa49fce58f
diff --git a/kde-plasma/powerdevil/powerdevil-5.17.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.17.5.ebuild
deleted file mode 100644
index 17db46ec63aa..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.17.5.ebuild
+++ /dev/null
@@ -1,66 +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.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://cgit.kde.org/powerdevil.git"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~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.18.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
index 3f5d960a107e..da5ea9b9b346 100644
--- a/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.18.5.ebuild
@@ -10,11 +10,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://cgit.kde.org/powerdevil.git"
+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/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 6989cd0564d8..d40824760ba1 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST sddm-kcm-5.17.5.tar.xz 59304 BLAKE2B bad791db8bdc4ace1060d3c49e6ce5100d8aa39c42f356ad5dd9b92f8e0a45b518c759ec5ff6d66d59e89b6ec1502050eb5093ab731ff4aef155ede3bf7b1e8d SHA512 8ba8024bfa336ab1344dc5c7f39e8395fbbef2cd4f4695be45c1a777fa06918e1a877d90b073518d182ee1cbfe67fd44419c9f67ecb24f2ffe832cac78da00b5
 DIST sddm-kcm-5.18.5.tar.xz 62184 BLAKE2B d4d55383540882eefafd39cdc65b2f686e271f7e3bfa1f2859b2de55a46a25f03db3413533b74d73782415decbd2dd84fc6f2c9ed517381e55b0917929832c99 SHA512 614cb8780549592ffc8f4f310aca7bcdb68b04b847118d77308b039711c81aee7a9c04726d0e2002b3c00a06c09465752a8886374a286574dfb7aeaa0919089c
-EBUILD sddm-kcm-5.17.5.ebuild 907 BLAKE2B f0b5e54871aaf670ad87eba8c850cbfde11448315b565b789f1287172d30250680cb97348dcb67a8a200bcd8eca9ba373d5ba97c197c0e9fbf98f735b6ef54bf SHA512 598e74c79c1d3e4f09302bc9347afacbe6d378e58ae986438ed7a8bb98c70fd032f24f30718e8416465af9722e71e692bf684bc16aaf8df19a99d8c0ff7e4c37
-EBUILD sddm-kcm-5.18.5.ebuild 910 BLAKE2B 0a67e1d91945f243e7559552f4aa49aa7191ceacb748ed6a3031157d6a388474cdca33657b975575116081966b0185e66a1709d7da66908178731aa5d42e62a8 SHA512 83552feee6f49660aa4b15777da2830671ba5a27ce53f18b99f0b4c5856854d35e75f70bddaaf1e7d8ee40b9ddb0091f0ce140ad06f1c20c53bc5c7159335301
+EBUILD sddm-kcm-5.18.5.ebuild 912 BLAKE2B d6782262b8cba1070aa63505619974da1511c983549e6a4a7aea9c7931dd8ba08378a9aa8563c62cfb8a9a3866229d28bdfe40193dd94879da287dddc9f0a4e5 SHA512 f66add63329fe686ef76e203db0698242eff2a1419b191305beaa38bf2bed68071ceef78e45fef52050bd5cce92d8b267f35b14c6ee0e999e517e3ed75a27a8f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.17.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.17.5.ebuild
deleted file mode 100644
index d36ac9ff07e5..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.17.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/sddm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild
index 7db29087a931..2fe831b8abab 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.18.5.ebuild
@@ -9,11 +9,11 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://cgit.kde.org/sddm-kcm.git"
+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/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 284074722e94..3c5ae6e1d9de 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,3 @@
-DIST systemsettings-5.17.5.tar.xz 172720 BLAKE2B f8cc7bd6e554e0a88c4241ab255b63fc259f09182c94e5ceba6a931a79927c52df926e8121180ea96075bf428dc28e3cedba9a4611491e06a151fe8d23a380b5 SHA512 75844d5bbfe518f857f24df46769ef38460518fa7eb548ba4903619dc6336d85f2d8d4ba7dc6b36bffd04dc1cf6f3e515e49a4bc537d2b1fffb374005c622b7f
 DIST systemsettings-5.18.5.tar.xz 178252 BLAKE2B ac8ec0ddb6eb54cf6133f1616284d41afbb630fd97ac55cc6eb68846c3a7e9028ecc2caed41c35f624235a74e28d810a81196ed3d6891cb0ff1387ff4bf45f32 SHA512 b6b9184570f188878daca140bd81ee13d47ba867eac5289b67295de9918205e5ebc7f7d644968fbbd9d9dfe1395cae6bd29f7ba4c4aa9a82f85b912693ae4e6a
-EBUILD systemsettings-5.17.5.ebuild 1783 BLAKE2B 9efa27b3b7f4f9aae18774fade350d6b919e3714621d49902a47a1be21c9160d513f8caea098fd9bc38227732213b5c1a3c725c5369da87f74af56c62186b450 SHA512 95c5c8e595db83d7f9e2f28c88398dd04a32a34535c4a2081bce5720e65330141427f9399d51c6a8ef79772aa9f47cba37081fa5c9657195729bdd6d9f1a0414
-EBUILD systemsettings-5.18.5.ebuild 1828 BLAKE2B 0c3ff6d6fb246708aab1b2e21351e4f699f440c11c5b451bb1f720dfd53c575b22adf065df3cac01c52fcea26f1cfabe5c788e39ff76fba7e77037f91b549516 SHA512 238ca0435970c36afbaa40e590f857c89db5ff7f7c8488283695e290d15aaa12934bc4b4188ac4fbdb428b93a65d7e67a4b0ba6dccd75bb6a808aa1986ddc1a4
+EBUILD systemsettings-5.18.5.ebuild 1825 BLAKE2B 59492e2f140213e274061c6a5decb4c0e0e5cd4858e3d43a39588aa214f7012039c21e738989efef2165055008d37f90e2f2cf3fe20615e424c94ef06f12971f SHA512 b3edc87210717f0e4354d2d0ac359aac653913f52bbf7d32a9cb884399ea4b931b1936c26589b3262ca54e52305837d55fcbe7b1b0614de56bcf9a119cdfe08c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/systemsettings/systemsettings-5.17.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.17.5.ebuild
deleted file mode 100644
index c2704895c690..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.17.5.ebuild
+++ /dev/null
@@ -1,65 +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.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}
-	!kde-misc/systemd-kcm
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# FIXME: hangs in chroot; similar to bug #640432
-	sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
-		-i CMakeLists.txt || die
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version kde-plasma/kde-gtk-config || \
-			elog "Install kde-plasma/kde-gtk-config to configure looks for GTK+."
-	fi
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild
index 4743a96659a5..0f5b48d3d7d3 100644
--- a/kde-plasma/systemsettings/systemsettings-5.18.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.18.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/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index 7013307de07d..027bd4e319a6 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,5 +1,3 @@
-DIST user-manager-5.17.5.tar.xz 2163828 BLAKE2B c5587a7afd748d75e9c9f679a8c3b99a3ad7c8b392d9dbbb45b78d9cda48ace69cf03d2aedbbf7b92fad8e20864d6fd7e94278da241a72cfe87c9c2b9dbc815a SHA512 34aa3ace5ba19e602b202bfc4cd1573423a122980e5d6d2815693e709b938e90816de6d12c4e53d97cd1c8e9d1dfa796558fc2afec6bca6767f1da4b5b365989
 DIST user-manager-5.18.5.tar.xz 2165888 BLAKE2B 011f40ce9cf18b9bc35c33ed56de416eca8ca6320f07ab725631ec335d58c2103425326c2c2e7d95385e0a70eda4b59419284dfe1d48259da45dfdc4dc04ba08 SHA512 fd3f26f1f95782e4e2ca04e92adc38953d026db9e840f823be38f66f9c790a9e154255dd821358f62c624194be8b4867354292df25289092ceaf87ce590cc9a8
-EBUILD user-manager-5.17.5.ebuild 870 BLAKE2B 46e2d8e34258025580470f0316d73cf6958ca7841382750f12fff80c83029f850398fdbb1406b1d17d415406cb07a39a829018c5b3c8230756e2b65ae7588910 SHA512 db27675da11555dfc2a763b77def16497912084e991d22b72061e8d7aaefc727eeefd47e4975753a2c02ec099b03263ca6417543958bb02ab415c089ee60c43a
-EBUILD user-manager-5.18.5.ebuild 833 BLAKE2B dd6b565a2e4d07016e961dcb9dc8dd39f9d34ae7c100e218d6ea4c4f3394793138b8163fc80ab4ecee700f6762f335e8931fd9e7034374e751a445e8c572896b SHA512 88a5a9304a51d8859445ce9b91d78d1a38db5ca1d8ffa01053489cd9570c4fa8a6ba763b92e44f0ec49aa926637738dc8b2c8bd133f460f72bc1719bf7381132
+EBUILD user-manager-5.18.5.ebuild 830 BLAKE2B 898ba4ca8eaf9707001ff3fa1c2862880c73c9932835b505ac7babacca39a7edefb9e89600d287eaf7b9c292b1f20eae7b9313e036bfebde69cf7db201b58d8b SHA512 063f2bd3657fe1156c21241d323d9cc5e591169db53130ecc42e2f45bd3820906458d555013cfce9790db6bad644213629b2218c0b5304d471e13efcb094daa6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/user-manager/user-manager-5.17.5.ebuild b/kde-plasma/user-manager/user-manager-5.17.5.ebuild
deleted file mode 100644
index aed14a3594c8..000000000000
--- a/kde-plasma/user-manager/user-manager-5.17.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.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple system settings module to manage the users of your system"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~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/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-libs/libpwquality-1.3.0
-"
-RDEPEND="${DEPEND}
-	sys-apps/accountsservice
-"
diff --git a/kde-plasma/user-manager/user-manager-5.18.5.ebuild b/kde-plasma/user-manager/user-manager-5.18.5.ebuild
index aae7f47b293e..9c51358e83b2 100644
--- a/kde-plasma/user-manager/user-manager-5.18.5.ebuild
+++ b/kde-plasma/user-manager/user-manager-5.18.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 e30e785639df..015ede3831d6 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,5 +1,3 @@
-DIST xdg-desktop-portal-kde-5.17.5.tar.xz 62912 BLAKE2B cc108a943c925c0943a4a391b4c00619d734837106c617d8dc12a21e890707dbd1aaace11dfa2ecd9b9a32a08dfba57b3baf1e7b33dec481a15e0fcc9f1abaf1 SHA512 b5a82d6744e49d2f6edb7bef2120f5517216dcbf8681cf50fb5522444f635d6cae17cf499310866e351ef9eaab35d37f604d241451a23fbd5f037e377cfd102c
 DIST xdg-desktop-portal-kde-5.18.5.tar.xz 65068 BLAKE2B 0455aafc8e9c0544bbb5df398ca80fa395391d5205e4e1a88a09e0f8bd399bfd5c5d56ef5b2cae8892cd48e4ddaf1c49dd583e04a0157204c646d3833005690f SHA512 2380250e4d159b69a518e6cffc0f9310386683d7d852ac9b5d6c63390ccf95f325197d3a6e27482b17602d0ce7e69bd12262dceaf178ce93a81f7ad6f95d7f6a
-EBUILD xdg-desktop-portal-kde-5.17.5.ebuild 1158 BLAKE2B bc0404a38321d72c77ddb8c634190fb5e727972d91fe793725fd3f506062661e99ba0d03299ec575d8358022c669f6a066665a0165b2cf234b6d135f5984bfe2 SHA512 13e549878f7380d903de8556d1aff084b92ca73236cc4e742776024f5af16b5b4b2bf6c49e69fd7c86a42d5b0d909c486f0e5a06740cb0c32dd0b95a0e197994
-EBUILD xdg-desktop-portal-kde-5.18.5.ebuild 1313 BLAKE2B a8e45eb89e83fc0892bb363a26a0bef73d29f4c43f50865e3c246ef4895b82da04d2ae1bfdc1f19b229d6e4477def3a4bd9a22474a1156a89214192e2a5b97f2 SHA512 8dfdc1d082658e1af6aee4a1e8bc8effa60ee90ab288c31e44482e6e5b83211ed7d5ec59a941dfcb6fcdd52b28e453f529aeea42dff5aee076fb31d7c8812646
+EBUILD xdg-desktop-portal-kde-5.18.5.ebuild 1310 BLAKE2B 21540d4659f2e56546b591e55aad777ac7f404cb506e223a2704855d231f64c7744627d4676d57d0d429b6084082b26769e8ddf25f017a546febc7c469e38b33 SHA512 9a32516c5a495ef62b2b668bca6cb0903ade52a91814df05fcb711b82f5f24816025b7e338a74ccba8dddf372cf6f1652a669c4713aab0793e3e25ee5245ed5f
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.5.ebuild
deleted file mode 100644
index 7a46a0a42499..000000000000
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.17.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks"
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="screencast"
-
-COMMON_DEPEND="
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5[cups]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	screencast? (
-		media-libs/libepoxy
-		media-libs/mesa[gbm]
-		media-video/pipewire:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/xdg-desktop-portal[screencast?]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package screencast PipeWire)
-		$(cmake_use_find_package screencast GBM)
-		$(cmake_use_find_package screencast Epoxy)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.18.5.ebuild
index 9f1a0bbc2194..cfa74d3b881c 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.18.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/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index e1f83a1fd739..d86a97b157db 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,4 @@
 AUX xembed-sni-proxy-5.14.90-standalone.patch 1984 BLAKE2B e3d5b53479fc18612bd698d89e27c69e178aa1f9bcfc7ce118eb1271d29cd7ee18ced9ec5e4296a3e6d45a4331c9688185ac41bc00ca30f2158d5617feae94d6 SHA512 cef4a94f1a31495bc7e8fab80be4e145a5335f4a9d500680435919e7554efa2c4e87013c4d16d53e1f7b4b7e341092e53d314ccb2a6f7e09ab83d5571275b4e1
-DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a
 DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-EBUILD xembed-sni-proxy-5.17.5.ebuild 1031 BLAKE2B fdc5eebcf1409d724fc553f8f58f83d926a54a02dc7a0a3a6b548f0f29cd16d234b205394c705af9cd4b1b94be1b42f950f187f259279b795bcb92dc0016f92f SHA512 63918320239a7af0644258f7bef511731d57df116a3911480d719359942b47df30198d1aeafefbfc98a75de563f61833cc62c890a745f518500dc8e196770b2a
-EBUILD xembed-sni-proxy-5.18.5.ebuild 1034 BLAKE2B 950d5d5637722daac78c6d17f0507afcf89f5be4d323bda075d4b99ac75a3199878d66adfbcd5554966eb5a2cfb268477b16b176e9078d9b119dc56b22360da6 SHA512 ebe14882c20cb3eb15cbec218346626aff1348f3b5a50eeabcf5bd8d0a6184847be9eded717489c6d0cc780a6f4198779cc8bf4d5511d4f028253bd0c3402fd0
+EBUILD xembed-sni-proxy-5.18.5.ebuild 1045 BLAKE2B 7bd18d0916a8b9bf85c558043162a446f94860769f32cd741919a535ff3227170e2ee1afd9edbc48f98c99e4acfef71788c3e6f85dd1be035a494d930639f4f4 SHA512 bf1bfc4583de9178b0d525662baaaebe96cc600b90761c1c6516a8e2b1a757f5afae3edcf986486b63cc2c4849850d8720e97763488a3092c2acc98c1979b582
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild
deleted file mode 100644
index fdff1765256f..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit cmake kde.org
-
-DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/plasma-workspace-5.14.2:5
-	!kde-plasma/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
index 7ef93d8e5aaa..4879c278a1ef 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.18.5.ebuild
@@ -10,11 +10,11 @@ QTMIN=5.12.3
 inherit cmake kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
+HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
author	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-30 11:44:06 +0100
commit	f516638b7fe9592837389826a6152a7e1b251c54 (patch)
tree	8bfecb640b7b6403d7a3d662d923eed630033da7 /kde-plasma
parent	1a61119f9f7b057830e2ce0563f913ec86f282ad (diff)