gentoo resync : 18.11.2019

4 files changed, 116 insertions, 10 deletions

diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index eba26f517db0..3805ec7a0a5c 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,7 @@
+AUX solid-5.64.0-udisks2-media-change-detection.patch 2748 BLAKE2B fce33a1d668deef83fabd7dd553170ca48d50bab2c2b452d28a9d64ef065efb775fdee7771698aba6313f5abb817a34efae5faf1bb8dd1811d992f91fd382135 SHA512 3b90fcfde9088931787bfc7b490b3a0ae3e3bd4a57e0b559bf7ddec80570ae5f5db37b8e1ace97d595d20d59b754858ff31b8965d5fea155dab41ab2aa350ed0
 DIST solid-5.60.0.tar.xz 261152 BLAKE2B 0dfbf35a8fa435d92e97a0e8745a0e0e38e89f0d58b81a8db8f985fe453647d045ba1e7c9523f276c55d3d72630226069b6b05a7991c9fd9698c6a91d0d193c4 SHA512 51781374fede9e16f546924d1a103704e68e1d67a852d53ca9c6e69cf00c3b46a92533b398aad7ba434eefbf25f6201696f46af532623bc5cfac01e4f1cae755
-DIST solid-5.63.0.tar.xz 262704 BLAKE2B 8dda822c0ef687060bb2cd65f4252dd32ee3795f48275aa4adbf3da9b9ec5186bb93cf48875bda2677bd93c6687f1f2a915c808439e19c9763f8d69dd418a050 SHA512 135eb9a71699a22d5dd201402c87216961a17aadc88bf326dee10df007134a09fcfcab61792d9e7c8323abdc7b081a9117778934aca1b0e408b90d11f245f45a
+DIST solid-5.64.0.tar.xz 264304 BLAKE2B 56128117e95e7b142ae83df630183f24fbb46e30f468a01fd39ca3a0d4d67d8ceeb135a05d840b20b0de9d9e1131c8c47bc78761849fa95e311243c8dbcd91d3 SHA512 f1294431973799369afc541db24d33c7c75fd17cce4b843da9c17c782e0a8afd2ba0032e46119c036ddf943747af33c2aa96a1c318ed531c5842b38a1010f857
 EBUILD solid-5.60.0.ebuild 770 BLAKE2B 0a55f1a63f0c54bef1705fd124b4b87cef32fbf4f00ce76f56e9f00f32613306615da0edec8b7eadca8879482d4ce77f8a129167070199950c4dacb84380f441 SHA512 fbb97c0083ac57c367c622847bfb65e9fbdfa3bec5d4e4c0bb36f581317460af455e011efa13b6032ab3f621fd6fe2d25f02e861df714bbb9878e7fd1d953c33
-EBUILD solid-5.63.0.ebuild 780 BLAKE2B 5696cda581e9b2792ceee1f230278e7dfb290ca07f5b12247da76d61926579ec6e791b64cc91b3ddad6eae8cf3e0bc067c3b27d188b1e77930b983713b8919d4 SHA512 67887e5ec4f7533eaed9c6467fc5e4a844da48758105c842c678967abc460840289dcc6f28b0d15e348a0383af35e779ed1757a958a219a492c993fb87dd29d9
+EBUILD solid-5.64.0-r1.ebuild 904 BLAKE2B c46de565343c4d0c66fd38d8a18bde28c38725f7a09c040a4f21e0ac6083270996ac3ea086241089f92c3e74c112c7c145744b7516120c029e8465e6a2c7a855 SHA512 f915905df3cd81fae27b65ffefdb8e6a81939fd2b1849e7e827920189c2abf5e920523ce555cbfa245667e166c1b8310decb038e552fd2585003558345ec208c
+EBUILD solid-5.64.0.ebuild 835 BLAKE2B 766930f5a0a5b31fc5aeb020faa2d7b8b2740939e875664903f884c8c83afebd95ea3ae6e6be3f832860fa654ca2c15491be2ee388f99db1603850568a02faf6 SHA512 9df7694f0fd57dc8a0f1b59f07b10d8c7a47e262b06dd601f2a37742ec6073e1c2415de2ad38ba7edc29cc49d1701b61c1d6869004d0ab93898a9bd88678db7c
 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
new file mode 100644
index 000000000000..57fd17f7b61b
--- /dev/null
+++ b/kde-frameworks/solid/files/solid-5.64.0-udisks2-media-change-detection.patch
@@ -0,0 +1,65 @@
+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.64.0-r1.ebuild b/kde-frameworks/solid/solid-5.64.0-r1.ebuild
new file mode 100644
index 000000000000..6eea94371fec
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.64.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="nls"
+
+BDEPEND="
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
+"
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	sys-fs/udisks:2
+	virtual/libudev:=
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-udisks2-media-change-detection.patch" )
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "app-misc/media-player-info" ; then
+		elog "For media player support, install app-misc/media-player-info"
+	fi
+}
diff --git a/kde-frameworks/solid/solid-5.63.0.ebuild b/kde-frameworks/solid/solid-5.64.0.ebuild
index 465afb9a5c4c..b24edd42d71b 100644
--- a/kde-frameworks/solid/solid-5.63.0.ebuild
+++ b/kde-frameworks/solid/solid-5.64.0.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
+QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
-inherit kde5
+inherit ecm kde.org
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
@@ -12,22 +13,22 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="nls"
 
 BDEPEND="
-	nls? ( $(add_qt_dep linguist-tools) )
+	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 RDEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	sys-fs/udisks:2
 	virtual/libudev:=
 "
 DEPEND="${RDEPEND}
-	test? ( $(add_qt_dep qtconcurrent) )
+	test? ( >=dev-qt/qtconcurrent-${QTMIN}:5 )
 "
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "app-misc/media-player-info" ; then
 		elog "For media player support, install app-misc/media-player-info"