gentoo resync : 15.12.2017

4 files changed, 6 insertions, 110 deletions

diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index fb0b1731cb06..64927988b3c6 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,6 +1,5 @@
-AUX knotifications-5.34.0-no-block-notification.patch 3726 BLAKE2B 681572f8da7842343ee7bb6d791a940344095c611b95289f4a03a2e3fdc8a237bb2dc04c1e281eaddeb2cc12a63a070389e984116aa3942892a546a94c690311 SHA512 836701ab0522090700c11c2c89aa046ffa13c5fd1698cf099b19d617cc4ceaa3c5f563c8ba70d9919ed83077d1f2909dd555ca34529d3bc57ad6758ce177dbfc
-DIST knotifications-5.37.0.tar.xz 100004 SHA256 66cdfddaa31f773a538d429026d0117e60f8a0a7f2a90c861f95d84395347b3f SHA512 3b08faf67d705233e98ff5e6cacdb6983134942f1ea5bb8cac43ecfe7b15aac987702cf635dd8dc3e45047e5069bb3fcd39c9745ac4bf414bb33f69336013644 WHIRLPOOL ec6c1ad4da2c45d0dc058d2b1c5c53679c68a1822b76085a71647f3386eede2ab86b9c8f38bc26b2f7b9a793de0c8508c5b22d539788e0043c37fd9212e01102
-DIST knotifications-5.40.0.tar.xz 99964 SHA256 1b54fdccee857c3f66ffa6c830d738bd968cf4c1f9ef2ac8f52a516e94287904 SHA512 7fbeff7ce781904ae9d3d57ef439c1d41880558f219465d5b593ee3099d3ce091124067494f5ce9da590ce68ab8f12ac2eda96c59be8d0a767b3edafeb251675 WHIRLPOOL 333f7e25726fe2d43ae4a2eca80fa5ee0650b009a4dc4670624755b703dd5f905c6b2729f9aee78ca34d3e5a91112ff0d2d28eda191632b19d1b752468ac8a94
-EBUILD knotifications-5.37.0-r1.ebuild 1047 BLAKE2B 18ade999ed44b0d89efbd371cf60435a2b238e8f2589691f09f1053627affe7979e8a6a5727f980c289810bb696cbb7eaa3b3c0b57bb5ff1ffd03dc73e028ec7 SHA512 c5e18a4baafd71462a437d70f714ec08abd851aecb22fb6321756d7e2c22fef0bd0d981fcb66c6fcde890e84dca9398f443b1d7b7bd1c3dd065e2fa8f0274548
-EBUILD knotifications-5.40.0.ebuild 980 BLAKE2B 97dee5cc992f346f0d962ef1dcdaf4993eb548feb2a230a7e79d8cd955ffc6fe317c4ceccf3d51368d4fa0dd3335f7df674ffedca4c7b12fdaa45067ba5c19f2 SHA512 498f994d99c06ccd7addfc4755bc0081949844f3168dbda47009a540447390961316f35d81ad57f4d88eb4ba118d3af9e71184c40d1d06ee7ef130623068db99
+DIST knotifications-5.40.0.tar.xz 99964 BLAKE2B 7ab0dfcca611b28f2f008fa7984a6b7b832ed718d54fd0cbf1b7b810d02ec89bc6f95fb2ffee1d877397ed68abeefdce113a879ad565e8af9cd892aa1fdddba6 SHA512 7fbeff7ce781904ae9d3d57ef439c1d41880558f219465d5b593ee3099d3ce091124067494f5ce9da590ce68ab8f12ac2eda96c59be8d0a767b3edafeb251675
+DIST knotifications-5.41.0.tar.xz 99952 BLAKE2B 9046b2225adf52d58502a1a1a11c878f9fec3e473c1a38cf9a7366a97bd6e6d435d46c6eb220b4c340d35e531cc3ab985311ebed906794068401b77518225fb5 SHA512 403adbafd6408bfe8c38afd312ec3b2b4f73d6601a6ea076d309ea7e7e599365cd89dbd5aad2358fb931c1414c22069228dd7991f65dc0adbeda54701f70354d
+EBUILD knotifications-5.40.0.ebuild 979 BLAKE2B 0bb0ce1a34ec9ff786c99316b68440914e2fd588a4ee7b8294f4ad6c5e9287b1abf8a5b1cd9fd9ab2ddbe4efcba3e390915068780c082103c5c83733347e20ab SHA512 00169edd275257fd0437151ebd10397957e76a7d2fb01f8434bd3404e975c133b0bf7aa0496774b95b5c6f85778764bedb2fafd41b5da6b22d5ba4e56b3d2247
+EBUILD knotifications-5.41.0.ebuild 981 BLAKE2B ce46cbaef5396e3a1ee933560fbd1994551bc8e3ce19f159bfb590238ab53aabcdd6718fd8a720c9342a1d6b5446561c15c5d605a5eb03ef8fbebec802a77962 SHA512 f9a7ed59e8ba364035e79b26efed0d4717dd501fee5906e70327fdf012f1e21b31802748505f83d12006074f4daa42e1d7895b4206e4a8c191a8d48f1e5ab012
 MISC metadata.xml 336 BLAKE2B 653f2a06935329b39c728a0475b92d1f5a0129e2d4f8cc04a045f4ca5408e3dd78199bea9f02668102d94b6ddf576bac13140b76d621acb03e125363745e2416 SHA512 10046ff92549d9bc3a8487d66095435045700bb85032f00e4f73477b0f7e506006601b7b1a61d341ff8af9a925939fb099b4adc55867f9b1faa5834b717283af
diff --git a/kde-frameworks/knotifications/files/knotifications-5.34.0-no-block-notification.patch b/kde-frameworks/knotifications/files/knotifications-5.34.0-no-block-notification.patch
deleted file mode 100644
index 2d1ae95af5fb..000000000000
--- a/kde-frameworks/knotifications/files/knotifications-5.34.0-no-block-notification.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 1c97e1d9741fd15962474f47932dd09728dae76b Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Fri, 28 Jul 2017 13:04:50 +0100
-Subject: [PATCH] Don't block starting notification service
-
-Summary:
-We don't need to manually start the DBus service.
-It blocks the calling app, and dbusServiceExists means that we will
-always end up going the DBus route over a popup anyway, so it won't
-do anything useful.
-
-The service (in the plasma case plasma-wait-for-name) will be started
-automatically when we actually send the notification.
-
-Also fix d-dbusServiceExists being cleared to false when the first
-service owner exits.
-
-BUG: 382444
-
-Subscribers: #frameworks
-
-Tags: #frameworks
-
-Differential Revision: https://phabricator.kde.org/D6963
----
- src/notifybypopup.cpp | 28 +++++++++++-----------------
- 1 file changed, 11 insertions(+), 17 deletions(-)
-
-diff --git a/src/notifybypopup.cpp b/src/notifybypopup.cpp
-index 735d52b..4f244e1 100644
---- a/src/notifybypopup.cpp
-+++ b/src/notifybypopup.cpp
-@@ -109,6 +109,9 @@ public:
-      * Specifies if DBus Notifications interface exists on session bus
-      */
-     bool dbusServiceExists;
-+
-+    bool dbusServiceActivatable;
-+
-     /**
-      * DBus notification daemon capabilities cache.
-      * Do not use this variable. Use #popupServerCapabilities() instead.
-@@ -161,6 +164,7 @@ NotifyByPopup::NotifyByPopup(QObject *parent)
- {
-     d->animationTimer = 0;
-     d->dbusServiceExists = false;
-+    d->dbusServiceActivatable = false;
-     d->dbusServiceCapCacheDirty = true;
-     d->nextPosition = -1;
- 
-@@ -180,32 +184,20 @@ NotifyByPopup::NotifyByPopup(QObject *parent)
-     connect(watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-             SLOT(onServiceOwnerChanged(QString,QString,QString)));
- 
-+#ifndef Q_WS_WIN
-     if (!d->dbusServiceExists) {
--        bool startfdo = false;
--#ifdef Q_WS_WIN
--        startfdo = true;
--#else
-         QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DBus"),
-                                                                 QStringLiteral("/org/freedesktop/DBus"),
-                                                                 QStringLiteral("org.freedesktop.DBus"),
-                                                                 QStringLiteral("ListActivatableNames"));
--
--        // FIXME - this should be async
-         QDBusReply<QStringList> reply = QDBusConnection::sessionBus().call(message);
-         if (reply.isValid() && reply.value().contains(dbusServiceName)) {
--            startfdo = true;
--            // We need to set d->dbusServiceExists to true because dbus might be too slow
--            // starting the service and the first call to NotifyByPopup::notify
--            // might not have had the service up, by setting this to true we
--            // guarantee it will still go through dbus and dbus will do the correct
--            // thing and wait for the service to go up
-+            d->dbusServiceActivatable = true;
-+            //if the service is activatable, we can assume it exists even if it is not currently running
-             d->dbusServiceExists = true;
-         }
--#endif
--        if (startfdo) {
--            QDBusConnection::sessionBus().interface()->startService(dbusServiceName);
--        }
-     }
-+#endif
- }
- 
- 
-@@ -439,7 +431,9 @@ void NotifyByPopup::onServiceOwnerChanged(const QString &serviceName, const QStr
- 
-     if (newOwner.isEmpty()) {
-         d->notificationQueue.clear();
--        d->dbusServiceExists = false;
-+        if (!d->dbusServiceActivatable) {
-+            d->dbusServiceExists = false;
-+        }
-     } else if (oldOwner.isEmpty()) {
-         d->dbusServiceExists = true;
- 
--- 
-2.13.5
-
diff --git a/kde-frameworks/knotifications/knotifications-5.40.0.ebuild b/kde-frameworks/knotifications/knotifications-5.40.0.ebuild
index be26dea4c91a..9cfffaf2c665 100644
--- a/kde-frameworks/knotifications/knotifications-5.40.0.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.40.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for notifying the user of an event"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dbus nls speech X"
 
 RDEPEND="
diff --git a/kde-frameworks/knotifications/knotifications-5.37.0-r1.ebuild b/kde-frameworks/knotifications/knotifications-5.41.0.ebuild
index 09709561d7a1..46d46ca122ec 100644
--- a/kde-frameworks/knotifications/knotifications-5.37.0-r1.ebuild
+++ b/kde-frameworks/knotifications/knotifications-5.41.0.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Framework for notifying the user of an event"
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="dbus nls speech X"
 
 RDEPEND="
@@ -33,8 +33,6 @@ DEPEND="${RDEPEND}
 	X? ( x11-proto/xproto )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.34.0-no-block-notification.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)