gentoo resync : 29.01.2021

4 files changed, 2 insertions, 168 deletions

diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index b1d171639595..b00fb70d8e4b 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,7 +1,4 @@
 AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee
-AUX libksysguard-5.18.90-unused-dep.patch 3054 BLAKE2B 9d48130d6754fd02a570ea91a17cc35fdb20a14b89e8408d041c983a4893dcf1fe3d35751ccacba845bcb4a8a5a230e0a78b722ba0a7cf720d2123abfdb6b78e SHA512 caf4a646361f3011a5926ae0ba7b10ab6b31bb01d8a5bead676735021096117492f531e8cd9d09dbfbfcfdc83b1d4d94d327c1766928fa6a7684989b967ba354
-DIST libksysguard-5.19.5.tar.xz 674900 BLAKE2B 88408494360921bff732ba535a932b2a17d8faba9a0cd231754dda6116ce52d8cb6ed32f89f05e16091b54a378d3d50e5e46feff1e27b46260f3803ca78b9855 SHA512 8e723eff1e50195005a91dd558df0ddce956c33478c00e177f1eae4d9997ea8332d86bb8fae1eb2d18bfe3bdceefa31fe4211dfcf4bb1c463d347ced33e75348
 DIST libksysguard-5.20.5.tar.xz 699156 BLAKE2B 749cbe4b73e8377bb3dc026000492d6dd0cea34dd13aafd32754aa84636ccf416e60fc97ca17c1810ea0b2458f6ec09471a383210b1a6b025a745fded3a1c734 SHA512 56fa61e1149f8a97f1884755bbc0475a1f9a458eb785d29416b4646e9a9edb1f2bf85e56dcf49226ab1509b4a63bf4334c1ad9853026ccd0eaf68dffa79864b0
-EBUILD libksysguard-5.19.5.ebuild 1710 BLAKE2B a0671e4ba5b7e5c6db8b933a7a48b3b5330fd2e6810b43135e90712577f2f265bef1be40bccce65f856e0fe40d9174cb26695a7cab10e3f25a9e09e176abba09 SHA512 9a4c63e759fae3557a467fa9222b0dcb6c12f39399c842a50d75134fe3482c0bd9f4f33cbcd684f55940dc36a8322620cc5085c177d832115b4976234d5f35eb
-EBUILD libksysguard-5.20.5.ebuild 1691 BLAKE2B f09873405adc3812bc52f7f30239ac562ff3505174a4566c552477e1ab5919bbc69ce7b02194963401a18c0d51c890fe0ae20b46af56404fc75e3fda5eb6b5b4 SHA512 8684647864b874a36862cbd4cb8c505b35c280d1fa986439ae54ed8b96f9e1f9f312d26d171c6e83abec8aeb88271d5333d26c4783f6ce068d000798545a13f3
+EBUILD libksysguard-5.20.5.ebuild 1689 BLAKE2B 89ab4bfe0742a8b6c3bbd6e8d356527e78328e9ba96d9a27ecb0d19c8690d1ec65f626e43e3ce5379100f90de32a9b17cdeb82170ec8b5b44f0b29ca88195d05 SHA512 acb35714b8b71469fb5ac15ce0d5283d79d01df335e5fdb3fa97aa5102bad9554fd35a808ebf8ed466477d4b07b86ab7e35325fa9cc7f42c13f6e4b226a14e18
 MISC metadata.xml 542 BLAKE2B ff3326f819a0324fdc3ab339c3172f91d1fabd5eae8faffdb3b3bcbaab2a73fb3882e57db5fb6bdb669b5ff3338fc8b3ccc63b771255e527c7a64f0cac0d3cc9 SHA512 ea5d493aa7e05db1b63db2556ff3cae361aee8a18fd2688871cba9882f91b8dbf7897b91ddce16b2acf0b12efe100e8db0754fd86126a7c1d95b6cee02b576c9
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch b/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch
deleted file mode 100644
index 903b7b8bcf27..000000000000
--- a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From fa06754147850ba06659f21e57cd7a724ecf8c49 Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
-Date: Sat, 23 May 2020 18:26:12 +0200
-Subject: [PATCH] remove unnecessary dependency
-
----
- CMakeLists.txt                   | 13 +------------
- signalplotter/CMakeLists.txt     |  1 -
- signalplotter/ksignalplotter.cpp |  2 +-
- signalplotter/ksignalplotter_p.h |  2 ++
- 4 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b12ead7..063cb05 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,14 +46,6 @@ set_package_properties(Qt5WebChannel PROPERTIES
- 
- find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n JobWidgets WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service GlobalAccel KIO Package Declarative NewStuff)
- 
--find_package(KF5 OPTIONAL_COMPONENTS Plasma)
--set_package_properties(KF5Plasma PROPERTIES
--                       URL "https://cgit.kde.org/plasma-framework.git/"
--                       DESCRIPTION "The library of the plasma project"
--                       TYPE OPTIONAL
--                       PURPOSE "Used by signalplotter to use Plasma themes"
--                      )
--
- find_package(ZLIB REQUIRED)
- set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams"
-                        URL "http://www.zlib.net"
-@@ -113,10 +105,7 @@ add_subdirectory( processcore )
- add_subdirectory( processui )
- add_subdirectory( sensors )
- add_subdirectory( faces )
--
--if (KF5Plasma_FOUND)
--    add_subdirectory( signalplotter )
--endif()
-+add_subdirectory( signalplotter )
- add_subdirectory( ksgrd )
- 
- if(BUILD_TESTING)
-diff --git a/signalplotter/CMakeLists.txt b/signalplotter/CMakeLists.txt
-index fd11f01..231fcf7 100644
---- a/signalplotter/CMakeLists.txt
-+++ b/signalplotter/CMakeLists.txt
-@@ -16,7 +16,6 @@ target_link_libraries(ksignalplotter
-         KF5::IconThemes
-     PRIVATE
-         KSysGuard::ProcessCore
--        KF5::Plasma
- )
- 
- set_target_properties(ksignalplotter
-diff --git a/signalplotter/ksignalplotter.cpp b/signalplotter/ksignalplotter.cpp
-index 4e6c278..df7c705 100644
---- a/signalplotter/ksignalplotter.cpp
-+++ b/signalplotter/ksignalplotter.cpp
-@@ -42,7 +42,6 @@
- #ifdef GRAPHICS_SIGNAL_PLOTTER
- #include <QGraphicsSceneResizeEvent>
- #include <QStyleOptionGraphicsItem>
--#include <Plasma/Theme>
- #endif
- 
- #include <klocalizedstring.h>
-@@ -52,6 +51,7 @@
- 
- #ifdef SVG_SUPPORT
- #include <Plasma/Svg>
-+#include <Plasma/Theme>
- #endif
- 
- 
-diff --git a/signalplotter/ksignalplotter_p.h b/signalplotter/ksignalplotter_p.h
-index 81912f5..082f97c 100644
---- a/signalplotter/ksignalplotter_p.h
-+++ b/signalplotter/ksignalplotter_p.h
-@@ -24,7 +24,9 @@
- //#define USE_QIMAGE
- 
- // SVG support causes it to crash at the moment :(
-+// (when re-enabling this remember to also link against plasma-framework)
- //#define SVG_SUPPORT
-+
- // Use a separate child widget to draw the graph in
- #ifndef KSYSGUARD_KSIGNALPLOTTER_P_H
- #define KSYSGUARD_KSIGNALPLOTTER_P_H
--- 
-2.26.2
-
diff --git a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
deleted file mode 100644
index cf0bfe42b844..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.19.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-LICENSE="LGPL-2+"
-SLOT="5/9"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="webengine X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${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/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	sys-libs/zlib
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:5
-		>=dev-qt/qtwebengine-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${RDEPEND}
-	!<kde-plasma/plasma-workspace-5.18.80:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	X? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch"
-	"${FILESDIR}/${PN}-5.18.90-unused-dep.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt5WebChannel)
-		$(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.20.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild
index c19133c93947..7ee8bd1bfd68 100644
--- a/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild
@@ -14,7 +14,7 @@ inherit ecm kde.org
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="webengine X"
 
 RDEPEND="