gentoo resync : 25.11.2020

4 files changed, 23 insertions, 17 deletions

diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index d4438f5a3c6e..89bbae08f6db 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
-DIST ksysguard-5.18.5.tar.xz 517648 BLAKE2B b50623c28a3884adc5db326d7b0745c558f02e1f515efa9a5d591948026447f427e08cb72805d7f1c8821cdb0038c894e4322520cf2630656e464da6f69af401 SHA512 2cfb82caef5d074b945f0a7478b32af86d49e174d4d294dfe6a54acdb0b1d335e151828a4f239b52cf767ba04d9e93bf1632f2a37e2b1d611128543e0e0008a3
 DIST ksysguard-5.19.5.tar.xz 542628 BLAKE2B 3aeacb401c79723aa46e9eb5df32785e314d7a52704d983e5c6b48dd841e908ec84c5b28c609accec990d6011d5355ba3363329973a68149f03b0b20d5d59265 SHA512 5dd3503e3792c247fa2dab274347ae00ac3ddd0090b8b5115abc90c84630e0f7376ce2ec43a853e2a9cfdadb31b142ea70190b54b65c7a45b5839b1dde5a1feb
-EBUILD ksysguard-5.18.5.ebuild 1393 BLAKE2B 9252e8b44a28642a7f25d46e402e091850761f287aaf9fe85353ead5d60ac43ebc24cbeed8ea0aedd5708911224e7211f302e766711b6279de51bba55b364c50 SHA512 d5b2f2a5d1581b86bb86824848ad4e492335a3d079779136e8e94cd7ad5e2437ba9b605e56ec35fdb3e7d6d264271b5085cf5bd26903dd8d3d1dc9075bd38f84
-EBUILD ksysguard-5.19.5.ebuild 1415 BLAKE2B 10df42e645d99d3b448f37872f3439a1c558a5de8b0771b19c24bf01837ce7baf38b88b68578d06799f21743c221746bd5f6d3b84c9031a3a51a774aed604d81 SHA512 a5bb21cb3418e07882c3f59e2e5ed0d8933d0ab8f240297907d275717168d2ba4f54c8f6e59919919f256009dccb340a485d15f2477bdbad62af72f456c01f14
-MISC metadata.xml 373 BLAKE2B 8d97f1bf96cb523b2832ca4bbb01ee86cf1d13b0b1b75809046da8601254283fa079361c1cf55708c851a08fb31b27beb8cf2df24ea9e14e4c32b8ca0692a7f9 SHA512 c1df9a56aba68a93ceae7cb2b9ea9216c40b6f619263cd8025cde82264206019a6b9d0eecb24f3a798d4f6e1a772752ceec500827e96caf8f050b0b132b08051
+DIST ksysguard-5.20.3.tar.xz 562868 BLAKE2B d597b088079c68e176e6f40d6dc468082e9906dacc800b60177f85f176a81eeb2db4ce489e8133c392ae36e1fbc97c97c6283b22ba2fa790798d993c52e55f5d SHA512 827a6e4dee4323a1fd9fe23eca165da861ebce266937691e114ea032475e08eaa07f7e8a0efb4e5f0971b1053f1d97da56906fb15a2083ec6d7a8089d41536fa
+EBUILD ksysguard-5.19.5.ebuild 1412 BLAKE2B ed15bd5f6f51235bcc2a2d3d105feaf3c531ccbb511f97387162364deb2cc2108a133c9293128ac6a6458d1a3ff1ceffaddb585c73cd07e3877b9c1376cc81d3 SHA512 2cdd16db81febd6ba22b342bef89179c702b17adcafc35223cccc1db404f062847ecfbabd174dfdb95f27be5e5dbf067299c0e8e4e06fa0d5fd72478c25bffdd
+EBUILD ksysguard-5.20.3.ebuild 1596 BLAKE2B 1c98f52cf926ad2a5ad6179817efe1af8a54ec922aebd43d3c03297b66d16589fe7415df1648e99e50a71e5ccbc648cf0d7aae87707520049dbe7a0435aa2ab9 SHA512 38ce45990aa8bc0c2dbbb82fdf6c05a5ef9e4a37712e7b6997a1de050654cda024272fa601907ac1eb36ee20e04ebfc0031a926f67107d27fb03dc369b83dabd
+MISC metadata.xml 617 BLAKE2B b122ab127e8a60b79ee9ad276ce975badbe0d0a750c85987d2aa6da790562a03a2f77fe93766187f863d1a402dca5b79bcee6c44238f6753c7d892e46b34a620 SHA512 fc4a5fd8233b70f4cdd7153aa6681423a74e03a8420534d6c9965c24a3e1c110b43923656720163aca045227cb1896246fe37fd935f5e1270f168435cf6791c5
diff --git a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
index c55c40f19f8c..0d99bed5a51b 100644
--- a/kde-plasma/ksysguard/ksysguard-5.19.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.19.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"
 
 RESTRICT+=" test" # bug 727848
diff --git a/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.20.3.ebuild
index 66cea4f4b33c..273236fd863c 100644
--- a/kde-plasma/ksysguard/ksysguard-5.18.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.20.3.ebuild
@@ -4,19 +4,23 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.66.0
+KFMIN=5.74.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
+QTMIN=5.15.1
 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="lm-sensors +network networkmanager"
 
 DEPEND="
+	>=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
@@ -32,23 +36,23 @@ DEPEND="
 	>=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? (
+	>=kde-plasma/libksysguard-${PVCUT}:5
+	lm-sensors? ( sys-apps/lm-sensors:= )
+	network? (
+		dev-libs/libnl:3
 		net-libs/libpcap
 		sys-libs/libcap
 	)
-	lm-sensors? ( sys-apps/lm-sensors:= )
+	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package pcap libpcap)
 		$(cmake_use_find_package lm-sensors Sensors)
+		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
+		$(cmake_use_find_package network libpcap)
+		$(cmake_use_find_package network NL)
 	)
 
 	ecm_src_configure
diff --git a/kde-plasma/ksysguard/metadata.xml b/kde-plasma/ksysguard/metadata.xml
index 61d3b2c41702..53a4d2a60e76 100644
--- a/kde-plasma/ksysguard/metadata.xml
+++ b/kde-plasma/ksysguard/metadata.xml
@@ -7,5 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="pcap">Enable per-process network statistic collection using <pkg>net-libs/libpcap</pkg></flag>
+		<flag name="network">Enable per-process network statistic collection using <pkg>dev-libs/libnl</pkg></flag>
+		<flag name="networkmanager">Enable improved backend for Network statistics using <pkg>kde-frameworks/networkmanager-qt</pkg></flag>
 	</use>
 </pkgmetadata>