kde-plasma/libksysguard: Update dependencies

Upstream commit 1eed283b5c1e98891a576134c0a1bd4586bde256

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 4 insertions, 95 deletions

diff --git a/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch
deleted file mode 100644
index c2fcb9551d..0000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2e2ab674038a1102081ead255a172a42d3a1d27a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 7 Sep 2021 16:08:30 +0200
-Subject: [PATCH] Gentooify message about QtWebEngineWidgets
-
-Translations can not be provided for this.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- processui/scripting.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index 1c35f72..7065cbe 100644
---- a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -241,7 +241,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) {
- #else
-     QMessageBox::critical(this,
-                           i18n("QtWebEngineWidgets not available"),
--                          i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution."));
-+                          i18n("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available."));
- #endif
- }
- #if WEBENGINE_SCRIPTING_ENABLED
--- 
-2.33.0
-
diff --git a/kde-plasma/libksysguard/libksysguard-6.0.49.9999.ebuild b/kde-plasma/libksysguard/libksysguard-6.0.49.9999.ebuild
index fa67861ada..a6d25bbcb5 100644
--- a/kde-plasma/libksysguard/libksysguard-6.0.49.9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-6.0.49.9999.ebuild
@@ -14,58 +14,27 @@ DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="6/9"
 KEYWORDS=""
-IUSE="webengine X"
+IUSE=""
 
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 RDEPEND="
 	dev-libs/libnl:3
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=kde-frameworks/kauth-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
 	>=kde-frameworks/knewstuff-${KFMIN}:6
 	>=kde-frameworks/kpackage-${KFMIN}:6
 	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
 	>=kde-frameworks/solid-${KFMIN}:6
 	net-libs/libpcap
 	sys-apps/lm-sensors:=
 	sys-libs/zlib
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:6
-		>=dev-qt/qtwebengine-${QTMIN}:6
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	X? ( x11-base/xorg-proto )
 "
+DEPEND="${RDEPEND}"
 BDEPEND="sys-libs/libcap"
 
-# downstream patch
-PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt6WebChannel)
-		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
-		-DWITH_X11=$(usex X)
-	)
-
-	ecm_src_configure
-}
-
 src_test() {
 	# bugs 797898, 889942: flaky test
 	local myctestargs=(
diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index 4640281580..ff94902f97 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -14,58 +14,27 @@ DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="6/9"
 KEYWORDS=""
-IUSE="webengine X"
+IUSE=""
 
-# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
 RDEPEND="
 	dev-libs/libnl:3
 	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=kde-frameworks/kauth-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6[qml]
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
 	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kglobalaccel-${KFMIN}:6
 	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/kjobwidgets-${KFMIN}:6
 	>=kde-frameworks/knewstuff-${KFMIN}:6
 	>=kde-frameworks/kpackage-${KFMIN}:6
 	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
 	>=kde-frameworks/solid-${KFMIN}:6
 	net-libs/libpcap
 	sys-apps/lm-sensors:=
 	sys-libs/zlib
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:6
-		>=dev-qt/qtwebengine-${QTMIN}:6
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	X? ( x11-base/xorg-proto )
 "
+DEPEND="${RDEPEND}"
 BDEPEND="sys-libs/libcap"
 
-# downstream patch
-PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt6WebChannel)
-		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
-		-DWITH_X11=$(usex X)
-	)
-
-	ecm_src_configure
-}
-
 src_test() {
 	# bugs 797898, 889942: flaky test
 	local myctestargs=(
diff --git a/kde-plasma/libksysguard/metadata.xml b/kde-plasma/libksysguard/metadata.xml
index 4bf88b5f67..039186a546 100644
--- a/kde-plasma/libksysguard/metadata.xml
+++ b/kde-plasma/libksysguard/metadata.xml
@@ -13,6 +13,5 @@
 	</slots>
 	<use>
 		<flag name="designer">Build plugins for <pkg>dev-qt/designer</pkg></flag>
-		<flag name="webengine">Enable display of detailed memory information using <pkg>dev-qt/qtwebengine</pkg>.</flag>
 	</use>
 </pkgmetadata>