gentoo resync : 22.12.2021

8 files changed, 93 insertions, 326 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 2d9d0f675553..b7fb14ddb392 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,10 +1,7 @@
-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
-AUX kio-5.85.0-revert-to-pre-libblkid-parsing.patch 4908 BLAKE2B 55436d26509966c05d445b3d8041271893be362c928fab4cfe6552995c1325001f072e84a1c2ce6e31c60687e29164c5e732dba2dc9ee3359585f5c1aefbc358 SHA512 eead88e9bf955a22157464b2d16ee9ad90c82e8c88ee454eff2ce5389a71dba3321bae26bcacc5899dd1555d378c6da63829dc5f4f9536b1b75c4f21deabb7cd
+AUX kio-5.88.0-fix-KRun-open-URLs-twice.patch 3243 BLAKE2B 0e93a04be3fec646fccb9ef45328f0bf8e72c874a629a130f496e27185c36960841b409076606d5bb049708f09ec27156971654b584a1f6274d314736c002283 SHA512 903aacef3af878223df0fc755c7001d7e5a0a9b1e1791b672a8bd81092721f3777f0621cc79c049230eb1f05e5a7cc9a42548ca7eee5307994edf9c237589f2a
 AUX kio-5.88.0-fix-copy-between-filesystems.patch 1094 BLAKE2B 0528d84cd6cb61ee370c9f4c50c48852420a02e403f622742f71920455c8cae90fc05e0026cd59fa0d8ab9a404bc531a80ba47d231fdd273fe89a8d27f10cf4f SHA512 becdf85d9bd9c52c05d5b8b23762fa0ba3794cd617b46fa50643200bbca793a5636275f77d2dcad709f69e34bc8fa1cb6a73998f23bb9591a484b73551ced0e8
-DIST kio-5.85.0.tar.xz 3200300 BLAKE2B fd723dba761b81862bf503645a8526a246867e5a10441f3edf895e4107c189ead357615e17f3704325976ed29867c54f98bc11b4e977e21a78d429ee7efa2dde SHA512 73c69743f3d99671ced8176bf9806df54eb3afd04dbdd9dd92b79c9979428f980d3dbda9504c81aca4aa36249b3e43edcc38831497752e31a510a70ee98dc4e8
 DIST kio-5.88.0.tar.xz 3247924 BLAKE2B 3687e97b3c936c93e7ee87f314340f8e9889e2afae584d360eb44414994406a34678ea304fff081a65beb03fa98ec1f22870f3a3f86e124352bc96f51c142c1f SHA512 3d79bc90c2f6aa54080824c15da282f54d18530362ffd144f36754f1751f58c0c48c9fd12ffece49f0b455c524b8585ba6c2baa684b0992471b7ec0636350c19
-EBUILD kio-5.85.0-r1.ebuild 2622 BLAKE2B 326ebbf29032e342e73b733dd721ad5c11902048233ab566a8570b024a580ccd3a26b6ace2838f5f2f9af79241c18d811e1b4ac646b3f4c04fe65f1eb52bfeea SHA512 507a63d154d91561d2e5e7ea08f93536c8c1c8b5b9d722793e53464f2eda089ef0f3db139259c351100fc00edbd8c7b00e39c45c8f41a12f0a394dd7927fa39d
-EBUILD kio-5.85.0-r2.ebuild 2688 BLAKE2B 0d526978d9366666662467f681dc56b25c7badf3d1a543f0b556f82e551ed1468f9014535727aabb5575dc76a15925838f0c7d9f2d9d72ccd0e6c638ecaf9f73 SHA512 16ceea38cfd4480c7c67342cae557f350bf45c8fd20cd361f70952dcc3c9ff8e4a3ae33b1e107735150628c640e9ddf875b8cb8aaa48a51188018ab905833e24
-EBUILD kio-5.88.0-r1.ebuild 2478 BLAKE2B 0cd43ec5c67b133331e34892e71c8d07fc9a354c091f99d0f86ed0c24ba3133e5ca054dc434584e6f1b0ab2d346044ca5582ba76f4cb2ea063f91d82597797c0 SHA512 4286305457b80b13654bc9ec6d154e5993f0210ace0bb96e586d55611cd58492826ebb188ef186d91921b130c16c9195c49407265882a914480d44152e418913
+DIST kio-5.89.0.tar.xz 3252852 BLAKE2B 734e7b2e0dfea9a055c5a266baf0428cd124b7335de3685d61d1940936692f44197c90fd4b923e2e2c11e60e366f82297d147e367ceed9b759cf9cbbdf9a898f SHA512 c13b36c3a36da2c410522f81a5dd73f3a149bc858cd4f534d8c909cc10376ecac0b7c900e03e3a3091b7922453f19df19dce645dddf886a7e25e88424095ac24
+EBUILD kio-5.88.0-r2.ebuild 2544 BLAKE2B da6593ee7059d1e9a47dab87a4f7aa8a3895618838e2de5d4f920c48f787bf9fb1cc061bb33604315ba344ca4686fd0204b542d1daaa4a65bdc38f589bde01f2 SHA512 67219306ff2353e93136eb23f28664b1970705732845769e9305cabfc58ca16b5d414e5a833eef59392b4223ed8e1c9ee49e7f9ca2ded647977f56dfa4704f2e
+EBUILD kio-5.89.0-r1.ebuild 2411 BLAKE2B 1a586348fed19fba073c7f6afb974671209a7321577e6442f6be2cf945c863c687e925ab1ec33ea676e6fe9e711ee8ae6857222acd3c42e6466613ca68f0db6a SHA512 5e274a8601df839a695a8deac6b9ffa95731d02e63b30d276a1883352eef2f2a813cd6200d7bf8da8cdc99d3591f5d79e0b5f2a755b54a2ef94039df745d4719
 MISC metadata.xml 672 BLAKE2B ed652f6e5751355ab96a5206da0184e37745e4b675e7f235648536931563b53c4f71112e81f809c88d02d01f9c77a20e9f41a2f6eb988b104636c8d450c50a18 SHA512 1fa6b33c8f146152015b0c8dbd70165022ceee580253850545c79eb3a74dbf44539e562014606a4ef4ea283a42f3946b1d3a79c0953a38fe10689137a53207ce
diff --git a/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch b/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch
deleted file mode 100644
index 54365b694fa6..000000000000
--- a/kde-frameworks/kio/files/kio-5.85.0-KDirOperator-exp-to-url-only-in-detail-treeview.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 51737430fcd963a04a4eddbb166114ae25430814 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Wed, 4 Aug 2021 23:22:10 +0200
-Subject: [PATCH] KDirOperator: expand to url only in detail tree view
-
-When "allow expansion" is disabled in the menu, the view type is KFile::Tree,
-however when selecting an item from the location (Name:) combobox history,
-the item model would expand to show the file; that should only happen if
-"allow expansion" is enabled, i.e. when the view type is KFile::DetailTree.
-
-BUG: 440475
-FIXED-IN: 5.86
-
-asturm 2021-08-15: fixed by merge with 8039f8b399757001ffa919ef56ede283c287dcd4
----
- src/filewidgets/kdiroperator.cpp | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp
-index bc80d93fe..7af20a057 100644
---- a/src/filewidgets/kdiroperator.cpp
-+++ b/src/filewidgets/kdiroperator.cpp
-@@ -1870,7 +1870,11 @@ void KDirOperator::setCurrentItem(const QUrl &url)
-     KFileItem item = d->m_dirLister->findByUrl(url);
-     if (d->m_shouldFetchForItems && item.isNull()) {
-         d->m_itemsToBeSetAsCurrent << url;
--        d->m_dirModel->expandToUrl(url);
-+
-+        if (d->m_viewKind == KFile::DetailTree) {
-+            d->m_dirModel->expandToUrl(url);
-+        }
-+
-         return;
-     }
- 
-@@ -1909,9 +1913,14 @@ void KDirOperator::setCurrentItems(const QList<QUrl> &urls)
-         KFileItem item = d->m_dirLister->findByUrl(url);
-         if (d->m_shouldFetchForItems && item.isNull()) {
-             d->m_itemsToBeSetAsCurrent << url;
--            d->m_dirModel->expandToUrl(url);
-+
-+            if (d->m_viewKind == KFile::DetailTree) {
-+                d->m_dirModel->expandToUrl(url);
-+            }
-+
-             continue;
-         }
-+
-         itemList << item;
-     }
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch b/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch
deleted file mode 100644
index 34a70a827e03..000000000000
--- a/kde-frameworks/kio/files/kio-5.85.0-allow-edit-icons-for-root-owned-desktop-files.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2187b62588b060bc27143dd326b5171aec930454 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 7 Aug 2021 19:38:43 +0000
-Subject: [PATCH] [kpropertiesdialog] Allow editing icons for root-owned
- desktop files
-
----
- src/widgets/kpropertiesdialog.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp
-index 76155338e..2288ccc08 100644
---- a/src/widgets/kpropertiesdialog.cpp
-+++ b/src/widgets/kpropertiesdialog.cpp
-@@ -1206,6 +1206,14 @@ KFilePropsPlugin::KFilePropsPlugin(KPropertiesDialog *_props)
- bool KFilePropsPlugin::enableIconButton() const
- {
-     const KFileItem item = properties->item();
-+
-+    // desktop files are special, files in /usr/share/applications can be
-+    // edited by overlaying them in .local/share/applications
-+    // https://bugs.kde.org/show_bug.cgi?id=429613
-+    if (item.isDesktopFile()) {
-+        return true;
-+    }
-+
-     // If the current item is a directory, check if it's writable,
-     // so we can create/update a .directory
-     // Current item is a file, same thing: check if it is writable
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch b/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch
deleted file mode 100644
index 1f4c7cf06157..000000000000
--- a/kde-frameworks/kio/files/kio-5.85.0-revert-to-pre-libblkid-parsing.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 221a94a66c4d2f6e4f2dc938ee8a63a6ca739477 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Wed, 20 Oct 2021 20:01:40 +0200
-Subject: [PATCH] KMountPoint: revert to parsing /dev/disk/by-{uuid,label}/
- manually
-
-Apparently libblkid is causing some performance issues when resolving
-UUID/LABEL tags from fstab when the device that has that UUID/LABEL isn't
-present.
-
-Parsing /dev/disk/by-* is more basic, since it's a simple check resolving
-some symlinks.
-
-Thanks to the users in the bug report for the investigative work, because
-personally I couldn't reproduce the problem on my machine no matter what I
-tried.
-
-BUG: 442106
-FIXED-IN: 5.88
----
- CMakeLists.txt                      |  3 +--
- src/core/CMakeLists.txt             |  5 ++---
- src/core/config-kmountpoint.h.cmake |  2 +-
- src/core/kmountpoint.cpp            | 18 ++++--------------
- 4 files changed, 8 insertions(+), 20 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ca374a4cb..f1bb1a59b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -130,8 +130,7 @@ set_package_properties(ACL PROPERTIES DESCRIPTION "LibACL"
- # Used by KMountPoint
- if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-     find_package(LibMount REQUIRED)
--    find_package(Blkid REQUIRED)
--    set(HAVE_LIBS_MOUNT_AND_BLKID ${LibMount_FOUND} AND ${Blkid_FOUND})
-+    set(HAVE_LIB_MOUNT ${LibMount_FOUND})
- endif()
- 
- if (ANDROID)
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index be19e9b62..67a1b1cf7 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -236,9 +236,8 @@ if(ACL_FOUND)
-   target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS})
- endif()
- 
--if(HAVE_LIBS_MOUNT_AND_BLKID)
--  # libmount links against blkid anyway
--  target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount Blkid::Blkid)
-+if(HAVE_LIB_MOUNT)
-+  target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount)
- endif()
- 
- # this should be done by cmake, see bug 371721
-diff --git a/src/core/config-kmountpoint.h.cmake b/src/core/config-kmountpoint.h.cmake
-index f824d4042..3673eb141 100644
---- a/src/core/config-kmountpoint.h.cmake
-+++ b/src/core/config-kmountpoint.h.cmake
-@@ -1,7 +1,7 @@
- #cmakedefine01 HAVE_GETMNTINFO
- #cmakedefine01 GETMNTINFO_USES_STATVFS
- 
--#cmakedefine01 HAVE_LIBS_MOUNT_AND_BLKID
-+#cmakedefine01 HAVE_LIB_MOUNT
- 
- #cmakedefine01 HAVE_SYS_MOUNT_H
- #cmakedefine01 HAVE_FSTAB_H
-diff --git a/src/core/kmountpoint.cpp b/src/core/kmountpoint.cpp
-index e2d32055c..f41cff5ee 100644
---- a/src/core/kmountpoint.cpp
-+++ b/src/core/kmountpoint.cpp
-@@ -44,7 +44,7 @@ static const Qt::CaseSensitivity cs = Qt::CaseSensitive;
- #endif
- 
- // Linux
--#if HAVE_LIBS_MOUNT_AND_BLKID
-+#if HAVE_LIB_MOUNT
- #include <libmount/libmount.h>
- #include <blkid/blkid.h>
- #endif
-@@ -176,7 +176,7 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded
- #ifdef Q_OS_WIN
-     result = KMountPoint::currentMountPoints(infoNeeded);
- 
--#elif HAVE_LIBS_MOUNT_AND_BLKID
-+#elif HAVE_LIB_MOUNT
-     if (struct libmnt_table *table = mnt_new_table()) {
-         // By default parses "/etc/fstab"
-         if (mnt_table_parse_fstab(table, nullptr) == 0) {
-@@ -202,23 +202,13 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded
-                 // or some network mount
-                 if (const char *source = mnt_fs_get_source(fs)) {
-                     mp->d->m_mountedFrom = QFile::decodeName(source);
--                    if (mp->d->m_mountedFrom.startsWith(QLatin1String("UUID")) || mp->d->m_mountedFrom.startsWith(QLatin1String("LABEL"))) {
--                        // Use blkid to resolve UUID/LABEL to the device file
--                        if (char *blkSource = blkid_evaluate_spec(source, nullptr)) {
--                            mp->d->m_mountedFrom = QFile::decodeName(blkSource);
--                            free(blkSource);
--                            if ((infoNeeded & KMountPoint::NeedRealDeviceName) //
--                                && mp->d->m_mountedFrom.startsWith(QLatin1String("/dev/"))) {
--                                mp->d->m_device = mp->d->m_mountedFrom;
--                            }
--                        }
--                    }
-                 }
- 
-                 if (infoNeeded & NeedMountOptions) {
-                     mp->d->m_mountOptions = QFile::decodeName(mnt_fs_get_options(fs)).split(QLatin1Char(','));
-                 }
- 
-+                mp->d->finalizePossibleMountPoint(infoNeeded);
-                 result.append(mp);
-             }
-             mnt_free_iter(itr);
-@@ -351,7 +341,7 @@ KMountPoint::List KMountPoint::currentMountPoints(DetailsNeededFlags infoNeeded)
-         }
-     }
- 
--#elif HAVE_LIBS_MOUNT_AND_BLKID
-+#elif HAVE_LIB_MOUNT
-     if (struct libmnt_table *table = mnt_new_table()) {
-         // By default, parses "/proc/self/mountinfo"
-         if (mnt_table_parse_mtab(table, nullptr) == 0) {
--- 
-GitLab
-
diff --git a/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch b/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch
new file mode 100644
index 000000000000..0d3bf2aeca3a
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.88.0-fix-KRun-open-URLs-twice.patch
@@ -0,0 +1,87 @@
+From 25f3a6937a80f2748790265b9b688d64126e43d0 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Tue, 30 Nov 2021 17:33:18 +0100
+Subject: [PATCH] Fix KRun::runApplication when xdg activation is involved
+
+Has waitForStarted account for xdg activation token request.
+
+BUG: 446272
+---
+ src/gui/kprocessrunner.cpp | 13 ++++++++++---
+ src/gui/kprocessrunner_p.h |  1 +
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/gui/kprocessrunner.cpp b/src/gui/kprocessrunner.cpp
+index 130dade75..82c959afe 100644
+--- a/src/gui/kprocessrunner.cpp
++++ b/src/gui/kprocessrunner.cpp
+@@ -32,6 +32,7 @@
+ #include <QProcess>
+ #include <QStandardPaths>
+ #include <QString>
++#include <QTimer>
+ #include <QUuid>
+ 
+ #ifdef Q_OS_WIN
+@@ -259,7 +260,6 @@ void KProcessRunner::init(const KService::Ptr &service,
+     Q_UNUSED(iconName);
+ #endif
+ 
+-    bool waitingForXdgToken = false;
+     if (KWindowSystem::isPlatformWayland()) {
+         if (!asn.isEmpty()) {
+             m_process->setEnv(QStringLiteral("XDG_ACTIVATION_TOKEN"), QString::fromUtf8(asn));
+@@ -274,7 +274,7 @@ void KProcessRunner::init(const KService::Ptr &service,
+                 }
+                 if (window) {
+                     const int launchedSerial = KWindowSystem::lastInputSerial(window);
+-                    waitingForXdgToken = true;
++                    m_waitingForXdgToken = true;
+                     connect(this, &KProcessRunner::xdgActivationTokenArrived, m_process.get(), [this] {
+                         startProcess();
+                     });
+@@ -285,6 +285,7 @@ void KProcessRunner::init(const KService::Ptr &service,
+                                 if (tokenSerial == launchedSerial) {
+                                     m_process->setEnv(QStringLiteral("XDG_ACTIVATION_TOKEN"), token);
+                                     Q_EMIT xdgActivationTokenArrived();
++                                    m_waitingForXdgToken = false;
+                                 }
+                             });
+                     KWindowSystem::requestXdgActivationToken(window, launchedSerial, QFileInfo(m_serviceEntryPath).completeBaseName());
+@@ -316,7 +317,7 @@ void KProcessRunner::init(const KService::Ptr &service,
+         m_description = userVisibleName;
+     }
+ 
+-    if (!waitingForXdgToken) {
++    if (!m_waitingForXdgToken) {
+         startProcess();
+     }
+ }
+@@ -331,6 +332,12 @@ void ForkingProcessRunner::startProcess()
+ 
+ bool ForkingProcessRunner::waitForStarted(int timeout)
+ {
++    if (m_process->state() == QProcess::NotRunning && m_waitingForXdgToken) {
++        QEventLoop loop;
++        QObject::connect(m_process.get(), &QProcess::stateChanged, &loop, &QEventLoop::quit);
++        QTimer::singleShot(timeout, &loop, &QEventLoop::quit);
++        loop.exec();
++    }
+     return m_process->waitForStarted(timeout);
+ }
+ 
+diff --git a/src/gui/kprocessrunner_p.h b/src/gui/kprocessrunner_p.h
+index 1f94df7a2..df6f08f64 100644
+--- a/src/gui/kprocessrunner_p.h
++++ b/src/gui/kprocessrunner_p.h
+@@ -140,6 +140,7 @@ protected:
+     qint64 m_pid = 0;
+     KService::Ptr m_service;
+     QString m_serviceEntryPath;
++    bool m_waitingForXdgToken = false;
+ 
+ private:
+     void emitDelayedError(const QString &errorMsg);
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.85.0-r2.ebuild b/kde-frameworks/kio/kio-5.85.0-r2.ebuild
deleted file mode 100644
index 8eb655b88799..000000000000
--- a/kde-frameworks/kio/kio-5.85.0-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~riscv 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=(
-	"${FILESDIR}"/${P}-KDirOperator-exp-to-url-only-in-detail-treeview.patch # KDE-bug 440475
-	"${FILESDIR}"/${P}-allow-edit-icons-for-root-owned-desktop-files.patch # KDE-bug 429613
-	"${FILESDIR}"/${P}-revert-to-pre-libblkid-parsing.patch # bug 821103, KDE-bug 442106
-)
-
-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)
-		$(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
-}
diff --git a/kde-frameworks/kio/kio-5.85.0-r1.ebuild b/kde-frameworks/kio/kio-5.88.0-r2.ebuild
index 92287327bcd9..d262628dccb5 100644
--- a/kde-frameworks/kio/kio-5.85.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.88.0-r2.ebuild
@@ -50,7 +50,6 @@ 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
@@ -72,8 +71,8 @@ DEPEND="${RDEPEND}
 PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-KDirOperator-exp-to-url-only-in-detail-treeview.patch # KDE-bug 440475
-	"${FILESDIR}"/${P}-allow-edit-icons-for-root-owned-desktop-files.patch # KDE-bug 429613
+	"${FILESDIR}"/${P}-fix-copy-between-filesystems.patch
+	"${FILESDIR}"/${P}-fix-KRun-open-URLs-twice.patch # KDE-bug 446272
 )
 
 src_configure() {
diff --git a/kde-frameworks/kio/kio-5.88.0-r1.ebuild b/kde-frameworks/kio/kio-5.89.0-r1.ebuild
index dcc6a8a9819b..738784f54c91 100644
--- a/kde-frameworks/kio/kio-5.88.0-r1.ebuild
+++ b/kde-frameworks/kio/kio-5.89.0-r1.ebuild
@@ -70,8 +70,6 @@ DEPEND="${RDEPEND}
 "
 PDEPEND=">=kde-frameworks/kded-${PVCUT}:5"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-copy-between-filesystems.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		-DKIO_NO_PUBLIC_QTCONCURRENT=ON