gentoo resync : 22.12.2021

4 files changed, 5 insertions, 77 deletions

diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index 7628cf072a04..97d83d740688 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,6 +1,5 @@
-AUX kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch 2743 BLAKE2B 067e602048a9caceee71d1288f43d3da06b4d00b904f46ea2e227c7af18b8c1cf543f8f84e2bec1890187488cf81abfa0a9cfadc311bcc67169a85f8b5876393 SHA512 21c6d19fa875b920e80027ddc9122a4f6855051b3397948864e408dc2265da405eac4b5d345930f94d4eda32e0340f746e20c56c7068b99fe8f5b5a8c6fc747f
-DIST kglobalaccel-5.85.0.tar.xz 87868 BLAKE2B c76a60426406689434b8b7e90ff9f107173ffa8bb6e6f78603541c2f7fdba62719d141f01ac2a7e3ebeae06a2a891a5467e6ee87eb5d30a53ed4e3faa98a1b28 SHA512 091194d3171820c121c32356bf1dfd98416b91952b745afbf35fc75a7e944a5c80f17fb1f8418016513eaaf63ccb07c1aec822f5f3823f3f4aa604c3dd9963f2
 DIST kglobalaccel-5.88.0.tar.xz 88180 BLAKE2B a1642db79366428c9fd1b644c03258633386a23d290545635bf787e22a362ae7c7d8701380498e9ecc5cea1ff230aeeec500f9c58d920b34d234b74f011d71ad SHA512 aeaf82a2371a9259493f89cec46f40abb6c0ddac48c4831b75a3a31c46bad63b390fd6948cd473124cdc28b2b3d8018834a986e11f4648028697ab871534787f
-EBUILD kglobalaccel-5.85.0-r1.ebuild 934 BLAKE2B 3dcd7e5e9972800ab25e50094761cd7b5eafaffeed22239c88936a348074457e91396dfc3e419f826cb7564706af374e2277dd30fea4970c513b15d96787e651 SHA512 56074522a4948ea9419639234851fb63f8bb29241d1d4403b1544581c810282be1ba01a29e188c29f5ded374de9922eea1290e50086e8217d85e385022cfc34d
-EBUILD kglobalaccel-5.88.0.ebuild 842 BLAKE2B 1489f22563189291286d7976e8568ad38a5131d57a550d409cd7c25372eca559f95ef69b1417670749c42a71fc6f132f854dda8d86ea11811f36d9269c28b0db SHA512 1cc8b8adf61d121b697ac2033f4aa29a8305f2259d3bccb4cc2b542317e32ccd63d5665478eee69a9cc961047681fef8242a6ff5e3f0d7cf0c09faf5d6cc336a
+DIST kglobalaccel-5.89.0.tar.xz 90384 BLAKE2B 5e8a3251650343326c40cbef6e52cbf87a4043cd4228269b627652589e4555acdbeaa0a822d2e83b0eb7053e4cb5ec1ba7055fe28b9b108bd3953979e164c3b6 SHA512 a9749dc090ec38bc37d625729ea9ab7b6e87521e8376a1182dd98978309a1b7cd3888f63a47a4ad56ae734cf49e43f77824288eeb3b3c00c35f8a171c12c5dcd
+EBUILD kglobalaccel-5.88.0.ebuild 839 BLAKE2B c76d084375f9b1e21db0c2ce3f1f326d9107afc26d8c976e78977350f6e0c45585a4e1b2a2b5c7eb21ae92b37a30aea979d333e1b355483efc012dace2befad7 SHA512 2f81ffcf109e74220ef83126bbc8520c7cb85188f1053aeb9596838d8c94e7396c008d1528c6b3f0885c6cbb4e5d62ac3b0f7911961de1f79802c23c357a6bce
+EBUILD kglobalaccel-5.89.0.ebuild 842 BLAKE2B 1489f22563189291286d7976e8568ad38a5131d57a550d409cd7c25372eca559f95ef69b1417670749c42a71fc6f132f854dda8d86ea11811f36d9269c28b0db SHA512 1cc8b8adf61d121b697ac2033f4aa29a8305f2259d3bccb4cc2b542317e32ccd63d5665478eee69a9cc961047681fef8242a6ff5e3f0d7cf0c09faf5d6cc336a
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch b/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch
deleted file mode 100644
index 0a5dcd5c4f37..000000000000
--- a/kde-frameworks/kglobalaccel/files/kglobalaccel-5.85.0-start-processes-w-kstart5-if-available.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c6c14830a98050cbee5aa48dd8812e2197515de3 Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Mon, 30 Aug 2021 15:45:36 +0200
-Subject: [PATCH] Start processes with kstart5 if available
-
-The intention of 717e4ea9f8e9d3f9ea5e6c8de2efbffd5ef2af82 was to start
-processes with kstart5 so they are in the correct cgroup. We should
-always check if it's available first as we still want to prefer it once
-klauncher is registered.
-BUG:433362
-
-* asturm 2021-09-04: Merged with:
-
-From 061c45df933f6a346c85c34fe10df6f1bd857908 Mon Sep 17 00:00:00 2001
-From: Nikos Chantziaras <realnc@gmail.com>
-Date: Thu, 2 Sep 2021 09:42:51 -0600
-Subject: [PATCH] Fix launching commands with args using kstart5
-
-By prepending "--" to the command, kstart5 parses it all as one thing,
-so additional arguments are executed as expected.
-
-BUG: 433362
----
- src/runtime/kserviceactioncomponent.cpp | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/src/runtime/kserviceactioncomponent.cpp b/src/runtime/kserviceactioncomponent.cpp
-index 8bb6962..09b3d7a 100644
---- a/src/runtime/kserviceactioncomponent.cpp
-+++ b/src/runtime/kserviceactioncomponent.cpp
-@@ -48,7 +48,13 @@
-     }
- 
-     const QString command = parts.takeFirst();
--    if (klauncherAvailable) {
-+
-+    const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5"));
-+    if (!kstart.isEmpty()) {
-+        parts.prepend(command);
-+        parts.prepend(QStringLiteral("--"));
-+        QProcess::startDetached(kstart, parts);
-+    } else if (klauncherAvailable) {
-         QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.klauncher5"),
-                                                           QStringLiteral("/KLauncher"),
-                                                           QStringLiteral("org.kde.KLauncher"),
-@@ -57,18 +63,14 @@
- 
-         QDBusConnection::sessionBus().asyncCall(msg);
-     } else {
--        const auto kstart = QStandardPaths::findExecutable(QStringLiteral("kstart5"));
--        if (kstart.isEmpty()) {
--            QProcess::startDetached(command, parts);
--        } else {
--            parts.prepend(command);
--            QProcess::startDetached(kstart, parts);
--        }
-+        QProcess::startDetached(command, parts);
-     }
- }
- 
- void KServiceActionComponent::emitGlobalShortcutPressed(const GlobalShortcut &shortcut)
- {
-+    // TODO KF6 use ApplicationLauncherJob to start processes when it's available in a framework that we depend on
-+
-     // DBusActivatatable spec as per https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#dbus
-     if (m_desktopFile->desktopGroup().readEntry("DBusActivatable", false)) {
-         QString method;
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.88.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.88.0.ebuild
index 43fdf06f50f9..efe4f3a45cf6 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.88.0.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.88.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework to handle global shortcuts"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.89.0.ebuild
index 52e82e49155e..43fdf06f50f9 100644
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.85.0-r1.ebuild
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.89.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework to handle global shortcuts"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="nls"
 
 DEPEND="
@@ -30,10 +30,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-start-processes-w-kstart5-if-available.patch # KDE-bug 433362
-)
-
 src_test() {
 	XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342
 }