gentoo resync : 15.06.2021

4 files changed, 15 insertions, 22 deletions

diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index a2e1a188218c..9797d824501d 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,5 +1,5 @@
-DIST ksysguard-5.20.5.tar.xz 564408 BLAKE2B c22fcc8280aea81007ec2366ac3f64ea7f66f1740a30ea49ffc4317c85d8e68cb5cd29ad4afd34dcb3a37ad6362bfbfdcb59b29e427d58c6de179ba107360a26 SHA512 17c96a3e19e428f90f729b813443199a5ab75608c0f46321127b1d4e2fc68a6a55df9ac8e3f194ae97ad533d3d22006c230f34ee328984e32205046e91487b08
 DIST ksysguard-5.21.5.tar.xz 604624 BLAKE2B ac95499a75be6eb2a56d8e96a560271cbaa2618c0a21493d3226cff0aeeb05ebd2644a65567f9ddae2f07016a22e2c9dbfc3c42b14b504d13e788ff1312a18c0 SHA512 53e41ae1fb14d8e3393671e2d42ab7304b144f8938c821402c16c66aa09917e3dfc8ce766df43f1bb9c09e2934a6dcd48a4a4781d379026164b278aaed95858e
-EBUILD ksysguard-5.20.5.ebuild 1643 BLAKE2B d36fb83d570031f8ff00c8251ea6396d5cbd72ed88731ef5ae5700350e236136a6bc768fc878ee4e010fe2f62bd2482b2d01c34f8f05e6631ff86d17e8f706af SHA512 639fa1c575235b7e740787fb90c64a2eb87819332e0bf248b791b773f739aed18168d25214ae1bf2e8f01b1a2eec931d85a32c47b8b92ecb8402dba63922e849
-EBUILD ksysguard-5.21.5.ebuild 1590 BLAKE2B 5b3b03c6886a5f2f3734cac2a96f012d9b75bbfe4d77a0ab336719b9a39b60d821d2296faab332e4d40480b3b8ca30b5e56bf58dc621aecf644cfc75e9150207 SHA512 5e9550b48a8125bc1306a24a203a1855a33e867ba95b744030ccf603f7c5f6ef6a8c4f9a7b45e0b11a098590cd13bea3fc919df5ecc1095f2e95b8aa8724ee5e
-MISC metadata.xml 508 BLAKE2B 0c56534db9cc082a5aed32fc958940d305acadc6aea338945edfc1adc349b51437bcbc549fc1983b73bfe4b511a0328be0632571ada20dbc2f6cb15f7300de5a SHA512 acf19c8d5b52abe5a2c0cb8fa4c75262613cf673e597ae3b3a4ce79fee76d75fbd2632612267eb9e4a18b27d32ca9c0f5df3a9d6a68f67e9a99d87d51ed2dba0
+DIST ksysguard-5.22.0.tar.xz 521768 BLAKE2B 0cceb54c19b5263d658fded8c603bbd3415b98c0e6ebde04fccc8d4f09a68037ba2b8666ed7beccaa1d54b9b792e537a730fa93233fd3cf1b59f915effce4b0e SHA512 07314366506d029206e6fba934eefc8d338e52ab0f8f79747c189a9f856e13f32c7b156bd49ccf1ab2bef5c37fb05924022606bae6bbf2eb4628043d7c2579a2
+EBUILD ksysguard-5.21.5.ebuild 1587 BLAKE2B 889817dede3d969f1c2dff5cb7f9a87ea334e07147dd34bfaebd2b71b6879f81f4b408b98c9635794b28cf54b7da7a72ec9df73a3e9a4a1237f7217614fe178b SHA512 7ff5fa50c8a4cdb382db1a1de5c685cfbc3565a041c0b286d2b872eb2c00c31f1a3c5322f76079505d895f39ddc9ec195878601b1330a1187f29b261892315fa
+EBUILD ksysguard-5.22.0.ebuild 1472 BLAKE2B 438ad27389a9ff2d5a88462208331e33ee4e493df7dacf48fe0d0bfc4ae0401654263ce6a78f341e59a2fde7c9c28c4827e058c8c6bd0e34161d9e875e305758 SHA512 5037f148b5f32adc576063b90503322909459376230d361606c3400f32de161c294fc9f8bd52bb2397bc2a167f80e2c1f6e4fba0e3bfbd04f0a29987731d9088
+MISC metadata.xml 398 BLAKE2B 74e96ef19d58955480eed6562f9be453b43dbad78933240fc7df76c762fbafc4e5902c59f4d26506d50c3fe60239846f51da362644fea0db6922aa5b7e977160 SHA512 85822c8e59b902ec140f8566b3451fdd8c9871477eedc610762a1504084db6908c7e673d882e1de522f319a42b340431605e4066a9b23ef8d79b2a9b79fe7c28
diff --git a/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
index b6ba2ea44f62..e370b1517773 100644
--- a/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild
@@ -15,7 +15,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 networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.22.0.ebuild
index f3592b8c6825..1be76e5802d0 100644
--- a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.22.0.ebuild
@@ -5,18 +5,23 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
-DESCRIPTION="Network-enabled task manager and system monitor"
+DESCRIPTION="Network-enabled resource usage monitor"
+HOMEPAGE="https://apps.kde.org/ksysguard/ https://userbase.kde.org/KSysGuard"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="lm-sensors +network networkmanager"
+IUSE="lm-sensors"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -30,7 +35,6 @@ DEPEND="
 	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
 	>=kde-frameworks/knewstuff-${KFMIN}:5
@@ -40,22 +44,12 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-plasma/libksysguard-${PVCUT}:5
 	lm-sensors? ( sys-apps/lm-sensors:= )
-	network? (
-		dev-libs/libnl:3
-		net-libs/libpcap
-		sys-libs/libcap
-	)
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
 "
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
 		$(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 4e1b25bdbebc..5b911e5d92ac 100644
--- a/kde-plasma/ksysguard/metadata.xml
+++ b/kde-plasma/ksysguard/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<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>