8 files changed, 16 insertions, 14 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 5bb3d018a0f1..394940b3a620 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index dcf7e4ffc10a..a343a224239a 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
 DIST ksysguard-5.15.5.tar.xz 500116 BLAKE2B 1a22e419af79685e241265d392eed7502998df88168adc4292c8500a152a8d1142d56c4a34dee409b29745d8a07f889c241b3ab9ab8f09f3eec68d1ec5826c79 SHA512 ae74adac0a4b20d9ddcf9b172542a3c96de46adb66b2f6c1d4e5f97562572e365f777d1daffd82e677ca1be37e868425112f69bd6e85e51118dc557f66ab5b8e
 DIST ksysguard-5.16.5.tar.xz 500304 BLAKE2B f2e5cb8dd43df8fc16365a0f263bd769e2b01e071ac8e4e49260aa7de5a6e63c70a95b87831a0b2910f523a37ba64d923a20b8e02866fbe8f0aac0f73d85ed7a SHA512 579175da2cc4d9255b36890b716e1f060106a24c609d4cd92accc38aa2c47bf9723e1a19dfa80678619db811b59b40c853655bf678c187d802e137978c3a970b
-EBUILD ksysguard-5.15.5.ebuild 1115 BLAKE2B ee7aedd0a34cbbf10ac673fa138f2ca3bc0f2ac31b1be14cbfaa9bec988a62132898e122efae8cf281223b30f315a45811c107decc6a255f4576f27058b08867 SHA512 a7d96fa4181bee1c1f1443ac02e03ac663373229cf9a47703f5c80331f4f38fe67d681c57582332a32a263b10a287cef42b108e8c92abc9a4f5d87f6156b763d
-EBUILD ksysguard-5.16.5.ebuild 1118 BLAKE2B f8b47b595b1157311bbabc7109b385072d134ce197a0743f80fa675d841a035f7b6e64cc134f4c3ceb0aa89d2305bd82147d6ffc699483f6670aae656c9626f5 SHA512 ef144abf54483690045c67553b46521cad41f93930cec6cbf42584bd785c0c1d688e662e6c2385f6f8d60d884608c557b9db52605c4566a3209fe03119dbf75a
+EBUILD ksysguard-5.15.5.ebuild 1115 BLAKE2B b111aeed28af34f6abec20f61a9fa7b3c6e3ea4705d50d351a726f3d7078885250f60fbe6b4dc82ee9971365eaf441030ea2ead6142e0f21532cd1b922e66b05 SHA512 3f84a0ef64d5b2741e31599d2fe79ce886967cb3e232a63faaffd07439567c1390804524be22353ed8f26c7bd90a64aadc1a2e99aacb2a5fca81035bbd47ac9e
+EBUILD ksysguard-5.16.5.ebuild 1118 BLAKE2B fd549508418aa805e816b357bc16f349774921dc3566e16a9b95afdafdaa3074da54a073285407d5677c3a1432e3f2b2b2fda8e270273ff6a4259e30389abd1e SHA512 a825e54d5730326648c702866c2bad500554bfc0f890d0c7590c9a21e3ee7cef352648f7396c71fb04abb421a4cac66c96c8a8a809691a457288fb652cf76ff6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
index 0a4f54edf90f..e8a0d00137e7 100644
--- a/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Network-enabled task manager and system monitor"
 LICENSE="GPL-2+"
 KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="lm-sensors"
+IUSE="lm_sensors"
 
 DEPEND="
 	$(add_frameworks_dep kcompletion)
@@ -32,13 +32,13 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	lm-sensors? ( sys-apps/lm-sensors:= )
+	lm_sensors? ( sys-apps/lm_sensors:= )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm-sensors Sensors)
+		$(cmake-utils_use_find_package lm_sensors Sensors)
 	)
 
 	kde5_src_configure
diff --git a/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
index b85ffb962120..dc21acd63e69 100644
--- a/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Network-enabled task manager and system monitor"
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="lm-sensors"
+IUSE="lm_sensors"
 
 DEPEND="
 	$(add_frameworks_dep kcompletion)
@@ -32,13 +32,13 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
-	lm-sensors? ( sys-apps/lm-sensors:= )
+	lm_sensors? ( sys-apps/lm_sensors:= )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package lm-sensors Sensors)
+		$(cmake-utils_use_find_package lm_sensors Sensors)
 	)
 
 	kde5_src_configure
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index e90684d3680e..a89290c722cf 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,5 @@
 DIST libkscreen-5.15.5.tar.xz 81000 BLAKE2B 53193ee41d81576c8f87053dfb388ff1e13c1fc7800956228e9f3d5e776789d4649e41f39829152bd51ba0de9a1ca6fe87b63e0870327947dea939da05488c81 SHA512 038ea60f534edfd1ceaf523a2d00ecb53f62b6f64ce9900b1313f9ab25b7099146167cbce50b31c799644fb0d5c9522a9bcbaad81e9022feb7532c911b2ec030
 DIST libkscreen-5.16.5.tar.xz 81028 BLAKE2B 9afeb4f96c39ce7bf4771ec704da7d8f639af478ce04a0e761b29a13b6cadf010a88a06d9becfec76873b2c7c23c9419605914088b72fe86fbb946d73f8cadef SHA512 f9dd46052cb5b45d896c6c366383d912e659ec617a0214c0c887d4f78951f620c5d368fc55ea615f9999920b010bbbda4a34f7fabc2fcf6fa106cc3561f9e007
 EBUILD libkscreen-5.15.5.ebuild 490 BLAKE2B 650b346825abe5e379592b4054ee2fdcc5f2bbe5ff081550a8179f2d48f6d85e47d8e960b9c3105cc8b9c817c519ff7774dd091e6e17d0ae20c3ff7caecb1084 SHA512 becc6a71c9cf15fd0ca4782dc6a7afbd94f938994ab33925401d5ce9d2d87b4389b2cbbb569f354d7dc6e16d06626decad627856b6405f5ed1572e7d0c854310
-EBUILD libkscreen-5.16.5.ebuild 500 BLAKE2B 5ae439d1a20a9fec5a316f07d17831cff1dee10f809c070964f3be767db52a1ba1d1db8211108687514766edde4768920b52371d20b3bbe8ffbe68c8af523974 SHA512 cf13e31770edfcaa4261a2b86ae5075b0773f1496529f63537440052712317ea2e5f6cbae5e3f17c92eac795dd41386cf671c933750f969266d28d184c2a7700
+EBUILD libkscreen-5.16.5.ebuild 493 BLAKE2B 2146aa1a0295483478cdc4eaa1edcb55dbd43b1267c9a694a2e4d668475caa6ce656639ff4cd3ffdf767a1c6f8caa41bbc12beaa3251299f36dc93b488666b46 SHA512 7f0247e2c714f26ab403edd2f1bf9f310dbd9abeb5ebe292580bdcf2f8c8e05572f0088f95b4d5a6a9bc4942c33c28835c1d5c174b3c4b2e41b4e42d6773df78
 MISC metadata.xml 337 BLAKE2B 9be36b63c5f53824f31a72360abc64456d7ac99fc2e798ec0653876215bea6faaf31490bb9ad775c4f38a548e7c32a61c425e301f53d6bf38a6b3cd99d100dcf SHA512 d515a27ce1085555a5268218a4db0ca594acab5210e2bb5e307c2e488fe69df1f5b5816123afb8e220ad435397e5ac89a9daa6dba94559ac0b9412e9756e3cdc
diff --git a/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild
index b4ee895edd18..175530ee8c02 100644
--- a/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.16.5.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Plasma screen management library"
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index f93ffc54fa20..23611cdc45b0 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,5 +1,5 @@
 DIST systemsettings-5.15.5.tar.xz 182452 BLAKE2B 215706f06d842a4be26e5032087ab6eca7b19a93ba998eb46d90593796b351bde893234d7cb097326a58d78a30584312eaae9e0ce3addf44ecfee0553e6075d7 SHA512 9bf486096c8e22779354ce1cf1028f7e55c1dae98da2bd9fcfe496c761e819d26756490d75e531049e519c0ffc0eeb643577004e022c0b0a988730d833ce6ec7
 DIST systemsettings-5.16.5.tar.xz 180252 BLAKE2B 75860a6aad43dc2804cdb4eaa649dedeaba9fbb3d5a78bb4c49309e2e452cbb08b29040426643d5a07ff904041787d72ec0e924b4e0b81b5ad17aa0599139e8e SHA512 b9899ff13a16fcc59d3daf47d327e2711ec544c672e61ac875a4cfb02716849d735b8aaed20e4e38ac5f8f9f926ee01065d2d2d6db76f74e72ad5333c96cfb0e
 EBUILD systemsettings-5.15.5.ebuild 1492 BLAKE2B 05805262ba9a7c1cd84a9fdec25abf7d929fba64d084bb7a462a55ad07717d4a01d882324a16d752676593b4c590968c5c2d0095b5c924a590677af3df6d127f SHA512 9615a4a30efafacc73e646775e06b166423d27ee0b2961b573b5fc9bc546abd1cadffd16bd9606c08fe927b05fac7f1fb9f206dc50c151eddc128e3bcbb9973f
-EBUILD systemsettings-5.16.5.ebuild 1414 BLAKE2B 08d73f08fc975c6297619619db78fa4088c4cae2052d0c61c4845f3c272d6bdacdeb07fa2423d365bc23a211173c211fd846a806cda07b13b5657b68d0b71800 SHA512 e9115e4b61fc90931348a410d8cfd41c48e1451975a1a5b8a3547b676a28e7054fe3ee71822af41a0156089b0f5db7fee20cd71068538820e9d68d7b066cfcdb
+EBUILD systemsettings-5.16.5.ebuild 1495 BLAKE2B 051f196d1b22dc8ad122babf77457cdfa40e5a9ecb6c35697513d89c59aefe4524583e4dea340302a6b2e32a9da12f2bd7621efb6ffe5d605d79fbe668d9c364 SHA512 36912552a68f2207fb681a9ea853453742e06f014b6cb66a38c43fa7c8da891d3283dec231c6b843302ff1712970fa541d28e4705cc92cefcadb874a7efe595c
 MISC metadata.xml 363 BLAKE2B f3d12ec4c4202f55b6f32033a4bb62d41da1cd188c5661a308c315f8eb86fc7190cb3c4316d4a393f686b722f09e5a3415a48c5216ad8818579d7bd9db8022cd SHA512 c90aba5c6ae443cbdbd45523a53548a5fde61d0eca8af6180eee3f9e0e92e546df3533abf58c9ac2b1a60ffb6dc6751b64f6128be1e8d623e5fc90aff90771eb
diff --git a/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
index ffaee9dd4312..3822242a75c3 100644
--- a/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.16.5.ebuild
@@ -6,9 +6,9 @@ EAPI=7
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
+DESCRIPTION="System settings utility"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
+IUSE="classic gtk"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -36,9 +36,11 @@ DEPEND="
 	$(add_qt_dep qtdeclarative 'widgets')
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	classic? ( $(add_frameworks_dep khtml) )
 "
 RDEPEND="${DEPEND}
 	$(add_frameworks_dep kirigami)
+	gtk? ( $(add_plasma_dep kde-gtk-config) )
 "
 
 src_prepare() {
@@ -51,7 +53,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
+		$(cmake-utils_use_find_package classic KF5KHtml)
 	)
 
 	kde5_src_configure