net-misc/cernbox-client: Bump to 2.2.4, drop old. (#689)

Remove dolphin-integration patch, applied upstream,
update nautilus-integration patch to upstream's version.

Package-Manager: portage-2.3.1

4 files changed, 17 insertions, 42 deletions

diff --git a/net-misc/cernbox-client/Manifest b/net-misc/cernbox-client/Manifest
index a95a3d3ce..c98aa1512 100644
--- a/net-misc/cernbox-client/Manifest
+++ b/net-misc/cernbox-client/Manifest
@@ -1,2 +1,2 @@
 DIST cernbox-client-2.1.1-1.1.src.rpm 13110999 SHA256 955f660e95ae5290ab6a9b05af6c6a0012428b574921f8d0a80a349a1ec39ead SHA512 25a53d88d393406ce4076932a1757dc27b2bbbe1a38a2d5f084024352a6467eb2ca650e1f5b86d5551f0277d4e4d9011f967e3651d86ed9b58a7296a8abe0039 WHIRLPOOL a5f416a299e49118a73a591f1ca6b58eb41d64bb84454ba363f27ccfdb4e38e5a1ab29395c9a4b1fbdd36d5d400dfac9567cd11cc8d0fd32bf5145917835187f
-DIST owncloudclient-2.2.3.tar.xz 12215320 SHA256 f8c921e3eda543c6c860ea8e3024ed164df0db7c0e83d1778ab0adfd324f7d01 SHA512 71be325e5d6177a767dc61b043bd6126b5b7a492a2a777c0179c2dbb77bf6104e26fce92734a6d4bfcc7b9c451026e86a2f44d39869e9451f21b0e534c26e189 WHIRLPOOL 7099c62214f1170c6ec3dfe2adc1c692d8847a0643bd7f5d5a5028f65e395774a29eec3ee6ece72e9e85dd343b05c3c1184665db34e635b2b99c6e15a33ce54e
+DIST owncloudclient-2.2.4.tar.xz 12216896 SHA256 f313534f7cdae686beeaa6670d9e3586a627ce78b67cab6e42a448a675d9e7d3 SHA512 5bc5273c90ab63c411e58d1fe13636f6b5977c28470efe53296a71541aaa63af99001cb630adaee99b9b81a8b56fe0f66c337319464ab950dd6eac4cdd53f951 WHIRLPOOL 18aa5076049f9cdfbafa58454937b7fc4c38a5405b6e1375d762d88bbfae92b813cd2ec88a4e4108012137c94908894821575d3f6d2bf694e35d734f2b8fbd37
diff --git a/net-misc/cernbox-client/cernbox-client-2.2.3.ebuild b/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild
index 5f5693ab6..a741a9f59 100644
--- a/net-misc/cernbox-client/cernbox-client-2.2.3.ebuild
+++ b/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild
@@ -88,8 +88,7 @@ src_prepare() {
 		popd > /dev/null || die
 	fi
 
-	eapply 	"${FILESDIR}"/shell-integration-nautilus.patch \
-		"${FILESDIR}"/shell-integration-dolphin.patch
+	eapply 	"${FILESDIR}"/shell-integration-nautilus.patch
 
 	default
 }
diff --git a/net-misc/cernbox-client/files/shell-integration-dolphin.patch b/net-misc/cernbox-client/files/shell-integration-dolphin.patch
deleted file mode 100644
index 69631b8d2..000000000
--- a/net-misc/cernbox-client/files/shell-integration-dolphin.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From acdcc9ee50db0e010dbda185356868d65a231070 Mon Sep 17 00:00:00 2001
-From: Klaas Freitag <freitag@owncloud.com>
-Date: Mon, 12 Sep 2016 13:50:41 +0200
-Subject: [PATCH] Dolphin Plugin: Use the Application name for the socket path
-
-do not hardcode.
-
-This should fix #5165
----
- shell_integration/dolphin/ownclouddolphinpluginhelper.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp b/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
-index 027e0e6..68c2a9c 100644
---- a/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
-+++ b/shell_integration/dolphin/ownclouddolphinpluginhelper.cpp
-@@ -21,6 +21,7 @@
- #include <qcoreevent.h>
- #include <QFile>
- #include "ownclouddolphinpluginhelper.h"
-+#include "config.h"
- 
- OwncloudDolphinPluginHelper* OwncloudDolphinPluginHelper::instance()
- {
-@@ -67,7 +68,10 @@ void OwncloudDolphinPluginHelper::tryConnect()
-         return;
-     }
-     QString runtimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
--    QString socketPath = runtimeDir + QLatin1String("/ownCloud/socket");
-+    runtimeDir.append( QChar('/'));
-+    runtimeDir.append( QLatin1String(APPLICATION_SHORTNAME) );
-+
-+    const QString socketPath = runtimeDir + QLatin1String("/socket");
-     _socket.connectToServer(socketPath);
- }
- 
diff --git a/net-misc/cernbox-client/files/shell-integration-nautilus.patch b/net-misc/cernbox-client/files/shell-integration-nautilus.patch
index 67aee0274..45cc39e3d 100644
--- a/net-misc/cernbox-client/files/shell-integration-nautilus.patch
+++ b/net-misc/cernbox-client/files/shell-integration-nautilus.patch
@@ -1,6 +1,18 @@
---- a/shell_integration/nautilus/CMakeLists.txt	2016-08-08 15:42:39.000000000 +0200
-+++ b/shell_integration/nautilus/CMakeLists.txt	2016-09-10 18:01:22.387950249 +0200
-@@ -19,8 +19,8 @@
+From 5f2b1999f6c22b293cb8aa91835b53cedc2dec94 Mon Sep 17 00:00:00 2001
+From: Christian Kamm <mail@ckamm.de>
+Date: Wed, 28 Sep 2016 13:09:15 +0200
+Subject: [PATCH] Package: Fix nautilus plugin name collision when branded
+
+As suggested by @olifre in #5183
+---
+ shell_integration/nautilus/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/shell_integration/nautilus/CMakeLists.txt b/shell_integration/nautilus/CMakeLists.txt
+index 6c1e9f7..3391102 100644
+--- a/shell_integration/nautilus/CMakeLists.txt
++++ b/shell_integration/nautilus/CMakeLists.txt
+@@ -19,8 +19,8 @@ if( UNIX AND NOT APPLE )
                      ERROR_VARIABLE errors OUTPUT_VARIABLE out)