gentoo resync : 16.09.2021

12 files changed, 12 insertions, 538 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 49627812bc54..f16104d94eb9 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,15 +1,7 @@
-AUX kio-5.81.0-fix-qtconcurrent-private-link.patch 1544 BLAKE2B f2e24a00addd20b60f93ee85ab8dab532b95c7dbfe85ba411ad83ff59ccb563e63560b557e33caafac3a385ac3d640bbabb801481ac709b06784c8d6d4a3326c SHA512 afc541a93607ad4e3544bb06631fbba4770d1e3a2d67ece951479dcf6e8bc8c8e12bb44ff79ddf491b526a98e74f350cfce6358da073310122ecd809e56d047c
-AUX kio-5.82.0-MimeTypeFinderJob-memleak-1.patch 2892 BLAKE2B b099cb4ce322c47d9e82c2e0ff9ca9b088a24caf919d22cafc1c1f766f5542fc71c313770e8342909136a9835e58126c8b8f1fca5cd2ffeb9e2deb0b93d5c04b SHA512 136085cf6abc6fb51b6ab3551dab339f97b18b77f51e8174e3a79358d3dd487b1f6306a774cfacafd84917f0ebfebc96d8d3eade2607d870d5791830f3b19a69
-AUX kio-5.82.0-MimeTypeFinderJob-memleak-2.patch 2478 BLAKE2B 51971136c6131a768f716f808278c2019237e42660f8d9c700a6a8cda45a6e9f9e95662317463ebb6026cf314b76658c230dd9b61240de8d6ad171bd3fd3a434 SHA512 fb40aa6a56ef7269645ac957aabb48ea277a5a4abcdf6905dd66cf1b9ecd0bcfcdfc91a0cfa9d1f4ebae563fb7df33c6085747b1f8a5dac66fb538fc2b39aef5
-AUX kio-5.82.0-MimeTypeFinderJob-memleak-3.patch 2179 BLAKE2B b32879d9ef0b88c3a2241eb1da21d7f390c3c2fb7c7fb8a5e6e812c60b50b5798f296e79c451f380c77b5d873909e3c8d5fb1661dae51fe753b5f7170e8a7236 SHA512 639635f6aa6acad149c90a3d277d142cf78fa28c59cd86ad56e11e825ee9938a05cfe151fff34164d81d15f3fcb41c2fb255cf706f9d0009c4b3afca4710d213
-AUX kio-5.82.0-MimeTypeFinderJob-memleak-4.patch 2467 BLAKE2B e32cf57531afd4532a7edccb48e185519ffba23e2e30877de2954730e8bc74b5569317d5d8eb7083b4f532aa2f7a49637c556f2ff136b41d03ef055cbbd0d6c6 SHA512 10559a3fb0b09901008d8eef7d494efc82e134701084bb30b62389e9255efc9821d9e30c408fa697995f04ad88caac0843803a33fbb2001d172e5f9b615e97c9
-AUX kio-5.82.0-fix-filenamesearch-crashes.patch 1046 BLAKE2B 3024bc3b143b1e5f261097ad47bf7c12ea54bdefba32faff9040a0128dd837453324f3b5b2cd2926b8f5ec2b899ff91daf4cbb3ae5c53cb401af88d78ff1fc01 SHA512 ae4ee91602dd0a7b54e9081db61056c775c2998542c326716fce4f8027173bb9893350a29b8d38ecb9e0a3194a314f6de97dc6a4e27a703c89cf77ee00d2f7f0
-AUX kio-5.82.0-no-cache-kcm.patch 2801 BLAKE2B 6779c2d1e77aff1e530beeb002b9aa7a993b365d8bdb22b7f77532038314cae62a237666b6d033a92f1219761f845c678b8367d86a757e5fc499165455f6345e SHA512 422ac748100d1e227ffc29da898437e4c4142b4c7f85ce46239ac6c76ae8feffe048fa1a44f3484b5859eb37baa3be96047652016c96c10b5fa2a262ce85b51a
-AUX kio-5.82.0-no-useragent-kcm.patch 3751 BLAKE2B 09ea333db392f0b35a531ff6921f4d9b0f8059ecc3bf48c8229c39815c49b4e6cbd6516fb2f99489ac468c33317260bb714915e971884d93dfa8b6284ba96039 SHA512 3641673476efab1c8e69408bc8472b1c6490209805d4039776ba397c39c98b59feed28cce9c03c55a8f87379d351cb87358773695dcdb5398aadb5cc1b89c4a4
 AUX kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch 1839 BLAKE2B a09e264a7c6e6bc8bf2ceda44937b8aac7c70a3fc40383dac70a78dcc7126c9387a7bfb478d52f7b2fb8c829b7e996d4336aee27c141ecb229f3f903ff6f37ba SHA512 7b4124d839337074e85fe499eeb1ef6b4290b000be9c180cf7c09432c85bc2a6f931207aa3f3c3cab94d4f877efaf1a73701394c1be3fbf15c9950ed6dffc816
 AUX kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch 1156 BLAKE2B 4a36114a86844b7d5abe0a5ab89ae979b99dda3e2fe307d7887fc66ef31c81da311f708927b2cddf0367ede36e12945ed9eee715178c6fd23abb99a6f47e4109 SHA512 579b74442c0057a5629cc516b5955a9d7b5504727d0eaeb3f5a5eb7ef828f30c2869e286000b492800b9139b602b98293cd3a67e91877993c2ea5deb70f4890a
-DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
 DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
-EBUILD kio-5.82.0-r2.ebuild 2933 BLAKE2B 0a5403e19ca99bfd4aca781fe39db28da02d1cd83717aebed1ca51d245ac49e57ee0fa4ca60c98ee675b331ef7947a2768728dfe6e5a5bc78c27a52a0b07d58b SHA512 e7172bcc1813bca6f08486db2af8dd33a3de5ebb2dd46ccaf137c74b34a4ab74237cc1dd7a13aa732667353f70020aa1b8a6977318537a08901849edb165bea3
-EBUILD kio-5.85.0-r1.ebuild 2625 BLAKE2B 672ec6795da13c4af17cebe586c7fc8cd46163e270f63159c1186ddd176124f7804af0b0080787cfe0a2ba348018226f6af51f36d1ee85b956e19b5d9ea9095d SHA512 d8fe973f5a874e7982f277f605105102acce1a7aa40d2d092e3bc6486826b3c9226e59d24e60340f9f0cd3db7b831011f007ac1d451c7c9ae3bd8b50fae50fc8
-MISC metadata.xml 671 BLAKE2B 9f99b79d8e3abd487802564d1af175cb88f807d77f184f4bf470b9a9293dd0962350c122041c06bc0f5348ad2a5d2d096181e2d8cbb1199ff56aec08f8bacad1 SHA512 900764f193062a4df9a3f85e348ce38ef7f0e6c7509fcbcb3f467aee4146a0d23ebea85e06ac88d81d986f898a126999b9e8f039592ae8dfae177c2ff422f363
+DIST kio-5.86.0.tar.xz 3251976 BLAKE2B 5257ad0be8023ec661262fcd96f3f5860357fda73d1a039fbb30e549f4bb0bcab62217ccea70c22ecea63622ecbccfbeae27afe3692470be738f813e466a9142 SHA512 64a4ae7b0fff6e4e2c5ee3a25ec6db472c198fbcce5d8a929da2d42f6a881e404151a1935532c53359b645acac2a46ffa129616acb26b871dc7993b91a31fd8e
+EBUILD kio-5.85.0-r1.ebuild 2622 BLAKE2B 326ebbf29032e342e73b733dd721ad5c11902048233ab566a8570b024a580ccd3a26b6ace2838f5f2f9af79241c18d811e1b4ac646b3f4c04fe65f1eb52bfeea SHA512 507a63d154d91561d2e5e7ea08f93536c8c1c8b5b9d722793e53464f2eda089ef0f3db139259c351100fc00edbd8c7b00e39c45c8f41a12f0a394dd7927fa39d
+EBUILD kio-5.86.0.ebuild 2432 BLAKE2B 942486a3eff422422b18101539bd78a903d004975ebc63428b2b6542f9f26c3e27c63e36f3c21aefa27e0e6aab985e168c30435b38581889410a12ed1fd7cad0 SHA512 094f60150e13476b1d0efe5fcd93f82282232d58c7b98dcdaa7ebba22a90989468836f9de540694c4ad04f5d420944af88ef39a397528745a374d0a8134ebf89
+MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
deleted file mode 100644
index 42637cd6e1e7..000000000000
--- a/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e6825658b7f59a3a933559def9aebf21ff0efb7f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 23 Apr 2021 20:10:31 +0200
-Subject: [PATCH] Drop find_dependency(Qt5Concurrent) from
- KF5KIOConfig.cmake.in
-
-This was added in 2f83dde2c8e8a25f0fe3dd52012bb49cb69e1ea5 but as far as I can
-see it is only a KIO build time dependency with no Qt5Concurrent header being
-used in KIO headers.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- KF5KIOConfig.cmake.in   | 1 -
- src/core/CMakeLists.txt | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in
-index 687ec512..749e9b9b 100644
---- a/KF5KIOConfig.cmake.in
-+++ b/KF5KIOConfig.cmake.in
-@@ -21,7 +21,6 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@")
- endif()
- 
- find_dependency(Qt5Network "@REQUIRED_QT_VERSION@")
--find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@")
- find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@")
- 
- include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake")
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 76c3061c..fe4be56b 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -188,9 +188,9 @@ PUBLIC
-  KF5::CoreAddons   # KJob
-  KF5::Service # TODO KF6 move to PRIVATE
-  Qt5::Network
-- Qt5::Concurrent            # QtConcurrentRun in hostinfo.cpp
-  Qt5::DBus
- PRIVATE
-+ Qt5::Concurrent            # QtConcurrentRun in hostinfo.cpp
-  Qt5::Xml                   # davjob.cpp uses QDom
-  KF5::ConfigCore
-  KF5::I18n
--- 
-2.31.1
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch
deleted file mode 100644
index 08d72d754d70..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e79da836c34fce66231e396c7215314d0eba51b4 Mon Sep 17 00:00:00 2001
-From: Jonathan Marten <jjm@keelhaul.me.uk>
-Date: Sat, 8 May 2021 15:20:39 +0000
-Subject: [PATCH] MimeTypeFinderJob: Resolve symlinks for a local file
-
----
- autotests/mimetypefinderjobtest.cpp | 18 +++++++++++++++++-
- src/core/mimetypefinderjob.cpp      |  2 +-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/autotests/mimetypefinderjobtest.cpp b/autotests/mimetypefinderjobtest.cpp
-index 72296b9b8..f494ff3b6 100644
---- a/autotests/mimetypefinderjobtest.cpp
-+++ b/autotests/mimetypefinderjobtest.cpp
-@@ -48,6 +48,7 @@ void MimeTypeFinderJobTest::determineMimeType_data()
-     QTest::newRow("text_file_no_extension") << "text/plain" << "srcfile";
-     QTest::newRow("desktop_file") << "application/x-desktop" << "foo.desktop";
-     QTest::newRow("script") << "application/x-shellscript" << "srcfile.sh";
-+    QTest::newRow("directory") << "inode/directory" << "srcdir";
-     /* clang-format on */
- }
- 
-@@ -60,7 +61,12 @@ void MimeTypeFinderJobTest::determineMimeType()
-     QTemporaryDir tempDir;
-     const QString srcDir = tempDir.path();
-     const QString srcFile = srcDir + QLatin1Char('/') + fileName;
--    createSrcFile(srcFile);
-+    if (mimeType == "inode/directory") {
-+        QVERIFY(QDir(srcDir).mkdir(fileName));
-+    } else {
-+        createSrcFile(srcFile);
-+    }
-+
-     QVERIFY(QFile::exists(srcFile));
-     const QUrl url = QUrl::fromLocalFile(srcFile);
- 
-@@ -68,6 +74,16 @@ void MimeTypeFinderJobTest::determineMimeType()
-     KIO::MimeTypeFinderJob *job = new KIO::MimeTypeFinderJob(url, this);
-     QVERIFY2(job->exec(), qPrintable(job->errorString()));
-     QCOMPARE(job->mimeType(), mimeType);
-+
-+    // Check that the result is the same when accessing the source
-+    // file through a symbolic link (bug #436708)
-+    const QString srcLink = srcDir + QLatin1String("/link_") + fileName;
-+    QVERIFY(QFile::link(srcFile, srcLink));
-+    const QUrl linkUrl = QUrl::fromLocalFile(srcLink);
-+
-+    job = new KIO::MimeTypeFinderJob(linkUrl, this);
-+    QVERIFY2(job->exec(), qPrintable(job->errorString()));
-+    QCOMPARE(job->mimeType(), mimeType);
- }
- 
- void MimeTypeFinderJobTest::invalidUrl()
-diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
-index f5e50cdc4..48fc8c289 100644
---- a/src/core/mimetypefinderjob.cpp
-+++ b/src/core/mimetypefinderjob.cpp
-@@ -122,7 +122,7 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
- {
-     Q_ASSERT(m_mimeTypeName.isEmpty());
- 
--    KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic, KIO::HideProgressInfo);
-+    KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic | KIO::StatResolveSymlink, KIO::HideProgressInfo);
-     if (!m_authPrompts) {
-         job->addMetaData(QStringLiteral("no-auth-prompt"), QStringLiteral("true"));
-     }
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch
deleted file mode 100644
index bf3ff50802f6..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c748d6987252fafc296cde9351b289ef734cf861 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Thu, 13 May 2021 23:03:57 +0200
-Subject: [PATCH] kio_file: pass the absolute path to
- QMimeDatabase::mimeTypeForFile()
-
-Otherwise detecting the mime type based on the file content may fail and
-return application/octet-stream.
-
-And pass the whole url to createUDSEntry(), less QFile::decodeName/encodeName()
-in the middle is better and less error prone.
-
-Note that without this change a MimeTypeFinderJob could end up failing to
-find the mime type of a local file based on the file contents.
----
- src/ioslaves/file/file_unix.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
-index 99d46c8f1..940e3cbc4 100644
---- a/src/ioslaves/file/file_unix.cpp
-+++ b/src/ioslaves/file/file_unix.cpp
-@@ -364,7 +364,7 @@ inline static time_t stat_mtime(QT_STATBUF &buf)
- }
- #endif
- 
--static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details)
-+static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QUrl &url)
- {
-     assert(entry.count() == 0); // by contract :-)
-     int entries = 0;
-@@ -539,7 +539,7 @@ static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSE
- 
-     if (details & KIO::StatMimeType) {
-         QMimeDatabase db;
--        entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(filename).name());
-+        entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(url.toLocalFile()).name());
-     }
- 
-     return true;
-@@ -1186,7 +1186,7 @@ void FileProtocol::listDir(const QUrl &url)
-             listEntry(entry);
- 
-         } else {
--            if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details)) {
-+            if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, url)) {
- #if HAVE_SYS_XATTR_H
-                 if (isNtfsHidden(filename)) {
-                     bool ntfsHidden = true;
-@@ -1476,7 +1476,7 @@ void FileProtocol::stat(const QUrl &url)
-     const KIO::StatDetails details = getStatDetails();
- 
-     UDSEntry entry;
--    if (!createUDSEntry(url.fileName(), _path, entry, details)) {
-+    if (!createUDSEntry(url.fileName(), _path, entry, details, url)) {
-         error(KIO::ERR_DOES_NOT_EXIST, path);
-         return;
-     }
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch
deleted file mode 100644
index a9c55e1f7f24..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c19876052ecec18a87a82f5950e8909e22e895ba Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Thu, 13 May 2021 17:02:52 +0200
-Subject: [PATCH] MimeTypeFinderJob: the StatJob details should include the
- mimetype
-
-Apparently we forgot to specify that we want the UDS_MIME_TYPE field in
-the statFile() method (both when it lived in OpenUrlJob and when it was moved
-to MimeTypeFinderJob). And now there is a dedicated StatJob flag, StatMimeType,
-that we can use.
-
-Not passing KIO::StatMimeType when creating the StatJob meant the code always
-used a get job to determine the mime type, which mean that e.g. opening an
-ISO file from Dolphin, which supposedly just needs to launch Ark, had the
-whole file read into memory, which means that opening a couple of ISO's and
-you're out of memory...
-
-Thanks to sitter for doing a big chunk of the investigative work in the bug
-report.
-
-CCBUG: 398908
----
- src/core/mimetypefinderjob.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp
-index 48fc8c289..baca58695 100644
---- a/src/core/mimetypefinderjob.cpp
-+++ b/src/core/mimetypefinderjob.cpp
-@@ -122,7 +122,9 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
- {
-     Q_ASSERT(m_mimeTypeName.isEmpty());
- 
--    KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, KIO::StatBasic | KIO::StatResolveSymlink, KIO::HideProgressInfo);
-+    static constexpr auto statFlags = KIO::StatBasic | KIO::StatResolveSymlink | KIO::StatMimeType;
-+
-+    KIO::StatJob *job = KIO::statDetails(m_url, KIO::StatJob::SourceSide, statFlags, KIO::HideProgressInfo);
-     if (!m_authPrompts) {
-         job->addMetaData(QStringLiteral("no-auth-prompt"), QStringLiteral("true"));
-     }
-@@ -147,6 +149,8 @@ void KIO::MimeTypeFinderJobPrivate::statFile()
- 
-         const KIO::UDSEntry entry = job->statResult();
- 
-+        qCDebug(KIO_CORE) << "UDSEntry from StatJob in MimeTypeFinderJob" << entry;
-+
-         const QString localPath = entry.stringValue(KIO::UDSEntry::UDS_LOCAL_PATH);
-         if (!localPath.isEmpty()) {
-             m_url = QUrl::fromLocalFile(localPath);
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch b/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch
deleted file mode 100644
index 9e59a0eb16eb..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-MimeTypeFinderJob-memleak-4.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 71484c97dee0c977a00f141123d8ccd9b93c2e96 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 14 May 2021 21:19:31 +0200
-Subject: [PATCH] kio_file: fix how createUDSEntry() is called
-
-When calling createUDSEntry() from listDir(), we need to concatenate the full
-path to the item.
-
-This is an addendum to commit c748d6987252f.
----
- src/ioslaves/file/file_unix.cpp | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
-index 940e3cbc4..3573c200e 100644
---- a/src/ioslaves/file/file_unix.cpp
-+++ b/src/ioslaves/file/file_unix.cpp
-@@ -364,7 +364,7 @@ inline static time_t stat_mtime(QT_STATBUF &buf)
- }
- #endif
- 
--static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QUrl &url)
-+static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSEntry &entry, KIO::StatDetails details, const QString &fullPath)
- {
-     assert(entry.count() == 0); // by contract :-)
-     int entries = 0;
-@@ -539,7 +539,7 @@ static bool createUDSEntry(const QString &filename, const QByteArray &path, UDSE
- 
-     if (details & KIO::StatMimeType) {
-         QMimeDatabase db;
--        entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(url.toLocalFile()).name());
-+        entry.fastInsert(KIO::UDSEntry::UDS_MIME_TYPE, db.mimeTypeForFile(fullPath).name());
-     }
- 
-     return true;
-@@ -1186,7 +1186,13 @@ void FileProtocol::listDir(const QUrl &url)
-             listEntry(entry);
- 
-         } else {
--            if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, url)) {
-+            QString fullPath(path);
-+            if (!fullPath.endsWith(QLatin1Char('/'))) {
-+                fullPath += QLatin1Char('/');
-+            }
-+            fullPath += filename;
-+
-+            if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details, fullPath)) {
- #if HAVE_SYS_XATTR_H
-                 if (isNtfsHidden(filename)) {
-                     bool ntfsHidden = true;
-@@ -1476,7 +1482,7 @@ void FileProtocol::stat(const QUrl &url)
-     const KIO::StatDetails details = getStatDetails();
- 
-     UDSEntry entry;
--    if (!createUDSEntry(url.fileName(), _path, entry, details, url)) {
-+    if (!createUDSEntry(url.fileName(), _path, entry, details, path)) {
-         error(KIO::ERR_DOES_NOT_EXIST, path);
-         return;
-     }
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch
deleted file mode 100644
index b92139a51871..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a38fcf356de0cbba1ce97c8ef70979ed897a8094 Mon Sep 17 00:00:00 2001
-From: Kai Uwe Broulik <kde@privat.broulik.de>
-Date: Tue, 18 May 2021 19:54:54 +0200
-Subject: [PATCH] [KCoreDirLister] Guard uiDelegate(), it might be null
-
-BUG: 437153
----
- src/core/kcoredirlister.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/kcoredirlister.cpp b/src/core/kcoredirlister.cpp
-index a836f0aa..58d8791c 100644
---- a/src/core/kcoredirlister.cpp
-+++ b/src/core/kcoredirlister.cpp
-@@ -1288,7 +1288,9 @@ void KCoreDirListerCache::slotResult(KJob *j)
-                 Q_EMIT kdl->jobError(job);
-                 if (kdl->d->m_autoErrorHandling && !errorShown) {
-                     errorShown = true; // do it only once
--                    job->uiDelegate()->showErrorMessage();
-+                    if (job->uiDelegate()) {
-+                        job->uiDelegate()->showErrorMessage();
-+                    }
-                 }
- #if KIOCORE_BUILD_DEPRECATED_SINCE(5, 82)
-                 kdl->handleError(job);
--- 
-2.31.1
-
diff --git a/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
deleted file mode 100644
index 9cc0379b6998..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-no-cache-kcm.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 581fab08ff4d5539e4684adcffc74ec3517ce29d Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 6 May 2021 21:26:31 +0200
-Subject: [PATCH] Remove the cache KCM
-
-Same reasoning as for
-https://invent.kde.org/frameworks/kio/-/merge_requests/438.
-
-It is very targeted towards KIO-based browsers which don't really exist
-any more.
-
-The setting is also global to everything that uses KIO and it's a bit
-questionable whether for example webdav browsing in Dolphin should
-automatically have the same cache settings as network access in Choqok.
-
-It being part of system settings is also confusing for users since it
-gives the false impression of true globality. They might expect it to
-affect Firefox or Webengine-based Konqueror which it does not.
----
- docs/kcontrol5/CMakeLists.txt       |   1 -
- src/kcms/kio/CMakeLists.txt         |   4 +-
- src/kcms/kio/main.cpp               |   4 +-
- 3 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
-index 2dd1ae16a..6c2f21b07 100644
---- a/docs/kcontrol5/CMakeLists.txt
-+++ b/docs/kcontrol5/CMakeLists.txt
-@@ -1,4 +1,3 @@
--add_subdirectory(cache)
- add_subdirectory(cookies)
- add_subdirectory(netpref)
- add_subdirectory(proxy)
-diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
-index 11cd239f2..5281fc7dc 100644
---- a/src/kcms/kio/CMakeLists.txt
-+++ b/src/kcms/kio/CMakeLists.txt
-@@ -12,11 +12,9 @@ set(kcm_kio_PART_SRCS
-     smbrodlg.cpp
-     kproxydlg.cpp
-     netpref.cpp
--    cache.cpp
-     ksaveioconfig.cpp)
- 
- ki18n_wrap_ui(kcm_kio_PART_SRCS
--    cache.ui
-     kproxydlg.ui
-     kcookiespolicies.ui
-     kcookiesmanagement.ui
-@@ -41,5 +39,5 @@ install(TARGETS kcm_kio  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
- 
- ########### install files ###############
- 
--install( FILES smb.desktop cookies.desktop cache.desktop
-+install( FILES smb.desktop cookies.desktop
-     netpref.desktop proxy.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
-index 8bacb10ca..2c0ebc29b 100644
---- a/src/kcms/kio/main.cpp
-+++ b/src/kcms/kio/main.cpp
-@@ -13,7 +13,6 @@
- #include <KPluginFactory>
- 
- // Local
--#include "cache.h"
- #include "kcookiesmain.h"
- #include "kproxydlg.h"
- #include "netpref.h"
-@@ -21,7 +20,6 @@
- 
- K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<SMBRoOptions>(QStringLiteral("smb")); registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
-                  registerPlugin<KProxyDialog>(QStringLiteral("proxy"));
--                 registerPlugin<KCookiesMain>(QStringLiteral("cookie"));
--                 registerPlugin<CacheConfigModule>(QStringLiteral("cache"));)
-+                 registerPlugin<KCookiesMain>(QStringLiteral("cookie"));)
- 
- #include "main.moc"
--- 
-GitLab
diff --git a/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch b/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
deleted file mode 100644
index ce0e891e9164..000000000000
--- a/kde-frameworks/kio/files/kio-5.82.0-no-useragent-kcm.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 1aa42558a0f539abfe4bc92cf2c8078ac4adb9a0 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Wed, 5 May 2021 22:27:25 +0200
-Subject: [PATCH] Remove the Browser Identification KCM
-
-It's purpose is to control the user agent used by kio-http.
-
-Very few things use kio-http these days, not even Konqueror with the
-webengine part.
-
-For the remaining use cases (kioclient, webdav kio worker, etc.) this
-kind of configurability is overkill.
-
-Moreover being part of systemsettings this gives a false impression of
-globality. A user might change something in there and wonder why it does
-not apply to Firefox or Falkon.
-
-Given the questionable usefulness and the potential for confusion I
-propose to remove it entirely.
----
- docs/kcontrol5/CMakeLists.txt                 |   1 -
- src/kcms/kio/CMakeLists.txt                   |  18 +-
- src/kcms/kio/main.cpp                         |   4 +-
- 3 files changed, 2 insertions(+), 21 deletions(-)
-
-diff --git a/docs/kcontrol5/CMakeLists.txt b/docs/kcontrol5/CMakeLists.txt
-index 1b19e5e7b..2dd1ae16a 100644
---- a/docs/kcontrol5/CMakeLists.txt
-+++ b/docs/kcontrol5/CMakeLists.txt
-@@ -4,5 +4,4 @@ add_subdirectory(netpref)
- add_subdirectory(proxy)
- add_subdirectory(smb)
- add_subdirectory(trash)
--add_subdirectory(useragent)
- add_subdirectory(webshortcuts)
-diff --git a/src/kcms/kio/CMakeLists.txt b/src/kcms/kio/CMakeLists.txt
-index a354651b0..11cd239f2 100644
---- a/src/kcms/kio/CMakeLists.txt
-+++ b/src/kcms/kio/CMakeLists.txt
-@@ -1,6 +1,4 @@
- 
--add_subdirectory( uasproviders )
--
- find_package(KF5TextWidgets ${KF_DEP_VERSION} REQUIRED)
- 
- ########### next target ###############
-@@ -12,31 +10,18 @@ set(kcm_kio_PART_SRCS
-     kcookiesmanagement.cpp
-     kcookiespolicyselectiondlg.cpp
-     smbrodlg.cpp
--    useragentdlg.cpp
-     kproxydlg.cpp
--    useragentinfo.cpp
--    useragentselectordlg.cpp
-     netpref.cpp
-     cache.cpp
-     ksaveioconfig.cpp)
- 
- ki18n_wrap_ui(kcm_kio_PART_SRCS
-     cache.ui
--    useragentselectordlg.ui
--    useragentdlg.ui
-     kproxydlg.ui
-     kcookiespolicies.ui
-     kcookiesmanagement.ui
-     kcookiespolicyselectiondlg.ui)
- 
--ecm_qt_export_logging_category(
--    IDENTIFIER KIO_USERAGENTDLG
--    CATEGORY_NAME kf.configwidgets.cms.kf.kio.useragentdlg
--    OLD_CATEGORY_NAMES kf5.kio.useragentdlg
--    DESCRIPTION "kio useragentdialog (KIO)"
--    EXPORT KIO
--)
--
- add_library(kcm_kio MODULE ${kcm_kio_PART_SRCS})
- 
- target_link_libraries(kcm_kio
-@@ -56,6 +41,5 @@ install(TARGETS kcm_kio  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
- 
- ########### install files ###############
- 
--install( FILES smb.desktop cookies.desktop useragent.desktop cache.desktop
-+install( FILES smb.desktop cookies.desktop cache.desktop
-     netpref.desktop proxy.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
--install( FILES uasprovider.desktop  DESTINATION  ${KDE_INSTALL_KSERVICETYPES5DIR} )
-diff --git a/src/kcms/kio/main.cpp b/src/kcms/kio/main.cpp
-index f1b065f46..8bacb10ca 100644
---- a/src/kcms/kio/main.cpp
-+++ b/src/kcms/kio/main.cpp
-@@ -18,10 +18,8 @@
- #include "kproxydlg.h"
- #include "netpref.h"
- #include "smbrodlg.h"
--#include "useragentdlg.h"
- 
--K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<UserAgentDlg>(QStringLiteral("useragent")); registerPlugin<SMBRoOptions>(QStringLiteral("smb"));
--                 registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
-+K_PLUGIN_FACTORY(KioConfigFactory, registerPlugin<SMBRoOptions>(QStringLiteral("smb")); registerPlugin<KIOPreferences>(QStringLiteral("netpref"));
-                  registerPlugin<KProxyDialog>(QStringLiteral("proxy"));
-                  registerPlugin<KCookiesMain>(QStringLiteral("cookie"));
-                  registerPlugin<CacheConfigModule>(QStringLiteral("cache"));)
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/kio-5.85.0-r1.ebuild b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
index 46ca739c2b5d..92287327bcd9 100644
--- a/kde-frameworks/kio/kio-5.85.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.85.0-r1.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
diff --git a/kde-frameworks/kio/kio-5.82.0-r2.ebuild b/kde-frameworks/kio/kio-5.86.0.ebuild
index 74aef058f24f..6c1d184379bd 100644
--- a/kde-frameworks/kio/kio-5.82.0-r2.ebuild
+++ b/kde-frameworks/kio/kio-5.86.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
@@ -13,11 +13,11 @@ inherit ecm kde.org xdg-utils
 DESCRIPTION="Framework providing transparent file and data management"
 
 LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="acl +handbook kerberos +kwallet X"
 
 # tests hang
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="
 	dev-libs/libxml2
@@ -50,6 +50,7 @@ RDEPEND="
 	=kde-frameworks/kwindowsystem-${PVCUT}*:5
 	=kde-frameworks/kxmlgui-${PVCUT}*:5
 	=kde-frameworks/solid-${PVCUT}*:5
+	sys-apps/util-linux
 	acl? (
 		sys-apps/attr
 		virtual/acl
@@ -68,28 +69,11 @@ DEPEND="${RDEPEND}
 		x11-libs/libXrender
 	)
 "
-PDEPEND="
-	>=kde-frameworks/kded-${PVCUT}:5
-"
-
-PATCHES=(
-	# pending https://invent.kde.org/frameworks/kio/-/merge_requests/426
-	"${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971
-	# upstream backport request - see also KDE-bug 398908
-	"${FILESDIR}"/${P}-MimeTypeFinderJob-memleak-{1,2,3,4}.patch
-	"${FILESDIR}"/${P}-fix-filenamesearch-crashes.patch # KDE-bug 437153
-	# git master/KIO 5.83:
-	"${FILESDIR}"/${P}-no-useragent-kcm.patch
-	"${FILESDIR}"/${P}-no-cache-kcm.patch
-)
-
-src_prepare() {
-	ecm_src_prepare
-	rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs
-}
+PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
 
 src_configure() {
 	local mycmakeargs=(
+		-DKIO_NO_PUBLIC_QTCONCURRENT=ON
 		$(cmake_use_find_package acl ACL)
 		$(cmake_use_find_package handbook KF5DocTools)
 		$(cmake_use_find_package kerberos GSSAPI)
diff --git a/kde-frameworks/kio/metadata.xml b/kde-frameworks/kio/metadata.xml
index d8da3ddcac5d..ef4d43059c0d 100644
--- a/kde-frameworks/kio/metadata.xml
+++ b/kde-frameworks/kio/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>