gentoo resync : 01.12.2017

5 files changed, 232 insertions, 1 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 4e8f5282a5f9..8e5b1efe1233 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index b61062f825c9..61ba76cf5a2d 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,6 +1,9 @@
 AUX kio-5.37.0-tests.patch 1399 BLAKE2B 4f489f5a6321a73b6a01df33c2cb8deaca2c72940c040c7c7e301cf654039f1c94d0eea4e76e581bfc525c2565eea13dfb863e0d1e2cbf10408e49da151b129d SHA512 a894886d400719ef8b11e83454be55406e2cd677da8cdbfd822e5155945198f54c4b2aed8c92b702fa7c8f858020c5e7c481719317513735c9538f0da5963221
+AUX kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch 2506 BLAKE2B 404ce0e81484a20d1841812096830748fffb9bafda15b4146e6c924eaedd3b07ae5f20221f505fdd576a5c3a60e660f82b1edcf698b2f1654fd0c2d14c8a0b79 SHA512 1e39632a67ba8244f992c4a22df837452a09ae0134693066414eeded90c4b8cdf684129d1594e1c7dc5a1cfc445246284dcf1f28006939c2974577691584afbb
+AUX kio-5.40.0-mkpath-qt-5.9.3.patch 2442 BLAKE2B 37ec852e1c34233ae00b60af8eb9ba82ccbf33761c78174a9a50ff4a29f33a285b38f5d3ac07e6eeb9f97d1fce3178a4335c9a1fd3fd84e4cbe9755606c88af0 SHA512 71a44dc2ded1218b9d7bd497654cb474690955a6e625057d23fbaa0c45c203cf112768f67d30cb6e97949fe98ba1bef969800cbf888b011c0cc76d662cf460b5
 DIST kio-5.37.0.tar.xz 3084204 SHA256 49448ebcfe182805f8f9cd40c1e2c8e686578cc2e7fa3688204d5ca4e182ac5b SHA512 42b2cbf6cbc414a0b69fdb36984d13574b1aee033170761dc55835cace44abead82f387f8afb35d8a82ee93a1909854ef43cff29d45c5881c4b13ca8862d2a64 WHIRLPOOL 649b16ebf5708d410d826a70726a9fdfd3668e00784246e7cb4d193b1951525e821046121886580bc16004280170277ac0344d1ee18afb91722e095118b1ccd6
-DIST kio-5.40.0.tar.xz 3100424 SHA256 30ea0b231b995faaf4283b9c9ecfaffb589268f5d7b5b805f69ed95601ac389b SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed WHIRLPOOL cfae3b3dc85f1398217c934943829dc28d2b7bfefe6d8adb5a082593f66127b313652b34278e6e4d612b266f7df8b03462a5ae8ac71af5685ad9641c08181b3a
+DIST kio-5.40.0.tar.xz 3100424 BLAKE2B 27f69f10febc327d1f935e2b8f3c24dc8b64e85ef35830841f99fdefb6238f590dc8a1284bd0896d6e0e2eb86f123e6788ebd277ca208df18312e8ac475221dc SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed
 EBUILD kio-5.37.0.ebuild 1948 BLAKE2B bbfec08de5c047c423f1fc227a1be8b3cfc5dabc6a8437c75c13b1803c29a795f36cfd27d44bfad5a3c6614ad11b2c54cdab880a4288ed540a3fe2e8efc3df71 SHA512 214a136ca904777793d39ad7d88ac9e60df3a253dcb76aea6782b27a4caee9f9581e64d1ddc9793887152661b875092efe09587199e24171bbdf6259f762416c
+EBUILD kio-5.40.0-r2.ebuild 2006 BLAKE2B d6f87e1f3d217046df97f120f0a4b386bb23f81760ac4fbb34fbb805822618a924f625fc93c18b19c3198da7d65d6563dd5cdb45b4c4005ebebbbe3372fe2d1b SHA512 b4cbdd9493cb46a23ef4d59220d5aff698083d240480b37b80d32d7407ee72266eccf0d3aaf708dc819e66b8aa8986f41c663753fa4963aeae927f3d0235665f
 EBUILD kio-5.40.0.ebuild 1896 BLAKE2B 05402887a0107b41fa23472b55e58f9f2420051e61c010745cfebb9dc1257808c12bbf1aed6ca0e9619c597450a56dace4d23da8e1b4256b0a64e48c90e843f2 SHA512 594849f0a48a4c6f3b8cb3255e9dca8f9e1fd4e798125a026f101d05a8779d5782aec991e68a1fa6447f758e5b63c15a8677458b48c8d666e8a1c3ccc161355c
 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820
diff --git a/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch
new file mode 100644
index 000000000000..9645620d04d7
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch
@@ -0,0 +1,80 @@
+From 298c0e734efdd8a7b66a531959e3fb5357a6495d Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Tue, 28 Nov 2017 19:42:46 +0900
+Subject: Fix creating a directory via KNewFileMenu+KIO::mkpath on Qt 5.9.3+
+
+Summary:
+f62768d04652 in qtbase.git introduced a behavior change in QUrl
+causing it to reject URLs with a path of "//foo" (note the double
+slash) as invalid.
+
+Both KNewFileMenu and KIO::mkpath contained code following this
+pattern:
+
+  url.path() + '/' + name
+
+This is a bad mix with forwarding slaves like kio_desktop, which
+translate a top-level path of / to some other URL:
+
+  (desktop:)/ + / + foo = //foo
+
+This patch addresses the two instances of this by wrapping the
+string building in QDir::cleanPath, which I think is the shortest
+and most readable way to go.
+
+2353119aae8f in kio.git (D8836) was another commit fixing fallout
+from this Qt change. Is unlikely this patch will be the last one.
+I suspect many other variations of this problem lurk about the
+codebase.
+
+BUG:387073
+
+Reviewers: dfaure, thiago, elvisangelaccio
+
+Subscribers: #frameworks
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D9029
+---
+ src/core/mkpathjob.cpp           | 3 ++-
+ src/filewidgets/knewfilemenu.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp
+index c77a9fe..f67a489 100644
+--- a/src/core/mkpathjob.cpp
++++ b/src/core/mkpathjob.cpp
+@@ -25,6 +25,7 @@
+ #include "mkdirjob.h"
+ #include <QTimer>
+ #include <QDebug>
++#include <QDir>
+ #include <QFileInfo>
+ 
+ using namespace KIO;
+@@ -123,7 +124,7 @@ void MkpathJobPrivate::slotStart()
+     }
+ 
+     if (m_pathIterator != m_pathComponents.constEnd()) {
+-        m_url.setPath(m_url.path() + '/' + *m_pathIterator);
++        m_url.setPath(QDir::cleanPath(m_url.path() + '/' + *m_pathIterator));
+         KIO::Job* job = KIO::mkdir(m_url);
+         q->addSubjob(job);
+         q->setProcessedAmount(KJob::Directories, q->processedAmount(KJob::Directories) + 1);
+diff --git a/src/filewidgets/knewfilemenu.cpp b/src/filewidgets/knewfilemenu.cpp
+index 023eebd..98c9852 100644
+--- a/src/filewidgets/knewfilemenu.cpp
++++ b/src/filewidgets/knewfilemenu.cpp
+@@ -855,7 +855,7 @@ void KNewFileMenuPrivate::_k_slotCreateDirectory(bool writeHiddenDir)
+                 }
+             }
+             url = baseUrl;
+-            url.setPath(url.path() + '/' + name);
++            url.setPath(QDir::cleanPath(url.path() + '/' + name));
+         }
+     }
+ 
+-- 
+cgit v0.11.2
+
diff --git a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
new file mode 100644
index 000000000000..d9cf7402741d
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
@@ -0,0 +1,65 @@
+From 2353119aae8f03565bc7779ed1d597d266f5afda Mon Sep 17 00:00:00 2001
+From: Elvis Angelaccio <elvis.angelaccio@kde.org>
+Date: Thu, 16 Nov 2017 10:41:19 +0100
+Subject: Fix KIO::mkpath with qtbase 5.10 beta 4
+
+Summary:
+The latest Qt 5.10 beta includes [1] which breaks a bunch of unit tests,
+since `url.setPath("//foo")` will now result in an invalid (empty) QUrl.
+
+This patch fixes the KIO::mkpath() case.
+
+[1]: http://code.qt.io/cgit/qt/qtbase.git/commit/?id=f62768d046528636789f901ac79e2cfa1843a7b7
+
+Test Plan:
+
+* I can now create folders from dolphin and plasma.
+* fileundomanagertest and mkpathjobtest no longer fail
+
+Reviewers: #frameworks, dfaure
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D8836
+---
+ src/core/mkpathjob.cpp | 17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/mkpathjob.cpp b/src/core/mkpathjob.cpp
+index bff46ca..a177805 100644
+--- a/src/core/mkpathjob.cpp
++++ b/src/core/mkpathjob.cpp
+@@ -43,8 +43,13 @@ public:
+         m_url.setPath(QStringLiteral("/"));
+         int i = 0;
+         for (; i < basePathComponents.count() && i < m_pathComponents.count(); ++i) {
+-            if (m_pathComponents.at(i) == basePathComponents.at(i)) {
+-                m_url.setPath(m_url.path() + '/' + m_pathComponents.at(i));
++            const QString pathComponent = m_pathComponents.at(i);
++            if (pathComponent == basePathComponents.at(i)) {
++                if (m_url.path() == QLatin1Char('/')) {
++                    m_url.setPath(m_url.path() + pathComponent);
++                } else {
++                    m_url.setPath(m_url.path() + '/' + pathComponent);
++                }
+             } else {
+                 break;
+             }
+@@ -57,7 +62,13 @@ public:
+         if (m_url.isLocalFile()) {
+             i = 0;
+             for (; i < m_pathComponents.count(); ++i) {
+-                QString testDir = m_url.toLocalFile() + '/' + m_pathComponents.at(i);
++                const QString localFile = m_url.toLocalFile();
++                QString testDir;
++                if (localFile == QLatin1Char('/')) {
++                    testDir = localFile + m_pathComponents.at(i);
++                } else {
++                    testDir = localFile + '/' + m_pathComponents.at(i);
++                }
+                 if (QFileInfo(testDir).isDir()) {
+                     m_url.setPath(testDir);
+                 } else {
+-- 
+cgit v0.11.2
+
diff --git a/kde-frameworks/kio/kio-5.40.0-r2.ebuild b/kde-frameworks/kio/kio-5.40.0-r2.ebuild
new file mode 100644
index 000000000000..b0b6cd7af7e1
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.40.0-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork 'ssl')
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	kerberos? ( virtual/krb5 )
+	kwallet? ( $(add_frameworks_dep kwallet) )
+	X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+	handbook? ( $(add_frameworks_dep kdoctools) )
+	test? ( sys-libs/zlib )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-proto/xproto
+	)
+"
+PDEPEND="
+	$(add_frameworks_dep kded)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-mkpath-qt-5.9.3.patch"
+	"${FILESDIR}/${P}-knewfilemenu-mkpath-qt-5.9.3.patch"
+)
+
+# tests hang
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package acl ACL)
+		$(cmake-utils_use_find_package handbook KF5DocTools)
+		$(cmake-utils_use_find_package kerberos GSSAPI)
+		$(cmake-utils_use_find_package kwallet KF5Wallet)
+		$(cmake-utils_use_find_package X X11)
+	)
+
+	kde5_src_configure
+}