gentoo resync : 25.11.2020

10 files changed, 52 insertions, 350 deletions

diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index c429412ec45e..ae39ece81a9d 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,14 +1,7 @@
-AUX konversation-1.7.5-QElapsedTimer.patch 2292 BLAKE2B 88cdfd06b20f75aa85a61792ac797a4315b7d7d0b1df8056a1967b50fcf827ab073ed8961e5be462b829b1b56c3ff9325a52d6a6d09429011fde55b732295215 SHA512 75408a7efb8b6e3d1e5e17b2c11111b487da92939680555f284d066e0507237b81bda34aa24cc73e519319853189edf38f6cbf74e8f2a76a02df3261e5084c52
-AUX konversation-1.7.5-fix-regex-for-cap-ack.patch 1040 BLAKE2B fb0e34812623079fcfaff022734f340b02bf1ee81cdf1819f034e203584fae922db1a8b7401942ea64df0c9dbdedb641c58d9c3688c9b7b47ca43b7ef64cf4de SHA512 e8f945919f21bbcb7ce9575fbb8b17e14b4c72fa736865bd7ed48c6806aa0be2778f63b9fbc05aa4580467587cba26b52ff7fea6e816208dd5048439dd8c9bbd
-AUX konversation-1.7.5-kf5bookmarks-5.69.patch 1491 BLAKE2B 4041825268ca0968cb4c21b3e2b2503600ebb0d1af3c91623091abf75875962b57c75de5f2936b1dc39c457d928df0990aec2db3472336cc51e9ad243727c7e1 SHA512 cb71fed6944c7b5299fb535bb650f607feb1417b3e648246162110ce89dbc3d65c65d2d077ea471762bd3941a725c02f54fdfd78927c88f3854ea80adae2263c
-AUX konversation-1.7.5-kf5windowsystem-5.63.patch 1074 BLAKE2B cd24488b5892d75fd81492e736c077fa8b109293c15fa8ba90ac7fe9c9928903f14f9de706784f6203b944a2aa87b45c6d79269b97e7fb22b5be82012c8b32d5 SHA512 55bfff05b0ac8d992312b821e507abdf397e23ff127544a2cd3c76654bcb575ff72fad82d44a852479ca2c9463c5ed08aa945e0bbf7ca735c2798c9aafd1aabd
-AUX konversation-1.7.5-missing-header.patch 574 BLAKE2B a2a88b4d071685301fcf071f676eac814ab21ce4dcdcd9af7ced5ea2e595d0335f73a36011393fa7c54ae26d60486d9b4319d2e197bee79adda79c6158b1a0d5 SHA512 b9b1b2e4b231d2a4beb63a6e757467ec0d32bfc9005dd990d7649cc6ac9c34d106b0b15bc3918490ef4ded81699e5d84161b3a1d8541aa6232ba485124b65386
-AUX konversation-1.7.5-qt-5.15.patch 814 BLAKE2B 3c5ddf41f0dc05244b69546616e7df2b98e2b51125954f7c5c9a75aaae750ee45a8a3fc3175dea6e0c171c4ee06d43002fdbcd6d08fc8e1bd9e316c25774ca4c SHA512 056a3d6c17b04734e446b623b88dfa9fd4a90133c251b427460f5c6f3f85a52ad46abe92b055e8a5eb86f433f67e4645f9999d6124d3343466b741d99c11b076
 AUX konversation-1.7.5-unused-kemoticons.patch 3192 BLAKE2B b1882f31639e17e2927ca7b7eecde12511a122ca6ebcc8fc2ab70cd38b28f973ba07e043aeed16dd029281b3c413515df707120c964105257960d23feee24e1f SHA512 3158d47aad3920715bd9dc010585e4a2e7488872a24cac8f69bff8ebafc4445d54611756ad05399d8bbd1b4be37fb28d8566577fbc040559fdad3ab18927e3df
 AUX konversation-1.7.6-no-kiconthemes.patch 13035 BLAKE2B a8f15af27cb86f8f8de3b4539de4bba891bf8434e8e1cc3941b11778b3ba35967afd05aa404d9f72888d9477321e45d0f34f7157c4236faf652f1026d8a55d4a SHA512 5a3fefb32f98a87b5c1d6272750c619318c28b650f0a334032b2454fb4aa77b24cc81b7b1161ad54f046b979edcb665e6fa4e5f1d303f9c1e39005efacef730e
+AUX konversation-1.7.7-no-solid.patch 1013 BLAKE2B 58cc622cce90ceded76e9b607b2a2f4d249fcbb4a722e8bc6f8e1a21345f25cc4244f77897e7a69b67c86d1533f926184bd89667d3705847c7d480bbd8f63510 SHA512 cd8e8bf8185785e26f4efc416419e858c8100a5673fd1440ef8c5f336099ae79e858016ec11fdeab18ccd6480f25f4a6e4a4f69c211456bb7e7a12fad465d17c
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
-DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
-DIST konversation-1.7.6.tar.xz 3354800 BLAKE2B cad571f5d55e030de0d8610417d7c2473f9d3f0b81cfc2c8f730324d73ef0eee17e2f11a6d5714ff541170fa3eab6f4eaa3ecde117a65e9af143e13c1e8afd66 SHA512 69c4b67a186f4242c74e2027d1faca6be7a30719287b960888751a5522da5abe24c6ada076bb097233cf0254c5cff12cc70c9a7a85875f80c0eb1637c6de6613
-EBUILD konversation-1.7.5-r2.ebuild 2270 BLAKE2B 32af7e63e381ecc1dced71e185fcde58c40b04a441df6f6cbc9b0d03502221f1dab4cc634f3dc1eabc9e57748655a4028dcc6e24a91a2aac39a926fa703a081d SHA512 07217bc16ffb0b54adff8ff8d8adda619a1b57ece9b6033caa4200afebbacf49f1e3c5a0ea0ffd5c1440d2f44dd2eeff70dd7e5e58e68596224d17bb8d576aa1
-EBUILD konversation-1.7.6.ebuild 2011 BLAKE2B 423b14d9e78ca566f3b990c37d66bd345ef9cfe13deaaf217d5702e61b0916a8eb9d9ea92f4da1086d489491c5f07e99c34a8eaa9e78b99870e25fdb52880633 SHA512 70eb988b22b44f297e9f1895020612a0a1c7b77cc0776abca0925e4e5a2000a6f1e1e07c8e58184621b0092ebbab6ca30efabe824ece6c2dfaaef5b2fe27abc8
+DIST konversation-1.7.7.tar.xz 3357584 BLAKE2B 9f6817a1e01674f383879eeaafc65a50825aa7554fedcf7fbe7affc43da16f7198761ca12b510d9980df5a5f41819a5415043ec91de55f1cb4d86e62e8e23ea0 SHA512 99026007af7fa00b82240c1f0e46a8d3db6c3434948aff7d0b01c2f99bccdd227a2a705bd83bce1ca2e47be13866d5d0a981c8b4ff8dec472612d6ee40f9ed2c
+EBUILD konversation-1.7.7-r1.ebuild 2114 BLAKE2B 6fe3aff1c5e1d0c6791787d25b2443dc50a61c0f5e1c8b6b79f7bfc192cabd76dff6d38234c14eb66932bf5200990c522cac6e9bb8b12646f87cb51653450b63 SHA512 0a5f1f1c8b3a0130a6e7a09977a5b9b6c536cc41c858a2ae68e71707b7b4ec76f7c7558fbb0096bd5ee916ef4ed6630f74317c1a0a2449459cda429234b41348
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
deleted file mode 100644
index 74fd23e58d3c..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 0efede7857a86f729bec0fdfd1789f7faf23d957 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Thu, 28 Nov 2019 17:41:33 +0100
-Subject: Port to QElapsedTimer; remove unused default constructor
-
-Tested by printing out the value of age(), works like before.
----
- src/irc/ircqueue.cpp |  8 ++++++++
- src/irc/ircqueue.h   | 18 +++++++-----------
- 2 files changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/src/irc/ircqueue.cpp b/src/irc/ircqueue.cpp
-index 1101623..3cc33a5 100644
---- a/src/irc/ircqueue.cpp
-+++ b/src/irc/ircqueue.cpp
-@@ -19,6 +19,14 @@
- 
- #include "server.h"
- 
-+IRCMessage::IRCMessage(const QString &str)
-+    : s(str) //, codec(QTextCodec::codecForName("utf8"))
-+{
-+    t.start();
-+}
-+
-+////
-+
- int IRCQueue::EmptyingRate::nextInterval(int, int elapsed)
- {
-     if (!isValid())
-diff --git a/src/irc/ircqueue.h b/src/irc/ircqueue.h
-index 3f7f0c8..7a91776 100644
---- a/src/irc/ircqueue.h
-+++ b/src/irc/ircqueue.h
-@@ -19,6 +19,7 @@
- #include <QObject>
- #include <QList>
- #include <QTime>
-+#include <QElapsedTimer>
- 
- class QTimer;
- class Server;
-@@ -34,29 +35,24 @@ class Server;
-  */
- struct IRCMessage
- {
--    IRCMessage() : t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8"))
--    {} ///< this constructor required for QValueList, do not use
--
-     /**
-         Make a new IRCMessage with timestamp of QTime::currentTime().
- 
-         Note the constructor takes a QString, not a const QString& or a QString *. If you want to modify the
-         contained text, put it back with setText.
-     */
--    IRCMessage(QString i) : s(i), t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8"))
--    {}
-+    IRCMessage(const QString &str);
- 
--    QString text() { return s; }
--    int age() { return t.elapsed(); }
--    QTime time() { return t; }
--    void setText(QString text) { s=text; }
-+    QString text() const { return s; }
-+    int age() const { return t.elapsed(); } // in milliseconds
-+    void setText(const QString &text) { s=text; }
- private:
-     QString s;
--    QTime t;
-+    QElapsedTimer t;
- 
-     //FIXME wire this up
-     //QTextCodec* codec;
--    //operator const char * () const { return codec->fromUnicode(text()); }
-+    //operator QByteArray () const { return codec->fromUnicode(text()); }
- 
- };
- 
--- 
-cgit v1.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
deleted file mode 100644
index f351dd00134f..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6d896b4efc93c18246ce4db7c788929b0ce75559 Mon Sep 17 00:00:00 2001
-From: Peter Simonsson <peter.simonsson@gmail.com>
-Date: Sun, 23 Sep 2018 08:29:43 +0200
-Subject: Fix regex for cap ack
-
-Seems to have worked despite being broken
----
- src/irc/inputfilter.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
-index fbd268b..45d4f88 100644
---- a/src/irc/inputfilter.cpp
-+++ b/src/irc/inputfilter.cpp
-@@ -795,7 +795,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma
- 
-                 foreach(const QString& capability, capabilities)
-                 {
--                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9"), Qt::CaseInsensitive));
-+                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9]"), Qt::CaseInsensitive));
-                     QString modifierString = capability.left(nameStart);
-                     QString name = capability.mid(nameStart);
- 
--- 
-cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
deleted file mode 100644
index 2c36f69aa99c..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 57df81cd8a11c4dbe170f9d81abd5b35b4887e0b Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 17 Apr 2020 13:14:26 +0200
-Subject: Adapt the code to KBookmarkMenu-5.69 changes
-
-Test Plan:
-Bookmarks menu still works, and the bookmark actions still show in the
-shortcuts editor dialog.
-
-Reviewers: #konversation, psn
-
-Reviewed By: #konversation, psn
-
-Subscribers: #konversation
-
-Differential Revision: https://phabricator.kde.org/D28911
----
- src/bookmarkhandler.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/bookmarkhandler.cpp b/src/bookmarkhandler.cpp
-index 5a70591..74b51ff 100644
---- a/src/bookmarkhandler.cpp
-+++ b/src/bookmarkhandler.cpp
-@@ -21,7 +21,10 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
- #include "connectionmanager.h"
- #include "viewer/viewcontainer.h"
- 
-+#include <KActionCollection>
-+#include <kbookmarks_version.h>
- #include <KBookmarkMenu>
-+#include <QMenu>
- #include <QStandardPaths>
- 
- 
-@@ -41,7 +44,12 @@ m_mainWindow(mainWindow)
-     manager->setEditorOptions(i18n("Konversation Bookmarks Editor"), false);
-     manager->setUpdate( true );
- 
-+#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
-     m_bookmarkMenu = new KBookmarkMenu(manager, this, menu, m_mainWindow->actionCollection());
-+#else
-+    m_bookmarkMenu = new KBookmarkMenu(manager, this, menu);
-+    m_mainWindow->actionCollection()->addActions(menu->actions());
-+#endif
- }
- 
- KonviBookmarkHandler::~KonviBookmarkHandler()
--- 
-cgit v1.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
deleted file mode 100644
index cf93b3b66def..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4295aba5c02533040723d140e062aebd231b3f18 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Thu, 28 Nov 2019 12:56:34 +0100
-Subject: Port away from deprecated KWindowSystem API (with ifdefs)
-
----
- src/application.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/application.cpp b/src/application.cpp
-index 4667c24..538624b 100644
---- a/src/application.cpp
-+++ b/src/application.cpp
-@@ -50,6 +50,7 @@
- #include <KTextEdit>
- #include <KSharedConfig>
- #include <KStartupInfo>
-+#include <kwindowsystem_version.h>
- 
- using namespace Konversation;
- 
-@@ -1392,7 +1393,12 @@ void Application::handleActivate(const QStringList& arguments)
- 
-     newInstance(m_commandLineParser);
- 
-+#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 62, 0)
-     KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
-+#else
-+    mainWindow->setAttribute(Qt::WA_NativeWindow, true);
-+    KStartupInfo::setNewStartupId(mainWindow->windowHandle(), KStartupInfo::startupId());
-+#endif
-     mainWindow->show();
-     mainWindow->raise();
- }
--- 
-cgit v1.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
deleted file mode 100644
index 1ff14b81ec58..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sun, 21 Jul 2019 09:14:32 +0200
-Subject: Fix build with Qt 5.13
-
----
- src/irc/outputfilter.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
-index f9e6253..45d11fb 100644
---- a/src/irc/outputfilter.cpp
-+++ b/src/irc/outputfilter.cpp
-@@ -32,6 +32,7 @@
- 
- #include <QStringList>
- #include <QFile>
-+#include <QMetaMethod>
- #include <QRegExp>
- #include <QTextCodec>
- #include <QByteArray>
--- 
-cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
deleted file mode 100644
index a17c0a432314..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f88c73cf278da9907496eab0777903f942c50cb9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 21 Apr 2020 10:34:49 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing header)
-
-Test Plan: Build succeeds with Qt 5.15.0_beta4
-
-Reviewers: #konversation, psn
-
-Reviewed By: #konversation, psn
-
-Differential Revision: https://phabricator.kde.org/D29038
----
- src/viewer/viewtree.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/viewer/viewtree.cpp b/src/viewer/viewtree.cpp
-index eeee8fb4..04ec4e54 100644
---- a/src/viewer/viewtree.cpp
-+++ b/src/viewer/viewtree.cpp
-@@ -21,6 +21,7 @@
- #include <QFontDatabase>
- #include <QGuiApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QItemSelectionModel>
- #include <QStyleHints>
- #include <QToolTip>
--- 
-2.26.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.7-no-solid.patch b/net-irc/konversation/files/konversation-1.7.7-no-solid.patch
new file mode 100644
index 000000000000..53ea4a3d7a1d
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.7-no-solid.patch
@@ -0,0 +1,38 @@
+From 3d8a425ef426019c49abea20baa58461900c731d Mon Sep 17 00:00:00 2001
+From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
+Date: Thu, 29 Oct 2020 13:15:22 +0100
+Subject: [PATCH] Remove unused explicit dep on and linkage of Solid
+
+(still pulled in via public dep of KIOFileWidgets, but not used by us)
+---
+ CMakeLists.txt     | 1 -
+ src/CMakeLists.txt | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72ec982d..bcd101e1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,7 +30,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
+     NotifyConfig
+     KIO
+     Parts
+-    Solid
+     Wallet
+     WidgetsAddons
+     GlobalAccel
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 460325f1..680053e2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -244,7 +244,6 @@ target_link_libraries(konversation
+     KF5::KIOFileWidgets
+     KF5::KIOWidgets
+     KF5::Parts
+-    KF5::Solid
+     KF5::Wallet
+     KF5::WidgetsAddons
+     KF5::GlobalAccel
+-- 
+GitLab
+
diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild
deleted file mode 100644
index 925f72f30810..000000000000
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ /dev/null
@@ -1,85 +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.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org
-https://kde.org/applications/internet/org.kde.konversation"
-SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="+crypt"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5=
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/phonon[qt5(+)]
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-"
-RDEPEND="${DEPEND}
-	crypt? ( app-crypt/qca:2[ssl] )
-"
-
-PATCHES=(
-	# 1.7 branch
-	"${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch
-	"${FILESDIR}"/${P}-missing-header.patch
-	"${FILESDIR}"/${P}-QElapsedTimer.patch
-	"${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
-	# git master
-	"${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
-	"${FILESDIR}"/${P}-unused-kemoticons.patch
-	"${FILESDIR}"/${P}-qt-5.15.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# Bug 616162
-	insinto /etc/xdg
-	doins "${FILESDIR}"/konversationrc
-}
diff --git a/net-irc/konversation/konversation-1.7.6.ebuild b/net-irc/konversation/konversation-1.7.7-r1.ebuild
index f088c5bfd39d..d3f2f657db22 100644
--- a/net-irc/konversation/konversation-1.7.6.ebuild
+++ b/net-irc/konversation/konversation-1.7.7-r1.ebuild
@@ -4,17 +4,20 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
+HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+crypt"
 
 BDEPEND="sys-devel/gettext"
@@ -51,14 +54,15 @@ DEPEND="
 	crypt? ( >=app-crypt/qca-2.3.0:2 )
 "
 RDEPEND="${DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:5
 	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
 "
 
 PATCHES=(
 	# git master
-	"${FILESDIR}"/${PN}-1.7.5-kf5bookmarks-5.69.patch
 	"${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch
-	"${FILESDIR}"/${P}-no-kiconthemes.patch
+	"${FILESDIR}"/${PN}-1.7.6-no-kiconthemes.patch
+	"${FILESDIR}"/${P}-no-solid.patch
 )
 
 src_configure() {