gentoo resync : 20.03.2022

4 files changed, 8 insertions, 168 deletions

diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 43ad5cba812f..afb09c20b909 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,6 +1,5 @@
-AUX kwidgetsaddons-5.88.0-kacceleratormanager-alt-x-shortcuts.patch 5226 BLAKE2B 16922dc0aba2824e5b66b1d8bbbb1d80f8608beaf87bfb5e23c05b5d62d8bf0a807737264f2d547f5393a39f11e0f76d4087e1bb3de97f0171ffa6b98a59721d SHA512 9a97ae97c628848ce8c30beb402b950e30ce276ef6feb1f02ded75c17c4c5d49b6393a4aabaeb3b3226290693b58bc181e06d458db97ed80f7c17994a42af2c3
-DIST kwidgetsaddons-5.88.0.tar.xz 2306968 BLAKE2B dd90673cac33f878186c003cc66fced723ed1d87845535da3ee87315fdbdae285b284cd52b776e354f104cd89640176aabe534fae9ecc310ae7dc447f66237e5 SHA512 722c55dad25fc3f7b516c7822ba2f0a2b87c6124435fc376f42bbba84aff28a0abf1791e8bb39c16a7708c91961c2fba4f6174ae704348a1a2058c65c4182bc8
 DIST kwidgetsaddons-5.90.0.tar.xz 2311612 BLAKE2B 558d19a8a98fb4d49437c435856d35f0f92103a90cf3e49286eb3021b94e48ad154c03997fe9089226837db2dbf1b1eee07f6fcde0ef445c3c096ed83227f8a3 SHA512 7e68785540a73ef08bc99ca37b486af037657afa0f24971d53b9143e4f8ec0a4fcb4bf4bf986eedfbc9251e86e034796a242f69dd6ef88f7480691789f27e631
-EBUILD kwidgetsaddons-5.88.0-r1.ebuild 895 BLAKE2B e597a9893cbe430aa7c66ec6f1e2081ddc4bc8a205fb58743e72f6761fa177dcd7b6d6691b16c17ff5ceff88000c4d7df9ad286a5c547619862d726f1cfd02ca SHA512 fff25aa12c47b0e78c9f65ffc80fc1746fe8cb7563bba3f3f900053e0c31fb4024ed884868a9c7bbf4ecc3c36921ddb5deff8c9f1f759f1639596a886ee5eb41
-EBUILD kwidgetsaddons-5.90.0.ebuild 807 BLAKE2B 7bd15b9b95e5730e819f4788a669d8fd1a4f07def58dcfe67cd139ca5a1ddb82563e8a9dac12967cd0e3290aa5b0540ff893ef88241be0ab8aebfdb434a9bb19 SHA512 149ac40f2713e0a4de794c65dc504ce391e22ef489ab118855f064e534dc9dede662f95064b1ae7bc0732c24d0f18ce37698eee23c9c83f2145acc778f2a661c
+DIST kwidgetsaddons-5.92.0.tar.xz 2313060 BLAKE2B d48d1be09dc65d79eb5961394ac5bd1f26c0613128c10faab45f5011131f7a2233733aaa844705f7905f3aede240ef6734ad4a68eb044af7531203252e2e8ca9 SHA512 a983eb8c8b186c0fade674516b6a99a6455d512c0ee243af5cfcdfb5733adfd9ca2b2e674959312350dfcd4faae8bc62a57cc356bd30b0420f9ed54db7bafd9f
+EBUILD kwidgetsaddons-5.90.0.ebuild 804 BLAKE2B 62aa8d0e94afe57f571cfabf85a38009e5d670d43ba5cbca1ba0beb7ed4dd9e7e9dd4410ec0e59e50c61d4a34325635a435ac978da647a59beae35d64f963f5d SHA512 1f6c3ca2d69f3a2d9728b439dc742a1983487b274ba8edf73e5caaa91d3a2d072af5e4eb2aac8d11fcf8c6b7d6cabd7fc28eeeaa869406c4e9b0865989aed9ad
+EBUILD kwidgetsaddons-5.92.0.ebuild 671 BLAKE2B 3df0e8e1a5ed7d6a8dec3ddf5fc5be345d02a23b18e6abdc79afcd658de84b0684ffccdc69f3e4469fc3ab7d643961b23a0f5d81e6c1b22a1f3aafaec7c1faea SHA512 35ba18dab0b7785d3f8f3e8e6dceb1be55f9aa589af87ad68c6f525e36344f438a10472ada1f3d80151ff02158dcadd475cd37681b184455405cedaf3015a358
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.88.0-kacceleratormanager-alt-x-shortcuts.patch b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.88.0-kacceleratormanager-alt-x-shortcuts.patch
deleted file mode 100644
index 6e7ca9e47298..000000000000
--- a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.88.0-kacceleratormanager-alt-x-shortcuts.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 294fe8ddc2f10d0a783bf9b80769c31ecc5922b1 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Fri, 5 Nov 2021 23:23:59 +0100
-Subject: [PATCH] KAcceleratorManager: Take into account actions with Alt+X
- shortcuts
-
-We need to mark those X labels as used, otherwise the accelerator
-manager may decide to use X for an accelerator and when pressing Alt+X
-we will have a conflict
-
-BUGS: 444990
----
- autotests/kacceleratormanagertest.cpp | 21 +++++++++++++++++++
- src/kacceleratormanager.cpp           | 30 ++++++++++++++++++++-------
- src/kacceleratormanager_p.h           |  4 ++--
- 3 files changed, 46 insertions(+), 9 deletions(-)
-
-diff --git a/autotests/kacceleratormanagertest.cpp b/autotests/kacceleratormanagertest.cpp
-index 3fc07928..2bdc4f74 100644
---- a/autotests/kacceleratormanagertest.cpp
-+++ b/autotests/kacceleratormanagertest.cpp
-@@ -8,6 +8,7 @@
- #include <kacceleratormanager.h>
- 
- #include <QMenu>
-+#include <QPushButton>
- #include <QTest>
- 
- #define QSL QStringLiteral
-@@ -75,6 +76,26 @@ private Q_SLOTS:
-         QCOMPARE(texts, expectedTexts);
-     }
- 
-+    void testExistingActionsShortcutsAreTakenIntoAccount()
-+    {
-+        std::unique_ptr<QWidget> w(new QWidget());
-+
-+        QPushButton *pb = new QPushButton(QSL("Open"), w.get());
-+
-+        KAcceleratorManager::manage(w.get());
-+        QCOMPARE(pb->text(), QSL("&Open"));
-+
-+        delete pb;
-+        pb = new QPushButton(QSL("Open"), w.get());
-+
-+        QAction *a = new QAction();
-+        a->setShortcut(QSL("Alt+O"));
-+        w->addAction(a);
-+
-+        KAcceleratorManager::manage(w.get());
-+        QCOMPARE(pb->text(), QSL("O&pen"));
-+    }
-+
-     void testActionIconTexts_data()
-     {
-         QTest::addColumn<QStringList>("initialTexts");
-diff --git a/src/kacceleratormanager.cpp b/src/kacceleratormanager.cpp
-index 66d596d3..2f7b1879 100644
---- a/src/kacceleratormanager.cpp
-+++ b/src/kacceleratormanager.cpp
-@@ -94,9 +94,8 @@ void KAcceleratorManagerPrivate::manage(QWidget *widget)
- 
-     Item *root = new Item;
- 
--    manageWidget(widget, root);
--
-     QString used;
-+    manageWidget(widget, root, used);
-     calculateAccelerators(root, used);
-     delete root;
- }
-@@ -175,7 +174,7 @@ void KAcceleratorManagerPrivate::calculateAccelerators(Item *item, QString &used
-     }
- }
- 
--void KAcceleratorManagerPrivate::traverseChildren(QWidget *widget, Item *item)
-+void KAcceleratorManagerPrivate::traverseChildren(QWidget *widget, Item *item, QString &used)
- {
-     const QList<QWidget *> childList = widget->findChildren<QWidget *>();
-     for (QWidget *w : childList) {
-@@ -192,12 +191,29 @@ void KAcceleratorManagerPrivate::traverseChildren(QWidget *widget, Item *item)
-             continue;
-         }
- 
--        manageWidget(w, item);
-+        manageWidget(w, item, used);
-     }
- }
- 
--void KAcceleratorManagerPrivate::manageWidget(QWidget *w, Item *item)
-+void KAcceleratorManagerPrivate::manageWidget(QWidget *w, Item *item, QString &used)
- {
-+    // If the widget has any action whose shortcuts contain keystrokes in the
-+    // form of Alt+X we need to mark X as used, otherwise we may assign it as accelerator
-+    // and there will be a conflict when trying to use it
-+    const QList<QAction *> widgetActions = w->actions();
-+    for (QAction *action : widgetActions) {
-+        const QList<QKeySequence> actionShortcuts = action->shortcuts();
-+        for (const QKeySequence &sequence : actionShortcuts) {
-+            const QString sequenceAsText = sequence.toString(QKeySequence::PortableText);
-+            const QStringList splitSequence = sequenceAsText.split(QStringLiteral(", "));
-+            for (const QString &shortcut : splitSequence) {
-+                if (shortcut.length() == 5 && shortcut.startsWith(QStringLiteral("Alt+"))) {
-+                    used.append(shortcut.right(1));
-+                }
-+            }
-+        }
-+    }
-+
-     // first treat the special cases
- 
-     QTabBar *tabBar = qobject_cast<QTabBar *>(w);
-@@ -247,7 +263,7 @@ void KAcceleratorManagerPrivate::manageWidget(QWidget *w, Item *item)
-     }
- 
-     if (w->inherits("KUrlRequester")) {
--        traverseChildren(w, item);
-+        traverseChildren(w, item, used);
-         return;
-     }
- 
-@@ -316,7 +332,7 @@ void KAcceleratorManagerPrivate::manageWidget(QWidget *w, Item *item)
-             item->addChild(i);
-         }
-     }
--    traverseChildren(w, item);
-+    traverseChildren(w, item, used);
- }
- 
- void KAcceleratorManagerPrivate::manageTabBar(QTabBar *bar, Item *item)
-diff --git a/src/kacceleratormanager_p.h b/src/kacceleratormanager_p.h
-index a92d04ab..04926476 100644
---- a/src/kacceleratormanager_p.h
-+++ b/src/kacceleratormanager_p.h
-@@ -227,9 +227,9 @@ public:
-     typedef QList<Item *> ItemList;
- 
- private:
--    static void traverseChildren(QWidget *widget, Item *item);
-+    static void traverseChildren(QWidget *widget, Item *item, QString &used);
- 
--    static void manageWidget(QWidget *widget, Item *item);
-+    static void manageWidget(QWidget *widget, Item *item, QString &used);
-     static void manageMenuBar(QMenuBar *mbar, Item *item);
-     static void manageTabBar(QTabBar *bar, Item *item);
-     static void manageDockWidget(QDockWidget *dock, Item *item);
--- 
-GitLab
-
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.90.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.90.0.ebuild
index d10557400c42..24700ee471f1 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.90.0.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.90.0.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 DESCRIPTION="An assortment of high-level widgets for common tasks"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.88.0-r1.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.92.0.ebuild
index 4540eecce948..1e1e66032bf6 100644
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.88.0-r1.ebuild
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.92.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,8 +9,9 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="An assortment of high-level widgets for common tasks"
+
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="nls"
 
 DEPEND="
@@ -18,18 +19,7 @@ DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 "
 RDEPEND="${DEPEND}"
-BDEPEND="
-	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
-"
-
-PATCHES=( "${FILESDIR}/${P}-kacceleratormanager-alt-x-shortcuts.patch" ) # KDE-bug 444990
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON # bug 746866
-	)
-	ecm_src_configure
-}
+BDEPEND="nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )"
 
 src_test() {
 	# bug 650216, 653186, 697866, 808216