gentoo resync : 15.01.2020

4 files changed, 69 insertions, 56 deletions

diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b18528694a69..bf15bb143690 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,6 +1,6 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
-DIST libksysguard-5.16.5.tar.xz 579572 BLAKE2B b2236c7d2e8c3886852ef9fe09465cc000863691b68245697a7424983dc82b3cd50dc47c0fb8d69bd37f4ddb2c3a07ec0de77619ffd87d3631867223ae9ab1ee SHA512 be6d4806108b26613686ff06d9d9ea10610c87c556a90c0c8a233e0190de00d9b3d87489ffbb378d64ee7fd29eb9c58faeb2a9269d8f4963f8c5866b19388cd5
 DIST libksysguard-5.17.4.tar.xz 606328 BLAKE2B 9a852c919cfa62977837343e3cd5d138e170662367cfc8e5d7c120bd35fe5f7d69716e3a9c5cd597e5aecfe9006d9caf65c74067fb82c1fc528eca6da7ce0dfe SHA512 8338a294dcc3766262c565494f99da7dd2d3e3db1e4290611985897bc0a5db8e6aaeda6b96b840fba7c95b59af410a042839942e82a95291714712b360ad3f7f
-EBUILD libksysguard-5.16.5.ebuild 1235 BLAKE2B 0b06e922ab8dfe55237d1827c8f12ab0014a7107aa5de8e7b57e8a558dc1c39d15c272f3095a7ecb5e1621421da2e1b59a2c18170bc8e46b08ebcac3e1e9e89e SHA512 8a5969e2867f364b21ca7d31abbe4cfe8f414035a77ee241e279953c9f277942c603f61e97e742e99bcbf707feccc59cb8d8570dc630f01dbb82473c82527f22
-EBUILD libksysguard-5.17.4.ebuild 1412 BLAKE2B ba5f93c863b69fb29abe0de39c5e9435ebedb3d0fdf85feb0eb100eecd64e18bbb1c3de65e44dbd01949b7d598e6f03deb0c325ae9a7cd9b36602f9cd224ef7d SHA512 68653bb13671371c4ac0250157601c97b31a0716483d9cf0f29599bae9dc2a50c6d13efda01017a69cc6b97f14407f1f6eeca46c8de77c59a3217479cc78d3cd
+DIST libksysguard-5.17.5.tar.xz 605628 BLAKE2B 6c10b1299a1408f508a183a869468580ab705f35b20d6086118641e57c0ea87706e3d2c6812e9829c920fc03d472ce33df9c863c0b3359db7266506b142b7220 SHA512 15e12044bca64b5019c30e3e009a4533b03a19627e2ca8ce6e0fffe3c6554f57ae7b86d82be18d92edd7c6abfff9d123462915f44ec33f796f7e6b8b3e2491ba
+EBUILD libksysguard-5.17.4.ebuild 1467 BLAKE2B 6fa555279c50d2ef8c3b48a4da10b59c4a843e09b473f52cf15c89aa6d8445635e3f5a2400a549664204ae778cfe9934ad8897d2ceabfe5f3d678439e4840f6e SHA512 a750538ed700737e1f3cab62205fb77f6dd87e5b499c19b1eae10d4f0f668ed0af7401b0a7f0dbbd7560174058df911b247171be6ab452f23a97b57040854c5b
+EBUILD libksysguard-5.17.5.ebuild 1470 BLAKE2B 931dcf0308cd77072719a6ea5aa5aaf3c8c360de9cb392ebebed6289935b720b859e80b699c5d8485e16b0795743405fefafe855541c579450f62e349472756b SHA512 baf19eb15e06b8594d3732f27043108e2978ff1777ba68898919e3ab949525229ff72e0a6a7da4d65fdd42fbdfa46aca3fe3044b65f4910c5c697b843bfe856e
 MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86
diff --git a/kde-plasma/libksysguard/libksysguard-5.16.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.16.5.ebuild
deleted file mode 100644
index 4c837759c771..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.16.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="minimal webengine X"
-
-RDEPEND="
-	$(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
-	webengine? ( $(add_qt_dep qtwebengine) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kiconthemes)
-	!minimal? ( $(add_frameworks_dep plasma) )
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package !minimal KF5Plasma)
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild
index 84405639255f..cfb3af8ead83 100644
--- a/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.17.4.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="minimal webengine X"
 
 RDEPEND="
@@ -55,3 +55,7 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}
diff --git a/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild
new file mode 100644
index 000000000000..798184e546a7
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+VIRTUALX_REQUIRED="test"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Task management and system monitoring library"
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="minimal webengine X"
+
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwebchannel-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	sys-libs/zlib
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+		x11-libs/libXres
+	)
+"
+DEPEND="${RDEPEND}
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	!minimal? ( >=kde-frameworks/plasma-${KFMIN}:5 )
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package !minimal KF5Plasma)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	LC_NUMERIC="C" ecm_src_test # bug 695514
+}