gentoo resync : 16.09.2021

5 files changed, 14 insertions, 83 deletions

diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 3b7166f1ea68..c6f68d1581b4 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.21.5.tar.xz 706172 BLAKE2B 776c9ae2c79ab644ee377ff76fa3d3ef41da15431bc628aa6e2f14a3914212566797c779c8aac7f0a0df3e89fe55bb748558fa56e5a3aa516535e59b5a53006f SHA512 1626f9489e0bdff3acad087577470818bd04d6d74d6afe95b11d02ecfe306328b3898a573704c11b0a34e73ec7a662b9c609b056be369694769a3dc2e6671fec
+AUX libksysguard-5.22.5-no-detailed-mem-message.patch 1100 BLAKE2B ca0d79c17109b9a24258c48a59efc3a8f66b28bcfd15ec1168f6276ea9568530abbfe442db7fdd9bd524409fac5cad951de44778df382e48b731d3d33fd68479 SHA512 20fd323fd34c6f46d4d3116c85edbeb8feee048890c5c78d1862891937962d5b04ec2e1d1429826f4f3999d6413d09040307322ae16284fb8c8f31e301290e65
 DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
-EBUILD libksysguard-5.21.5.ebuild 1689 BLAKE2B 25ba7ecd1b6590393450d4909d53064ee5c9b72f9ee28a2b58312293138dfdf4fc19be0060024876240ec00ea65f2d8d648c6c8602ad296d14b984314d8b3a15 SHA512 93a8decd5e9ab4e627b48cf57ec61a089dd7a81dd2f69433c3f0dbd2dae5a2627fceccbd0147b5240ee94d69b10ee5494281f41b65d12e7651d0470dc119baab
-EBUILD libksysguard-5.22.5.ebuild 1806 BLAKE2B 5fd588d323ecb7857c8f852dc214487fb92e488bb5ce203f819fdd9c0ab4bca9962df8762b5e7640a6d8649c70ecfafb2902a68fe13ffbada4b137205e8e059f SHA512 b84a3ad9ab407e5491e51c65d11f29115b6f6a9a996355c67ca90fdd49256a90f6c24499e37c0bd3f8ee7208afdfb95ffe13f08768528b85125a369a1537ecee
-MISC metadata.xml 610 BLAKE2B bb0e7feacf14aba0c3076ef60c86d09053ddbe57ffb2fb4d19c287b25dc4afd0e3058132356702caad20432c1419e4b6a5ab1ee2221a989be378e73ba7c8a1fe SHA512 f609c5b64c1b8a31129e6c968827bfe199aa5fdf096a65144b5883ed8dfd8f0dad3063184b74a40d55067b808fe6dbcde252342ec68cf3c1f02170b234a3a051
+EBUILD libksysguard-5.22.5.ebuild 1795 BLAKE2B b750fa9d5ed0e13f8f5959db8a36650ae94ab73a9f6b17640f74072481b9a7753bb16684508b17b74ad236639f66fad5e2e6636a464a872c84402c2903d61243 SHA512 5dba3b166d5e56bd0adea34f7407312abeab0d051e20aacd1cc0cdee7e5017d2133b5d7b3098dbb132b08d6b9fe793a4e1e78d1d53c6d8cfc9fb25a671179145
+MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch
index 477f88d4e55b..352cad76b765 100644
--- a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch
+++ b/kde-plasma/libksysguard/files/libksysguard-5.22.5-no-detailed-mem-message.patch
@@ -1,18 +1,20 @@
-From 49c5fdcc3bfdfedfaeaabac4f0070b986a166ce2 Mon Sep 17 00:00:00 2001
+From a81b823c8e169ee5a4212070a9cc77dad27aa7b6 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 7 Jun 2019 22:58:55 +0200
+Date: Tue, 7 Sep 2021 16:08:30 +0200
 Subject: [PATCH] Gentooify message about QtWebEngineWidgets
 
 Translations can not be provided for this.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  processui/scripting.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index 83cf895..647194a 100644
+index 2e95624..c69a123 100644
 --- a/processui/scripting.cpp
 +++ b/processui/scripting.cpp
-@@ -242,7 +242,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) {
+@@ -243,7 +243,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) {
      mScriptingHtmlDialog->webView()->load(fileName);
  #else
      QMessageBox::critical(this, i18n("QtWebEngineWidgets not available"),
@@ -20,7 +22,7 @@ index 83cf895..647194a 100644
 +            QStringLiteral("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available."));
  #endif
  }
- #if HAVE_QTWEBENGINEWIDGETS
+ #if WEBENGINE_SCRIPTING_ENABLED
 -- 
-2.21.0
+2.33.0
 
diff --git a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
deleted file mode 100644
index 0c4c4f344a8e..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.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" )
-
-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.22.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
index 70c379be6c7c..75b9c0ee7c19 100644
--- a/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.22.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library"
 
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="webengine X"
 
 COMMON_DEPEND="
@@ -58,7 +58,7 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-plasma/plasma-workspace-5.18.80:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
+PATCHES=( "${FILESDIR}/${P}-no-detailed-mem-message.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-plasma/libksysguard/metadata.xml b/kde-plasma/libksysguard/metadata.xml
index 2c0239f1a63b..4bf88b5f67ae 100644
--- a/kde-plasma/libksysguard/metadata.xml
+++ b/kde-plasma/libksysguard/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>