gentoo resync : 25.11.2020

46 files changed, 551 insertions, 664 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 1337517d34d5..566ac995c7b7 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index cf1b9d57f7e6..6e629f37133e 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,5 +1,13 @@
-DIST kdeconnect-kde-20.04.3.tar.xz 431092 BLAKE2B 8da7439f6d3ef17c1a80b6a47411200e5bb2e622c9072b386cb2aaf6730fde80a6c6d8564aaaad42ad97f471259e651ccc9e78d5067619e7f150b61aecec645b SHA512 148526e1c216725fa92b96682ea2a78f4bbb94d56066bc545fee875b321eda2b41f75f840366d1a69e74ea3e40832ac70dce912226427df019fed4387c68ec43
-DIST kdeconnect-kde-20.08.1.tar.xz 407996 BLAKE2B c0f9975146aa459caefe34a8adb315390669d27739ac82d5b0b06a9f7721cac32aece91c54aea961210f4f66ac061550b1e71927b35f65bab56a7fb1fcf5b16b SHA512 c6322b1a77323a814f9a501d871f03c70530f9ba63dcede4228005f528da577078c1fc56760ee4181e0cc90ffa97ced59451c6d2546e3c9424afa21ff2d76f8c
-EBUILD kdeconnect-20.04.3.ebuild 2263 BLAKE2B 6eaba05230ff5b09361b54ddb6944d8c9e9f673804bc8fe9eb6317372718c29b6538130ac42208bcc13aebd7d496576f724074fc0f2bd2363384e76683f2d7b4 SHA512 8ea2e0d5fcaef53abb88643ea356bb1dbe7d7e17db868ae3051b5d4c5f44c1eb29d13b493dd2075dd3399de97b150683d73b5cbe3186da6f6b894572d668d15c
-EBUILD kdeconnect-20.08.1.ebuild 2294 BLAKE2B 37700d854800c2f1416edfd9d8a23820072f2ab46e83099cbe63bd7aef874b50160610c87e63b9787a5f272d1230617cc59bd62d7706c8bb093e0da27ae0d444 SHA512 6199096c2e72d9a4e043ece94e325e19afd68da06b74e459ff21289670adb4b5c9273a75d1ce6bc8da03c72733b0d635af659a89be58664dbc2b47f690bd2999
+AUX kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch 2893 BLAKE2B 2e0fcf55ccef118b95d3ec93dbdbe11a41922998b796b5114258c7f245aee5758fcd7cf6e8f5be58e0576f204c906ea9929e81ff5546cd5d9f95ffea83575275 SHA512 9625217ce5a654104170ced8cf87efe14d553f281b9bd3850b2a3071b04d4e6f3e09cc8f4841388fb557931c80475b6f1c11863af1da7b526556fe3ab3c6259d
+AUX kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch 1096 BLAKE2B 21a4b7b4ea36617fa3f2fb566446e56c4276c77b4cc07ccc0e097555ae23c560fd9709034ef9153d680ab2d58f848143657d1575d80db1a4803302d494a9850c SHA512 c1f901f11f33fdbdca968e52ec3a79b59eb8f4757ffba2b23883161fe41a45e8f6cddd821e1a910d80605b92a0b9953cde8fe60261f39f0fb28d2afd4d611210
+AUX kdeconnect-20.04.3-03-Fix-use-after-free-in-LanLinkProvider-connectError.patch 1121 BLAKE2B 902cbb2db6d5baf340e2f49531d75fb4ca6d368e1efcc4da5dfc8a17fb825b390af74ee4574b134d216db67cc0a0fcfcbbc02a63c58f74656020dc6f3068288c SHA512 282053314df245cf9fd00315b59448a7d7a1a1c73f8badeb98daafc7d56e17b6755128183a516e5d1c93deae83c7c756b1ca9e485f6a1c474a556d68c5a64942
+AUX kdeconnect-20.04.3-04-Limit-identity-packets-to-8KiB.patch 1537 BLAKE2B cc0642738e4a262572b63f417511cf5296488e83b5b82189a6d268a360603d51970ac8cfade5c28cf00294c5675bb8f1b375aaba51b12024790723b0d6ecd771 SHA512 6db188aeb96ce93d92ad0f11fe8809a0fb32363a84612824efe21228547c45f6b38e3dae834ba8f55a14e4cba1df004915dcf26108cca211ee5a008f17562e41
+AUX kdeconnect-20.04.3-05-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch 1372 BLAKE2B d806766634088fbc26963223132c8c2b12cb690520e69c98470b87b5d9f94c896d243e19561fdbff1a92164cc071570cc5ff7ad0127693e6738b854a99b03f49 SHA512 c19cd4aff831b5918d6bbc5e23d5cbd845dfd9bfbd6515e3f7c9ba65e590bae1a643d9e784b1a9bbeed74b04b0d4aead7415a4bf7c1842918bce08560c06687c
+AUX kdeconnect-20.04.3-06-Don-t-brute-force-reading-the-socket.patch 3199 BLAKE2B 0bc6f9a430e90801a4930975a460cbdc7ead387c6ba24ab62147c47e7ba49986effed1a5da9f8125fed5e33403eafe12c1068127d3ec340a14ae4e45778f873a SHA512 8cf8ffe0df864a82976c51e95c9806109e3c66d792ce31016515ac1132674cf97be71d70ea9efb29892ec1624fab6fcac553e1e64c7950a3b0bbdb7d8e79bbea
+AUX kdeconnect-20.04.3-07-Limit-number-of-connected-sockets-from-unpaired-devi.patch 1836 BLAKE2B 9886ba5833626546308d6f1b4fa4bbc7455628d1737a7126f8be40d652275249b2949028e93177ab994bfed102ff835c7f8882b2e9d85f186efd3232efeae90f SHA512 6feb3f96f8f6bb70d383ae66134b2773ea7b4b5275ce16b92974365b4d3bf29d5fe7db6fdd6c60d777a2cf3feac5dc7e989e562e5cd62a6d50c98d2b030f1c32
+AUX kdeconnect-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.patch 2107 BLAKE2B 902059f4b1d40f3d221e024ec0fb86e8664f918ed3cb1236b9b3d98173ed3a7387301965ee0f2925ea304d77a268f2b2c29c89463b1b5e2aed52f7871a324c3a SHA512 54d0686e6af67a3c075bcb844b4f80941a9eb69f180c996f17c3ab57437b03a91b33b3d91966a06159ced16fc4b7a07711e100d698f73a0f855c3195af83471c
+AUX kdeconnect-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch 1197 BLAKE2B 4cf50f0d883b194c92f16961df4d7158e19644c8f6756afa27bbfe8438da0ae44fe96d29184060c242ffc0870536d35b9871f4dbde042a2fe176abb8cf0a2180 SHA512 ff3b227bd15612201a0510a5ea0f330372e712b05b170b34d671b68e7ac3d1f561a65fcc1ea55d239bc64065186b70a17530061ddfadf6ce4f0a13a9a8d100e9
+AUX kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch 2261 BLAKE2B 531b3a81f9ed7c50794191140bd510f0ee5968c4deb67056f0f37649f19caa96fc0a2cfd9bd29086b6c9c59cd591d41a2db52627c5006deef41dd74f86b36ed6 SHA512 20e856aba62f5528b6772d8693c435ef7070065377d5dbee9e695a11f6d782082fdcc8b5d40804137a93db4f12f16a41a2b8af4212179cd1a0f43e1f30e71453
+DIST kdeconnect-kde-20.08.3.tar.xz 420232 BLAKE2B 2044c121ea769f915fd7026201ec038961720df379096d4a93917b76ac0baccf0a3e8e864bd9da8536b4efc930ba05d1c1d209352c68ed3917fbe8a1747086e6 SHA512 89b5af789b6db58a7f2ae3436f0a212d72b7ba2511fc62cb8cd90d4291939e70bd3922256f17a6a01d2e6952f0c03912c2793728c8c18fedba608ef02bd9c9c3
+EBUILD kdeconnect-20.08.3.ebuild 2262 BLAKE2B 03b72bc5aaca68e4670793927c11ce195549f702e045c7aeab088dd9462ee6099b80ac30f15bfa9ed1246a756ef90c7c532ffff22cad673a20455e6dc9f5470e SHA512 b025519dcb7beb30bce5f398f42d08aa849d26cd065c50c1e6625f8c53edf09c5575f8349cbba2d079d0db95058e6f53151a2777f3add09a1d4be9de0a3d6c1d
 MISC metadata.xml 577 BLAKE2B 4a7b31db0d4e48ab09de42119a36b7733603d2b3f85f7cbf36b61713f2f87488f4fe1223d2dc2ef7460b41525eb59fe5e43196df54f8f454241e56518ad73855 SHA512 faf6e262a0f0d020bbaf4372c8f5c308de1fae0cee4f37cdf9509b585ead0706ba06109f27e691cbd0ebceadb7c352b0d335dc29e87baee13ac3dda5eca11a5c
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
new file mode 100644
index 000000000000..cafeb9501cd8
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-01-Do-not-ignore-SSL-errors-except-for-self-signed-cert.patch
@@ -0,0 +1,65 @@
+From f183b5447bad47655c21af87214579f03bf3a163 Mon Sep 17 00:00:00 2001
+From: Albert Vaca Cintora <albertvaka@gmail.com>
+Date: Thu, 24 Sep 2020 16:59:22 +0200
+Subject: [PATCH 01/10] Do not ignore SSL errors, except for self-signed cert
+ errors.
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/backends/lan/lanlinkprovider.cpp | 24 +++++++++++++-----------
+ 1 file changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
+index d9a7d8fa..fc005cee 100644
+--- a/core/backends/lan/lanlinkprovider.cpp
++++ b/core/backends/lan/lanlinkprovider.cpp
+@@ -297,9 +297,7 @@ void LanLinkProvider::tcpSocketConnected()
+ 
+             connect(socket, &QSslSocket::encrypted, this, &LanLinkProvider::encrypted);
+ 
+-            if (isDeviceTrusted) {
+-                connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &LanLinkProvider::sslErrors);
+-            }
++            connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &LanLinkProvider::sslErrors);
+ 
+             socket->startServerEncryption();
+ 
+@@ -326,8 +324,6 @@ void LanLinkProvider::encrypted()
+ 
+     QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
+     if (!socket) return;
+-    // TODO delete me?
+-    disconnect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &LanLinkProvider::sslErrors);
+ 
+     Q_ASSERT(socket->mode() != QSslSocket::UnencryptedMode);
+     LanDeviceLink::ConnectionStarted connectionOrigin = (socket->mode() == QSslSocket::SslClientMode)? LanDeviceLink::Locally : LanDeviceLink::Remotely;
+@@ -346,14 +342,20 @@ void LanLinkProvider::sslErrors(const QList<QSslError>& errors)
+     QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
+     if (!socket) return;
+ 
+-    qCDebug(KDECONNECT_CORE) << "Failing due to " << errors;
+-    Device* device = Daemon::instance()->getDevice(socket->peerVerifyName());
+-    if (device) {
+-        device->unpair();
++    bool fatal = false;
++    for (const QSslError& error : errors) {
++        if (error.error() != QSslError::SelfSignedCertificate) {
++            qCCritical(KDECONNECT_CORE) << "Disconnecting due to fatal SSL Error: " << error;
++            fatal = true;
++        } else {
++            qCDebug(KDECONNECT_CORE) << "Ignoring self-signed cert error";
++        }
+     }
+ 
+-    delete m_receivedIdentityPackets.take(socket).np;
+-    // Socket disconnects itself on ssl error and will be deleted by deleteLater slot, no need to delete manually
++    if (fatal) {
++        socket->disconnectFromHost();
++        delete m_receivedIdentityPackets.take(socket).np;
++    }
+ }
+ 
+ //I'm the new device and this is the answer to my UDP identity packet (no data received yet). They are connecting to us through TCP, and they should send an identity.
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch
new file mode 100644
index 000000000000..b374d001036c
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-02-Do-not-leak-the-local-user-in-the-device-name.patch
@@ -0,0 +1,32 @@
+From b279c52101d3f7cc30a26086d58de0b5f1c547fa Mon Sep 17 00:00:00 2001
+From: Albert Vaca Cintora <albertvaka@gmail.com>
+Date: Thu, 24 Sep 2020 17:01:03 +0200
+Subject: [PATCH 02/10] Do not leak the local user in the device name.
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/kdeconnectconfig.cpp | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/core/kdeconnectconfig.cpp b/core/kdeconnectconfig.cpp
+index 91719303..a8dbcf5c 100644
+--- a/core/kdeconnectconfig.cpp
++++ b/core/kdeconnectconfig.cpp
+@@ -90,13 +90,7 @@ KdeConnectConfig::KdeConnectConfig()
+ 
+ QString KdeConnectConfig::name()
+ {
+-    QString username;
+-    #ifdef Q_OS_WIN
+-        username = QString::fromLatin1(qgetenv("USERNAME"));
+-    #else
+-        username = QString::fromLatin1(qgetenv("USER"));
+-    #endif
+-    QString defaultName = username + QStringLiteral("@") + QHostInfo::localHostName();
++    QString defaultName = QHostInfo::localHostName();
+     QString name = d->m_config->value(QStringLiteral("name"), defaultName).toString();
+     return name;
+ }
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-03-Fix-use-after-free-in-LanLinkProvider-connectError.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-03-Fix-use-after-free-in-LanLinkProvider-connectError.patch
new file mode 100644
index 000000000000..52fb9057b930
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-03-Fix-use-after-free-in-LanLinkProvider-connectError.patch
@@ -0,0 +1,28 @@
+From d35b88c1b25fe13715f9170f18674d476ca9acdc Mon Sep 17 00:00:00 2001
+From: Matthias Gerstner <mgerstner@suse.de>
+Date: Thu, 24 Sep 2020 17:03:06 +0200
+Subject: [PATCH 03/10] Fix use after free in LanLinkProvider::connectError()
+
+If QSslSocket::connectToHost() hasn't finished running.
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/backends/lan/lanlinkprovider.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
+index fc005cee..235c221f 100644
+--- a/core/backends/lan/lanlinkprovider.cpp
++++ b/core/backends/lan/lanlinkprovider.cpp
+@@ -252,7 +252,7 @@ void LanLinkProvider::connectError(QAbstractSocket::SocketError socketError)
+     //The socket we created didn't work, and we didn't manage
+     //to create a LanDeviceLink from it, deleting everything.
+     delete m_receivedIdentityPackets.take(socket).np;
+-    delete socket;
++    socket->deleteLater();
+ }
+ 
+ //We received a UDP packet and answered by connecting to them by TCP. This gets called on a successful connection.
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-04-Limit-identity-packets-to-8KiB.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-04-Limit-identity-packets-to-8KiB.patch
new file mode 100644
index 000000000000..e083f5896def
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-04-Limit-identity-packets-to-8KiB.patch
@@ -0,0 +1,36 @@
+From b496e66899e5bc9547b6537a7f44ab44dd0aaf38 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 16 Sep 2020 02:28:58 +0200
+Subject: [PATCH 04/10] Limit identity packets to 8KiB
+
+Healthy identity packages shouldn't be that big and we don't want to
+allow systems around us to send us ever humongous packages that will
+just leave us without any memory.
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/backends/lan/lanlinkprovider.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
+index 235c221f..1fd3870e 100644
+--- a/core/backends/lan/lanlinkprovider.cpp
++++ b/core/backends/lan/lanlinkprovider.cpp
+@@ -381,6 +381,14 @@ void LanLinkProvider::newConnection()
+ void LanLinkProvider::dataReceived()
+ {
+     QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
++    //the size here is arbitrary and is now at 8192 bytes. It needs to be considerably long as it includes the capabilities but there needs to be a limit
++    //Tested between my systems and I get around 2000 per identity package.
++    if (socket->bytesAvailable() > 8192) {
++        qCWarning(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Suspiciously long identity package received. Closing connection." << socket->peerAddress() << socket->bytesAvailable();
++        socket->disconnectFromHost();
++        return;
++    }
++
+ #if QT_VERSION < QT_VERSION_CHECK(5,7,0)
+     if (!socket->canReadLine())
+         return;
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-05-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-05-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch
new file mode 100644
index 000000000000..1465ce48b989
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-05-Do-not-let-lanlink-connections-stay-open-for-long-wi.patch
@@ -0,0 +1,37 @@
+From 5310eae85dbdf92fba30375238a2481f2e34943e Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 16 Sep 2020 02:44:38 +0200
+Subject: [PATCH 05/10] Do not let lanlink connections stay open for long
+ without authenticating
+
+If there's no information received, close the socket to try again.
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/backends/lan/lanlinkprovider.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
+index 1fd3870e..a4942c65 100644
+--- a/core/backends/lan/lanlinkprovider.cpp
++++ b/core/backends/lan/lanlinkprovider.cpp
+@@ -374,6 +374,16 @@ void LanLinkProvider::newConnection()
+         connect(socket, &QIODevice::readyRead,
+                 this, &LanLinkProvider::dataReceived);
+ 
++        QTimer* timer = new QTimer(socket);
++        timer->setSingleShot(true);
++        timer->setInterval(1000);
++        connect(socket, &QSslSocket::encrypted,
++                timer, &QObject::deleteLater);
++        connect(timer, &QTimer::timeout, socket, [socket] {
++            qCWarning(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Host timed out without sending any identity." << socket->peerAddress();
++            socket->disconnectFromHost();
++        });
++        timer->start();
+     }
+ }
+ 
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-06-Don-t-brute-force-reading-the-socket.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-06-Don-t-brute-force-reading-the-socket.patch
new file mode 100644
index 000000000000..7bb674a8e8f2
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-06-Don-t-brute-force-reading-the-socket.patch
@@ -0,0 +1,102 @@
+From 721ba9faafb79aac73973410ee1dd3624ded97a5 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 16 Sep 2020 02:27:13 +0200
+Subject: [PATCH 06/10] Don't brute-force reading the socket
+
+The package will arrive eventually, and dataReceived will be emitted.
+Otherwise we just end up calling dataReceived to no end.
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/backends/lan/socketlinereader.cpp |  8 -------
+ tests/testsocketlinereader.cpp         | 31 ++++++++++++++++++++++++--
+ 2 files changed, 29 insertions(+), 10 deletions(-)
+
+diff --git a/core/backends/lan/socketlinereader.cpp b/core/backends/lan/socketlinereader.cpp
+index f67fdf3f..da77052a 100644
+--- a/core/backends/lan/socketlinereader.cpp
++++ b/core/backends/lan/socketlinereader.cpp
+@@ -38,14 +38,6 @@ void SocketLineReader::dataReceived()
+         }
+     }
+ 
+-    //If we still have things to read from the socket, call dataReceived again
+-    //We do this manually because we do not trust readyRead to be emitted again
+-    //So we call this method again just in case.
+-    if (m_socket->bytesAvailable() > 0) {
+-        QMetaObject::invokeMethod(this, "dataReceived", Qt::QueuedConnection);
+-        return;
+-    }
+-
+     //If we have any packets, tell it to the world.
+     if (!m_packets.isEmpty()) {
+         Q_EMIT readyRead();
+diff --git a/tests/testsocketlinereader.cpp b/tests/testsocketlinereader.cpp
+index 75584556..b6425b03 100644
+--- a/tests/testsocketlinereader.cpp
++++ b/tests/testsocketlinereader.cpp
+@@ -25,16 +25,19 @@
+ #include <QProcess>
+ #include <QEventLoop>
+ #include <QTimer>
++#include <QSignalSpy>
+ 
+ class TestSocketLineReader : public QObject
+ {
+     Q_OBJECT
+ public Q_SLOTS:
+-    void initTestCase();
++    void init();
++    void cleanup() { delete m_server; }
+     void newPacket();
+ 
+ private Q_SLOTS:
+     void socketLineReader();
++    void badData();
+ 
+ private:
+     QTimer m_timer;
+@@ -45,8 +48,9 @@ private:
+     SocketLineReader* m_reader;
+ };
+ 
+-void TestSocketLineReader::initTestCase()
++void TestSocketLineReader::init()
+ {
++    m_packets.clear();
+     m_server = new Server(this);
+ 
+     QVERIFY2(m_server->listen(QHostAddress::LocalHost, 8694), "Failed to create local tcp server");
+@@ -97,6 +101,29 @@ void TestSocketLineReader::socketLineReader()
+     }
+ }
+ 
++void TestSocketLineReader::badData()
++{
++    const QList<QByteArray> dataToSend = { "data1\n", "data" }; //does not end in a \n
++    for (const QByteArray& line : qAsConst(dataToSend)) {
++        m_conn->write(line);
++    }
++    m_conn->flush();
++
++    QSignalSpy spy(m_server, &QTcpServer::newConnection);
++    QVERIFY(m_server->hasPendingConnections() || spy.wait(1000));
++    QSslSocket* sock = m_server->nextPendingConnection();
++
++    QVERIFY2(sock != nullptr, "Could not open a connection to the client");
++
++    m_reader = new SocketLineReader(sock, this);
++    connect(m_reader, &SocketLineReader::readyRead, this, &TestSocketLineReader::newPacket);
++    m_timer.start();
++    m_loop.exec();
++
++    QCOMPARE(m_packets.count(), 1);
++    QCOMPARE(m_packets[0], dataToSend[0]);
++}
++
+ void TestSocketLineReader::newPacket()
+ {
+     if (!m_reader->bytesAvailable()) {
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-07-Limit-number-of-connected-sockets-from-unpaired-devi.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-07-Limit-number-of-connected-sockets-from-unpaired-devi.patch
new file mode 100644
index 000000000000..6a6bdb01cb96
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-07-Limit-number-of-connected-sockets-from-unpaired-devi.patch
@@ -0,0 +1,42 @@
+From ae58b9dec49c809b85b5404cee17946116f8a706 Mon Sep 17 00:00:00 2001
+From: Albert Vaca Cintora <albertvaka@gmail.com>
+Date: Thu, 24 Sep 2020 17:13:34 +0200
+Subject: [PATCH 07/10] Limit number of connected sockets from unpaired devices
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/backends/lan/lanlinkprovider.cpp | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
+index a4942c65..770e7866 100644
+--- a/core/backends/lan/lanlinkprovider.cpp
++++ b/core/backends/lan/lanlinkprovider.cpp
+@@ -46,6 +46,8 @@
+ 
+ #define MIN_VERSION_WITH_SSL_SUPPORT 6
+ 
++static const int MAX_UNPAIRED_CONNECTIONS = 42;
++
+ LanLinkProvider::LanLinkProvider(
+         bool testMode,
+         quint16 udpBroadcastPort,
+@@ -555,6 +557,15 @@ void LanLinkProvider::addLink(const QString& deviceId, QSslSocket* socket, Netwo
+         deviceLink->reset(socket, connectionOrigin);
+     } else {
+         deviceLink = new LanDeviceLink(deviceId, this, socket, connectionOrigin);
++        // Socket disconnection will now be handled by LanDeviceLink
++        disconnect(socket, &QAbstractSocket::disconnected, socket, &QObject::deleteLater);
++        bool isDeviceTrusted = KdeConnectConfig::instance().trustedDevices().contains(deviceId);
++        if (!isDeviceTrusted && m_links.size() > MAX_UNPAIRED_CONNECTIONS) {
++            qCWarning(KDECONNECT_CORE) << "Too many unpaired devices to remember them all. Ignoring " << deviceId;
++            socket->disconnectFromHost();
++            socket->deleteLater();
++            return;
++        }
+         connect(deviceLink, &QObject::destroyed, this, &LanLinkProvider::deviceLinkDestroyed);
+         m_links[deviceId] = deviceLink;
+         if (m_pairingHandlers.contains(deviceId)) {
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.patch
new file mode 100644
index 000000000000..36d612e9cbc1
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-08-Do-not-remember-more-than-a-few-identity-packets-at-.patch
@@ -0,0 +1,54 @@
+From 66c768aa9e7fba30b119c8b801efd49ed1270b0a Mon Sep 17 00:00:00 2001
+From: Albert Vaca Cintora <albertvaka@gmail.com>
+Date: Thu, 24 Sep 2020 17:16:02 +0200
+Subject: [PATCH 08/10] Do not remember more than a few identity packets at a
+ time
+
+To prevent the kdeconnect process from using too much memory.
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/backends/lan/lanlinkprovider.cpp | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
+index 770e7866..6afb8552 100644
+--- a/core/backends/lan/lanlinkprovider.cpp
++++ b/core/backends/lan/lanlinkprovider.cpp
+@@ -47,6 +47,7 @@
+ #define MIN_VERSION_WITH_SSL_SUPPORT 6
+ 
+ static const int MAX_UNPAIRED_CONNECTIONS = 42;
++static const int MAX_REMEMBERED_IDENTITY_PACKETS = 42;
+ 
+ LanLinkProvider::LanLinkProvider(
+         bool testMode,
+@@ -225,6 +226,12 @@ void LanLinkProvider::udpBroadcastReceived()
+ 
+         //qCDebug(KDECONNECT_CORE) << "Received Udp identity packet from" << sender << " asking for a tcp connection on port " << tcpPort;
+ 
++        if (m_receivedIdentityPackets.size() > MAX_REMEMBERED_IDENTITY_PACKETS) {
++            qCWarning(KDECONNECT_CORE) << "Too many remembered identities, ignoring" << receivedPacket->get<QString>(QStringLiteral("deviceId")) << "received via UDP";
++            delete receivedPacket;
++            continue;
++        }
++
+         QSslSocket* socket = new QSslSocket(this);
+         socket->setProxy(QNetworkProxy::NoProxy);
+         m_receivedIdentityPackets[socket].np = receivedPacket;
+@@ -435,6 +442,12 @@ void LanLinkProvider::dataReceived()
+         return;
+     }
+ 
++    if (m_receivedIdentityPackets.size() > MAX_REMEMBERED_IDENTITY_PACKETS) {
++        qCWarning(KDECONNECT_CORE) << "Too many remembered identities, ignoring" << np->get<QString>(QStringLiteral("deviceId")) << "received via TCP";
++        delete np;
++        return;
++    }
++
+     // Needed in "encrypted" if ssl is used, similar to "tcpSocketConnected"
+     m_receivedIdentityPackets[socket].np = np;
+ 
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch
new file mode 100644
index 000000000000..c108144632ca
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-09-Limit-the-ports-we-try-to-connect-to-to-the-port-ran.patch
@@ -0,0 +1,32 @@
+From 85b691e40f525e22ca5cc4ebe79c361d71d7dc05 Mon Sep 17 00:00:00 2001
+From: Albert Vaca Cintora <albertvaka@gmail.com>
+Date: Thu, 24 Sep 2020 17:18:06 +0200
+Subject: [PATCH 09/10] Limit the ports we try to connect to to the port range
+ of KDE Connect
+
+So we can't trigger connections to other services.
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/backends/lan/lanlinkprovider.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
+index 6afb8552..f3d6801d 100644
+--- a/core/backends/lan/lanlinkprovider.cpp
++++ b/core/backends/lan/lanlinkprovider.cpp
+@@ -223,6 +223,11 @@ void LanLinkProvider::udpBroadcastReceived()
+         }
+ 
+         int tcpPort = receivedPacket->get<int>(QStringLiteral("tcpPort"));
++        if (tcpPort < MIN_TCP_PORT || tcpPort > MAX_TCP_PORT) {
++            qCDebug(KDECONNECT_CORE) << "TCP port outside of kdeconnect's range";
++            delete receivedPacket;
++            continue;
++        }
+ 
+         //qCDebug(KDECONNECT_CORE) << "Received Udp identity packet from" << sender << " asking for a tcp connection on port " << tcpPort;
+ 
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/files/kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch
new file mode 100644
index 000000000000..d10f0193dacc
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-20.04.3-10-Do-not-replace-connections-for-a-given-deviceId-if-t.patch
@@ -0,0 +1,58 @@
+From 48180b46552d40729a36b7431e97bbe2b5379306 Mon Sep 17 00:00:00 2001
+From: Albert Vaca Cintora <albertvaka@gmail.com>
+Date: Thu, 24 Sep 2020 18:46:57 +0200
+Subject: [PATCH 10/10] Do not replace connections for a given deviceId if the
+ certs have changed
+
+Thanks Matthias Gerstner <mgerstner@suse.de> for reporting this.
+---
+ core/backends/lan/landevicelink.cpp   | 5 +++++
+ core/backends/lan/landevicelink.h     | 1 +
+ core/backends/lan/lanlinkprovider.cpp | 6 ++++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/core/backends/lan/landevicelink.cpp b/core/backends/lan/landevicelink.cpp
+index 8a65fb92..41af6f0e 100644
+--- a/core/backends/lan/landevicelink.cpp
++++ b/core/backends/lan/landevicelink.cpp
+@@ -192,3 +192,8 @@ bool LanDeviceLink::linkShouldBeKeptAlive() {
+     //return (mConnectionSource == ConnectionStarted::Remotely || pairStatus() == Paired);
+ 
+ }
++
++QSslCertificate LanDeviceLink::certificate() const
++{
++    return m_socketLineReader->peerCertificate();
++}
+diff --git a/core/backends/lan/landevicelink.h b/core/backends/lan/landevicelink.h
+index 28f63db2..485c58b5 100644
+--- a/core/backends/lan/landevicelink.h
++++ b/core/backends/lan/landevicelink.h
+@@ -56,6 +56,7 @@ public:
+     bool linkShouldBeKeptAlive() override;
+ 
+     QHostAddress hostAddress() const;
++    QSslCertificate certificate() const;
+ 
+ private Q_SLOTS:
+     void dataReceived();
+diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
+index f3d6801d..372cdc8f 100644
+--- a/core/backends/lan/lanlinkprovider.cpp
++++ b/core/backends/lan/lanlinkprovider.cpp
+@@ -345,6 +345,12 @@ void LanLinkProvider::encrypted()
+     NetworkPacket* receivedPacket = m_receivedIdentityPackets[socket].np;
+     const QString& deviceId = receivedPacket->get<QString>(QStringLiteral("deviceId"));
+ 
++    if (m_links.contains(deviceId) && m_links[deviceId]->certificate() != socket->peerCertificate()) {
++        socket->disconnectFromHost();
++        qCWarning(KDECONNECT_CORE) << "Got connection for the same deviceId but certificates don't match. Ignoring " << deviceId;
++        return;
++    }
++
+     addLink(deviceId, socket, receivedPacket, connectionOrigin);
+ 
+     // Copied from tcpSocketConnected slot, now delete received packet
+-- 
+2.28.0
+
diff --git a/kde-misc/kdeconnect/kdeconnect-20.04.3.ebuild b/kde-misc/kdeconnect/kdeconnect-20.04.3.ebuild
deleted file mode 100644
index f6ae548b6c75..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-20.04.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KDE_ORG_NAME="${PN}-kde"
-KDE_RELEASE_SERVICE="true"
-KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://kdeconnect.kde.org/
-https://kde.org/applications/internet/org.kde.kdeconnect.kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="bluetooth pulseaudio wayland X"
-
-DEPEND="
-	>=app-crypt/qca-2.1.0:2[qt5(+),ssl]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	bluetooth? ( >=dev-qt/qtbluetooth-${QTMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libfakekey
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	pulseaudio? ( media-libs/pulseaudio-qt )
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	dev-libs/kpeoplevcard
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	net-fs/sshfs
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBLUETOOTH_ENABLED=$(usex bluetooth)
-		$(cmake_use_find_package pulseaudio KF5PulseAudioQt)
-		$(cmake_use_find_package wayland KF5Wayland)
-		$(cmake_use_find_package X LibFakeKey)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst(){
-	ecm_pkg_postinst
-
-	elog "The Android .apk file is available via"
-	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
-	elog "or via"
-	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
-}
diff --git a/kde-misc/kdeconnect/kdeconnect-20.08.1.ebuild b/kde-misc/kdeconnect/kdeconnect-20.08.3.ebuild
index be85ee3bf6af..f2e7774d075d 100644
--- a/kde-misc/kdeconnect/kdeconnect-20.08.1.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-20.08.3.ebuild
@@ -8,17 +8,17 @@ ECM_TEST="true"
 KDE_ORG_NAME="${PN}-kde"
 KDE_RELEASE_SERVICE="true"
 KDE_SELINUX_MODULE="${PN}"
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
 HOMEPAGE="https://kdeconnect.kde.org/
-https://kde.org/applications/internet/org.kde.kdeconnect.kcm"
+https://apps.kde.org/en/kdeconnect.kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="bluetooth pulseaudio wayland X"
 
 DEPEND="
@@ -81,5 +81,5 @@ pkg_postinst(){
 	elog "The Android .apk file is available via"
 	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
 	elog "or via"
-	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
+	elog "https://f-droid.org/packages/org.kde.kdeconnect_tp/"
 }
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index e350d2fae1e0..d5ee3b56dbfd 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,6 +1,4 @@
 AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
-DIST kdiff3-1.8.3.tar.xz 1038904 BLAKE2B 43fccb146a2220661d5f7e1e836de06b00afe54b9bccbd37b76eaf1dc660eb81dae781b08071f581c5a3bd123b7b829c4339b72348c65829c4f977a61771e69e SHA512 5cadd1cfe7e85a1dfb81c4f1cb685f988b0155b581ffa38653d4df30172b6a1ee4ed4269869285b5add3ca163eae88645d702e6fc84380229ac09ea14dd20a4d
 DIST kdiff3-1.8.4.tar.xz 1040492 BLAKE2B 4598a5db318821af085c19983f17260969220bf7352fc961b8e49237c6818b5f723cebac8190ceb591f2cd3ad54b52b9f7bb91be91ce90c399ad959398e64f1e SHA512 100632f7656e53f567faec8efea1aba132916e7b6c9569b2bacb7da1081f1dd126e27825663fb860f3d40cb205cf3c1817dd28ea560b9e650b5002e3d89dd9d8
-EBUILD kdiff3-1.8.3-r1.ebuild 1078 BLAKE2B fefd53a09e26ab9c0c699ad7f939ba456d55e2497220159a6c3b06497d79f1c8e2de6f3c00e7aabf85fdc861af7bc1ff709b81d9ffa71ea84745b5bc7b3ed258 SHA512 59142b7b8b835121f61c7013f8f678bea635e03440041abdfe11da3d9fe6d62c6acee158f05197dc92c9ca45362035f4a5a504acfb664319d6060c994963da5e
-EBUILD kdiff3-1.8.4.ebuild 1087 BLAKE2B c861e9db380c87f51b688c9bb3d4b1b1bc485383d15c95f3f163c0c3f902af6d916ef593f91984a76ce2c04df8cc385a110eb8fb7474fade014902b366e99909 SHA512 94ebe581ee9e52a0b49f580665cecedffac4008fabb7d481ef8f0d9edd4091cc243de0f6b900918b08279851ebb71f06c0b1af37299123b1f9badcd72feee945
+EBUILD kdiff3-1.8.4.ebuild 1060 BLAKE2B 7821c38937bee4dbf00f78447eb6e5ab4cd2d3fe85f5d833b9e3bb7a5a9516ae97b843187e251f33caf6e47ba8f361d347b371bfe4d7f7cdef5e4bb522bccd5a SHA512 c922f4cffbbea168471530e6c43492a1d22ce55f1e5e05ce6874187f163113e6304cf45eda768318868a696d4385bbda235d55d383ac9b0425b4a12494ed6949
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild b/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
deleted file mode 100644
index 678e2ab4e74a..000000000000
--- a/kde-misc/kdiff3/kdiff3-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
-https://userbase.kde.org/KDiff3"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${P}-hidpi.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
index 7b3bf740d42b..7f4a90ae3b4f 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.4.ebuild
@@ -9,13 +9,12 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/development/org.kde.kdiff3
-https://userbase.kde.org/KDiff3"
+HOMEPAGE="https://apps.kde.org/en/kdiff3 https://userbase.kde.org/KDiff3"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index 0a96f4c2edd7..fe127926edf3 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,5 +1,3 @@
-DIST kio-gdrive-1.3.0.tar.xz 51668 BLAKE2B a5c9bc347e5b40998449b613e8ad73c362d82d2486a1e91527f84acc5473d603b3cca422bd7c67cff28e49b08803904fdf752bec742bae752e868b8a84321684 SHA512 b0a6be2b59512d3faf6c677c6f3ffdcc9a38fff3a41d0bc6a29566008d7da3ab524fb189ddd219308a8ac8244fbed67c01da480e8193ed0aeb815fe64d72988a
-DIST kio-gdrive-20.08.1.tar.xz 57056 BLAKE2B e5804b035c8db7eef0e8e0f1809cb62e5f0f5fd07aa7a35f62384ff0e18ade24bf4acdc088611b6ee5b7822480b51227d0a3421f79b1f2966e3c079a2cf3ec32 SHA512 3b1b0ca114b72182e36dbfcd166f32bc2e1a128d031d4d95825ffa088b25fe7266dbafb812f64e89c033d4d56f20dcca8da19ae0861e97fc4e08512880f77274
-EBUILD kio-gdrive-1.3.0.ebuild 1069 BLAKE2B 258a60d0c4a8cb207b1799a4e8bbe05c0d75f616377d4eccfeb02b317c8cc4a06c6cd03b4f4c217e7fde0b822feb4a5e18044365c66f23b4385f6548fdc76622 SHA512 8900f71af6c32a24cbd232cb1c9bfc3189919ac4a0f682fd057480e4296dae6891ea97a26ea376e50d9cfc8a1ce342a53d338ba8a329ca62498399fd64fca9f1
-EBUILD kio-gdrive-20.08.1.ebuild 1050 BLAKE2B db4a9e73a22fb1dcf249c8b29dd700bc2209c49e6fa15f8667e6992313563b1d4922947919e31d58a30d5dc0ed7cb2e26a2c5f906d1fea40860d1ecfc8610656 SHA512 8b3cca5eaa2f2e7879abeea2201542b25565e867d11fbb2bed31f7bf1678115327e6842b6297e9e6966475ce0d197195da10ac8bb5ec3a6acfacc66d43c8c556
+DIST kio-gdrive-20.08.3.tar.xz 57968 BLAKE2B 3f17f957dbae9899eaead570e891f42717bc865deb834055ff8eb881ee4d02baea7caf63825912520f0d3107a810d4fc17df7e0839975dbf40f620c6a8cfb956 SHA512 1255eb4a1955c1862ce7e85908c38c637733d98ca71eb54eaa1986d9ec7e81097f453681b820e9c1a294ba876038fc70a6f0a94cf54353b305e880ea1e573db4
+EBUILD kio-gdrive-20.08.3.ebuild 1130 BLAKE2B 6346e4c036e18658f8597a28f9917dabaa5e1ab56d5fdcaae3c40cb535cd3663879c2000b73bb195ad04bdc0a7728ddd20595c1e98e1ec7ad77321ade10024d3 SHA512 182e67e070fa8a63d57af349a74bd04e772e51d4947eba2572d70922e5eea8a74b084fd228aba19f7ab02d0dc1facf1af8b57a7cc47a92a0f6309f764fce9a1a
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
deleted file mode 100644
index 3778ffc71683..000000000000
--- a/kde-misc/kio-gdrive/kio-gdrive-1.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://phabricator.kde.org/project/profile/72/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="5"
-IUSE="+kaccounts"
-
-BDEPEND="dev-util/intltool"
-RDEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/libkgapi-19.08.0:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	kaccounts? ( >=kde-apps/kaccounts-integration-20.03.90:5 )
-	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-DOCS=( README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kaccounts KAccounts)
-	)
-	ecm_src_configure
-}
diff --git a/kde-misc/kio-gdrive/kio-gdrive-20.08.1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-20.08.3.ebuild
index ff0a142385e5..ff89c6625633 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-20.08.1.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-20.08.3.ebuild
@@ -8,20 +8,21 @@ ECM_TEST="optional"
 KDE_ORG_CATEGORY="network"
 KDE_RELEASE_SERVICE="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="KIO Slave for Google Drive service"
-HOMEPAGE="https://kde.org/applications/internet/org.kde.kio_gdrive"
+HOMEPAGE="https://apps.kde.org/en/kio_gdrive"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+kaccounts"
 
 BDEPEND="dev-util/intltool"
-RDEPEND="
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-apps/libkgapi-19.08.0:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -31,10 +32,12 @@ RDEPEND="
 	kaccounts? ( >=kde-apps/kaccounts-integration-${PVCUT}:5 )
 	!kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] )
 "
-DEPEND="${RDEPEND}
-	>=dev-qt/qtgui-${QTMIN}:5
+DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtnetwork-${QTMIN}:5
 "
+RDEPEND="${COMMON_DEPEND}
+	kaccounts? ( >=kde-apps/kaccounts-providers-${PVCUT}:5 )
+"
 
 DOCS=( README.md )
 
diff --git a/kde-misc/kmarkdownwebview/Manifest b/kde-misc/kmarkdownwebview/Manifest
index 9b50e21133ef..4c34a2c2a11b 100644
--- a/kde-misc/kmarkdownwebview/Manifest
+++ b/kde-misc/kmarkdownwebview/Manifest
@@ -1,5 +1,3 @@
-DIST kmarkdownwebview-0.5.5.tar.xz 64468 BLAKE2B 7116173ace51c3b4189c5af433114e6a7156ad6ce8381078d61aa20e17c4e067b2affa0f816fed27b02c4ddc0f4c15263220384a9afc6ae592b287dac2d93938 SHA512 c10bb4da4ff2b3a05dc82887ddbc45447387a4cd4bee64cefb5f21e42dbbb777b3b00118867e78af684c579e4f3c604be1973b1ee4e18692fc6bfd6b24bffeee
 DIST kmarkdownwebview-0.5.6.tar.xz 68992 BLAKE2B cf2dd0718c6517b7ff3cebd032410b695a4ec40e6c51c93ac3f8f85cd3ffdb9a23c1922ac7f7e097412f0ea76891ea067ca2633d036dba8e45ff3fd6cc468f9b SHA512 51c99da9cb2fd0868bf0bc18e89efad75d70758343cf2b4d05e4eec00d328cc041ee9c8b90c402dc137afab5266e9dfb8877832064305de5a836c4aa94af4e4e
-EBUILD kmarkdownwebview-0.5.5.ebuild 985 BLAKE2B 01d7bf488c3f2398868c53a783de5d961fc11e6aef491c70f19a3067abadec76cbb136f6a68ac98071d3030a0c6c22e4a945972bbcdbf43accbd9bf469582a58 SHA512 396c37caa382f435eb41b80f8ccc64aff285a0198b8ac103f7326f8f80a7d8308f605fc476f626b39aefa9bfe822ac448abc25e225d93de5d34bfba1169a8497
-EBUILD kmarkdownwebview-0.5.6.ebuild 747 BLAKE2B aba4cb36086a4837b9a51178284ed72b439ff6c03ce92e773456e00a908fa5c319b141b600227ffcff39c7d34300b54b16ec988524cf7357eef32b1ad787a8be SHA512 6e3c3dea66a2c71d3b16a52f0e21613da5539c4bb48bd301bcb106982aada4f51defcecdca9484a39082ce526241b62902b34db733f1293028f22ddb5997f9d5
-MISC metadata.xml 365 BLAKE2B 708304c47cade844b320dbdbe71124d0cdbab506b655095ab9ee703f3cc5f44c0bc1561ccd7dfec9d9b2b14edaae90abf323cbd1ea6cdda1fbc6fa5193c15c81 SHA512 dbb15189ec2a5c3cc0afd100dba5c187a2464c8fd12e048f4d65aa39165c7cc093fbca646792768371f5fb2997c3b721d64524e63542693b44562b6f3bf755f5
+EBUILD kmarkdownwebview-0.5.6.ebuild 725 BLAKE2B e5de2dd2c7018a56fe1ccd80c4482654b01ee7fc356323ab184938fbad7efbd01961f8ec8acb66c75244cda6788b78ce54480a140545ac47b8106207767fc8d4 SHA512 95f58ed97993bdbfd1166cecd940b12f73fd961d89481fed6a953e9ef43d11a4e762fc6bf1f0fbb7c5e95f6b15968d743abe4e9d51aa25aedc4ddc6ec90cad51
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild
deleted file mode 100644
index 46c920cf2f62..000000000000
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="KPart for rendering Markdown content"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.kmarkdownwebviewpart"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="!webkit? ( BSD ) LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64"
-IUSE="webkit"
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	!webkit? (
-		>=dev-qt/qtwebchannel-${QTMIN}:5
-		>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QTWEBKIT=$(usex webkit)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild
index a39961d2e0a6..113eeb3ce745 100644
--- a/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild
+++ b/kde-misc/kmarkdownwebview/kmarkdownwebview-0.5.6.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit ecm kde.org
 
 DESCRIPTION="KPart for rendering Markdown content"
-HOMEPAGE="https://frinring.wordpress.com/2017/09/14/kmarkdownwebview-0-1-0/"
+HOMEPAGE="https://apps.kde.org/en/kmarkdownwebviewpart"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="BSD LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/kmarkdownwebview/metadata.xml b/kde-misc/kmarkdownwebview/metadata.xml
index 4ec8ab04c611..2fdbf33d963d 100644
--- a/kde-misc/kmarkdownwebview/metadata.xml
+++ b/kde-misc/kmarkdownwebview/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="webkit">Use <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index 55df2878c57d..c7c18f904fba 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,5 +1,3 @@
-AUX krename-5.0.0-exiv2-0.27.patch 5106 BLAKE2B 756e29fe3bdc0d83d3612ec9af7fe0936d70eda023c64bafb198c9b0d29bb69e4978fd5c2eaa7606e41b2d730ae1566217983f7fb2dba72c996b11982beaef49 SHA512 98a917db7212f120f1cab3fdf89e9e09d05205da386df2f838b770ac378ec3b71d5a25bd022740569a34c39cb20b3ced0c489b7945c4ed3d85fd4442988b8f4f
-AUX krename-5.0.0-kf-5.72-findtaglib.patch 1158 BLAKE2B 16e1c23eb7000456cbf651e24e5bb5a9218671abc9fbe08b1b83e2640c3327b55b24cd197d42da391a4beb5024b5a4e658476dfdab8cfd4c29e50c622659eb4a SHA512 1a934e22bb149ab7be169192adff387bfd5326cd1b4782391ee54c13ada2ba8744ed4a0eb39da8ff07829efc56ea8692405d1e656eae69bfde4ccc7ac1702c9d
-DIST krename-5.0.0.tar.xz 279968 BLAKE2B fefbcb4ba1bac3f505db9392c3407af780ae7669f6bf105dd9faca32b0527e64b0a9a8590ac7df429d2cdbc2fe0028eca1215c056f895038f1c02685e42636a6 SHA512 9a52d921342f81990236aecb260beebca04f65578b34704c338f94214117d0e18d8b39e9832ddb5fed39a8f1d9f58f05a445e7dec3631e7cac062f30fce09597
-EBUILD krename-5.0.0-r1.ebuild 1579 BLAKE2B 006cdec76760504116f61487ce44f8714b14ceb0c5eda80d8e356e31de0e7bbf4b91d0d89e9271773772996a1184d9646ef774d8801825525efaed299d5325bf SHA512 3649a7b82124cc0b5c5e70b4643637b6b746f88533f9f19c3c0107d345686dacf1181b421d1b87ddf4d0b21488d7c9409e2a08d40911a8ec5e2f20c1765b69d8
+DIST krename-5.0.1.tar.xz 321556 BLAKE2B 38835e4f7ce97b4991419ac7676268701c0977feb32457c9dc5ddcea92f576012320eac06aadbe426a5e176aae6270606688afd377af4c9ea32d66bd75a74fdd SHA512 1e8b17d9b8396354da131132fb6add24c6620ac39ab7ea5954391358369a4749f83df040e8425c74442ec143d1f07b322e592e5744f80eeef4b961d72f9dd379
+EBUILD krename-5.0.1.ebuild 1486 BLAKE2B 4e284b7e2cec7a2d10973f03053b6ef29c00b5c7b6448b619548d2d80c5ba1c04b6bc52262ea0a3954fb68e1267d69a93ce88e6484a5564edd24024544db584f SHA512 0161c660fb891ea3453d5fa7de3acb154d6f332840c9e5580548583689d0f68de44caaa3a736719d8b80bf870b87d676f940de40b479aa42455abe72ec111231
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch b/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch
deleted file mode 100644
index fdc13a1815e3..000000000000
--- a/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From ec90823494f5ec9bb2e8098f44209f383ef8c22a Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Tue, 20 Nov 2018 18:24:29 +0100
-Subject: Use #cmakedefine01 instead of macro_bool_to_01
-
----
- CMakeLists.txt                    | 13 +++++--------
- config-krename.h.cmake            | 10 +++++-----
- 3 files changed, 10 insertions(+), 33 deletions(-)
- delete mode 100644 cmake/modules/MacroBoolTo01.cmake
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,13 +80,10 @@ set_package_properties(Freetype PROPERTIES
- 
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
- 
--
--# Update configuration
--include(MacroBoolTo01)
--macro_bool_to_01(TAGLIB_FOUND HAVE_TAGLIB)
--macro_bool_to_01(EXIV2_FOUND HAVE_EXIV2)
--macro_bool_to_01(PoDoFo_FOUND HAVE_PODOFO)
--macro_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE)
-+set(HAVE_TAGLIB ${TAGLIB_FOUND})
-+set(HAVE_EXIV2 ${LibExiv2_FOUND})
-+set(HAVE_PODOFO ${PoDoFo_FOUND})
-+set(HAVE_FREETYPE ${FREETYPE_FOUND})
- configure_file(config-krename.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krename.h)
- 
- # Directories
---- a/config-krename.h.cmake
-+++ b/config-krename.h.cmake
-@@ -1,15 +1,15 @@
- /* config.h. Generated by cmake from config.h.cmake */
- 
- /* have TagLib */
--#define HAVE_TAGLIB ${HAVE_TAGLIB}
-+#cmakedefine01 HAVE_TAGLIB
- 
- /* have Exiv2 */
--#define HAVE_EXIV2 ${HAVE_EXIV2}
-+#cmakedefine01 HAVE_EXIV2
- 
- /* have PoDoFo */
--#define HAVE_PODOFO ${HAVE_PODOFO}
-+#cmakedefine01 HAVE_PODOFO
- 
- /* have Freetype */
--#define HAVE_FREETYPE ${HAVE_FREETYPE}
-+#cmakedefine01 HAVE_FREETYPE
- 
--#define VERSION "${KRENAME_VERSION}"
-+#define VERSION "${krename_VERSION}"
--- 
-cgit v1.1
-
-From b22de9135ba2a5abdbd2b275a60933a50f074010 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Tue, 20 Nov 2018 18:26:47 +0100
-Subject: Fix building against exiv2-0.27
-
-One neeeded part is to copy over the new FindLibExiv2 module from
-ECM which has not appeared in a release yet (it will with 5.53.0).
-I'll probably add that version as a requirement and remove the copy
-again in the near future.
-The other part includes raising the cmake version requirement to
-3.7.0, which was released over 2 years ago. (The version comparison
-could be easily solved differently and less elegantly, but let's see
-if people with ancient cmakes complain).
----
- CMakeLists.txt                   |  15 ++---
- config-krename.h.cmake           |   3 +
- src/CMakeLists.txt               |   8 +--
- src/exiv2plugin.cpp              |   8 ++-
- 6 files changed, 137 insertions(+), 91 deletions(-)
- delete mode 100644 cmake/modules/FindExiv2.cmake
- create mode 100644 cmake/modules/FindLibExiv2.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,5 @@
--project(krename)
- 
--cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.7)
-+
-+project(krename VERSION "5.0.0")
- 
-@@ -39,10 +40,6 @@ add_definitions(
-     -DQT_STRICT_ITERATORS
- )
- 
--set(KRENAME_VERSION "5.0.0")
--
--include(FindGettext)
--
- # Find taglib
- set(TAGLIB_MIN_VERSION "1.5")
- find_package(Taglib ${TAGLIB_MIN_VERSION})
-@@ -58,11 +55,12 @@ set_package_properties(Taglib PROPERTIES
-     TYPE OPTIONAL)
- 
- # Find exiv2
--find_package(Exiv2 0.13) # AccessMode was added in 0.13
--set_package_properties(Exiv2 PROPERTIES
--    DESCRIPTION "A library to access image metadata"
--    URL "http://www.exiv2.org"
--    TYPE OPTIONAL)
-+find_package(LibExiv2 0.13) # AccessMode was added in 0.13
-+set_package_properties(LibExiv2 PROPERTIES TYPE OPTIONAL)
-+
-+if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27")
-+    set(HAVE_LIBEXIV2_0_27 TRUE)
-+endif()
- 
- # Find podofo
- find_package(PoDoFo)
---- a/config-krename.h.cmake
-+++ b/config-krename.h.cmake
-@@ -6,6 +6,9 @@
- /* have Exiv2 */
- #cmakedefine01 HAVE_EXIV2
- 
-+/* Defined if we have libexiv2 >= 0.27 */
-+#cmakedefine HAVE_LIBEXIV2_0_27
-+
- /* have PoDoFo */
- #cmakedefine01 HAVE_PODOFO
- 
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -23,7 +23,7 @@ if(FREETYPE_FOUND)
-     include_directories(${FREETYPE_INCLUDE_DIRS})
- endif()
- 
--add_definitions(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS})
-+add_definitions(${TAGLIB_CFLAGS})
- # Exiv2 needs exceptions
- kde_enable_exceptions()
- 
-@@ -67,7 +67,7 @@ set(krename_SRCS
-     snumplugin.cpp
- )
- 
--if(EXIV2_FOUND)
-+if(LibExiv2_FOUND)
-     set(krename_SRCS ${krename_SRCS}
-         exiv2plugin.cpp
-     )
-@@ -137,9 +137,9 @@ if(TAGLIB_FOUND)
-         ${TAGLIB_LIBRARIES}
-     )
- endif()
--if(EXIV2_FOUND)
-+if(LibExiv2_FOUND)
-     target_link_libraries(krename
--        ${EXIV2_LIBRARIES}
-+        LibExiv2::LibExiv2
-     )
- endif()
- if(PoDoFo_FOUND)
---- a/src/exiv2plugin.cpp
-+++ b/src/exiv2plugin.cpp
-@@ -17,13 +17,19 @@
- 
- #include "exiv2plugin.h"
- 
-+#include "../config-krename.h"
-+
- #include <KLocalizedString>
- 
- #include <exiv2/error.hpp>
- #include <exiv2/exif.hpp>
- #include <exiv2/image.hpp>
- #include <exiv2/iptc.hpp>
--#include <exiv2/xmp.hpp>
-+#ifdef HAVE_LIBEXIV2_0_27
-+    #include <exiv2/xmp_exiv2.hpp>
-+#else
-+    #include <exiv2/xmp.hpp>
-+#endif
- #include <exiv2/tags.hpp>
- 
- #include "batchrenamer.h"
--- 
-cgit v1.1
diff --git a/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
deleted file mode 100644
index 672d0c106818..000000000000
--- a/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c1e0259445f32516785a6cb6e82e7cb401b6df37 Mon Sep 17 00:00:00 2001
-From: Jonathan Riddell <jr@jriddell.org>
-Date: Fri, 19 Jun 2020 16:44:47 +0100
-Subject: [PATCH] use local cmake modules first, fixes build failure
-
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 602129b..4550621 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(krename)
- cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
- # search packages used by KDE
- find_package(ECM 0.0.11 REQUIRED NO_MODULE)
--set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
- 
- include(KDEInstallDirs)
- include(ECMInstallIcons)
-@@ -28,8 +28,8 @@ find_package(KF5 REQUIRED COMPONENTS
-     XmlGui
- )
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
--                      ${CMAKE_SOURCE_DIR}/cmake/modules)
-+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules
-+                      ${CMAKE_MODULE_PATH})
- 
- add_definitions(
-     -DQT_DEPRECATED_WARNINGS
--- 
-GitLab
-
diff --git a/kde-misc/krename/krename-5.0.0-r1.ebuild b/kde-misc/krename/krename-5.0.1.ebuild
index b650df235fa7..d1db403c8f9c 100644
--- a/kde-misc/krename/krename-5.0.0-r1.ebuild
+++ b/kde-misc/krename/krename-5.0.1.ebuild
@@ -4,18 +4,20 @@
 EAPI=7
 
 ECM_TEST="true"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 inherit ecm kde.org
 
 DESCRIPTION="Powerful batch file renamer"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.krename
-https://userbase.kde.org/KRename"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+HOMEPAGE="https://apps.kde.org/en/krename https://userbase.kde.org/KRename"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm64 x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 x86"
 IUSE="exif pdf taglib truetype"
 
 BDEPEND="sys-devel/gettext"
@@ -41,14 +43,7 @@ DEPEND="
 	taglib? ( media-libs/taglib )
 	truetype? ( media-libs/freetype:2 )
 "
-RDEPEND="${DEPEND}
-	!kde-misc/krename:4
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-exiv2-0.27.patch"
-	"${FILESDIR}/${P}-kf-5.72-findtaglib.patch"
-)
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 9b9fd043feca..763a2101ddac 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,3 +1,3 @@
 DIST krusader-2.7.2.tar.xz 2912396 BLAKE2B d2675dbde007f002e7dd3730b806e30443ae9e6923d7255ea6c5582370aeb5783822ca0893fc01985fccca209cd0e88e8ada2234d18011d3f90a7e74bffe84ae SHA512 8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b
-EBUILD krusader-2.7.2.ebuild 2073 BLAKE2B 462630db3d6c6817cbfb0d6bfc2853dbe399e6cbf52ef60df5081ba4eb56cb0954f68443758cbd7eba25e6aa3a1cf693eae1f7914860f10644476abb590ddd0e SHA512 ce95dd84fd94e17161f39d1005257b5a72406c3b8480a69616f3e59a5126885eea1c8f8d9147d26b8f09c8935c216ee998264675b46959d837a440ade5558ab4
+EBUILD krusader-2.7.2.ebuild 2080 BLAKE2B 23da52f3d63ae1812b82267226b07ffd00cba759c1f46f959e0f62d794f6448d6f7ff2e33f23fcca6b101a3f4509370a52cc3a5a7ce7fcaa99f587cc3fdf2260 SHA512 45b49108537bd6e5605f36be085598cf7112516d40b18f2ae0f7d59778e44724e67cfd104b34dbd6a616a90b5395dbf7a29a822e5c478b1a968f54cd077b0819
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/krusader/krusader-2.7.2.ebuild b/kde-misc/krusader/krusader-2.7.2.ebuild
index c9660bef1289..5c06921ef956 100644
--- a/kde-misc/krusader/krusader-2.7.2.ebuild
+++ b/kde-misc/krusader/krusader-2.7.2.ebuild
@@ -10,7 +10,7 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Advanced twin-panel (commander-style) file-manager with many extras"
diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest
index 21fa22006eb4..57c2eee2c39e 100644
--- a/kde-misc/latte-dock/Manifest
+++ b/kde-misc/latte-dock/Manifest
@@ -1,3 +1,3 @@
 DIST latte-dock-0.9.11.tar.xz 719904 BLAKE2B 6d88fa42eab9e44144b33ba2affd98a74632f5aedb733bc279b5edd5db75f561af5428bcd1d9d60a4af8c1134686ea47adc9be798ee1e06ef9db515296e48494 SHA512 d02747e4709de8f3091c4686f6d80129fa2fe9d6e994cec436083c59b0ceab0b01af3c1c92d946e497e725bd20efc8ec1e8d284666348a13cf6ba79e515c30d5
-EBUILD latte-dock-0.9.11.ebuild 1662 BLAKE2B 68fd470513f74ada5ab011251da49fdd637d0475527821d126cd1fcd0bb1c4aca08269ad05b56dafb12b5baa892459a37df0edce3907bacc29062f110ddd7637 SHA512 1e3c77baa9aeab61712e18dee9fd9b147171871da69a297abca52ad92908928fe14c8589b042744062ad24c2e171e558105a68975a1e937b5e38df9761a5fa48
+EBUILD latte-dock-0.9.11.ebuild 1639 BLAKE2B a3af64d56a85ccc2edeaf43e51b72d53a81a0599a3c969ed752b8de890aac19030497d359f5e34886e65bd22105e5d48074dbde6353c3e0b26a0b2cd4666c3a4 SHA512 36287dc89bb0e5559abfc98aeea2379253c05cb7836687d3a6ad560428d986a758b1e2c32d864b20f1bf90d5c4fa148db76324d8446288a22d3971b7a21cddff
 MISC metadata.xml 335 BLAKE2B d13829999e285af46bff2cc9a481971b9fae0b308565fef00a165cae6f7d9ffaa74848818e015fde8ada30707af5a759eba203485a175b777819db0d359e4303 SHA512 57262a654c1c96e908733bd51f75dab5fc8ba18a115a70ae36469ce3b494fb54d56631ed513bcaed56f170b540e3026a7d875a2d770129161075531d7bcf40a8
diff --git a/kde-misc/latte-dock/latte-dock-0.9.11.ebuild b/kde-misc/latte-dock/latte-dock-0.9.11.ebuild
index f670080350f8..bd0953866da9 100644
--- a/kde-misc/latte-dock/latte-dock-0.9.11.ebuild
+++ b/kde-misc/latte-dock/latte-dock-0.9.11.ebuild
@@ -13,7 +13,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 DESCRIPTION="Elegant dock, based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.latte-dock"
+HOMEPAGE="https://apps.kde.org/en/latte-dock"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/kde-misc/markdownpart/Manifest b/kde-misc/markdownpart/Manifest
index 1dbea07cc5f7..db9cdabd815b 100644
--- a/kde-misc/markdownpart/Manifest
+++ b/kde-misc/markdownpart/Manifest
@@ -1,3 +1,3 @@
 DIST markdownpart-0.1.1.tar.xz 25200 BLAKE2B cb437fc82b1ad88b95761240dc35cfa2f092f10ce4db0e75550caeaba839a009dd722bdbcacadd49e9c7c4fc4d64dad4c8907e0bbbf0b02f67bd67f5d9caea72 SHA512 9d02ec9e2d6099abe5b19674abcfb7f63af2c923eb2ed881ca0bd0dee52097a82e222962043a94ab55353f49ba33b50cc200753d8e06a36166f1f48d0baf7ec7
-EBUILD markdownpart-0.1.1.ebuild 763 BLAKE2B ee5e7eaa1efa3b38491a3e4a84e75a3dce0c868709768f7631009d0edd884d3b864ec47facb069f240b0088a99aa4c9a948035dc08fa4428a8d4ce111f8965b2 SHA512 93c39228cf1753658cf6de1a36d93f0fee5f855d42023eb8becc6932aa71a501e58713aff308d17fc7a5d540663a4b3ec12b01fec0ed86b31b3e93b357bdbccf
+EBUILD markdownpart-0.1.1.ebuild 770 BLAKE2B 674e2f8f500115ba3a032d7005ac70f92138d53caf0caa1e39fb3fdea267a64d2032692cc4008a5decdc14f4a38169d518d9d788f861edbb1fc9e4f282e6baf8 SHA512 0aafbcac75729865c0f7a0146c8d919a55edce02787abaffb63f8cfef619202815f6c579808d43b50f65f93504656f3ad2fa5130ea3f1a992eb28f3689d6ebb6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/markdownpart/markdownpart-0.1.1.ebuild b/kde-misc/markdownpart/markdownpart-0.1.1.ebuild
index 942b94c616ee..98e93324931e 100644
--- a/kde-misc/markdownpart/markdownpart-0.1.1.ebuild
+++ b/kde-misc/markdownpart/markdownpart-0.1.1.ebuild
@@ -9,11 +9,11 @@ inherit ecm kde.org
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Markdown viewer KParts plugin based on QTextDocument"
-HOMEPAGE="https://invent.kde.org/utilities/markdownpart"
+HOMEPAGE="https://apps.kde.org/en/markdownpart"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
diff --git a/kde-misc/rsibreak/Manifest b/kde-misc/rsibreak/Manifest
index 85d91a5c08b3..a744f1b6dff2 100644
--- a/kde-misc/rsibreak/Manifest
+++ b/kde-misc/rsibreak/Manifest
@@ -1,3 +1,3 @@
 DIST rsibreak-0.12.13.tar.xz 550544 BLAKE2B fc3380e7ae9036c072f93cc46ef0f074f0a1b2777019a25615ae9cf183979985781b7254e8041d1f5a31a0ed404ed34a399d1fb0b675540860d49145fcbbddcd SHA512 dc1411221828afab1c8f3ee89238be44d9fd3784cb5cce4f5a50ce063e14d1683257bffa1b24509d7009e74d0be16f1c788754690b503490fb8be1bedc9657fd
-EBUILD rsibreak-0.12.13.ebuild 1381 BLAKE2B c90291f41efdf968cf896b519853dc2b116873c4255b25e3150238d95a1cbe4ea3355f513fb6c7ad6317e71221ac0768290514d797342d2801e363d3ed2fb1f1 SHA512 5ea4d173fbdbd08311821b409374fb9c9380b33e3e79b95b493d55532ddc151a114ff4c1d9910713603ef6b1ecf380ba935cf4d9ab3017470ea1b97b142ce398
+EBUILD rsibreak-0.12.13.ebuild 1358 BLAKE2B d659c5026cd8a597be099e9d9be1cd1a9f79ad33e4d66e49e97be769aa899793b643f54d2a153079ae7a6e82a542a3efad0ebd3898a91463c49026446f31533f SHA512 e3bb9217e7f62f8723161e1d4d7936997811ac0ba15ca481a5980288127e36db86153e1ff362c75cfa7eb0b3106e57bd65f2cae17bf8deb074b6643f4600a615
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/rsibreak/rsibreak-0.12.13.ebuild b/kde-misc/rsibreak/rsibreak-0.12.13.ebuild
index e98e759840de..e1596550e099 100644
--- a/kde-misc/rsibreak/rsibreak-0.12.13.ebuild
+++ b/kde-misc/rsibreak/rsibreak-0.12.13.ebuild
@@ -10,8 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Small utility which bothers you at certain intervals"
-HOMEPAGE="https://kde.org/applications/utilities/org.kde.rsibreak
-https://userbase.kde.org/RSIBreak"
+HOMEPAGE="https://apps.kde.org/en/rsibreak https://userbase.kde.org/RSIBreak"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 22c8e7d8d38b..15dac8c47885 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,3 +1,3 @@
 DIST skanlite-2.2.0.tar.xz 2415104 BLAKE2B 4ae5d909cdfdf55a552c11346ac689190aa67fd960e2af98ccc02cbf834ec6668e2926a5ab8a07ff6c4a4ef375dc1979250686c5ba05f1a94be4c59026f44f1a SHA512 cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20
-EBUILD skanlite-2.2.0.ebuild 963 BLAKE2B ed5ce6f331c0919afb9885e92ec305bdefc1adc7f9d54ee6c70fdb38a283447797f628392786f8e1de286dd56e28e1764fcc4fab1f34be7d12c7503c163fe99c SHA512 081d96ae41052eb8b8755eebb6c3cf6e34fb629a83de74f4dedea41e94d90de63347058760616a1d25859286881aa5c757f0ad7d93875f3646c65a93a303e14e
+EBUILD skanlite-2.2.0.ebuild 941 BLAKE2B 78d28f07b99436c0769390b921ebcb9dec50fdcca47566c23debe59191eebe3686114ad34c8b5836ca2f3e908a150c03df0058fa9aa25293a62b8d5cd954e60c SHA512 2b444644fe28e1f7a50ebd9d4e976a37aafdc1d235877a32dffc3f2d2bac3adf4acf60fbf3d48b8cc896e458614dacc6502bd9a3fdeca8301c406a3651685793
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/skanlite/skanlite-2.2.0.ebuild b/kde-misc/skanlite/skanlite-2.2.0.ebuild
index a79b4e6c1ead..3581dd22cf6d 100644
--- a/kde-misc/skanlite/skanlite-2.2.0.ebuild
+++ b/kde-misc/skanlite/skanlite-2.2.0.ebuild
@@ -10,7 +10,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.skanlite"
+HOMEPAGE="https://apps.kde.org/en/skanlite"
 SRC_URI="mirror://kde/stable/${PN}/2.2/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index f0d038b3718e..7daec7770241 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,3 @@
-DIST tellico-3.3.2.tar.xz 5623808 BLAKE2B 2c709a40799f53d8431cc4eeab5d33242e9f967fa9af02c05675730fdb9b249b05c7af17ab8269fec0b53e3d4ad6144213f060aa4b2c32e27bca93bd905d7828 SHA512 4e304553e58ea3cfcc8aabdbe86ea2b1b52edb6d4f690d0f9e5c5c6de152dac25889a7beea3394eac711ef2195efe1bf1f3fd48bf57aece923ed47b975d664d8
 DIST tellico-3.3.3.tar.xz 5625284 BLAKE2B 1d9c2fe20b9a59bf34c1d43870dedc622c611516dd98356cf2bb05b81e85ed952e78e11a5b36e080183fd4c21eada886d410336db16c5c839f5b243b4efa4612 SHA512 0f0307744fbbcc176272957950929df15448aea7eafe71db7b7247b1b9bdf8ebf5dd2e9eb7b19aeb169ac16375788bf5cc401a5def1f9c10fda6fe8981530ef4
-EBUILD tellico-3.3.2.ebuild 2274 BLAKE2B d209766fa7aa530d1b1949434d6a467eaf92ea1ec615fbdab96f7da48bd1c1f853fcbbe3662251976ce87afc2af3e4cc3816a8b537292f37f37df85470335550 SHA512 f0027b211c48463910574e6759b34492c13d1ff63b5db0e0d14fe679140ccbd7904bc29c82e8b93b5868f005835c8395c5843699380245c85452329d8c6be52c
-EBUILD tellico-3.3.3.ebuild 2276 BLAKE2B c4b8a113e598a8c19eefb94a8a3630483bba2c964bf9a0e440f72438fa30488e99cd34d3582f1457568b8dc97f2983e5892b9f350e7279a91541ab307c72a2c0 SHA512 a9803f077c989d4aa80e54fa594615e6b87e65d9c6a4f90a325cb619dc9b3b23bc980a40c6c3b25f9806fc2a514b8292728e1fd7c4e8b8225fd99f59e628c9a8
+EBUILD tellico-3.3.3.ebuild 2274 BLAKE2B d209766fa7aa530d1b1949434d6a467eaf92ea1ec615fbdab96f7da48bd1c1f853fcbbe3662251976ce87afc2af3e4cc3816a8b537292f37f37df85470335550 SHA512 f0027b211c48463910574e6759b34492c13d1ff63b5db0e0d14fe679140ccbd7904bc29c82e8b93b5868f005835c8395c5843699380245c85452329d8c6be52c
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/tellico-3.3.2.ebuild b/kde-misc/tellico/tellico-3.3.2.ebuild
deleted file mode 100644
index a2f510ecd1c9..000000000000
--- a/kde-misc/tellico/tellico-3.3.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Collection manager based on KDE Frameworks"
-HOMEPAGE="https://tellico-project.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-BDEPEND="
-	sys-devel/gettext
-"
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-perl/Text-BibTeX-0.780.0-r1
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/karchive:5
-	kde-frameworks/kcodecs:5
-	kde-frameworks/kcompletion:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kcrash:5
-	kde-frameworks/kguiaddons:5
-	kde-frameworks/khtml:5
-	kde-frameworks/kiconthemes:5
-	kde-frameworks/kitemmodels:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kjobwidgets:5
-	kde-frameworks/kio:5
-	kde-frameworks/knewstuff:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kservice:5
-	kde-frameworks/ktextwidgets:5
-	kde-frameworks/kwallet:5
-	kde-frameworks/kwidgetsaddons:5
-	kde-frameworks/kwindowsystem:5
-	kde-frameworks/kxmlgui:5
-	kde-frameworks/solid:5
-	kde-frameworks/sonnet:5
-	cddb? ( kde-apps/libkcddb:5 )
-	discid? ( dev-libs/libcdio:= )
-	pdf? ( app-text/poppler[qt5] )
-	scanner? ( kde-apps/libksane:5 )
-	semantic-desktop? ( kde-frameworks/kfilemetadata:5 )
-	taglib? ( >=media-libs/taglib-1.5 )
-	v4l? ( >=media-libs/libv4l-0.8.3 )
-	xmp? ( >=media-libs/exempi-2 )
-	yaz? ( >=dev-libs/yaz-2:0 )
-"
-DEPEND="${RDEPEND}"
-
-# tests need network access
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-		$(cmake_use_find_package cddb KF5Cddb)
-		$(cmake_use_find_package discid CDIO)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package scanner KF5Sane)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake_use_find_package taglib Taglib)
-		-DENABLE_WEBCAM=$(usex v4l)
-		$(cmake_use_find_package xmp Exempi)
-		$(cmake_use_find_package yaz Yaz)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-misc/tellico/tellico-3.3.3.ebuild b/kde-misc/tellico/tellico-3.3.3.ebuild
index f39a4200a144..a2f510ecd1c9 100644
--- a/kde-misc/tellico/tellico-3.3.3.ebuild
+++ b/kde-misc/tellico/tellico-3.3.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://tellico-project.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="https://tellico-project.org/files/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 75f3c2f0ec91..8996e5b84b24 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,4 +1,4 @@
 AUX wacomtablet-3.2.0-qt-5.15.patch 663 BLAKE2B e47fcda757a55ad13c5a0089084c7dd10ba7472e49d9703f000096f336f47208d648539c240afd2083221c8084864940194f5487812eb2890ada6226b0bf8f5e SHA512 120b2e3b57159d0bcfbee707d4f328c2dbeef846d449f5fde7b452da99bcd2de79463bd63e88dc26d7c9071e6fbd112dd528d5c05817bc16c16276004ab4b78f
 DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6
-EBUILD wacomtablet-3.2.0.ebuild 1385 BLAKE2B 7311e2f4724f9bce777fa69eacffeafe75b7f8d4a39250e39ef290cd0ed152239c30cd33b5e3681f83308cc8cb642e6f9086f0b3ad037c3a758593c6b8155661 SHA512 caa813b6aa0d79a7729b8687fbbfd7905e2503955046930a4f0521c97746091447c6c71bebb6498571528773607309f8106f6f20edb87f80c4f4ed2c488f2088
+EBUILD wacomtablet-3.2.0.ebuild 1365 BLAKE2B 6c9c74c6f35ec00e7b2a70e252cf5ecd34850477544f207a05382ecd1b055ae0d1a25c635cba5075ce3d53da6de512d54f6cf149a5ed0733ffb7f7f8a6ece03f SHA512 30aaadab9604536d548eb52e474dd445ebe3a4fded80c822b02420c7bac691ffe45b15cf90e3b86d81419c44ceeeab0233c4f04ec9ec0ee3ab31125f8bcb878d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
index 9f284009c8c1..0902de90c21a 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="System settings module for Wacom tablets"
-HOMEPAGE="https://kde.org/applications/system/org.kde.wacomtablet
+HOMEPAGE="https://apps.kde.org/en/wacomtablet
 https://userbase.kde.org/Wacomtablet"
 
 LICENSE="GPL-2"
diff --git a/kde-misc/zanshin/Manifest b/kde-misc/zanshin/Manifest
index 3cb432bb2667..a8e83805fe33 100644
--- a/kde-misc/zanshin/Manifest
+++ b/kde-misc/zanshin/Manifest
@@ -1,6 +1,5 @@
 AUX zanshin-0.5.71-akonadi-20.07.80.patch 605 BLAKE2B 7a7e3b8575499f53ec51dc958e2886dbd5202f9b533df7f7638ee1feed3de921bfff34de931274529a98b8f025116e044853b86ae315f0156cd62ec05ece49cd SHA512 cdf23cbaa72ec4179ddb85df41109f428614d66aa8d7a781135d092aaa51cf96ba2146a0f631ed1adbc93e8d78b007d5a7e2f94a5d237718c9f2f95f75a08121
 AUX zanshin-0.5.71-kontactinterface-20.07.80.patch 1656 BLAKE2B d28e5e881b31c3552939204ffc8aa68e1ee46c18045b67bbf711727e500105e6798c66e04399c90394da91d26efbb340674d359f87c2d55d468b880e9d0d84d9 SHA512 f2e588a92d7ef598ffcb7056868a008642ea32f06680d28cc17b1bb6f359de5bedaa37e6e709c3236b6e83532d145ffc739192ac7a2a15240634e05b393e0bc0
 DIST zanshin-0.5.71.tar.xz 307872 BLAKE2B 3b767af7527348177b7105126acedd47e222859985feb47f89066732293d77d89347ab105b3a8269717c5fc723f1b8bcd1a52e5242bf77828019e55a48e2db6a SHA512 47b4fa8797dd50372dcf176198e1c80348cd1ba604d1ed61cd973956e54ba5551caea33c766d857bc3ad598bd0eae9882ffc315e13e6e3b9c1033d01c8e029d8
-EBUILD zanshin-0.5.71-r1.ebuild 1708 BLAKE2B 7a2587d90857f7072138f408b8a0a2ad4b04a2b8e337f0f855c3c985e595789229e8a879c34c7c651aea2ce8ac2a3e2f585bd34c1c63410bd59aac4fa1f12f8a SHA512 bf35cfd229c687f143ad323964375fd8e6144be0a66a8ea0213460fb93100e1633ef93e9a1a98d054ce614c1d8393e64effd822779fd9d84faae549dd3627eb4
-EBUILD zanshin-0.5.71-r2.ebuild 1918 BLAKE2B 89ac432b66deb52aa29aeec3b27b4dbc8ae5833651a7352ab413466e4118aeb7716acf98d92ecaa66024dd079511952d95c8b7bb823ecc17c0ccb5f951d44d6c SHA512 f9f9757261be097e06d89c85bdbb78a32183c1a800b5d7a777011f309ef17615601294d897ca638de3756836b8755ce3b208263964843811244db1adb8c1f1a0
+EBUILD zanshin-0.5.71-r2.ebuild 1895 BLAKE2B 7d27f120a4ce2a2de1dd8f6ad622abc4d78c146a937217d7756fef33db1c51c15f9ef249df6c642c21bf9e21fc99095da8b1592f80a6f7bf1fe06c8f2e395c89 SHA512 68c103a41b33edd8cb590359e07eccb5651659ae24360063768205ad3d551d79b8937da26217c700f307f3176345612106fd5ee7fcde0aac7a42a0f90f0cd90c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
deleted file mode 100644
index d864e26cf2b1..000000000000
--- a/kde-misc/zanshin/zanshin-0.5.71-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Getting things done application by KDE"
-HOMEPAGE="https://zanshin.kde.org/ https://userbase.kde.org/Zanshin
-https://kde.org/applications/utilities/org.kde.zanshin"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-IUSE=""
-
-BDEPEND="
-	test? ( <kde-apps/akonadi-20.04.50[tools] )
-"
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	<kde-apps/akonadi-20.04.50
-	<kde-apps/akonadi-calendar-20.04.50
-	<kde-apps/akonadi-contacts-20.04.50
-	<kde-apps/kmime-20.04.50
-	<kde-apps/kontactinterface-20.04.50
-	>=kde-frameworks/kcalendarcore-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcontacts-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/zanshin:4
-	<kde-apps/kdepim-runtime-20.04.50
-"
diff --git a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild b/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
index e8fe90d5d2c2..3293a80aec11 100644
--- a/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
+++ b/kde-misc/zanshin/zanshin-0.5.71-r2.ebuild
@@ -11,8 +11,8 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Getting things done application by KDE"
-HOMEPAGE="https://zanshin.kde.org/ https://userbase.kde.org/Zanshin
-https://kde.org/applications/utilities/org.kde.zanshin"
+HOMEPAGE="https://zanshin.kde.org/ https://apps.kde.org/en/zanshin
+https://userbase.kde.org/Zanshin"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"