[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/

[Andreas Sturmlechner]

commit:     b7c85ff59071636cb109f0b7229ab9a3f279b8a2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 08:06:57 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 09:03:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c85ff5

kde-frameworks/kio: drop 5.82.0*

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/kio/Manifest                        |   1 -
 .../kio-5.81.0-fix-qtconcurrent-private-link.patch |  46 ---------
 .../kio-5.82.0-MimeTypeFinderJob-memleak-1.patch   |  69 -------------
 .../kio-5.82.0-MimeTypeFinderJob-memleak-2.patch   |  61 -----------
 .../kio-5.82.0-MimeTypeFinderJob-memleak-3.patch   |  52 ----------
 .../kio-5.82.0-MimeTypeFinderJob-memleak-4.patch   |  62 ------------
 .../kio-5.82.0-fix-filenamesearch-crashes.patch    |  28 ------
 .../kio/files/kio-5.82.0-no-cache-kcm.patch        |  79 ---------------
 .../kio/files/kio-5.82.0-no-useragent-kcm.patch    | 105 -------------------
 kde-frameworks/kio/kio-5.82.0-r2.ebuild            | 111 ---------------------
 10 files changed, 614 deletions(-)

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index c4bfe59fdca..2e46d8cebbd 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,3 +1,2 @@
-DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc
 DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
 DIST kio-5.86.0.tar.xz 3251976 BLAKE2B 5257ad0be8023ec661262fcd96f3f5860357fda73d1a039fbb30e549f4bb0bcab62217ccea70c22ecea63622ecbccfbeae27afe3692470be738f813e466a9142 SHA512 64a4ae7b0fff6e4e2c5ee3a25ec6db472c198fbcce5d8a929da2d42f6a881e404151a1935532c53359b645acac2a46ffa129616acb26b871dc7993b91a31fd8e

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 42637cd6e1e..00000000000
--- 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@g.o>
-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@g.o>
----
- 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 08d72d754d7..00000000000
--- 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@×××××××××××.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 bf3ff50802f..00000000000
--- 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@×××××.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 a9c55e1f7f2..00000000000
--- 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@×××××.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 9e59a0eb16e..00000000000
--- 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@×××××.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 b92139a5187..00000000000
--- 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@××××××××××××××.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 9cc0379b699..00000000000
--- 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@×××.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 ce0e891e916..00000000000
--- 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@×××.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.82.0-r2.ebuild b/kde-frameworks/kio/kio-5.82.0-r2.ebuild
deleted file mode 100644
index 74aef058f24..00000000000
--- a/kde-frameworks/kio/kio-5.82.0-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org xdg-utils
-
-DESCRIPTION="Framework providing transparent file and data management"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-# tests hang
-RESTRICT+=" test"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	=kde-frameworks/kauth-${PVCUT}*:5
-	=kde-frameworks/karchive-${PVCUT}*:5
-	=kde-frameworks/kbookmarks-${PVCUT}*:5
-	=kde-frameworks/kcodecs-${PVCUT}*:5
-	=kde-frameworks/kcompletion-${PVCUT}*:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/kcrash-${PVCUT}*:5
-	=kde-frameworks/kdbusaddons-${PVCUT}*:5
-	=kde-frameworks/kguiaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kiconthemes-${PVCUT}*:5
-	=kde-frameworks/kitemviews-${PVCUT}*:5
-	=kde-frameworks/kjobwidgets-${PVCUT}*:5
-	=kde-frameworks/knotifications-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/ktextwidgets-${PVCUT}*:5
-	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5
-	=kde-frameworks/kxmlgui-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
-	kerberos? ( virtual/krb5 )
-	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	test? ( sys-libs/zlib )
-	X? (
-		x11-base/xorg-proto
-		x11-libs/libX11
-		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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package acl ACL)
-		$(cmake_use_find_package handbook KF5DocTools)
-		$(cmake_use_find_package kerberos GSSAPI)
-		$(cmake_use_find_package kwallet KF5Wallet)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	ecm_pkg_postrm
-	xdg_desktop_database_update
-}