gentoo resync : 02.02.2022

4 files changed, 7 insertions, 101 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 6e7945d9fe90..9f8fc12ef7e3 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,6 +1,5 @@
-AUX bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch 3219 BLAKE2B 0eb626feb23369b55b1fd0e81c5c1f069510cd1ec30d8359fe759300c0ea11a00e4f2a01897c06ff9fda77f6499bd298c6c97645bbef08b80deea091af5019ac SHA512 7a2f1c77e2cae0e2a54ce6c98328c7c158f337af6a762026f4a9a973591ee73a8d9ba1aab496e876b7e2ed62de0697cb10df9072f76263240f7c3da14ae6a9f7
-DIST bluedevil-5.23.4.tar.xz 171304 BLAKE2B 239dc03d078f38c371446e3a1d73ad667eed2f4aa9c7d434d41ff2c973b5abf6d9b3b8661c7d3907adc55cb588e5481a66039b258a9ba7f468ce331c1dc172dc SHA512 41564e1e7fc7ecf5225063180a69d04c36340bd5b7c4ed8540b1b46b232c43c684e9c3faaafa1ded037c08a4a1bc49a82b9a4660df97e00e5ae2711fceba9a6b
 DIST bluedevil-5.23.5.tar.xz 171644 BLAKE2B b555e1f56706ae20b5017f6b97c4db9ed6e8ee7e7dba5a8e172e0e6d6e85c695c14bb220e95ef01c9390ad5163dbc4490b5142cb18cfb526fc4efc5f18106123 SHA512 66185703fe36b7da48ccf21db09832a80497562f5f57e539fc11d4e898f5d6f0e47ad94c81ad03ca3b0b82163f40f23b64de3af084453931dfe30861e1e3b000
-EBUILD bluedevil-5.23.4-r1.ebuild 1208 BLAKE2B 432f72f84b031478a82b529592285eece80c9701f9f3f16b2216f49dd418bee2362d3c03135805b138a3819168b19ccfbb6604d84c1a428a29e519d670b4926c SHA512 976f404a8d68035ddf51084bd3149a65c4d1145d8cc65262ec049f2ba49b3ae494fdb4cb5e57c1411dad1dd4c331abec9c65cdea844bd13c792b4746a8dd87eb
-EBUILD bluedevil-5.23.5.ebuild 1121 BLAKE2B 81fb12d807f1b0f8abb3795c8e1884a064a5c9ea82b8be361daccdb25863f9261e1097d266ee0a9056b5bbf6ad4286b473c861d99c5301cb0167e32defd3f012 SHA512 a8a61e34ea995e70b43f69fcaf37b1304345b9492a462a81cc5ff5b1a60cf2e36aa317cd5cb4413d67a279555be843f5b5425c2cb7e861cba2fb36be8ccce360
+DIST bluedevil-5.23.90.tar.xz 172152 BLAKE2B 47fe3965ad30bf5e05e0db90634fe3579724743b62e0d97e2737c4ac265f20611a0f5589b64d8a39d60ae41358317df73efc3804c2d1a4770fe68b9d34803316 SHA512 5d31fb14b401171fae27e8f375e4cf933dc1a09d7acb12dfb5baf6c2a216c17de17541534078c317d5bbc06a4461e557411863cb0fb9ba0ebdf490dcea0208aa
+EBUILD bluedevil-5.23.5.ebuild 1118 BLAKE2B 11b9fc33292c91544b5ec954f2dbebfcc82cbaab32519476b3c8f88132342313e3c4d90e35cb763ff6297640703e07148c7d698ef09427d3a80ce25a500c9333 SHA512 a1c78d4ab7cdc032da47b799bdb7ee38746469aa426af8ef8aa85b868fe2e878bdec88daffe55c44c5f22e37109df80237f53f24d950ca25ca54e657099f78c2
+EBUILD bluedevil-5.23.90.ebuild 1121 BLAKE2B 80eb20fbbc3cbdb123bf67b236e13e70c0c1d8a958c877cafc374d0f92eafa53a06bdab0738b932c60230fa4444f268f8764cd5056670ab8128ec5ca0c5b4513 SHA512 795fb78afe25ab7be0a92b776c9f2d4df8da9b0f2d66815ce868568d959a6ca0a3b2998668e93b1ec54711f13d3a8b3e68684375e8f84aa8433557ec2b25ae7a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/bluedevil/bluedevil-5.23.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.23.5.ebuild
index c56714bd5a0a..662406ac4ad0 100644
--- a/kde-plasma/bluedevil/bluedevil-5.23.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.23.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild b/kde-plasma/bluedevil/bluedevil-5.23.90.ebuild
index c50dffa5f1b3..0f52e59f206e 100644
--- a/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.23.90.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-KFMIN=5.86.0
+KFMIN=5.90.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -13,13 +13,9 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
-PATCHES=(
-	"${FILESDIR}"/${P}-save-bluetooth-status-on-teardown.patch # KDE-bug 445376
-)
-
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
diff --git a/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch b/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch
deleted file mode 100644
index 1a0a28e50ec9..000000000000
--- a/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From daaa18920ae93b482585eb3df790a6d5a647b6db Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Fri, 19 Nov 2021 19:37:58 -0700
-Subject: [PATCH] Save bluetooth status on teardown
-
-Instead of watching for the shutdown and restart signals, just save
-status anytime kded quits, which automatically covers those use cases as
-well as when logging out. This is what the code was already halfway
-doing; let's go all the way.
-
-BUG: 445376
-FIXED-IN: 5.23.5
-(cherry picked from commit e57bb7580251f38e798bea21cdad43a3f90f2568)
----
- src/kded/devicemonitor.cpp | 29 +++--------------------------
- src/kded/devicemonitor.h   |  1 -
- 2 files changed, 3 insertions(+), 27 deletions(-)
-
-diff --git a/src/kded/devicemonitor.cpp b/src/kded/devicemonitor.cpp
-index 735747ee..5090a8be 100644
---- a/src/kded/devicemonitor.cpp
-+++ b/src/kded/devicemonitor.cpp
-@@ -46,15 +46,6 @@ DeviceMonitor::DeviceMonitor(BlueDevilDaemon *daemon)
-                                          this,
-                                          SLOT(login1PrepareForSleep(bool)));
- 
--    // Catch shutdown events so we can save status when shutting down and
--    // optionally resume when starting up
--    QDBusConnection::systemBus().connect(QStringLiteral("org.freedesktop.login1"),
--                                         QStringLiteral("/org/freedesktop/login1"),
--                                         QStringLiteral("org.freedesktop.login1.Manager"),
--                                         QStringLiteral("PrepareForShutdown"),
--                                         this,
--                                         SLOT(login1PrepareForShutdown(bool)));
--
-     // Set initial state
-     const KConfigGroup globalGroup = m_config->group("Global");
-     const QString launchState = globalGroup.readEntry("launchState", "remember");
-@@ -75,17 +66,11 @@ DeviceMonitor::DeviceMonitor(BlueDevilDaemon *daemon)
-     }
- }
- 
--// Save state when tearing down to avoid getting out of sync if kded crashes
--// or is manually restarted
- DeviceMonitor::~DeviceMonitor()
- {
--    KConfigGroup globalGroup = m_config->group("Global");
--
--    if (m_manager->isBluetoothBlocked()) {
--        globalGroup.writeEntry<bool>("bluetoothBlocked", true);
--    } else {
--        globalGroup.deleteEntry("bluetoothBlocked");
--    }
-+    // Save state when tearing down to avoid getting out of sync if kded crashes
-+    // or is manually restarted
-+    saveState();
- }
- 
- KFilePlacesModel *DeviceMonitor::places()
-@@ -140,14 +125,6 @@ void DeviceMonitor::login1PrepareForSleep(bool active)
-     }
- }
- 
--void DeviceMonitor::login1PrepareForShutdown(bool active)
--{
--    if (active) {
--        qCDebug(BLUEDAEMON) << "About to shut down";
--        saveState();
--    }
--}
--
- void DeviceMonitor::saveState()
- {
-     KConfigGroup adaptersGroup = m_config->group("Adapters");
-diff --git a/src/kded/devicemonitor.h b/src/kded/devicemonitor.h
-index 6a35fed4..a7b38cab 100644
---- a/src/kded/devicemonitor.h
-+++ b/src/kded/devicemonitor.h
-@@ -35,7 +35,6 @@ private Q_SLOTS:
- 
-     void deviceConnectedChanged(bool connected);
-     void login1PrepareForSleep(bool active);
--    void login1PrepareForShutdown(bool active);
- 
- private:
-     void restoreState();
--- 
-GitLab
-