gentoo resync : 28.04.2021

6 files changed, 10 insertions, 519 deletions

diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index eeb71f028030..02a72be85d17 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,9 +1,6 @@
-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.7.tar.xz 3357584 BLAKE2B 9f6817a1e01674f383879eeaafc65a50825aa7554fedcf7fbe7affc43da16f7198761ca12b510d9980df5a5f41819a5415043ec91de55f1cb4d86e62e8e23ea0 SHA512 99026007af7fa00b82240c1f0e46a8d3db6c3434948aff7d0b01c2f99bccdd227a2a705bd83bce1ca2e47be13866d5d0a981c8b4ff8dec472612d6ee40f9ed2c
 DIST konversation-20.12.3.tar.xz 4242136 BLAKE2B 2483b34dde69a73029d15e8d626c77ebc9f91aaca0dc7b83f4b92629bbf773873de52bf8fd1ead3d862fbb496f2dcc3823320d983ea0c0f2c0ba8ac831ce379f SHA512 022854edac9e2b834e9c6795cd02e9d9fe5ab54f4d3facaff9f60cac680e1b6df12ef3ac3281a07d4ce732f491fe2b49f47fd467751c9b87549e02df3ef27bae
-EBUILD konversation-1.7.7-r1.ebuild 2114 BLAKE2B 6fe3aff1c5e1d0c6791787d25b2443dc50a61c0f5e1c8b6b79f7bfc192cabd76dff6d38234c14eb66932bf5200990c522cac6e9bb8b12646f87cb51653450b63 SHA512 0a5f1f1c8b3a0130a6e7a09977a5b9b6c536cc41c858a2ae68e71707b7b4ec76f7c7558fbb0096bd5ee916ef4ed6630f74317c1a0a2449459cda429234b41348
-EBUILD konversation-20.12.3.ebuild 1905 BLAKE2B ca8c9ed95a0f9f2563cacb6d2119081c20ec311d12c1c30ac6fd546b9b1ee02296b752b998c42e8d2eaf6ef80f8d7050ed3d6a46d981ea967bb17b23033c1b92 SHA512 845bdfcd9d7ffc3741a5cfd1738ccfbb8e6fbabb0281d3227c9b5e15eefd710c3b72b844b21e5865adae8333c9ef74473891c4b19fc921f6ec62b33e06a9e8f6
+DIST konversation-21.04.0.tar.xz 4230300 BLAKE2B f5f1ece730b9b1f849e9dd990b94a4760dc660c643fbf5e26f7d6568cae2f5ab005ccb6e6d6dc64f0268531b3c1b79b312a9eef69aa4e99a11e7a784c7161e25 SHA512 1b0355d9ad2fdb5f62aced44c92d312115fe58153a1f52278aeb699f78e8b48eabf2f816190943f5fc583356885486ea7e04aefab1712f7627bb70d405d4ff47
+EBUILD konversation-20.12.3.ebuild 1902 BLAKE2B 65a9eb42c8b5922fbaa78935813bc9efb52d405141e9cd89fd47b80f51aae23e0b50a4240092c39a7d91011a82e258a6f705c342e44d11f0ed5583b9873e956b SHA512 8c8d3683660cce99b2902f66c866a78739e9d1e539c62f9f0c44d92422405f2a7fbd10d084c2f849ea6792cc5e96e780f232eb2881f790c6b61487de1442cdf4
+EBUILD konversation-21.04.0.ebuild 1894 BLAKE2B f4cef411a30ec8dce3a836d69ff72926ab105f78d991eaa09ee7fbc815abe97972210965a3d1047422657ef47ab44f185e8be583b8936dfe2bcab7795a02d5c7 SHA512 62f463191aa4a40d1f945c1636e1dabe1e47bdde86b60d41b24cfeaaf170c6d08361997a0e7c2ceff96d73f704504a37e571e3cf7c3d181cb47c4dcf42e2d4f8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
deleted file mode 100644
index d856a17215a9..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Mon, 16 Sep 2019 18:18:49 +0100
-Subject: Drop effectively unused kemoticons support
-
-Summary:
-Konversation only supported emoticons if config value EnableEmotIcons
-was true. This by default was false and there is no UI for configuring
-this, making it effectively unused.
-
-This appears to be deliberate from the code comments.
-
-This helps clear up some KEmoticon library usage for future KF6
-transitioning.
-
-UTF-8 emoticons work correctly.
-
-Test Plan: Compiles
-
-Differential Revision: https://phabricator.kde.org/D24000
----
- src/CMakeLists.txt           |  2 --
- src/config/konversation.kcfg |  8 --------
- src/viewer/ircview.cpp       |  3 ---
- 3 files changed, 13 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c2077b3..89616a6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -138,7 +138,6 @@ set(viewer_SRCS
-     viewer/topiclabel.cpp
-     viewer/awaylabel.cpp
-     viewer/editnotifydialog.cpp
--    viewer/emoticons.cpp
-     viewer/images.cpp
-     viewer/quickbutton.cpp
-     viewer/searchbar.cpp
-@@ -224,7 +223,6 @@ target_link_libraries(konversation
-     KF5::Bookmarks
-     KF5::ConfigWidgets
-     KF5::Crash
--    KF5::Emoticons
-     KF5::I18n
-     KF5::IdleTime
-     KF5::NotifyConfig
-diff --git a/src/config/konversation.kcfg b/src/config/konversation.kcfg
-index 1d59eaf..3f0b7a6 100644
---- a/src/config/konversation.kcfg
-+++ b/src/config/konversation.kcfg
-@@ -844,14 +844,6 @@
-       <label></label>
-       <whatsthis></whatsthis>
-     </entry>
--    <entry key="EnableEmotIcons" type="Bool">
--      <default>false</default>
--      <label>Enable emoticons</label>
--    </entry>
--    <entry key="EmotIconTheme" type="String">
--      <default>Default</default>
--      <label>Emoticons theme</label>
--    </entry>
-   </group>
-   <group name="PreferencesDialog">
-     <entry name="PreferencesDialogSize" key="Size" type="Size">
-diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
-index c129f61..15f78ca 100644
---- a/src/viewer/ircview.cpp
-+++ b/src/viewer/ircview.cpp
-@@ -20,7 +20,6 @@
- #include "application.h"
- #include "highlight.h"
- #include "sound.h"
--#include "emoticons.h"
- #include "notificationhandler.h"
- 
- #include <QDrag>
-@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const QString& defaultColor, const
-             QLatin1String("\">") + filteredLine + QLatin1String("</font>");
-     }
- 
--    filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine);
--
-     return filteredLine;
- }
- 
--- 
-cgit v1.1
-
-From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001
-From: Peter Simonsson <peter.simonsson@gmail.com>
-Date: Tue, 7 Apr 2020 16:37:53 +0200
-Subject: Remove KEmoticons from dependencies as it's not used
-
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5315dbd..19facd8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-     CoreAddons
-     Crash
-     DocTools
--    Emoticons
-     I18n
-     IdleTime
-     NotifyConfig
--- 
-cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch b/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
deleted file mode 100644
index f631a9493483..000000000000
--- a/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-From 2104a776203d32b49512b303506f94085e0e4d89 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 19 Sep 2020 22:50:48 +0200
-Subject: [PATCH] Port away from KIconthemes
-
-Use appropriate QIcon/QStyle API instead
-
-Incorporates:
-
-commit 5cd6c690e005a040e5fd3ccfca7ae23593c6dfe6
-Author: Nicolas Fella <nicolas.fella@gmx.de>
-Date:   Sat Sep 19 22:50:48 2020 +0200
-Subject: Remove unneeded system tray icon update
-
-  The system tray icon is specified by name.
-  We don't need to do anything when the theme changes.
-
-commit d1bce09605c255f7b96fa677ece363b3053d085e
-Author: Peter Simonsson <peter.simonsson@gmail.com>
-Date:   Tue Oct 22 21:35:25 2019 +0200
-Subject: Don't use deprecated SmallIcon
-
----
- CMakeLists.txt                |  1 -
- src/CMakeLists.txt            |  1 -
- src/dcc/recipientdialog.cpp   |  5 ++---
- src/dcc/transferlistmodel.cpp | 25 ++++---------------------
- src/dcc/transferlistmodel.h   |  3 +--
- src/irc/channel.cpp           |  4 ++--
- src/irc/nicksonline.cpp       |  1 -
- src/irc/query.cpp             |  4 ++--
- src/mainwindow.cpp            |  2 --
- src/statusbar.cpp             |  4 ++--
- src/viewer/ircview.cpp        |  5 ++---
- src/viewer/ircviewbox.cpp     |  1 -
- src/viewer/topiclabel.cpp     |  6 ++----
- src/viewer/viewcontainer.cpp  |  4 +---
- 14 files changed, 18 insertions(+), 48 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f0cd4b4f..3a1f5274 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,7 +37,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-     DBusAddons
-     Notifications
-     WindowSystem
--    IconThemes
-     ItemViews
- )
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 04f28971..36de36b0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -238,7 +238,6 @@ target_link_libraries(konversation
-     KF5::CoreAddons
-     KF5::Notifications
-     KF5::WindowSystem
--    KF5::IconThemes
-     KF5::ItemViews
-     Phonon::phonon4qt5)
- 
-diff --git a/src/dcc/recipientdialog.cpp b/src/dcc/recipientdialog.cpp
-index 3e6eeae7..e81e91ea 100644
---- a/src/dcc/recipientdialog.cpp
-+++ b/src/dcc/recipientdialog.cpp
-@@ -28,7 +28,6 @@
- #include <KLineEdit>
- #include <KSharedConfig>
- #include <KWindowConfig>
--#include <KIconLoader>
- 
- namespace Konversation
- {
-@@ -64,12 +63,12 @@ namespace Konversation
-             dialogLayout->addWidget(buttonBox);
-             QPushButton* button = buttonBox->addButton(QDialogButtonBox::Ok);
-             button->setToolTip(i18n("Select nickname and close the window"));
--            button->setIcon(SmallIcon("dialog-ok"));
-+            button->setIcon(QIcon::fromTheme("dialog-ok"));
-             button->setShortcut(Qt::CTRL | Qt::Key_Return);
-             button->setDefault(true);
-             button = buttonBox->addButton(QDialogButtonBox::Cancel);
-             button->setToolTip(i18n("Close the window without changes"));
--            button->setIcon(SmallIcon("dialog-cancel"));
-+            button->setIcon(QIcon::fromTheme("dialog-cancel"));
- 
-             KWindowConfig::restoreWindowSize(windowHandle(), KConfigGroup(KSharedConfig::openConfig(), "DCCRecipientDialog"));
- 
-diff --git a/src/dcc/transferlistmodel.cpp b/src/dcc/transferlistmodel.cpp
-index cc1763f9..2a7e3b15 100644
---- a/src/dcc/transferlistmodel.cpp
-+++ b/src/dcc/transferlistmodel.cpp
-@@ -21,7 +21,6 @@
- #include <KCategorizedSortFilterProxyModel>
- #include <KLocalizedString>
- #include <KCategoryDrawer>
--#include <KIconLoader>
- 
- namespace Konversation
- {
-@@ -313,15 +312,11 @@ namespace Konversation
-                     {
-                         case TransferHeaderData::Status:
-                         {
--                            QVariant decoration(QVariant::Pixmap);
--                            decoration.setValue<QPixmap>(getStatusIcon(transfer->getStatus()));
--                            return decoration;
-+                            return getStatusIcon(transfer->getStatus());
-                         }
-                         case TransferHeaderData::TypeIcon:
-                         {
--                            QVariant decoration(QVariant::Pixmap);
--                            decoration.setValue<QPixmap>(getTypeIcon(transfer->getType()));
--                            return decoration;
-+                            return transfer->getType() == Transfer::Send ? QIcon::fromTheme("arrow-up") : QIcon::fromTheme("arrow-down");
-                         }
-                         default:
-                             return QVariant();
-@@ -384,19 +379,7 @@ namespace Konversation
-             }
-         }
- 
--        QPixmap TransferListModel::getTypeIcon(Transfer::Type type) const
--        {
--            if (type == Transfer::Send)
--            {
--                return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Small);
--            }
--            else
--            {
--                return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Small);
--            }
--        }
--
--        QPixmap TransferListModel::getStatusIcon(Transfer::Status status) const
-+        QIcon TransferListModel::getStatusIcon(Transfer::Status status) const
-         {
-             QString icon;
-             switch (status)
-@@ -422,7 +405,7 @@ namespace Konversation
-                 default:
-                 break;
-             }
--            return KIconLoader::global()->loadIcon(icon, KIconLoader::Small);
-+            return QIcon::fromTheme(icon);
-         }
- 
-         QString TransferListModel::getSpeedPrettyText (transferspeed_t speed)
-diff --git a/src/dcc/transferlistmodel.h b/src/dcc/transferlistmodel.h
-index 3a8a945c..b8bc0d25 100644
---- a/src/dcc/transferlistmodel.h
-+++ b/src/dcc/transferlistmodel.h
-@@ -164,8 +164,7 @@ namespace Konversation
-             inline QString getPositionPrettyText(KIO::fileoffset_t position,
-                                                  KIO::filesize_t filesize) const;
-             inline QString getSenderAddressPrettyText(Transfer *transfer) const;
--            inline QPixmap getStatusIcon(Transfer::Status status) const;
--            inline QPixmap getTypeIcon(Transfer::Type type) const;
-+            inline QIcon getStatusIcon(Transfer::Status status) const;
-             inline QString getStatusDescription(Transfer::Status status, Transfer::Type type, const QString& errorMessage = QString()) const;
- 
-             QList<TransferItemData> m_transferList;
-diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp
-index 6488a0c1..595d0adc 100644
---- a/src/irc/channel.cpp
-+++ b/src/irc/channel.cpp
-@@ -38,7 +38,6 @@
- #include <KLineEdit>
- #include <KPasswordDialog>
- #include <KMessageBox>
--#include <KIconLoader>
- #include <KComboBox>
- 
- #define DELAYED_SORT_TRIGGER    10
-@@ -237,7 +236,8 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent)
-     awayLabel->hide();
-     cipherLabel = new QLabel(commandLineBox);
-     cipherLabel->hide();
--    cipherLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
-+    const int toolBarIconSize = cipherLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
-+    cipherLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
-     m_inputBar = new IRCInput(commandLineBox);
- 
-     commandLineLayout->addWidget(nicknameCombobox);
-diff --git a/src/irc/nicksonline.cpp b/src/irc/nicksonline.cpp
-index e23deab4..bb4cf00e 100644
---- a/src/irc/nicksonline.cpp
-+++ b/src/irc/nicksonline.cpp
-@@ -31,7 +31,6 @@
- #include <QToolTip>
- #include <QTreeWidget>
- 
--#include <KIconLoader>
- #include <KToolBar>
- 
- 
-diff --git a/src/irc/query.cpp b/src/irc/query.cpp
-index 8c1845e6..56310642 100644
---- a/src/irc/query.cpp
-+++ b/src/irc/query.cpp
-@@ -25,7 +25,6 @@
- 
- #include <QSplitter>
- 
--#include <KIconLoader>
- #include <KMessageBox>
- #include <KSqueezedTextLabel>
- 
-@@ -75,7 +74,8 @@ Query::Query(QWidget* parent, const QString& _name) : ChatWindow(parent)
-     blowfishLabel = new QLabel(inputBox);
-     inputBoxLayout->addWidget(blowfishLabel);
-     blowfishLabel->hide();
--    blowfishLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
-+    const int toolBarIconSize = blowfishLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
-+    blowfishLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
-     m_inputBar=new IRCInput(inputBox);
-     inputBoxLayout->addWidget(m_inputBar);
- 
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index 40423d29..a876de30 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -49,7 +49,6 @@
- #include <KActionMenu>
- #include <KNotifyConfigWidget>
- #include <KGlobalAccel>
--#include <KIconLoader>
- 
- MainWindow::MainWindow() : KXmlGuiWindow(0)
- {
-@@ -743,7 +742,6 @@ void MainWindow::updateTrayIcon()
-             // set up system tray
-             m_trayIcon = new Konversation::TrayIcon(this);
-             connect(this, SIGNAL(endNotification()), m_trayIcon, SLOT(endNotification()));
--            connect(KIconLoader::global(), SIGNAL(iconChanged(int)), m_trayIcon, SLOT(updateAppearance()));
-             QMenu *trayMenu = qobject_cast<QMenu*>(m_trayIcon->contextMenu());
-             trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::Preferences))));
-             trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::ConfigureNotifications))));
-diff --git a/src/statusbar.cpp b/src/statusbar.cpp
-index 07a22fc6..e0efb02f 100644
---- a/src/statusbar.cpp
-+++ b/src/statusbar.cpp
-@@ -19,7 +19,6 @@
- #include <KLocalizedString>
- #include <QStatusBar>
- #include <KSqueezedTextLabel>
--#include <KIconLoader>
- 
- namespace Konversation
- {
-@@ -52,7 +51,8 @@ namespace Konversation
- 
-         m_sslLabel = new SSLLabel(m_window->statusBar());
-         m_sslLabel->setObjectName(QStringLiteral("sslLabel"));
--        m_sslLabel->setPixmap(SmallIcon(QStringLiteral("security-high")));
-+        const int smallIconSize = m_sslLabel->style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize);
-+        m_sslLabel->setPixmap(QIcon::fromTheme(QStringLiteral("security-high")).pixmap(smallIconSize));
-         m_sslLabel->hide();
-         m_sslLabel->setWhatsThis(i18n("All communication with the server is encrypted.  This makes it harder for someone to listen in on your communications."));
- 
-diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
-index 73f5305f..86bbc3ae 100644
---- a/src/viewer/ircview.cpp
-+++ b/src/viewer/ircview.cpp
-@@ -30,9 +30,7 @@
- #include <QTextDocumentFragment>
- #include <QMimeData>
- 
--#include <KIconLoader>
- #include <KStandardShortcut>
--#include <kio/pixmaploader.h>
- #include <KUrlMimeData>
- #include <QLocale>
- 
-@@ -2000,7 +1998,8 @@ void IRCView::mouseMoveEvent(QMouseEvent* ev)
- 
-         drag->setMimeData(mimeData);
- 
--        QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
-+        const QString iconName = KIO::iconNameForUrl(url);
-+        const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
-         drag->setPixmap(pixmap);
- 
-         drag->exec();
-diff --git a/src/viewer/ircviewbox.cpp b/src/viewer/ircviewbox.cpp
-index 463c9fd3..6c10d976 100644
---- a/src/viewer/ircviewbox.cpp
-+++ b/src/viewer/ircviewbox.cpp
-@@ -14,7 +14,6 @@
- #include "ircview.h"
- #include "searchbar.h"
- 
--#include <KIconLoader>
- #include <QPixmap>
- #include <QVBoxLayout>
- 
-diff --git a/src/viewer/topiclabel.cpp b/src/viewer/topiclabel.cpp
-index 6a8b4331..c96edc6e 100644
---- a/src/viewer/topiclabel.cpp
-+++ b/src/viewer/topiclabel.cpp
-@@ -20,9 +20,6 @@
- #include <QTextDocument>
- #include <QMimeData>
- 
--#include <KIconLoader>
--#include <kio/pixmaploader.h>
--
- namespace Konversation
- {
-     TopicLabel::TopicLabel(QWidget *parent, const char *name)
-@@ -181,7 +178,8 @@ namespace Konversation
- 
-             drag->setMimeData(mimeData);
- 
--            QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
-+            const QString iconName = KIO::iconNameForUrl(url);
-+            const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
-             drag->setPixmap(pixmap);
- 
-             drag->exec();
-diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp
-index 94d498ea..fd7be5bc 100644
---- a/src/viewer/viewcontainer.cpp
-+++ b/src/viewer/viewcontainer.cpp
-@@ -52,8 +52,6 @@
- #include <KToggleAction>
- #include <KSelectAction>
- #include <KWindowSystem>
--#include <KIconLoader>
--
- 
- using namespace Konversation;
- 
-@@ -241,7 +239,7 @@ void ViewContainer::setupTabWidget()
-     m_vbox->hide();
- 
-     QToolButton* closeBtn = new QToolButton(m_tabWidget);
--    closeBtn->setIcon(SmallIcon("tab-close"));
-+    closeBtn->setIcon(QIcon::fromTheme("tab-close"));
-     closeBtn->adjustSize();
-     m_tabWidget->setCornerWidget(closeBtn, Qt::BottomRightCorner);
-     connect(closeBtn, SIGNAL(clicked()), this, SLOT(closeCurrentView()));
--- 
-2.28.0
-
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
deleted file mode 100644
index 53ea4a3d7a1d..000000000000
--- a/net-irc/konversation/files/konversation-1.7.7-no-solid.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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-20.12.3.ebuild b/net-irc/konversation/konversation-20.12.3.ebuild
index 5e0ea6be4c39..8712bc63e0eb 100644
--- a/net-irc/konversation/konversation-20.12.3.ebuild
+++ b/net-irc/konversation/konversation-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+crypt"
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-irc/konversation/konversation-1.7.7-r1.ebuild b/net-irc/konversation/konversation-21.04.0.ebuild
index d3f2f657db22..81b41083e5b3 100644
--- a/net-irc/konversation/konversation-1.7.7-r1.ebuild
+++ b/net-irc/konversation/konversation-21.04.0.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KDE_GEAR="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="User friendly IRC Client"
 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"
@@ -41,6 +38,7 @@ DEPEND="
 	>=kde-frameworks/kidletime-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/knotifyconfig-${KFMIN}:5
 	>=kde-frameworks/kparts-${KFMIN}:5
@@ -58,13 +56,6 @@ RDEPEND="${DEPEND}
 	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
 "
 
-PATCHES=(
-	# git master
-	"${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch
-	"${FILESDIR}"/${PN}-1.7.6-no-kiconthemes.patch
-	"${FILESDIR}"/${P}-no-solid.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package crypt Qca-qt5)