Revision bump adds upstream patch which reverts a regression with cifs mounts introduced in 4.13.1, bug #511012.

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

4 files changed, 76 insertions, 17 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index b370f530a8e2..971ed8be4fa4 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1002 2014/05/13 17:43:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1003 2014/05/25 20:07:06 johu Exp $
+
+*kdelibs-4.13.1-r1 (25 May 2014)
+
+  25 May 2014; Johannes Huber <johu@gentoo.org>
+  +files/kdelibs-4.13.1-kio-diskfree.patch, +kdelibs-4.13.1-r1.ebuild,
+  -kdelibs-4.13.1.ebuild:
+  Revision bump adds upstream patch which reverts a regression with cifs mounts
+  introduced in 4.13.1, bug #511012.
 
 *kdelibs-4.13.1 (13 May 2014)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 13fbf82090da..9a29c88e5b99 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX dist/01_gentoo_set_xdg_menu_prefix-1.patch 592 SHA256 dea20e8a0e8f0ecc1aec1b38cec994312514aa1e88ba25fede01e1953623f341 SHA512 33a7eeb58b65ce28f0fadc1f6c7133e670391330d084df39990bb0a5b4ddd78f52375c1ebc620823adfe4eee22f10b85064d3fdcb6df0f63c5f6e757357e7ca7 WHIRLPOOL c585ed614ae27e0694156a7af68e222fe13578db95e611b592896475772572c316a05a60b39d1797d28f2c7bea52736ac41c5ee096a92e09e945c34f07ecf69c
 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9 SHA512 e4d057665461dc27bda326178c8c21dbe75458a9cdc3cf976cf1e5b549d18732cd538c17fbad1f67b09188da0650e8d9c16d43076ffcfe06003484ddb442eb04 WHIRLPOOL f741e12a2a03a56a24ee734f6cf56d16d7621d708b87ea3be04e11b99cf24b9af53c88c4304c3b2d225e51c7403f8aacb1fcb152cc227bb5f98d6dea276250be
 AUX kdelibs-4.10.0-udisks.patch 2012 SHA256 a856a103831162da416ea07ab9f18db5d5eb4732ee9203c9d6799a4616e53f25 SHA512 b22d2f70f17618d5f2d11e9037c4d198a1fa11252d59098f120cc77cc12bcb3d90f1a69c63f33abb01217f396f3eb51ea8285e5ff5306eb41e63cc15654ced33 WHIRLPOOL 6c6b33afdb29fda62798f9b7121711bf8f8de44bd4839523316abb9a2a05e6e9f773e700b1e43fc75564aa82d18490aeec5ca04c51418d37d2f9b3c8924daf9f
+AUX kdelibs-4.13.1-kio-diskfree.patch 1845 SHA256 85e4d8fe871ea3aba8bcb50140540dfccd48dbe8db6e87e71447d95a1c4928f5 SHA512 0de4e30c379f76a0c8ce63b12bf8c9b509de7343ff6821278eb7189ab49d4ca11b9be0f090cc61cb1ca97872a86218914156de55d28c95709796d66fe450a701 WHIRLPOOL 29863a7d2ccc82958bf1b754456ef4dce993647def8e254d01e2662fb45778108ef336cf8ea87210e8a38254168f9a4f2b34a308c9dd542a29620ba05c10379e
 AUX kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch 2210 SHA256 3602e079a4788feceff27f7f6bcaeff33828c259a81d0357f7df092000f98a6a SHA512 9207f2ab33e757d3d8ed3279350ea4326339129f232bb67bcce7b3806480fe551c9ba03a93d289df311e913055c343c925f957eb0b0b24bec6a7ef59017090a2 WHIRLPOOL f63b26fc0657f7e72856b493fc469af1cfaa68bb18b1dd4078f9dae44c37a3bdec9114c6a2c92c55b2cdde4d7cbc2ea072df1157b26e43f844dccf16ec8b1f8d
 AUX kdelibs-4.4.90-xslt.patch 553 SHA256 ffb7b7f44d3e840d1fe5e3b1d859db74f6bf534d44160f48e0f91993200ab55b SHA512 0016a0cb2f4a93cc2a9638a74c8aa42759830304abf97b608393099093a35205bcdfbd0a8a6d501f6628119de34d39c7a40cac9ed99bff7081c651f678533dea WHIRLPOOL 8fd53eb3a5bb083b12f1ff1e68f5ba9208a5badd0210944bf62297899a7416d61cbd29d24adc02024b70789bad289abafcfa24b02370e5ea5929b39022dc6f46
 AUX kdelibs-4.6.2-armlinking.patch 1129 SHA256 9b076d1587bb02b85353f3a155199fd6dace7d1c76f189667787bca89192dee6 SHA512 d0208e095e751d4064e3f9b7d836135bce8c7f1cb7b4f1a20ef4d86d2fd5a08523c563c72ab86a871929000f26e4d50fa58fd81f7996edc57066984ce508ff1d WHIRLPOOL 81535f48c1ab14e37fd0dae7751317e72c53f4c55d4c28be67db8c6782af9a0a5e1ee3aba48680b8d367c9b6dda4d0e481392826b5eb597e1965bfbff70aaf38
@@ -16,24 +17,24 @@ DIST kdelibs-4.13.0.tar.xz 11556112 SHA256 8b073a92cbb1d68ac2668ec30649bcf422ac5
 DIST kdelibs-4.13.1.tar.xz 11554488 SHA256 088ba3eccadafa5cc06f9b39aed84deb37777290f178f9154ee95437083326a4 SHA512 dab707539baa72976cff34c286dad7b1297522d8d8b9289f70693a9a10e4761bba5dc3ad2a0fbef052a12cfde967c3e7a911da349e0d35f282ffd8ff27fda323 WHIRLPOOL 4aef805ab7c32a94581687bb9f84cb73e3912a07c79eb49bfb513f74d3241d55692e3ff01ba2b9f943cf4c9dacfd68d4406ca6a7c56d1959f29d622bbe669b20
 EBUILD kdelibs-4.12.5.ebuild 8534 SHA256 7db7205382314f69f890f265c51d8243bf516d132939cb87e913c3c59cb09bba SHA512 f434a636778e4f90c8b420db7ad31851b2d74eeda1e5114a337754295f01d440b666a96ffef3c92327a7f07fe027ae6bee82f039f233326e896fdc104ad38ec9 WHIRLPOOL 2c7c26a5a8d6e68f0ed90ec419bca4f2257600d88c3788fdae98df2ecbf8253bb84a1f37f4c48939a57852593b5bfcb472ef414cefcf34b527dcc4e46e1e0aa9
 EBUILD kdelibs-4.13.0.ebuild 8539 SHA256 9473e4f35f4c2bb37a6d437ca083e6f633ac75f8431d0b0acc0f037efbbd48ca SHA512 916fe1126cc2cd2d0320379e1523bd6df636a393bb643b8bad84095731ea45549d1c39ba3fc9ac2530032bc80f6e9cc6f59df46c0d4fd0771f08b6180bdfd092 WHIRLPOOL ef65670aacdcb8c889c3f009fb38f34566c623db910e76dd6381a7e3761d00c404c6a7f5af1064099d964c3f9cf579bb4e5db040621230953ee66d176daf7d7b
-EBUILD kdelibs-4.13.1.ebuild 8494 SHA256 e9dbb24d705c3c1ec80093073b595a3bc4c87a161e213a911901f0df7cd5c9af SHA512 e9843233c892451354e921193f95613b0be45d42afdfcfcd7a55c6fa5cc149432a0f01c08a0cca898cacd1305007fa5c4284f8f067c31398505d0a44237bb813 WHIRLPOOL 9783fa09d66a200a7fd9de6ac8c08cab5221197a6670318d3b946c1ba31ccaa0162f156eb2a9939de9e14c576ad60c8d9dcc7a9c61d04aa2ea9af00f658e61e5
-MISC ChangeLog 55773 SHA256 dca70668e382966994f1395c75f615f2eb202e14dbc15787d914746740587ce1 SHA512 b5bc538a313d5045075b0d2b50b8997470aeeb2333cd3a1157384b24efbcc872b0b970856af5b5acdb18c094b05a64e1cdd072b5ecb93b09fb8cc23135e4efed WHIRLPOOL fc94ba0c1f25ccc46906632d01392a14591bcce9b0895ff49ea0c745f4d2f817a46daf55251b1f52121778b128d447555d107e2e1e8a757a4c6e219a4f6c276d
+EBUILD kdelibs-4.13.1-r1.ebuild 8536 SHA256 fe1caebf65bc3378145d35a6f6c000febe0455b1dec37524f68cbfc9a42f5204 SHA512 06b323d87254ad9de93ba15e39599517305581ff3e42cd853864622b805bf5aeed7f225c94f83093d1e3d235d9ff5a84038683ec92558f4d6d22038670abc57a WHIRLPOOL 5a67428634598348b507460c1df1085155293977fd8990d4670bbfabbb2424ed3c03bf01ed3500ae0812e0abbeb5cfab552722e6e5c47f867ac1d0b0e9669096
+MISC ChangeLog 56070 SHA256 e7e998bd4953a5e889586d599a51f63379ac98b1a1a55609f4489a265d2fdcb1 SHA512 10dd0e9fc4e33437b84367571d049dae8c49804591a56dce308ba4a348d8f3eb62d5027506aca7c03c253becd7ba3cab90d54e552a0b311e0ed06df621dbddaf WHIRLPOOL 7e6f0f665144eccdfceb0c03c79c3bd360589389cacceae35cafb546259cba4c28df6334af0df1a94073c37d225647b63566d562ab60e5523a598f92da4c62b2
 MISC ChangeLog-2009 110608 SHA256 845ba7764dc9cabd4753d146e82cc0347a0dbbe21a76a4aab453106e7d70ba1f SHA512 c643c3bd742f1c2c4322217b4d9f2992310e9bf86f585ef687cf68f54ed2a86d2950f7f3c3fc5021a2dd472b6db39e17415ca6cde478e4ef4f91317a116889b5 WHIRLPOOL 8dd58bffc294a811176bc3f9882a0fa8a12c02fcdd692bacfccfc9745646d5062d3980553388fcdc835bbbecefd0783f029d07a5999e7208ceece5a93fa36893
 MISC metadata.xml 479 SHA256 ee8c6078738cb67ee6339da3041a6ec393859379131646c233c84cba637d219d SHA512 143333c1b6e67c073b65c67595f07f92f2417849f92fe58091fb6b9b2b8f1f9fa07c992231e6f235a335c17bbc3765a7521b02353d8c3087541cb3e3c1c98a3f WHIRLPOOL f14e61fd6a232d345687c06f54006d7607d0cd6c25bfcfa9483a1e33b1469266f0edd4e5ad83f010dd2e9160654621baaaab5e6fc1ffff3915ac815bbc9170d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIbBAEBCAAGBQJTclpDAAoJEGVpnaTzz9K9uWIP9Rk5bYyfnFU9zS4KLltqjDKa
-zFEwceq5ytZwEN118qlfTx+v/BAWEpZR7qvR+/iiBSeJ9kTTyF6yT423VCoeMFs3
-NkVSHu5rghDNfLoeLiDaUKh/K6Owju7+K95gncjqJ1AvaEVgLAJWXhgAur7VRCVX
-osBh/J/VwSa1rcByKhmAkMyTcKmjGdiBLP+HUBGj5VlxAf7J/9s/KET691fesqui
-hi4HbvlOTs4nRTCqCJ8V26DMAWT0yYFX5oLvTudB7OHo4zm+1En4x/G4JaDgl4yT
-HFQ9699z7tanpn/7HoM4lGsnnfvsdOuQhutDMTFbZhWITS9GZxqjzb+78UbjIfB+
-mHreVwW64BtZGV2P/+lXJU+XtDKJ3itpreLNMRIgUgkxF89ypqd7ogUQnEdJ/Iqy
-h31rOKChmITKwsHZMFaiP/ICWn9ERWTVYytWQcq9nQV535oPCQd8fpmkxq1zb/wq
-xQMCXvVuelcjWIgLPzgLQ43Hx4N7nLO5JxlHRM2lUDy/7siRPxf0xk69mA0P2n7t
-vOgDsPOzRINwYba1Cwv8v8z2rIKtKvOpZsGjuHbvGJkYusaa8QpUyqRuQz74NGSY
-Zqx8Y+oEUBF6W2ERE77grnC+hwhfgiy97v9R4ZpSeLgo/m/kfm0I/dYJ0DmbHyB2
-b4CoIHWPuaA0ZEiWJd4=
-=35Em
+iQIcBAEBCAAGBQJTgjE3AAoJEGVpnaTzz9K9LlIQAJhjRN/mDxB+SpA7CaUW/IGe
+hdTYj25eP05AEycYZx2Rak9VKU1dMHd3nMuQgqtSwKp2PljPkGhWD0/reOBcUCAT
+xJ1wLU+HIX8g4dWyQLplV8LK0ah+gBOA93uag2L3q36fSWf6atLYNZboCBjO0xT1
+2DMWU7zETRBM8nqFrhASkO+/d1kz2KQBD6TfWakre7JECzqZL16NAo+OwuPWTS5T
+WKTUFxiw+LqC07z9rVb9nwyhRlD4uiyslZc3xy4m6r8CLbNVJJYoBqz5S1HAiucj
+GxRdvVsZB2Lxrt7Fn4tGUjBiuAlVaqlL6W9mLUHrRCqeH3U/16DZqjwG68bPP4AK
+0MkjYfCaJJj4FF1ZWmfzkhjTj6HoIwl+tuKnsTpcLJdFeb9WHwpNayIon1uBE2vW
+Li9Gs339XX5EbJIAepARLT1N0g10EdspCoKg6WO7tn7L2K5rA1QMToytWK4j7DeM
+EpjzceqADw28FGYvzzv9gm8mxW9dkzL80dywlp2b1yDqfBIqSRFAwCcDjLcnypN6
+UaED6AJrPrEp3GPHxKVjeiNwUQ5PlibKcrHqxZdgHpirqnRSTPmRWa+EZMAS48aK
+7i/0g9H6QexJjVgTW8SIv2uEuzqGkUiBzhmUcJ/W8y6YJX94GptETPIaN+Sumlbh
+6hHpaq+F0twx6lk4C6d7
+=vbgA
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch b/kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch
new file mode 100644
index 000000000000..98bae45942d7
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.13.1-kio-diskfree.patch
@@ -0,0 +1,49 @@
+commit 9a8426ae2ed35ac900b89a623618fc158d24ee6a
+Author: Tomáš Trnka <tomastrnka@gmx.com>
+Date:   Sun May 25 16:12:36 2014 +0200
+
+    Revert "Avoid unnecessary automounting in KDiskFreeSpaceInfo::freeSpaceInfo"
+    
+    This reverts commit 6246e99b43f3d1a9e15d563fbb5e173ed50ba5e5.
+    
+    It breaks KIO on CIFS mounts as the check for automounts copied over
+    from frameworks/kfileitem.cpp isDirectoryMounted() apparently matches
+    CIFS as well (and for some weird reason KIO checks for available space
+    before trying to copy files).
+    
+    We'll probably have to return to v1 of the abovementioned commit, i.e.
+    checking for "autofs" explicitly. However, more testing is apparently
+    necessary to avoid further nasty surprises.
+    
+    REVIEW: 117044
+    BUG: 334776
+    FIXED-IN: 4.13.2
+
+diff --git a/kio/kfile/kdiskfreespaceinfo.cpp b/kio/kfile/kdiskfreespaceinfo.cpp
+index 5c1fa72..f11eb09 100644
+--- a/kio/kfile/kdiskfreespaceinfo.cpp
++++ b/kio/kfile/kdiskfreespaceinfo.cpp
+@@ -33,7 +33,6 @@
+ #include <QtCore/QDir>
+ #include <windows.h>
+ #else
+-#include <QtCore/QFileInfo>
+ #include <sys/statvfs.h>
+ #endif
+ 
+@@ -131,15 +130,6 @@ KDiskFreeSpaceInfo KDiskFreeSpaceInfo::freeSpaceInfo( const QString& path )
+ #else
+     struct statvfs statvfs_buf;
+ 
+-    // Ignore autofs mountpoints as statvfs would trigger (expensive) automounting
+-    // This also matches "special" filesystems like /proc where free space has no meaning
+-    if (mp) {
+-        QFileInfo fi(info.d->mountPoint);
+-        if (fi.isDir() && fi.size() == 0) {
+-            return info;
+-        }
+-    }
+-
+     // Prefer mountPoint if available, so that it even works with non-existing files.
+     const QString pathArg = info.d->mountPoint.isEmpty() ? path : info.d->mountPoint;
+     if (!statvfs(QFile::encodeName(pathArg).constData(), &statvfs_buf)) {
diff --git a/kde-base/kdelibs/kdelibs-4.13.1.ebuild b/kde-base/kdelibs/kdelibs-4.13.1-r1.ebuild
index 2d845f978483..fc84690fe83b 100644
--- a/kde-base/kdelibs/kdelibs-4.13.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.13.1.ebuild,v 1.1 2014/05/13 17:43:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.13.1-r1.ebuild,v 1.1 2014/05/25 20:07:06 johu Exp $
 
 EAPI=5
 
@@ -134,6 +134,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
 	"${FILESDIR}/${PN}-4.9.3-werror.patch"
 	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
+	"${FILESDIR}/${P}-kio-diskfree.patch"
 )
 
 pkg_pretend() {