Merge branch 'edge' into next

19 files changed, 624 insertions, 28 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index eda4eef206c2..365a8d58858a 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index e9a914c0b75a..8dfb0e23e4f9 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,5 +1,6 @@
 AUX atheme-services-7.2.10_p2-configure-logdir.patch 833 BLAKE2B 3809ea93546547de99b41ff19547b027102706e5e06e40333491440a1f09b0e78e31f5956def37ea1f6b067876a72f54a275d428332f2f479c7dace476bdc200 SHA512 43ca2af5aec6a1ea4b08564c62a21ae762fd01f2c177dbf8f7c6ebb238b9302b8310f2fe96ce2b20a7f7014c488a02177d1e583aa438ceff7576e4880ca2f62f
+AUX atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch 377 BLAKE2B 068127c36f21614cf8322fcd550c4c1bb5aecc9f692796da960a0544ede5572ddce64b8cca2b2243c2ba0296f78d1dcde8bed92100c55679d69cf3ed9e66645a SHA512 d70e3df0662f0a4e20af45ccfde94a61acf3102d55d1432597a732e93c1bafd2fbec0e37b4d74125147adfc8506c96f3da2564ca6e7155c56916a6abf1e46de7
 AUX atheme-services.initd 524 BLAKE2B 1388771d1d086baee885598eb448ee3daf1031e120cd21947a344aa72b24b969a5e9c6c5705b72c30a78020fbc2f27e56e0fbc618f58e8aae14c6fcae4b049c5 SHA512 3b90f60677088384c3f69b9dde40d18f4829d3435da0cdfbab003db3b68b6462ef31635b5fe4ed59d56745df9aa95a0690586b56d2f91e621aa2e708cb289cc1
 DIST atheme-services-7.2.10_p2.tar.xz 21061364 BLAKE2B e02ea3b9b55c0a02bfd354da65ed45318c2f0a5d5d35cabe7984760cfe1683b9856cc779754f1de8861816b5b2d2323c898100697e8d365ffed039e90b42cde6 SHA512 c7e6654ddbf515b1565b77f0659cd9a77787d004fb532ecdee638189e823ec65afc283cbeafc6d7625ed6c210835e5546c5e33718e08ad0b280ccc7a2df7be48
-EBUILD atheme-services-7.2.10_p2.ebuild 2213 BLAKE2B abd040d824e75d3db7ac86eed9b8e60b0a2dc5963ed31bd485cdd0b30699bcc2478543f8123dc3b4722806327dde01c3f56cca48029752ece2c7280a1be4a5b7 SHA512 ee4cce046f792b685c854f9f3ed4ba849a5a13048658cd4fa1acf753fbf0aa6ca758b43016429fa1ae0d9bffbdc96c106b04733e1adce610adea1e0268f04878
+EBUILD atheme-services-7.2.10_p2-r2.ebuild 2287 BLAKE2B cf9e63e6511c708a0cac4c06f7f70ddd00fc06306b5cee1c8fe4e14c0c49199205e79b41397b8996148ef8aa454b200e64fdbca2aadd532987d3556031eed05d SHA512 2c6873981b724e7256efead03c9b7ce01b699ffae2b0d8c7c28c0e2bfb2fb1a6d18c12f34f7d5899f6014590aaee4f676bda471f7ad2e65d82bb5f570988a7bb
 MISC metadata.xml 721 BLAKE2B cab35add2ea8e919feee82480bd106479b29de57733ae46b18ebac83bbefde0f9e9d1479db8f59c4be4d60383805f969378a4a33b36976ac9bcae99ea8e7dd96 SHA512 bc64eb444e7f6166a81a832c005bd6acb582c9dda7471b057756ede11531290645ef6d9d4c664a87405200190ed4a51678403691e5863cc0af2a408741bd7d15
diff --git a/net-irc/atheme-services/atheme-services-7.2.10_p2.ebuild b/net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild
index 370851d3ea41..820dfd3bd2f6 100644
--- a/net-irc/atheme-services/atheme-services-7.2.10_p2.ebuild
+++ b/net-irc/atheme-services/atheme-services-7.2.10_p2-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic perl-functions user
+inherit flag-o-matic perl-functions
 
 MY_PN="atheme"
 MY_PV="7.2.10-r2"
 
 DESCRIPTION="A portable and secure set of open-source and modular IRC services"
 HOMEPAGE="https://github.com/atheme/atheme"
-SRC_URI="https://github.com/atheme/atheme/releases/download/v${MY_PV}/${MY_PN}-v${MY_PV}.tar.xz -> ${PN}-${PV}.tar.xz"
+SRC_URI="https://github.com/atheme/atheme/releases/download/v${MY_PV}/${MY_PN}-v${MY_PV}.tar.xz -> ${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,22 +18,24 @@ KEYWORDS="~amd64"
 IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
 S="${WORKDIR}/${MY_PN}-v${MY_PV}"
 
-RDEPEND=">=dev-libs/libmowgli-2.1.0:2
+RDEPEND="
+	acct-group/atheme-services
+	acct-user/atheme-services
+	>=dev-libs/libmowgli-2.1.0:2
 	cracklib? ( sys-libs/cracklib )
 	ldap? ( net-nds/openldap )
 	perl? ( dev-lang/perl )
 	pcre? ( dev-libs/libpcre )
 	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+# 'dev-vcs/git' required as per bug #665802
+BDEPEND="
 	dev-vcs/git
 	virtual/pkgconfig"
 
-PATCHES=("${FILESDIR}"/${P}-configure-logdir.patch)
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-configure-logdir.patch
+	"${FILESDIR}"/${P}-fix-backtrace-compat-detection.patch)
 
 src_configure() {
 	# perl scriping module support is also broken in 7.0.0. Yay for QA failures.
@@ -85,8 +87,8 @@ src_install() {
 
 	use perl && perl_domodule -r contrib/Atheme{,.pm}
 
-	rm "${ED%/}/usr/share/doc/${PF}/WINDOWS" || die
+	rm "${ED}/usr/share/doc/${PF}/WINDOWS" || die
 
 	# Bug #454840 #520490
-	rm -rf "${ED%/}/var/run" || die
+	rm -rf "${ED}/var/run" || die
 }
diff --git a/net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch b/net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch
new file mode 100644
index 000000000000..b6f448163aac
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services-7.2.10_p2-fix-backtrace-compat-detection.patch
@@ -0,0 +1,12 @@
+diff --git a/modules/contrib/backtrace.c b/modules/contrib/backtrace.c
+index 8c4eeb2..064e88e 100644
+--- a/modules/contrib/backtrace.c
++++ b/modules/contrib/backtrace.c
+@@ -1,6 +1,6 @@
+ #include "atheme-compat.h"
+ 
+-#if defined( __linux__) || defined(__Linux__)
++#if (defined( __linux__) || defined(__Linux__)) && defined(__GLIBC__)
+ #include <execinfo.h>
+ 
+ DECLARE_MODULE_V1
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 84aca1d02fc4..4b7d35c701f3 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,6 +1,12 @@
+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 konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
 EBUILD konversation-1.7.5-r1.ebuild 2072 BLAKE2B 30748529d81e48df25598047d5dcb078e9ce44aafcd102d36ecac01c0f9b395ddceb19e6d47842d8ab396d87803447191d78b213fd8249212958c7b203ac2bc3 SHA512 7598b801ade04ed967942e24f653271e7a07b7ace7c16264bd4e285bfbe7f6bc83d449c255a27367d462216d5bceec74f0203a956043d8b3f757df6a53fca4b7
+EBUILD konversation-1.7.5-r2.ebuild 2272 BLAKE2B 3c87dc8a8f1102d8a3b3b13c757de4502b3d59d4d8fdd8841dcae85eda66f3cccaf052fb31831bb8bd41722ec667291ec48453bae560e09d5bbe4a3d0a93da4d SHA512 f5cbe6112c22fefe5a9af3a61e169ca2409b7da6eb1fd6fa3cb698246561e91d7cbc1d68585d4ab4d9057b222917cf2a1aa3e84141182ddb2712fb65430208ef
 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
new file mode 100644
index 000000000000..74fd23e58d3c
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
@@ -0,0 +1,81 @@
+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-kf5bookmarks-5.69.patch b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
new file mode 100644
index 000000000000..2c36f69aa99c
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
@@ -0,0 +1,51 @@
+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
new file mode 100644
index 000000000000..cf93b3b66def
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
@@ -0,0 +1,37 @@
+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-qt-5.15.patch b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
new file mode 100644
index 000000000000..a17c0a432314
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
@@ -0,0 +1,31 @@
+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.5-unused-kemoticons.patch b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
new file mode 100644
index 000000000000..d856a17215a9
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
@@ -0,0 +1,112 @@
+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/konversation-1.7.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild
new file mode 100644
index 000000000000..22ed78f5a2d3
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -0,0 +1,85 @@
+# 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/ngircd/Manifest b/net-irc/ngircd/Manifest
index d3568b0a6070..8d495183b2fb 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -3,4 +3,4 @@ DIST ngircd-23.tar.gz 517686 BLAKE2B 1e1d7386a95f22917e6f69ec43bc48a8031543c48d6
 DIST ngircd-24.tar.gz 524968 BLAKE2B 8ec0518d54f43a4c42fbf9744d217eb2aae498fe4f0010bce6ad68164037c2e55dc2b9681babce8ca5f7e26bac60a91389c63dab397d349dd4bcbcce6c2e9839 SHA512 66d1b9576c03d0a70be17a235f2da50ee661646cd428d18a6c61975407671dd4a3a545069258536773b27d4fb63523527366bbbf4f35cb08111dc60842924395
 EBUILD ngircd-23-r1.ebuild 1650 BLAKE2B dec05ba13a17143191e093b2956bc013b8517e52a7949cd5a0e9b7f0810834ce46b57bf06ed549b89a98fa32b4e6945bbab05cc393437cdd9d7ced38c2d69126 SHA512 9bd2d786f35f5bc0cc48db592c6c9bf1d921bf24a55924b947d625f9043b7a8f6d97377266385aeb3d4a4f982a98c4c8e71c03ebd48a81302eec31fdbf97ef66
 EBUILD ngircd-24.ebuild 1685 BLAKE2B eb31abc6faf507e55bf9a88abe98fd83eb4dd9fee3e580e0b9f9fb187c47b29a2b7ab16e11f347769ad82e4f4f495eccf5622205215f91b3d920e833f6d7d8d8 SHA512 66d47dd1029301755ae43fbfcc5d25930a3965011884c5c965a9bd6983e187d79086b182958b9bb7942232e7705e419f8aaa11ed334aebbb76a9d8d55caec4df
-MISC metadata.xml 458 BLAKE2B 9a07a315798ae59419edaf626c6e9097630b7d8c2d0c740f9c2f3ab417b1d28e2c31a8912220ba98b109925e9b8b79ad0c3865e1e321d359216e06f9f541c9a3 SHA512 94654981a9803ff905d7373d9026f12346db7965bbaa1e034c0661930b90916bc290622f33ecc7716cceca710ed830135de04873115f568962b0d80134f1253d
+MISC metadata.xml 259 BLAKE2B db253a70057f68a5b270f8133fd92ece2932276797ea0c1edb3f00a453610b6d880c8cebf35ee7cdbcd533433521b70851a7a4c296806ac6f3f5407bc144f667 SHA512 2b92154346053dfc4dbd911664a5fc8b7a72eb3a12fe191cf010cceb362a8eb36e42cbf52cc0f0843d5ffe24fd6c0082bd11b2e7e4fa900f7660e828c1daa1d9
diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml
index f616e43774b0..7f0bfef99296 100644
--- a/net-irc/ngircd/metadata.xml
+++ b/net-irc/ngircd/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@blackphoenix.de</email>
-		<name>Moritz Kick</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="ident">Enables support for <pkg>net-libs/libident</pkg></flag>
 	</use>
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 24ba294ee98a..0346d742db11 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,7 +1,10 @@
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
+AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8dfc3e9eab968008ad681a8b9f353bff4951bba8023d5c04affda6b58fde5db8232d0f1f9ae3e470424f0 SHA512 99163776104f2f27a585332004221fac16a9fbf9c8930b0603b5f33aca4c5ac13bdded4d5917143796b3893a19d2f709b0c4d4d635d85bd681f643b3b59131f5
 DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
 DIST unrealircd-5.0.3.1.tar.gz 4902967 BLAKE2B d3c2e2399091b3aa9906583231d5ba42534234c4c40ce7412609fe8866438848bb69a4fc3cd378e0ed9ab13970ba2a7b27ba9fccdaaaea3585ec0a05aa5f89c2 SHA512 1bf3e2aab2f14d68a02ae6925d9e91135a92cf08886f703be0cd203c8b4b323bfc3930254d2bda381e60b3991f379115c954fa1fd262e28d7a27172a25bb172a
+DIST unrealircd-5.0.4.tar.gz 4907069 BLAKE2B 223c45dbd060cf13afabafd13325bb76889fa64f663fff1be753de703df50265c6a05658edfe7300e97cf1431f54992b7e37801ef4773b02add9d5edca80237c SHA512 cdd83fa55bdf1960499fff48ba656b66cf5a1c43a360658bc37add217af36933f00280f7eaddcbbd39720058a401650b944a5f0ce79ae3ca6749bd58c9cd5241
 EBUILD unrealircd-4.2.4.1.ebuild 5452 BLAKE2B 356dfc371b2c8757cd710ba93401f4a34e069b545cc77573b9942ac1672e0a4367be3fb1a47fdf9ef7cdee3a1ba40bc57d0ae0366c16262665a03cdc63fae242 SHA512 b875c731c0712ab570b1d18fe0ca30abe5ed235d24a3beafa169f98d94cc6f52130d935d21ba732bbf74b368adfd9754283e61688339b1a2599523fd3e3d3d98
 EBUILD unrealircd-5.0.3.1.ebuild 5008 BLAKE2B ada6fca3216c0cbffcab8de82791d605bed4754e6bea55b9e8d1866ec771c987a019600ad073d9178c0e87265b55d45ad8143254bf710d520805f6e7d25285c9 SHA512 21c19a57e4cbf63f046d9bbeeee00e0400a63291329bd9d7765f9d790b3d065f8bae492c5703b927e9779f0481295153875a1655613b6c1445582d7adc0f176d
+EBUILD unrealircd-5.0.4.ebuild 5090 BLAKE2B 2403730ad38e5220d43b6227385deb58546293602c727438232ee4fd1910a9863b0fd78c1adbc6f43fe9cd32a256b67c08c43d495a03dc8e9b90c4c955e97309 SHA512 4ca8d90ddc7182b54b24153de1b30ffb3cae9298cfe664b4d914471603aa62bd50d1d4c4f1dd3e4346c1f40a239317efc8209bf29435041e578ecfb6fef452f6
 MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/files/unrealircd.service b/net-irc/unrealircd/files/unrealircd.service
new file mode 100644
index 000000000000..5382670ef0a4
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Unrealircd IRC Server Daemon
+After=network.target
+
+[Service]
+Type=forking
+User=unrealircd
+ExecStart=/usr/bin/unrealircd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-irc/unrealircd/unrealircd-5.0.4.ebuild b/net-irc/unrealircd/unrealircd-5.0.4.ebuild
new file mode 100644
index 000000000000..d2f7a8a96ec9
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.4.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert systemd
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.7:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm -r extras || die
+
+	# building third-party modules (which we don't do) cause a sandbox violation
+	# bug 704444
+	echo "" > src/buildmod || die
+
+	if use class-nofakelag; then
+		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# Default value for privatelibdir adds a build path to -Wl,-rpath.
+	econf \
+		--with-bindir="${EPREFIX}"/usr/bin \
+		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
+		--with-confdir="${EPREFIX}"/etc/${PN} \
+		--with-datadir="${EPREFIX}"/var/lib/${PN} \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--without-privatelibdir \
+		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-maxconnections=1024 \
+		--with-nick-history=2000 \
+		--with-permissions=0640 \
+		--with-system-argon2 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+
+	(
+		cd src/modules || die
+		for subdir in $(find . -type d -print); do
+			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+				doexe "${subdir}"/*.so
+			fi
+		done
+	)
+
+	insinto /etc/${PN}
+	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+	# is redundant with app-misc/ca-certificates and examples will all
+	# be in docs anyway.
+	doins -r doc/conf/{aliases,help}
+	doins doc/conf/*.conf
+	newins doc/conf/examples/example.conf ${PN}.conf
+	keepdir /etc/${PN}/tls
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	fperms 0750 /etc/${PN}/tls
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/log/${PN}
+	fperms 0770 /var/lib/${PN}{,/tmp}
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+
+	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+	# that to look for ca-certificates-provided file instead. %s is
+	# CONFDIR. #618066
+	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+
+	insinto $(systemd_get_systemunitdir)
+	doins "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/tls/server.cert
+				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
+			)
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can also configure ${PN} start at boot with rc-update(1)."
+	elog "It is recommended to run unrealircd as an unprivileged user."
+	elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 5974068f7539..a52e8e525602 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -6,6 +6,6 @@ DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac8760
 DIST znc-1.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
 DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
 EBUILD znc-1.7.4.ebuild 5134 BLAKE2B 31bd284fc0ece9ee5f6790171a94193e36b19dc200a8adc79b5605e47a3936d4ea1fa4f77431762b65d876d6d6bd78320715e9d3cadd9c9a8c5899699d938265 SHA512 73cc767efc33a7cfca17967035d98d5e30de22cbb97566ee9d754d2db5137f425db8bdae458d22651d17b9efd056f48cb8016049b1055ba817774240f873dc8a
-EBUILD znc-1.7.5.ebuild 5137 BLAKE2B 516fb575d9ae7425af9a4cd01d93c337bf8c7a486417b7bdb58c47fe0ced239969b5caaee8f15745340097524788613cd88069e35a9e91cfca24fb10a7dd2c2e SHA512 780522547629c77123716116f6247652de57fb5f7d1171721551d455fad99a90ed3f1456b4ae4e344373f97686eb1da50f791c2e2e7e3c9df38685d3a2c3e11b
-EBUILD znc-9999.ebuild 5137 BLAKE2B 516fb575d9ae7425af9a4cd01d93c337bf8c7a486417b7bdb58c47fe0ced239969b5caaee8f15745340097524788613cd88069e35a9e91cfca24fb10a7dd2c2e SHA512 780522547629c77123716116f6247652de57fb5f7d1171721551d455fad99a90ed3f1456b4ae4e344373f97686eb1da50f791c2e2e7e3c9df38685d3a2c3e11b
+EBUILD znc-1.7.5.ebuild 5139 BLAKE2B 14a8c7636d185678c767e17d6bd65b0e1c6ce0f07b2ab02ee6cbe397618785206bade9f440c82e19eae4d4f7c2da4c522ab2950ccc96adb686b5bac31cb2d52d SHA512 8501a3bb7f50675b069fba726e22c0a87f2333c813ae57ced1db9e7b3b433520ac81d57771ac9de4a5d88b3a9ed08d4f091211f57785149c0f033eccca964ed9
+EBUILD znc-9999.ebuild 5139 BLAKE2B 14a8c7636d185678c767e17d6bd65b0e1c6ce0f07b2ab02ee6cbe397618785206bade9f440c82e19eae4d4f7c2da4c522ab2950ccc96adb686b5bac31cb2d52d SHA512 8501a3bb7f50675b069fba726e22c0a87f2333c813ae57ced1db9e7b3b433520ac81d57771ac9de4a5d88b3a9ed08d4f091211f57785149c0f033eccca964ed9
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index e703db8161dd..6820a1521d18 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
 
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index e703db8161dd..6820a1521d18 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user