gentoo resync : 01.10.2021

3 files changed, 107 insertions, 0 deletions

diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index c6f68d1581b4..d7994df21980 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,4 +1,7 @@
 AUX libksysguard-5.22.5-no-detailed-mem-message.patch 1100 BLAKE2B ca0d79c17109b9a24258c48a59efc3a8f66b28bcfd15ec1168f6276ea9568530abbfe442db7fdd9bd524409fac5cad951de44778df382e48b731d3d33fd68479 SHA512 20fd323fd34c6f46d4d3116c85edbeb8feee048890c5c78d1862891937962d5b04ec2e1d1429826f4f3999d6413d09040307322ae16284fb8c8f31e301290e65
+AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f46cb60f1423523eb53ed564b2d0d8d6ab0429851f1e73e1aef844cbdcb23cfa70c4b0aac125587caa924fed50da94c5cb8de49d5f215fd38c03a SHA512 281b047e7f7e4d3a8e8d5ca9247dd4aca538cb13d1ff3e35303c059187140586233cff1b7c50caf5f289f9e4f63a2f57421ff0389cbbb50ad3f408a2addb396b
 DIST libksysguard-5.22.5.tar.xz 736820 BLAKE2B fab0f51362bd973d1b5d1ed2e393614b12e334f002b1bdcd8d2c4d582e2dcf03dabad86cf325944bdc565fb9098a361b73ec5645a0b2887b585c57c0f0acff06 SHA512 e7f14519d35146dce9eea3903cfda25e63d819a6305b099786404f2eb44b0923cf2296cf576e33b9f642c0934e7baff6fd87ffc505cc2af9f5807082f3aefd80
+DIST libksysguard-5.22.90.tar.xz 768516 BLAKE2B d50df60b9e2b2a09ea951d9ee2fd8dc89f9df85f23e2e1c1d8af23f2df719ad6f0224739cf7ec95745c6e05e1ae652ea5e93bbfde1cecfc15b9e02ba821a2d25 SHA512 5c586c24a64ebd05b4768ae3713e852ec8cbb9517b799b37bed56284cf4f6daafcb9ea9f9c0f53392f56645c80ccb1763bbac1c43cdc8344239a2da38fd550a9
 EBUILD libksysguard-5.22.5.ebuild 1795 BLAKE2B b750fa9d5ed0e13f8f5959db8a36650ae94ab73a9f6b17640f74072481b9a7753bb16684508b17b74ad236639f66fad5e2e6636a464a872c84402c2903d61243 SHA512 5dba3b166d5e56bd0adea34f7407312abeab0d051e20aacd1cc0cdee7e5017d2133b5d7b3098dbb132b08d6b9fe793a4e1e78d1d53c6d8cfc9fb25a671179145
+EBUILD libksysguard-5.22.90.ebuild 1830 BLAKE2B 822bafb786ed86f9c829416e52924d1439b5bb105505f0a08cf35e2e1a51bdd0194246dede9b7f3d90298af09af8c8ca10a5945cd0c61c5fd205cd9f4801ede3 SHA512 04a9bfc170ad79dd428046cdb115bc4fee71cbf6cf45bd487dbeaef8f793dfa626d895fb06e0c6ff5457b9c845b0a33e51ec93c5b64c5023ff68acc27fc9e21c
 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch
new file mode 100644
index 000000000000..c2fcb9551d2e
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch
@@ -0,0 +1,28 @@
+From 2e2ab674038a1102081ead255a172a42d3a1d27a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 1c35f72..7065cbe 100644
+--- a/processui/scripting.cpp
++++ b/processui/scripting.cpp
+@@ -241,7 +241,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) {
+ #else
+     QMessageBox::critical(this,
+                           i18n("QtWebEngineWidgets not available"),
+-                          i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution."));
++                          i18n("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available."));
+ #endif
+ }
+ #if WEBENGINE_SCRIPTING_ENABLED
+-- 
+2.33.0
+
diff --git a/kde-plasma/libksysguard/libksysguard-5.22.90.ebuild b/kde-plasma/libksysguard/libksysguard-5.22.90.ebuild
new file mode 100644
index 000000000000..1a8b55594efa
--- /dev/null
+++ b/kde-plasma/libksysguard/libksysguard-5.22.90.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="true"
+KFMIN=5.86.0
+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 ~riscv ~x86"
+IUSE="webengine X"
+
+COMMON_DEPEND="
+	dev-libs/libnl:3
+	>=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
+	net-libs/libpcap
+	sys-apps/lm-sensors:=
+	sys-libs/libcap
+	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="${COMMON_DEPEND}
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<kde-plasma/ksysguard-5.21.90:5
+	!<kde-plasma/plasma-workspace-5.18.80:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.22.80-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
+}