gentoo resync : 30.05.2020

3 files changed, 2 insertions, 65 deletions

diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 8129232c9448..487e558d7473 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,6 +1,4 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
-DIST libksysguard-5.17.5.tar.xz 605628 BLAKE2B 6c10b1299a1408f508a183a869468580ab705f35b20d6086118641e57c0ea87706e3d2c6812e9829c920fc03d472ce33df9c863c0b3359db7266506b142b7220 SHA512 15e12044bca64b5019c30e3e009a4533b03a19627e2ca8ce6e0fffe3c6554f57ae7b86d82be18d92edd7c6abfff9d123462915f44ec33f796f7e6b8b3e2491ba
 DIST libksysguard-5.18.5.tar.xz 610320 BLAKE2B c644bfa216ae851eb1520b9135add670ecbc4733be7bde27437a876141ca9f37c3531a78c347e7c00149e1d1f287a680954c3e885cfdc0838398626d6ed3d651 SHA512 a648d0db1378165188187db9de78f816b1dfe647ce7e7ea2d505bc04c5008d2c24b2a113bc73c4fc4b3ddf467682ea3b306286f4bffa2c750918112892d78fb3
-EBUILD libksysguard-5.17.5.ebuild 1474 BLAKE2B b6f0c08a54cd113395a32511e8c7794cc7c0c4afb680410760f5bcb8672e1978923d7e8e9af7c5f813973faa4dcc2e95f16092a189a6a64cea33627ed2fc4b87 SHA512 2ec98251ac838addb4a25b3ecda0ec38a11e8c00b01cfff3913189c2e4ba72de6642fee76b41b2797ba0ea9d07bad23766f468ab091ab18813f7d73d13fa97fe
-EBUILD libksysguard-5.18.5.ebuild 1535 BLAKE2B a5760cb9cd73e263201d77867f63bcd5ca52993137242c163bedac40dc4127a603d0d02630a1301d04835f6e5cb39f91954a1d200ce27225db3ca24ffc4f9a69 SHA512 a2bd666aa1cbc031a8c31d67b012bd7feac3660d916703ea50eb34f8d353919961317f684c5907677d02182b6ab3fafb9fd89703456edacc3e78429c3ba398a7
+EBUILD libksysguard-5.18.5.ebuild 1532 BLAKE2B bd23ce39743bd0d5f085771371fbe3bf352f0ca0b25191fdce0f3a4b3e638cfc9f3a757d3d5206ba528637bcda4a71f938fa0e5127d847328acfc8636d2d7ad8 SHA512 0987e280ae69e5ba924eb0de04d7163e652122d7e5d59dfa14ce0d5bbb1f09e761126a6f8f2b7c4eda99bae2640c0919ae7f3be9930cdae038758f0883f65772
 MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86
diff --git a/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild
deleted file mode 100644
index 4a5508fe8451..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.17.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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 ~ppc64 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
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
index 01dc3bb8624d..a4a569627298 100644
--- a/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.18.5.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="minimal webengine X"
 
 RDEPEND="