Revision bump adds upstream patch announced on packagers ml. Patch fixes clicking the trash plasmoid or starting Dolphin from the command line with a URL that includes another kioslave will just open the home folder.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 89 insertions, 19 deletions

diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index 5182bbc1f252..075a322527da 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.208 2013/11/05 22:23:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.209 2013/11/09 13:43:52 johu Exp $
+
+*dolphin-4.11.3-r1 (09 Nov 2013)
+
+  09 Nov 2013; Johannes Huber <johu@gentoo.org> +dolphin-4.11.3-r1.ebuild,
+  +files/dolphin-4.11.3-regression.patch, -dolphin-4.11.3.ebuild:
+  Revision bump adds upstream patch announced on packagers ml. Patch fixes
+  clicking the trash plasmoid or starting Dolphin from the command line with a
+  URL that includes another kioslave will just open the home folder.
 
 *dolphin-4.11.3 (05 Nov 2013)
 
diff --git a/kde-base/dolphin/Manifest b/kde-base/dolphin/Manifest
index 3b165d1af1d6..a5a0cf68afca 100644
--- a/kde-base/dolphin/Manifest
+++ b/kde-base/dolphin/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX dolphin-4.11.3-regression.patch 2336 SHA256 49da7250c84444f41729f0d7f75c70835c31a10571a1cf0ae76d7f5c6639a635 SHA512 1e725ba2968aa94c27b3303b6548b293b57bceb6a8cd16703a947edd3d3f257aecd6049574372edcaffc30b0ce77944ccf23a551b36fe5be048a2ba8e792e610 WHIRLPOOL c77ff51b383e763a9fb89096ad710ed1e2f3bc43d3ff7c2429e2b2e1f6e6c61cedad504b3db0005b9bce17e38af51c52b547581c8ef1c1965c8064e6b70d8de4
 DIST kde-baseapps-4.10.5.tar.xz 2615840 SHA256 ff89e9c3a6eea103a368200cf2aa2bcd5d5c2dad92683aff03d1253516e608b4 SHA512 b296fc3fabde36affda575bbbe3bd02383d2673dae1a30aeb897cfdba8b63a5ad9244ba11d677694afd89bc40ea1c7adbeb42680ea14b569d507e2931e29c980 WHIRLPOOL 2bfd54399ea4a15a59b9feb59bb1135579fd33c1eea39587443784a98ec92629cb506f493ec77323297736013d45c8a8cda37f1848efd275e41e7194b6dc3627
 DIST kde-baseapps-4.11.2.tar.xz 2559488 SHA256 9d086ae35dd028c24c70aa0931218a3ca99980ce3160386ffc09f5716c7efccd SHA512 bd5f84cae8cd58f0be469405a87c97eb12a83c442e59edac78b0909618e10b42ca2bc87616c5a61a05df1fcb6cb77a1084fee1c1cf4ff9ffff9fa7079b39f50a WHIRLPOOL f9c86855a9c2f3e2c3d11005b396372673c3c4a3facb4c9f5e0b9f5eb858f00c5eb47ceb2e948e66d0668e4b16f522c47a39325945e9ff3233b360ee2d556cf4
 DIST kde-baseapps-4.11.3.tar.xz 2561788 SHA256 b209b3425c8a18e36eadad95c89a89b7ff396903e2d5f1c9d9228eb8e9118573 SHA512 69e3a604a844f59d207aaae6c5a5ea9f0745bec6f77875c4ca0bc0f18220bf2fc94854b412e62a6ae48a4463a4a9d911732ef1ff0ae8f798d6ee027ea6f33de8 WHIRLPOOL 001642a5dc39a63793e66fa8e5d738abd3b026f85ded65ed3cb279ab0e07b33b41b7e5701783a0ea6e8ab9fcc10f8e671e7b12eda3819342916f683a32df351a
 EBUILD dolphin-4.10.5.ebuild 1443 SHA256 0a6087744333ed80139811e2f95bdd2b00393d509fa9b1fe0ec847be17f80ffe SHA512 645737a63218488e63ba3e1a0411aaa4796b6a79091117cc90782acedd1e142848ba33e394d171627328e5ab5ba0ac694d989d25430499acdbf9de35c94faf11 WHIRLPOOL 2409e0c884fbe8da778760a75e94401fbf7caca29a75adc3512511fbcc7849a84eabb86bcca6c28b07890009505cd4c91b18050bd4e4f526315b74d20e53f725
 EBUILD dolphin-4.11.2-r1.ebuild 1452 SHA256 997483b5780bf74fed40dd067a5453aae61afc30972334ba984a56048f4461f6 SHA512 c3450cb56867c67934481e6041cd3e499058d56aaa6129dd31604ea1b779136c5aec63490dd13e264e34312e4834a240861b318750a2d64ccd79698d493fdb2c WHIRLPOOL fb1a2508187cc606b93873788944b1c5d243f9fd212068afe2f4249c674f973e3f80b340ba09b41ee097878a205039512f63d4a9714d4047a495e1f0aa916118
-EBUILD dolphin-4.11.3.ebuild 1449 SHA256 2255ffc83127919ab5ba085ae3071c50d4e00331ad609a534953be7ffa512685 SHA512 86dc456ad1734230ca34ab9369278f2b6bbaa1a62fdf7c650b550200b07b753ea420c9aa8ed71fdb70022a12b45046f0741a492c20bd71a85c99fa001fc7d1ab WHIRLPOOL 62654f60d1390eea31dbb327d4b8bb91776bbd94dc8d29eed7952f2965ea2a5f2211e0ced81d3e2e0fb5d20c7ed9644b868cb6976f11012fc85dbfc7e8497077
-MISC ChangeLog 26724 SHA256 1e8f07655aa8fb19657da8d6b93797be2349fcb5bafbb6fd00f07dc6b00e9059 SHA512 d29c55aeac781715f052e241705400dfc7029ffacff5823f45f2df8ab264abce0d58771b8eb329ca97d4fd78b80e067362350faf70edaa419acddef5bdd2d3d0 WHIRLPOOL 4e804e950eec17463d7132839e4f4705d9d6f4ff494da01b6bb8ac7411cec2121a5d74764b659a375c417dd93013ae14fd33cfc6dea05b552c27b98cc1f53ead
+EBUILD dolphin-4.11.3-r1.ebuild 1496 SHA256 dd36fdc6d703203b9c66e097442e7c38c877167c4fd9d1bb4791a992013d6177 SHA512 09a20db9edb483b682d9227854a2f847e3461e8940a5c94ae6b5e1202f7c32b300d3a35cbdf1b6b8998732677f5e243a6e2594046ac5b82e47c5575ce96dd16f WHIRLPOOL 5e99d3a36353e6c36c7c91a6cd6fd0d1cbc60c6c6f83212a0dd73efc7c5d876c7c7125cd848b35af08c8a3bdf42aeecbb176576d1b2c46bf64f22a0fa7a788ed
+MISC ChangeLog 27118 SHA256 1215124edb5ac7521c3389438292eec1a705f385517f430e4c08f8297d79537c SHA512 1907d68c2893adf80399193033cdaf76ece3d3c67a5500bae4e1d5cab88cef11f2db9e0aa9c1eb06cbf6cad7a329d6644357b5c0f2d1491f4f394c90e2f7a2a7 WHIRLPOOL e80801d3c44ab3f63288829e9f9212572f58547ae9cbe426eab5badc22cb5edad37861915603652f0adaf33787801ecaa2a26af7f57c2a784fc9d2511b5cba8d
 MISC metadata.xml 287 SHA256 f8ca0fcb27fae3e13bce985f13164013ba54c573c50a047622953f03c48a6969 SHA512 b85ce8bcdb8dd6cf4521a6e287186c1b602383172bf0d2e239a63b7f223b0b920aba517cad1e430f1bca65598d7e998f71d7e297a92b1dfb277a6609c733eb8a WHIRLPOOL bb24b57ab0aedf0b59aaf84eb7aa2b35d3997eb2e00a34eab410015b0fc889f38f3f3d7bc374985fbd5e47627067b590ca968cb82cd34e9b790edbb57872ab1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSeXA3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcIN4QAJM6v6m/lWxUH8eLOKGO+VdD
-n6R+KkdrCDtfos6dhfI9YGv1gHu8ZDywBynSZNPqV9h03LVzz1INx1NQ3HRvPuje
-mxsrl220ZiBD5/+l/teNZmaY3AWVqNJeizYIkk7xBJn/OzKb9HgicDI6zySiWHnZ
-9z7fhEfWjnhcUpaVPZUmC5drnCF2xYAPzGJTzBzQkjV4vtUd1cfwT37p8xiAtI1m
-VUb/YtHKPQGJRenCzEHx7PENFPmn5HUxXolhucfD0BaXYuzYTAkRcPLF+Ff9b5F1
-xTFfyBeH3pJPVJOXcJai8QhFCcEQS1XwO4HhcqnWoveBzqGFxaMIpbam/l80eLJs
-GxKN+3ze9tay13w+ufpc9BPCuH6XJf5nC1z13auhoVmSyLYFsVKH/ihjEKIXIxl0
-YmJ+KIL/mU8DTe1RagmUIECfWYZwNKyivNFnUeH9B2PTZlpcT+c4tnFZ5PD3/cbs
-+enQWr70LMjfgZdYxqCF44kEBIMYPaVFfNXJTxPFfs7ZU/H84NdNjZJPtij7UoI+
-q/85E/Ymja5mGHwaLVU5/OClj/yf7X/LM/wHfDu3BL0AYtOHcNBsyYYSYnHJECZb
-J5c07bazDzgK1iRPj4StxPrLF3HgOyTcc/tu5SuoAXiTt28x+YVOgGr2DFhBxPUu
-WyRL0cu4mhnPICNoXvV6
-=/sYj
+iQIcBAEBCAAGBQJSfjwdAAoJEGVpnaTzz9K9i4AP/j3g+BHgWtDTOk6W2JlKf8Y7
+5X6ewuujfdS9bJ514zT1zfoqsqmwbZBDzRs3/h6z24AW8qGCszZr1iCfnQFCeMr+
+SK3PCfwk5uruLOX5LobwYj1aOxRGKN44jcQy38wmEKMT6+pGX2fGh52ZzAAU0//o
+l0c3ZOeLhF3nlKrx6Pdqy1JmVJGD5bOI1WPexfa72p7R7oPhmln7X8l1W+0c18+Y
+9t94h0qOUuB8RpYnldCLXcIhW3r9jzH+Fw1ZlFsTNudytl1UuS2gd35cEakvjPeb
+fX6TKvst7nBkSbbUiO8DBqdQ44FvZMeyM5mnY/ElwZQXddYnbvZIKEQjS2aE54h3
+sXrd1yL+cIsIL7nJGsTEjJqP0Nh6sh6udieEpi6DIGprXB7tE2AgB6SC2rUoCjkP
+H9fcrJOZsJlczHYvhTbZaGmX7Xrn0GvEj3oP7Gpb4R2CaG7QgeorBHs/QujvakXL
+5R17nT6JjVvXi/6yKXWzCY/VoLWkCG8jrXACy+Gh/JzvnpS/bm9YC80mvBsRCrCo
+a65VeqPGQpNjbwcIF7R861JU1ixahBLJ2PXH4ajQG8AMf1nrqZY6bXDZ6vck+hdz
+wwnjPRN1dgduH0Ok7HSEAqYl6gdxHXvifkVRlJDea73ALtAvXHz2WNVpYlNhSQMr
+tvEffMuuycnHEucinbFV
+=VkJ7
 -----END PGP SIGNATURE-----
diff --git a/kde-base/dolphin/dolphin-4.11.3.ebuild b/kde-base/dolphin/dolphin-4.11.3-r1.ebuild
index b197f55b8f27..1021f9b1c985 100644
--- a/kde-base/dolphin/dolphin-4.11.3.ebuild
+++ b/kde-base/dolphin/dolphin-4.11.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.11.3.ebuild,v 1.1 2013/11/05 22:23:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.11.3-r1.ebuild,v 1.1 2013/11/09 13:43:52 johu Exp $
 
 EAPI=5
 
@@ -41,6 +41,8 @@ PDEPEND="
 RESTRICT="test"
 # bug 393129
 
+PATCHES=( "${FILESDIR}/${P}-regression.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with semantic-desktop NepomukCore)
diff --git a/kde-base/dolphin/files/dolphin-4.11.3-regression.patch b/kde-base/dolphin/files/dolphin-4.11.3-regression.patch
new file mode 100644
index 000000000000..d27c176faa27
--- /dev/null
+++ b/kde-base/dolphin/files/dolphin-4.11.3-regression.patch
@@ -0,0 +1,61 @@
+commit 1c856e44774a7ce8eb6dce6828ef689647f83ca4
+Author: Wolfgang Bauer <wbauer@tmo.at>
+Date:   Wed Nov 6 16:46:09 2013 +0100
+
+    Revert "Files passed as arguments: Ignore unsupported files"
+    
+    This reverts commit cd9e50ae4f3ded5a78d0cfb09a67684a9c15d726.
+    
+    See bug#327224 for details.
+
+diff --git a/dolphin/src/dolphinmainwindow.cpp b/dolphin/src/dolphinmainwindow.cpp
+index 9da73f9..b477600 100644
+--- a/dolphin/src/dolphinmainwindow.cpp
++++ b/dolphin/src/dolphinmainwindow.cpp
+@@ -31,7 +31,6 @@
+ #include "panels/information/informationpanel.h"
+ #include "settings/dolphinsettingsdialog.h"
+ #include "statusbar/dolphinstatusbar.h"
+-#include "views/dolphinview.h"
+ #include "views/dolphinviewactionhandler.h"
+ #include "views/dolphinremoteencoding.h"
+ #include "views/draganddrophelper.h"
+@@ -244,20 +243,8 @@ void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
+         return;
+     }
+ 
+-    // dirs could contain URLs that actually point to archives or other files.
+-    // Replace them by URLs we can open where possible and filter the rest out.
+-    QList<KUrl> urlsToOpen;
+-    foreach (const KUrl& rawUrl, dirs) {
+-        const KFileItem& item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, rawUrl);
+-        item.determineMimeType();
+-        const KUrl& url = DolphinView::openItemAsFolderUrl(item);
+-        if (!url.isEmpty()) {
+-            urlsToOpen.append(url);
+-        }
+-    }
+-
+-    if (urlsToOpen.count() == 1) {
+-        m_activeViewContainer->setUrl(urlsToOpen.first());
++    if (dirs.count() == 1) {
++        m_activeViewContainer->setUrl(dirs.first());
+         return;
+     }
+ 
+@@ -267,12 +254,12 @@ void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
+ 
+     // Open each directory inside a new tab. If the "split view" option has been enabled,
+     // always show two directories within one tab.
+-    QList<KUrl>::const_iterator it = urlsToOpen.begin();
+-    while (it != urlsToOpen.end()) {
++    QList<KUrl>::const_iterator it = dirs.begin();
++    while (it != dirs.end()) {
+         openNewTab(*it);
+         ++it;
+ 
+-        if (hasSplitView && (it != urlsToOpen.end())) {
++        if (hasSplitView && (it != dirs.end())) {
+             const int tabIndex = m_viewTab.count() - 1;
+             m_viewTab[tabIndex].secondaryView->setUrl(*it);
+             ++it;