[gentoo-commits] proj/kde:master commit in: kde-plasma/libksysguard/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     ed977b37721c8de9d3845309f645fa16cc9acc9a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  7 07:45:08 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 07:45:08 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed977b37

kde-plasma/libksysguard: Switch USE detailedmemory to webengine/webkit

The remaining scope of the feature does not warrant a local USE.
Message shown to users at runtime if built without webengine/webkit
correlates with new USE flag naming as well.

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/libksysguard/libksysguard-5.14.49.9999.ebuild | 6 +++---
 kde-plasma/libksysguard/libksysguard-9999.ebuild         | 6 +++---
 kde-plasma/libksysguard/metadata.xml                     | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/kde-plasma/libksysguard/libksysguard-5.14.49.9999.ebuild b/kde-plasma/libksysguard/libksysguard-5.14.49.9999.ebuild
index 3ea2bd94a4..88258f5735 100644
--- a/kde-plasma/libksysguard/libksysguard-5.14.49.9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.14.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="+detailedmemory minimal X"
+IUSE="minimal webkit X"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kauth)
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 	sys-libs/zlib
-	detailedmemory? ( $(add_qt_dep qtwebkit) )
+	webkit? ( $(add_qt_dep qtwebkit) )
 	X? (
 		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
@@ -44,8 +44,8 @@ DEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
 		$(cmake-utils_use_find_package !minimal KF5Plasma)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
 		$(cmake-utils_use_find_package X X11)
 	)
 

diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index 8de5b4fd2f..7caf9116f1 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="+detailedmemory minimal X"
+IUSE="minimal webengine X"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kauth)
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwidgets)
 	sys-libs/zlib
-	detailedmemory? ( $(add_qt_dep qtwebengine) )
+	webengine? ( $(add_qt_dep qtwebengine) )
 	X? (
 		$(add_qt_dep qtx11extras)
 		x11-libs/libX11
@@ -44,8 +44,8 @@ DEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package detailedmemory Qt5WebEngineWidgets)
 		$(cmake-utils_use_find_package !minimal KF5Plasma)
+		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
 		$(cmake-utils_use_find_package X X11)
 	)
 

diff --git a/kde-plasma/libksysguard/metadata.xml b/kde-plasma/libksysguard/metadata.xml
index 403015c2a2..18db884d69 100644
--- a/kde-plasma/libksysguard/metadata.xml
+++ b/kde-plasma/libksysguard/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="detailedmemory">Enable display of detailed memory information using <pkg>dev-qt/qtwebkit</pkg>.</flag>
+		<flag name="webengine">Enable display of detailed memory information using <pkg>dev-qt/qtwebengine</pkg>.</flag>
+		<flag name="webkit">Enable display of detailed memory information using <pkg>dev-qt/qtwebkit</pkg>.</flag>
 	</use>
 </pkgmetadata>