gentoo resync : 18.11.2018

4 files changed, 7 insertions, 61 deletions

diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 54ab6241ed9d..027ea9c4c02e 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,5 @@
-DIST libksysguard-5.12.7.tar.xz 572060 BLAKE2B 9eec376f5af64a90554513bd9f714b170987c0f18313b6fe21fbf4647f79b11cc8077d4945095210a234b5c8d31de70c9bc27784304415dc689d56b1bcafffba SHA512 78a063606567632c19a7f1c9d2e7d69634432f3e49bb08a3162805aeb94e0930f2d43e9372207512558b785b8c7e20fdca801de35c055e456ac3cb812bd96efa
 DIST libksysguard-5.13.5.tar.xz 568200 BLAKE2B aafe167cca39ce33eaa56579a228c3d4b9a1a25c55ee268f9e54bfa33162233a242bec0ba9c2adafe238bdaa0b37573d8846c50338e91ec9a1cea797c308a0d9 SHA512 4be616ee2c6e3293f95c3f63ed2722395a6a78510765bcdb3112f37402507a2b7aa9e7bc58fb84bc6d294863e033c1843b228801a3bb534763ca96c1ec729978
-DIST libksysguard-5.14.2.tar.xz 572804 BLAKE2B 80fa12aa721865fd20d44f7f59e7775b7c4554671466d0ddf4f35b843b38c5bc02556c118b2d5b5b54e370ea9739c850e07faa37e34529b8691a9efc3df3d0da SHA512 3820afa2551b35096ff9982f7ca6c4bc39bc8ba209d7b34351bf6b54b0ec2afe0a364d5b26a268fb49439638ae7df44284a7b78410540549a1a03b7d6313e1bb
-EBUILD libksysguard-5.12.7.ebuild 1243 BLAKE2B f4c516f4977e375aef77bd0b91cda8841ab7d4cb2dcba77adea9756c6fe72556ddc092619f2dbce1d13f93c0857caf10570ae2f8a7a9ad446dffc0d5b9103a4c SHA512 ca913804ca6375a85f84ed90e67587a05a1f44c75eb4c073d807e2ce081ac23ba82f6af98acba01d2888192c38af6650010c5c899573ab1f9d089304abf0bea4
+DIST libksysguard-5.14.3.tar.xz 576328 BLAKE2B fa10444f1c08f1ba70f4fcd32591714736d2fe7982685c705e90f662c402ad5194edf00b1a6ce425bf8b25f5d4a91a88092408b3cce2ae6a40b49d13805cca7d SHA512 b561ad796ccf290176d116b8c5c9845d07a76e3f089bf578cf4a9cb2ef323dfb848c5011d084da0e3f548e3d92b57c732db0d4c93b79b7aee5085d8df2516467
 EBUILD libksysguard-5.13.5.ebuild 1241 BLAKE2B 3cfb0a9e47e5f3e51e52f235e6a0acda52486b66e906325d5cb6761727177c75c2335b2a1c4a514a220004d48f31b3cd8a5b90893103537f8d437b5069b5db48 SHA512 96a4f8d8354a239adf1997ec1ba0787fe266f73149f0a7c13423390373dea1093c3b13685a46583043294f03c252f42fabadff3ec58a3e45ecea3b6f92cfc61f
-EBUILD libksysguard-5.14.2.ebuild 1243 BLAKE2B f4c516f4977e375aef77bd0b91cda8841ab7d4cb2dcba77adea9756c6fe72556ddc092619f2dbce1d13f93c0857caf10570ae2f8a7a9ad446dffc0d5b9103a4c SHA512 ca913804ca6375a85f84ed90e67587a05a1f44c75eb4c073d807e2ce081ac23ba82f6af98acba01d2888192c38af6650010c5c899573ab1f9d089304abf0bea4
-MISC metadata.xml 381 BLAKE2B 50486844ab6d038f69a97e298953a1eaef11d9ee011c4b10fd3210deaeaf4298f0d93c514a2227a2ede9227aeeeed3a68b37ae1badd3783a23cf35ab208f8fe6 SHA512 a504dc62874b82d6df35261af6e3875b0af5879be5c90f9e1c2754d6980bb26aa3c75632d825b8347687a9cf48908a671c807afc574f177a12ab7881c7ef8d43
+EBUILD libksysguard-5.14.3.ebuild 1218 BLAKE2B ec13dee57c73c0829e274f91d8d8bbbf985c9c1de07d3a80484e4bcd9b50db0f9ef65d7c318f4fab423ad3c7413e6bfd8eec8280cdb2173e175b64194cde7aa7 SHA512 1392456794b6b23b7f3488617f9a7042cc27dee09b2295771c5323237de4bbb5ae1f96f5025f21e5ac1531d65db86140032c671daf30e10ac1e7d8ac4df9fba1
+MISC metadata.xml 490 BLAKE2B 5e6f977dafc69ea1293db2b85cd2cee2bfef59cfb7af668b4543d0c183e4baa693be3fa1855ff765dd26ff4bddb4385ac87115212252ce9275dd7d6725f74f3d SHA512 0f8cc56d36f9c8a7edfe0324a475c175707e356fec6ed7c2b13489cb4897b01b786f0a7e768c96cdf0aec43c76bdb3331f97420a4eae3ae01aa5752395a7ce05
diff --git a/kde-plasma/libksysguard/libksysguard-5.14.2.ebuild b/kde-plasma/libksysguard/libksysguard-5.14.2.ebuild
deleted file mode 100644
index 0baa04a013a4..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.14.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+detailedmemory minimal X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	sys-libs/zlib
-	detailedmemory? ( $(add_qt_dep qtwebkit) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/ksysguard:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kiconthemes)
-	!minimal? ( $(add_frameworks_dep plasma) )
-	X? ( x11-base/xorg-proto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.12.7.ebuild b/kde-plasma/libksysguard/libksysguard-5.14.3.ebuild
index 0baa04a013a4..73a7633dfb95 100644
--- a/kde-plasma/libksysguard/libksysguard-5.12.7.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.14.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-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/metadata.xml b/kde-plasma/libksysguard/metadata.xml
index 403015c2a28e..76ebdd10ce91 100644
--- a/kde-plasma/libksysguard/metadata.xml
+++ b/kde-plasma/libksysguard/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="detailedmemory">Enable display of detailed memory information using <pkg>dev-qt/qtwebkit</pkg>.</flag>
+		<flag name="webkit">Enable display of detailed memory information using <pkg>dev-qt/qtwebkit</pkg>.</flag>
 	</use>
 </pkgmetadata>