gentoo Easter resync : 12.04.2020

4 files changed, 7 insertions, 75 deletions

diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 6fdaf04bcac9..f429d56b82b6 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,6 +1,5 @@
-AUX solid-5.64.0-udisks2-media-change-detection.patch 2748 BLAKE2B fce33a1d668deef83fabd7dd553170ca48d50bab2c2b452d28a9d64ef065efb775fdee7771698aba6313f5abb817a34efae5faf1bb8dd1811d992f91fd382135 SHA512 3b90fcfde9088931787bfc7b490b3a0ae3e3bd4a57e0b559bf7ddec80570ae5f5db37b8e1ace97d595d20d59b754858ff31b8965d5fea155dab41ab2aa350ed0
-DIST solid-5.64.0.tar.xz 264304 BLAKE2B 56128117e95e7b142ae83df630183f24fbb46e30f468a01fd39ca3a0d4d67d8ceeb135a05d840b20b0de9d9e1131c8c47bc78761849fa95e311243c8dbcd91d3 SHA512 f1294431973799369afc541db24d33c7c75fd17cce4b843da9c17c782e0a8afd2ba0032e46119c036ddf943747af33c2aa96a1c318ed531c5842b38a1010f857
 DIST solid-5.67.0.tar.xz 265740 BLAKE2B 56589131e08782a74157328e366e9d6f835e855324ced74a5d823b71ab50a13952eb2326c20670b0433c273a35209d22b33acf4fa794540a781df0e019d8f4f8 SHA512 fd5e96b397c6de719c0bcea1c44be069d4cce97d1bdd65b20416cd7dc83646bba83915e565b584cf5131d040809b1e3937084552503ccc7d2db0e2e638b453b1
-EBUILD solid-5.64.0-r1.ebuild 901 BLAKE2B 05940fd418f394976996cfbcb8a8b5368dc841c7c222febc0f83c00501c7efbb6ac878025e92a45b8e52e58d1342ce485ffc55c5eaded7eb7d9851c6c44f254d SHA512 1700093546e34051bf443ed0a6a3fe2215c52344cac1b70a109a326b900c24e7b9d14bc2ad4c2145d6af85940c603e7e698c7a1d640fc93efc3975aaa21bd9d6
-EBUILD solid-5.67.0.ebuild 831 BLAKE2B e71b2f285d18fa807fe5a803d184d7785a2e7ed3cc8f9b50830de7c7b999f57d0b7642c13c32833413b0e211862608eb2944f2cabed79f0bd6a6bbf1e6f13b2b SHA512 ab5e7b9ec2c47ee191a45516609bce1e8999fedb1284fd38b378d519c85ee006ef26612934e68773dc09ff4b2d070dc27525e7d0eadaf7136d9050d0f93d224e
+DIST solid-5.69.0.tar.xz 268296 BLAKE2B 82dbb643130893cc9553e7955f686f9906e9e0c187ea86864a9a667e6672de0a11301d3773cfe476b66fbeab85f5acdfe467b7de573727bb243e2f4709c9c372 SHA512 eaf9de6f2f01564062f1dbf15e2393f03a2875150eedff8b0bf94a5c3d28d6756e8775cb71152eeee3b06c4fefc18cac715ccd5fd2fb9347ebbae17c4ac67af4
+EBUILD solid-5.67.0.ebuild 828 BLAKE2B 42c3c955b9a98d81bb9cb6006b3da4e60a86581916ee8a6e30f65be6e58502164bdda1fb58976c7e5b61542936045572bc40225dd2e81229a84b7f045602419c SHA512 583dde1b33007e9df618f83e1b4398d6521df26d329b65301b32df945ca50809c489d09f2849028fde284b2ee42770411f5dd774940e5d5ef1af64272344aad1
+EBUILD solid-5.69.0.ebuild 831 BLAKE2B e71b2f285d18fa807fe5a803d184d7785a2e7ed3cc8f9b50830de7c7b999f57d0b7642c13c32833413b0e211862608eb2944f2cabed79f0bd6a6bbf1e6f13b2b SHA512 ab5e7b9ec2c47ee191a45516609bce1e8999fedb1284fd38b378d519c85ee006ef26612934e68773dc09ff4b2d070dc27525e7d0eadaf7136d9050d0f93d224e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/files/solid-5.64.0-udisks2-media-change-detection.patch b/kde-frameworks/solid/files/solid-5.64.0-udisks2-media-change-detection.patch
deleted file mode 100644
index 57fd17f7b61b..000000000000
--- a/kde-frameworks/solid/files/solid-5.64.0-udisks2-media-change-detection.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4aa39aed1bd6c81dbf0d6dc9d312af5340f7caab Mon Sep 17 00:00:00 2001
-From: Rok Mandeljc <rok.mandeljc@gmail.com>
-Date: Tue, 12 Nov 2019 10:20:38 -0700
-Subject: [udisks2] fix media change detection for external optical drives
-
-Summary:
-If an external optical drive is connected after Solid does its initial introspection, the resulting UDI does not get a mediaChanged signal/slot connection, and thus fails to react to the media change. Consequently, disc content is not properly updated after the medium is ejected, causing bug #394348.
-
-This patch assumes that an addition of "org.freedesktop.UDisks2.Block" interface means that a new device has been added; in this case, it performs Device::mightBeOpticalDisc() check to add the slotMediaChanged() connection.
-
-BUG: 394348
-FIXED-IN: 5.65
-
-Test Plan:
-Test steps:
-1. Start KDE Plasma session. Make sure K3b is installed.
-2. Connect an external USB optical drive.
-3. Insert the disc
-4. Observe Device action notifications for the inserted disc.
-5. Eject the disc.
-6. Observe Device action notifications.
-
-Behavior before patch: after disc is ejected, a "Copy with K3b" action remains available for the drive
-See: https://bugs.kde.org/show_bug.cgi?id=394348
-
-Behavior after patch: after disc is ejected, no actions remain available for the drive
-
-Reviewers: bruns, broulik, dfaure, #frameworks, ngraham
-
-Reviewed By: ngraham
-
-Subscribers: ngraham, bugseforuns, kde-frameworks-devel
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D20508
----
- src/solid/devices/backends/udisks2/udisksmanager.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/solid/devices/backends/udisks2/udisksmanager.cpp b/src/solid/devices/backends/udisks2/udisksmanager.cpp
-index 4982aee..3b76423 100644
---- a/src/solid/devices/backends/udisks2/udisksmanager.cpp
-+++ b/src/solid/devices/backends/udisks2/udisksmanager.cpp
-@@ -191,6 +191,18 @@ void Manager::slotInterfacesAdded(const QDBusObjectPath &object_path, const Vari
- 
-     qCDebug(UDISKS2) << udi << "has new interfaces:" << interfaces_and_properties.keys();
- 
-+    // If device gained an org.freedesktop.UDisks2.Block interface, we
-+    // should check if it is an optical drive, in order to properly
-+    // register mediaChanged event handler with newly-plugged external
-+    // drives
-+    if (interfaces_and_properties.contains("org.freedesktop.UDisks2.Block")) {
-+        Device device(udi);
-+        if (device.mightBeOpticalDisc()) {
-+            QDBusConnection::systemBus().connect(UD2_DBUS_SERVICE, udi, DBUS_INTERFACE_PROPS, "PropertiesChanged", this,
-+                SLOT(slotMediaChanged(QDBusMessage)));
-+        }
-+    }
-+
-     updateBackend(udi);
- 
-     // new device, we don't know it yet
--- 
-cgit v1.1
diff --git a/kde-frameworks/solid/solid-5.67.0.ebuild b/kde-frameworks/solid/solid-5.67.0.ebuild
index 68634750131a..575a4ed6847f 100644
--- a/kde-frameworks/solid/solid-5.67.0.ebuild
+++ b/kde-frameworks/solid/solid-5.67.0.ebuild
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="nls"
 
 BDEPEND="
diff --git a/kde-frameworks/solid/solid-5.64.0-r1.ebuild b/kde-frameworks/solid/solid-5.69.0.ebuild
index 1f6d4edfb3c0..68634750131a 100644
--- a/kde-frameworks/solid/solid-5.64.0-r1.ebuild
+++ b/kde-frameworks/solid/solid-5.69.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit ecm kde.org
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="nls"
 
 BDEPEND="
@@ -17,8 +17,8 @@ BDEPEND="
 "
 RDEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	sys-fs/udisks:2
 	virtual/libudev:=
@@ -27,8 +27,6 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
 "
 
-PATCHES=( "${FILESDIR}/${P}-udisks2-media-change-detection.patch" )
-
 pkg_postinst() {
 	ecm_pkg_postinst