gentoo resync : 13.03.2018

6 files changed, 8 insertions, 203 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index daf6f2a87707..75ca0e130c49 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,8 +1,5 @@
-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 2481 BLAKE2B 7c98a58dfaa7f86cf83179f2615d54fa0c1ef81a226a6533a2c6d0a7c3247ca9414ee7a9863664411f51f4433152f1df6e076402463010f27e9cd656bea036fa SHA512 c8207d96555ddeddc6e8d387fb59d33d2a7a34fc068f6ad9ee30f92b16007d5f53696fcc83e8a3686af6314e127f6556088f418b16759f9a1eea812adce0cd46
-AUX kio-5.40.0-testtrash-qt-5.9.3.patch 1311 BLAKE2B 98bf9667d64e1f408adcde47e05d26c8774459679cd3ad67948dd4a245225ce9cef4c1030aaaa01cb3303d7589bd97565860df7bbe329578bb298282c771c184 SHA512 4761fbb0f7d5034dc66717c2578b095fdb6b85241c5e05fc0ab166c75aae9ddd1d9b3aaa0b9628a44c13cc6f4cfcdb0aa348f3e1c97b7780e53567a1392c11ef
-DIST kio-5.40.0.tar.xz 3100424 BLAKE2B 27f69f10febc327d1f935e2b8f3c24dc8b64e85ef35830841f99fdefb6238f590dc8a1284bd0896d6e0e2eb86f123e6788ebd277ca208df18312e8ac475221dc SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed
 DIST kio-5.43.0.tar.xz 3139276 BLAKE2B 1fbaf93e7bd3565ff5c85a8a3e33b3dbe2e7a4314cb866711a3be72bb8f1eb320fb3a6c9af421914b440787cdee393ca3762ffd8ac881e2427f8f3e5c47e739e SHA512 23885d851dade24bb08ba1de2eda65db3ab13c8f378a42281f8a50230c9e836b5255643c89fbfca3dedc1e41ee259e67aaed2933cdf739ee4fb1c7eb650b95f6
-EBUILD kio-5.40.0-r3.ebuild 2049 BLAKE2B 1ada218376a92f1c844609293957423ca0bf1965fe3bf597d9809882795fc743e8acfc9132a3821a64e11d7ad6341f33078c4466a420337ecfbd3a13a44faf98 SHA512 91eb82ca9b5c9b2f82991a22b667957ee16101082c40a699338a47f0a28dbd54d0fdfffaafc606ac5d7b051072f9db8316b0c42ce2c103fd6660ce5f53982d23
-EBUILD kio-5.43.0-r1.ebuild 1925 BLAKE2B 93b699ee4fb0fe1830753a60b1ebb3b365333985a4e2f481fb437868143d13860115e7a5c3de65c3a073260b4f02cd0146c23d28d2d01beb7e299ffe2a52fa2d SHA512 57aa7929f3463ae9a8184c91e0d41b43ab7df07512a64540e8700f1c192ac5a0b715d090155bf8489352aa874046d37c50948a78228b1ef139115ed4318ca5f1
+DIST kio-5.44.0.tar.xz 3145388 BLAKE2B 0e76a55706cc0f487752967b29495e1b706181e607760afc4ac922bb54889003b8fb9cad1e5847254558b243efc1567ab8da7d0b18416990856cfaa720972784 SHA512 ec50fce1b60eda5ba637abd37a14e10d853bbf35be2d1ef48ee69681ed2f5356d919e06f0156558187f0e7bc5f642790e72af6f7554a1c72ffd445d22844429b
+EBUILD kio-5.43.0-r1.ebuild 1923 BLAKE2B 771b42ecb14aedff9a65e8d7e4d614fc327c962ad07a3a8cc1823727560f1d757e42c31d55ce643bef584c59c8adb6c8cbfa273e0b89c714439b3266d9d03c02 SHA512 bdb054aaa25fecc5630d3925e32c40cdf6e4d6389d04f244b83a9367b811d680e06fb1d8bce09f6e626a60f61d83c001400b4533e01417e55f36daa9648bc79c
+EBUILD kio-5.44.0.ebuild 1925 BLAKE2B f845722a1b1a54e54153737ca80940d0920b7edb9e9120571d7fa6343daec066903a8a30e27dfff1869ac52ab45daa4cd62c7b439ba32cdea333764242cc8a6b SHA512 3289336c78f99d57ecd4c22a8915dc84f79a2fb981fd5e595fda6257aa75f7625a535d2f6610ff2f4ec7a9ab3f752213591a29a57dfe1ae4cf62abe0bb8b6463
 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
deleted file mode 100644
index 9645620d04d7..000000000000
--- a/kde-frameworks/kio/files/kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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
deleted file mode 100644
index 503a8c773780..000000000000
--- a/kde-frameworks/kio/files/kio-5.40.0-mkpath-qt-5.9.3.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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
-
-* asturm: Fix build with Qt-5.7.1
----
- 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() == QLatin1String("/")) {
-+                    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 == QLatin1String("/")) {
-+                    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/files/kio-5.40.0-testtrash-qt-5.9.3.patch b/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch
deleted file mode 100644
index f3e1112720da..000000000000
--- a/kde-frameworks/kio/files/kio-5.40.0-testtrash-qt-5.9.3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 05938a167dd4190014d800bb02446e2779a9b3b2 Mon Sep 17 00:00:00 2001
-From: Elvis Angelaccio <elvis.angelaccio@kde.org>
-Date: Thu, 16 Nov 2017 12:06:41 +0100
-Subject: Fix testtrash with qtbase 5.10 beta 4
-
-Summary:
-Same fix as in D8836, this time for testtrash.
-
-Test Plan:
-Run testtrash.
-
-Reviewed By: dfaure
-
-Differential Revision: https://phabricator.kde.org/D8837
-
-*asturm: Fix build with Qt-5.7.1
----
- src/core/listjob.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/listjob.cpp b/src/core/listjob.cpp
-index 4b7b510..54a422a 100644
---- a/src/core/listjob.cpp
-+++ b/src/core/listjob.cpp
-@@ -117,7 +117,11 @@ void ListJobPrivate::slotListEntries(const KIO::UDSEntryList &list)
-                 itemURL = q->url();
-                 filename = entry.stringValue(KIO::UDSEntry::UDS_NAME);
-                 Q_ASSERT(!filename.isEmpty()); // we'll recurse forever otherwise :)
--                itemURL.setPath(itemURL.path() + '/' + filename);
-+                if (itemURL.path() == QLatin1String("/")) {
-+                    itemURL.setPath(itemURL.path() + filename);
-+                } else {
-+                    itemURL.setPath(itemURL.path() + '/' + filename);
-+                }
-             }
- 
-             if (entry.isDir() && !entry.isLink()) {
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kio/kio-5.43.0-r1.ebuild b/kde-frameworks/kio/kio-5.43.0-r1.ebuild
index 6688a725275a..186e877e8c34 100644
--- a/kde-frameworks/kio/kio-5.43.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.43.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 RDEPEND="
diff --git a/kde-frameworks/kio/kio-5.40.0-r3.ebuild b/kde-frameworks/kio/kio-5.44.0.ebuild
index e850e493306a..34ad81d47e85 100644
--- a/kde-frameworks/kio/kio-5.40.0-r3.ebuild
+++ b/kde-frameworks/kio/kio-5.44.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,10 +9,11 @@ inherit kde5
 
 DESCRIPTION="Framework providing transparent file and data management"
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 RDEPEND="
+	$(add_frameworks_dep kauth)
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcodecs)
@@ -44,13 +45,13 @@ RDEPEND="
 		sys-apps/attr
 		virtual/acl
 	)
+	handbook? ( $(add_frameworks_dep kdoctools) )
 	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
@@ -62,12 +63,6 @@ PDEPEND="
 	$(add_frameworks_dep kded)
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-mkpath-qt-5.9.3.patch"
-	"${FILESDIR}/${P}-knewfilemenu-mkpath-qt-5.9.3.patch"
-	"${FILESDIR}/${P}-testtrash-qt-5.9.3.patch"
-)
-
 # tests hang
 RESTRICT+=" test"