gentoo resync : 22.12.2021

4 files changed, 96 insertions, 45 deletions

diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index e324d8bc932e..b63295c06c51 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,4 @@
-DIST bluedevil-5.22.5.tar.xz 162740 BLAKE2B 2561bc614083bb7548c752330588d46afe99c0a0e7c215c8079044b240dce6dda8894aecf67d9af6750a1dbef5259e4e508d672485fe9ede215259bdb41e9480 SHA512 bd92fb1bd55f29916a5e4818785e9be43f7eec01bb5ec9ac35ffe5a8e20ac11079261f46f96a7e60d2f6c5b9b1a06773de2bd525f796d4e0d651edc5056202ab
+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
-EBUILD bluedevil-5.22.5.ebuild 1118 BLAKE2B af4d6e101a1f5cbc513d2d0155ce7a93a97bd509f7bf53827fed90dd98feaabdfdff2ea76ab0996caaaad958ec0a81c57c7f29d8e41c346304e2915ef46660b4 SHA512 25872950b76d750fc4f471b1efdfa70534010b538a504c5673d55910cddea9662e0f1b1ee76d6bc08086b44de5a18a11cda159913b42d1e50848c4afc3ab312b
-EBUILD bluedevil-5.23.4.ebuild 1121 BLAKE2B acbda1f0abf4912eb5b7da6bef58762d4796f1b557f67c5d936da99ce19106dbb7469ecc404aab99181089cd5edcaf38a2695f0db02f5ffb6960307ebfa5ac6c SHA512 a65f37ff96ea819771df1b869bf1855c4d258a4678ec1711fe9b7a05b31ac129eaea98154645fe3cbbb616f67265b1dfa44d18a8c34e9a681d1c1967b3ce924b
+EBUILD bluedevil-5.23.4-r1.ebuild 1208 BLAKE2B 432f72f84b031478a82b529592285eece80c9701f9f3f16b2216f49dd418bee2362d3c03135805b138a3819168b19ccfbb6604d84c1a428a29e519d670b4926c SHA512 976f404a8d68035ddf51084bd3149a65c4d1145d8cc65262ec049f2ba49b3ae494fdb4cb5e57c1411dad1dd4c331abec9c65cdea844bd13c792b4746a8dd87eb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/bluedevil/bluedevil-5.22.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild
index c4ed728f052b..c50dffa5f1b3 100644
--- a/kde-plasma/bluedevil/bluedevil-5.22.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.23.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KFMIN=5.82.0
+KFMIN=5.86.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
@@ -16,6 +16,10 @@ SLOT="5"
 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/bluedevil-5.23.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.23.4.ebuild
deleted file mode 100644
index a5596eaace02..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.23.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.86.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/bluez-qt-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}: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
new file mode 100644
index 000000000000..1a0a28e50ec9
--- /dev/null
+++ b/kde-plasma/bluedevil/files/bluedevil-5.23.4-save-bluetooth-status-on-teardown.patch
@@ -0,0 +1,89 @@
+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
+