gentoo resync : 22.10.2018

4 files changed, 8 insertions, 205 deletions

diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 1e62ab209d3e..d81dd4656b0f 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,6 +1,5 @@
-AUX solid-5.46.0-crash-on-unmount.patch 8078 BLAKE2B b82620b7927d4810050ec3057c090fdbd516ae35f9ee6079966f40f88a5fb7e3a95d29d324c029575001ba9865980faea20a3a246c851d5d6b41b27d4074d0b2 SHA512 01023049c0a3de2e7aa104c6e43c72acc18227e4c361f884ab07f1c5d10538b4e621b3b5e41150b6e5c98e96a0ed26080d2e78c6e36275ab3db2b414af078647
-DIST solid-5.46.0.tar.xz 257668 BLAKE2B 3ec991f4b5b9f68cbf6770663625f7c332f1cbfc3d0ec6b489b464c8c460bd509dc570135075cae45430b2857d9cccbc6df48bf754f4d880858e4484f8fcbb32 SHA512 3b5a62f9723cd164a0ee2504e27a650bfae4a9d6b063db08e95d4a2735242092b39cb5b509d28408ca435adce18bf780c22a0acb4c8bf47749c5273edf6ed46c
 DIST solid-5.50.0.tar.xz 259468 BLAKE2B 3176b3f3b78b3daae088cfad783e8a5fab03a3ee20bdaa122cf0fd33ddf668cd350ec5e91fa0606d9a1e1cb953ce18bc804401464b75135aab0a99a2b2bf8639 SHA512 f51c7bcaed7b2390f1b290791d7e9dc4a86ce8a925a2955c072be66274257c81c7872f76105fa8a03b35c184a8598551aa2bfa74017de487fc5a3521ea49d6a1
-EBUILD solid-5.46.0-r1.ebuild 777 BLAKE2B 9fb8633f7f7265e6be0b16af8f18e402d18028e0c765b44d851deef98ed63e7c89c9a008cdc731c8f323b1ac6955bbe6eb0b295b399b651143ffd9789b805baa SHA512 bfded2998292566bc38df87856c339e1da2febc53fa077cdffa9f913feabe30f709c4176b8a807dbee94a2942303ae4e838d8497892c5b6b429ca7c7a009c396
-EBUILD solid-5.50.0.ebuild 722 BLAKE2B e20ef602b832a4ec4d7898ff16476853c477ada68bccb5e08f9b6c589a7d2269f518b6a73ebb2b38a1750e7ded899d58da4bfc71ab49b009d37d407b6f60a177 SHA512 3779d2d6e90050cba3a10bd368bf5b3bc75efc8a888ce23353d521e916b9c323d374b66d52861b49118805c8b63c59dcce2dab48bf56d1d0abb5e22ecd0015e8
+DIST solid-5.51.0.tar.xz 259544 BLAKE2B 2a0aab119651439fa7aabb4b1b7c24d428dc446fa64361c0088d10b11085d988f44c68f863e46cd23196783d476d8237c7c0f65e6fa528fe677d782ea411a2e4 SHA512 4a57a96f9080734781f4bddc33aa3ebc312fdf784e61cd143f76e0a222cec26bcb62322f68422d770ca8494b64344f0870fa63d66fec17bc3a209511c168d226
+EBUILD solid-5.50.0.ebuild 717 BLAKE2B 685da0d08ad58fdc17a08987991852fc29c842eb9356c1c79a15f442d2258e224bc53ffb57baac1714cbab0b34324647013172c25d36cbb630f19f3b70cb19ff SHA512 1d24c20e390729b7c1d28ba49f8da9e071534b4121cf65212c7261a7a9f7b73b19ab7366e5f3288ec4b6ee43a87725882f59195d255918a1cef0cb54816db72d
+EBUILD solid-5.51.0.ebuild 719 BLAKE2B dd5447b46a1f13c8fbe9c58908b91fbf85fc5b48e829e673c5c8d3cf97efec5aca2898e03114068ec99063f2d100cac9bc610fc5192ff282cc4210e25526c3df SHA512 769fdd74ac0837dc0d527cf509d772badbebe62a7b79790bc34608d44d0864753535963b59868244069a0ecb25f97f37599df6afa1b03737708dd40d47f5761f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/files/solid-5.46.0-crash-on-unmount.patch b/kde-frameworks/solid/files/solid-5.46.0-crash-on-unmount.patch
deleted file mode 100644
index 378890b6b878..000000000000
--- a/kde-frameworks/solid/files/solid-5.46.0-crash-on-unmount.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From 967dc53dc9a5d1c7ba0c9f57fcb9bc640cd9663b Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Wed, 16 May 2018 14:37:33 +0200
-Subject: [FStab Handling] Clean up process running by using lambdas
-
-Encapsulates the QProcess* into the job it's supposed to be doing without storing it as a member and polluting state when multiple
-actions are requested simultaneously.
-
-CCBUG: 388499
-
-Differential Revision: https://phabricator.kde.org/D9653
----
- src/solid/devices/backends/fstab/fstabhandling.cpp | 29 +++++++--------
- src/solid/devices/backends/fstab/fstabhandling.h   |  9 ++---
- .../devices/backends/fstab/fstabstorageaccess.cpp  | 42 ++++++++--------------
- .../devices/backends/fstab/fstabstorageaccess.h    |  3 --
- 4 files changed, 30 insertions(+), 53 deletions(-)
-
-diff --git a/src/solid/devices/backends/fstab/fstabhandling.cpp b/src/solid/devices/backends/fstab/fstabhandling.cpp
-index 9d078dd..e56f55a 100644
---- a/src/solid/devices/backends/fstab/fstabhandling.cpp
-+++ b/src/solid/devices/backends/fstab/fstabhandling.cpp
-@@ -226,34 +226,31 @@ QStringList Solid::Backends::Fstab::FstabHandling::options(const QString &device
-     return options;
- }
- 
--QProcess *Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &commandName,
--        const QStringList &args,
--        QObject *obj, const char *slot)
-+bool Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &commandName, const QStringList &args,
-+                                                              const QObject *receiver, std::function<void(QProcess *)> callback)
- {
-     QStringList env = QProcess::systemEnvironment();
-     env.replaceInStrings(QRegExp("^PATH=(.*)", Qt::CaseInsensitive), "PATH=/sbin:/bin:/usr/sbin/:/usr/bin");
- 
--    QProcess *process = new QProcess(obj);
-+    QProcess *process = new QProcess();
- 
--    QObject::connect(process, SIGNAL(finished(int,QProcess::ExitStatus)),
--                     obj, slot);
-+    QObject::connect(process, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), receiver,
-+        [process, callback](int exitCode, QProcess::ExitStatus exitStatus) {
-+            Q_UNUSED(exitCode);
-+            Q_UNUSED(exitStatus);
-+            callback(process);
-+            process->deleteLater();
-+    });
- 
-     process->setEnvironment(env);
-     process->start(commandName, args);
- 
-     if (process->waitForStarted()) {
--        return process;
--    } else {
--        delete process;
--        return nullptr;
-+        return true;
-     }
--}
- 
--QProcess *Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &commandName,
--        const QString &device,
--        QObject *obj, const char *slot)
--{
--    return callSystemCommand(commandName, QStringList() << device, obj, slot);
-+    delete process;
-+    return false;
- }
- 
- void Solid::Backends::Fstab::FstabHandling::_k_updateMtabMountPointsCache()
-diff --git a/src/solid/devices/backends/fstab/fstabhandling.h b/src/solid/devices/backends/fstab/fstabhandling.h
-index 2b6b9d9..bcd6c33 100644
---- a/src/solid/devices/backends/fstab/fstabhandling.h
-+++ b/src/solid/devices/backends/fstab/fstabhandling.h
-@@ -25,6 +25,8 @@
- #include <QtCore/QString>
- #include <QtCore/QMultiHash>
- 
-+#include <functional>
-+
- class QProcess;
- class QObject;
- 
-@@ -44,12 +46,7 @@ public:
-     static QStringList currentMountPoints(const QString &device);
-     static QStringList mountPoints(const QString &device);
-     static QStringList options(const QString &device);
--    static QProcess *callSystemCommand(const QString &commandName,
--                                       const QStringList &args,
--                                       QObject *obj, const char *slot);
--    static QProcess *callSystemCommand(const QString &commandName,
--                                       const QString &device,
--                                       QObject *obj, const char *slot);
-+    static bool callSystemCommand(const QString &commandName, const QStringList &args, const QObject *recvr, std::function<void(QProcess *)> callback);
-     static void flushMtabCache();
-     static void flushFstabCache();
- 
-diff --git a/src/solid/devices/backends/fstab/fstabstorageaccess.cpp b/src/solid/devices/backends/fstab/fstabstorageaccess.cpp
-index a4063ff..e8fce5b 100644
---- a/src/solid/devices/backends/fstab/fstabstorageaccess.cpp
-+++ b/src/solid/devices/backends/fstab/fstabstorageaccess.cpp
-@@ -91,10 +91,13 @@ bool FstabStorageAccess::setup()
-         return false;
-     }
-     m_fstabDevice->broadcastActionRequested("setup");
--    m_process = FstabHandling::callSystemCommand("mount", filePath(),
--                this, SLOT(slotSetupFinished(int,QProcess::ExitStatus)));
--
--    return m_process != nullptr;
-+    return FstabHandling::callSystemCommand("mount", {filePath()}, this, [this](QProcess *process) {
-+        if (process->exitCode() == 0) {
-+            m_fstabDevice->broadcastActionDone("setup", Solid::NoError, QString());
-+        } else {
-+            m_fstabDevice->broadcastActionDone("setup", Solid::UnauthorizedOperation, process->readAllStandardError());
-+        }
-+    });
- }
- 
- void FstabStorageAccess::slotSetupRequested()
-@@ -108,10 +111,13 @@ bool FstabStorageAccess::teardown()
-         return false;
-     }
-     m_fstabDevice->broadcastActionRequested("teardown");
--    m_process = FstabHandling::callSystemCommand("umount", filePath(),
--                this, SLOT(slotTeardownFinished(int,QProcess::ExitStatus)));
--
--    return m_process != nullptr;
-+    return FstabHandling::callSystemCommand("umount", {filePath()}, this, [this](QProcess *process) {
-+        if (process->exitCode() == 0) {
-+            m_fstabDevice->broadcastActionDone("teardown", Solid::NoError, QString());
-+        } else {
-+            m_fstabDevice->broadcastActionDone("teardown", Solid::UnauthorizedOperation, process->readAllStandardError());
-+        }
-+    });
- }
- 
- void FstabStorageAccess::slotTeardownRequested()
-@@ -119,31 +125,11 @@ void FstabStorageAccess::slotTeardownRequested()
-     emit teardownRequested(m_fstabDevice->udi());
- }
- 
--void FstabStorageAccess::slotSetupFinished(int exitCode, QProcess::ExitStatus /*exitStatus*/)
--{
--    if (exitCode == 0) {
--        m_fstabDevice->broadcastActionDone("setup", Solid::NoError, QString());
--    } else {
--        m_fstabDevice->broadcastActionDone("setup", Solid::UnauthorizedOperation, m_process->readAllStandardError());
--    }
--    delete m_process;
--}
--
- void FstabStorageAccess::slotSetupDone(int error, const QString &errorString)
- {
-     emit setupDone(static_cast<Solid::ErrorType>(error), errorString, m_fstabDevice->udi());
- }
- 
--void FstabStorageAccess::slotTeardownFinished(int exitCode, QProcess::ExitStatus /*exitStatus*/)
--{
--    if (exitCode == 0) {
--        m_fstabDevice->broadcastActionDone("teardown", Solid::NoError, QString());
--    } else {
--        m_fstabDevice->broadcastActionDone("teardown", Solid::UnauthorizedOperation, m_process->readAllStandardError());
--    }
--    delete m_process;
--}
--
- void FstabStorageAccess::slotTeardownDone(int error, const QString &errorString)
- {
-     emit teardownDone(static_cast<Solid::ErrorType>(error), errorString, m_fstabDevice->udi());
-diff --git a/src/solid/devices/backends/fstab/fstabstorageaccess.h b/src/solid/devices/backends/fstab/fstabstorageaccess.h
-index 10ca0a9..61deb88 100644
---- a/src/solid/devices/backends/fstab/fstabstorageaccess.h
-+++ b/src/solid/devices/backends/fstab/fstabstorageaccess.h
-@@ -68,8 +68,6 @@ Q_SIGNALS:
-     void teardownRequested(const QString &udi) Q_DECL_OVERRIDE;
- 
- private Q_SLOTS:
--    void slotSetupFinished(int exitCode, QProcess::ExitStatus exitStatus);
--    void slotTeardownFinished(int exitCode, QProcess::ExitStatus exitStatus);
-     void onMtabChanged(const QString &device);
-     void connectDBusSignals();
- 
-@@ -80,7 +78,6 @@ private Q_SLOTS:
- 
- private:
-     Solid::Backends::Fstab::FstabDevice *m_fstabDevice;
--    QProcess *m_process;
-     QString m_filePath;
-     bool m_isAccessible;
-     bool m_isIgnored;
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/solid/solid-5.50.0.ebuild b/kde-frameworks/solid/solid-5.50.0.ebuild
index 3e36d8d362f1..1a1d84f6be40 100644
--- a/kde-frameworks/solid/solid-5.50.0.ebuild
+++ b/kde-frameworks/solid/solid-5.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/kde-frameworks/solid/solid-5.46.0-r1.ebuild b/kde-frameworks/solid/solid-5.51.0.ebuild
index b300aed7ec9b..a6a149e84acb 100644
--- a/kde-frameworks/solid/solid-5.46.0-r1.ebuild
+++ b/kde-frameworks/solid/solid-5.51.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Provider for platform independent hardware discovery, abstraction and management"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="nls"
 
 RDEPEND="
@@ -23,13 +23,10 @@ DEPEND="${RDEPEND}
 	nls? ( $(add_qt_dep linguist-tools) )
 	test? ( $(add_qt_dep qtconcurrent) )
 "
-
-PATCHES=( "${FILESDIR}/${P}-crash-on-unmount.patch" )
-
 pkg_postinst() {
 	kde5_pkg_postinst
 
 	if ! has_version "app-misc/media-player-info" ; then
-		einfo "For media player support, install app-misc/media-player-info"
+		elog "For media player support, install app-misc/media-player-info"
 	fi
 }