gentoo resync : 13.06.2020

19 files changed, 262 insertions, 230 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 28b5be33ab87..8e576638b21f 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 6afb5c253ef1..771acb82828c 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -6,5 +6,5 @@ AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f
 DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
 DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
 EBUILD anope-2.0.6.ebuild 5003 BLAKE2B d6d518195763f6673b6472daf36cf8e9ee792a04026b4289741b573cf6b3be669bb03e6a4be436ea5fb5ce4f66ad350918cf7bd6f97ef83b49589ebf7e9b0145 SHA512 9987c769735d6e1521c67143698ceeb3fa3143a020fe34b85d81a254f7b3761908ee1c5200b9999f73f51d7cb686236ecba9002f4e290c8ecdca82592f95bd98
-EBUILD anope-2.0.7.ebuild 4300 BLAKE2B 518e5927adb3377a4a6dd880546ee43a0e9e3cb36e5d5cf7e24238662f0cb890c58021aa4a708d369e7a75a2d59809e48509ee98b06b46c1bb45633ae77bfc61 SHA512 8defbd4c92bafbb223e1077b9436b1f6ad372d888c1b141e932e13369c3c73c46a83c3c9fd523270f1d0c9fac6928764c381e44c41fa89d22385060824f11cf9
+EBUILD anope-2.0.7.ebuild 4305 BLAKE2B 0bfc78a17737d333768066bb5182f2a426f62c5e4de7559226b76aa81a7d7bf6ed1e4ec7748832569d4725f6d0107d4dabfa8ce2110d263fcc4996c850683808 SHA512 d2134d165f68f718c1e60a0056a89dfb346c12e6c2ebb363cd688d50e792860c8292008b2e6020350cac769a3ac0cea51e22a5dffdcedf95a1e735b4857a038a
 MISC metadata.xml 1766 BLAKE2B 468c8eada20fc23455d92c612f3268876d812a7c7a87a593f896fe8fa7246dbb75441430a2e0cb4d6a1fa36b611553c0df43de2edda195a51b390c70712d7ab9 SHA512 b40ef7336a091b3211826a3b2b1e51c0586187b903b3aa34e4d9e3df0194ae3ce92964d490e77b5d679aaaa76eadf40af5b1d785d6540a23c2b832474f0a5a03
diff --git a/net-irc/anope/anope-2.0.7.ebuild b/net-irc/anope/anope-2.0.7.ebuild
index c97d65e1d2af..f00b232f80bd 100644
--- a/net-irc/anope/anope-2.0.7.ebuild
+++ b/net-irc/anope/anope-2.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
 REQUIRED_USE="
 	sql? ( || ( mysql sqlite ) )
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 83f0cdbf2a9d..dc3ed13e39bc 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,4 +1,4 @@
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
-EBUILD hexchat-2.14.3.ebuild 3299 BLAKE2B d5ac297ebb98b02019ea5f4bfa54d73dd20d522e62a6be31df6b7e821875b7fee98c01ba81310938f4d526adf6ed5e942ed512b3c5540a015e4d5984009c1d43 SHA512 82add37bfaeaf8f2251ad9577f0ca047c2be24932ea341d381687a7c8bd5241226b8a47ec16758d08cdeace9f6b32330d9b96a738e0c04acbe62612cb4511090
+EBUILD hexchat-2.14.3.ebuild 3306 BLAKE2B 35b341f235a0f040c19693953ee700289a87c771e0b03a1f9a4e35820d87e8bf00a6966448ae494f2a31b859c1ed1beb1126ec88f1f32a7b1a980a232918ff8b SHA512 dc97a7f6ad56a2b1bd650f9ec0cbd50b60ed0afb664f69854b6949b8993ca9ea0bbaa5d2bda501e2ac80728de873ae7813c4a8c0f7475db8c92dd64171946650
 EBUILD hexchat-9999.ebuild 3305 BLAKE2B bc257f377203432fe4d387258f537469ce93a6352156064593bc4d90b7afa812ddccaac097e3be1e9876b46b41c8f81634c3de7567a501214c1655cd2edcf9f3 SHA512 1eabde97709ab477d3b5ff3a742feb069d04e0239927bae5cdda7c2b8e2642937dc4384ff94225bd5ab63dedf45e7e7783414c43742c13fb82031ba87a47af56
 MISC metadata.xml 1042 BLAKE2B a8b2d37197b07fb76badeb4439d07f5b8acc0ab888f277050306ccf7b906de3bc4dc8b7a13af4b398494c350ea83eb373b107528055e6e502667b2a56e052133 SHA512 aac3a4017b0e64d98a71fcfffaec8a8245ccb7f691d40fc327599202831462e09eb7e382ed4230f5f3c584dfe0ebd9c0e3bd8f157103109cad037c9e597ef68d
diff --git a/net-irc/hexchat/hexchat-2.14.3.ebuild b/net-irc/hexchat/hexchat-2.14.3.ebuild
index 823883d65b5b..772120a1859f 100644
--- a/net-irc/hexchat/hexchat-2.14.3.ebuild
+++ b/net-irc/hexchat/hexchat-2.14.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index be2309afa2c8..d2261b10efea 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -4,5 +4,5 @@ AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e
 DIST ngircd-24.tar.gz 524968 BLAKE2B 8ec0518d54f43a4c42fbf9744d217eb2aae498fe4f0010bce6ad68164037c2e55dc2b9681babce8ca5f7e26bac60a91389c63dab397d349dd4bcbcce6c2e9839 SHA512 66d1b9576c03d0a70be17a235f2da50ee661646cd428d18a6c61975407671dd4a3a545069258536773b27d4fb63523527366bbbf4f35cb08111dc60842924395
 DIST ngircd-25.tar.gz 527886 BLAKE2B ab75c9a904fae8da4c89e07bd66bb000bc9b614e27269be3ac6f55254c77abeb2d6f7d0afc6d05630f7c548ea13d842d4c0376123035f9417eda55565a69dcec SHA512 0c96e97da312fe86c50007a72db03f85b9f79df053806f50badd07c7ca8e8bddd99adb478eab8be9630330707d7aa578b5d0bd3017b59bf4515319a64c29ea6c
 EBUILD ngircd-24.ebuild 1685 BLAKE2B eb31abc6faf507e55bf9a88abe98fd83eb4dd9fee3e580e0b9f9fb187c47b29a2b7ab16e11f347769ad82e4f4f495eccf5622205215f91b3d920e833f6d7d8d8 SHA512 66d47dd1029301755ae43fbfcc5d25930a3965011884c5c965a9bd6983e187d79086b182958b9bb7942232e7705e419f8aaa11ed334aebbb76a9d8d55caec4df
-EBUILD ngircd-25.ebuild 2269 BLAKE2B 8ebaf779409d513b2cdd22506b8ae26382b8183b881e7729211413fb2a7d70b5979a97addd8514cce0dfee9891316f0fd051dbce0ef64833913407c79ea6e4c3 SHA512 e83e0e3865fbdb8bdf766baeb6b58fef197a7fc25ae12b8d758357ae6ac25c17989d4b842315e62d4353fbf3f6340ac12fa5c731883ea2248108a4db78b915aa
+EBUILD ngircd-25.ebuild 2271 BLAKE2B e77f07b0d40e5e9c2bae30e46d76f9ecac7d999b4e4805856a6e14449c73ce66dba7222843e60bc8271aa9fa935e7253ce50bdf455ec34e0476fa4cf61c57631 SHA512 771716ee4e3fa58df6428cf0d5b3c5bf155827a363521f7943611cfb602f143152e41cb995b885899c35cddf70d8269bed60ee5f568e94633326ebfe43f84fff
 MISC metadata.xml 632 BLAKE2B c27dd54558ef8f4670a5c888fbe81fffd77c20eb8e487a45bd61cfe8703fb3c379217e3ee8a0304a1b27eddc3a9fea0826b1cacd8c464a20fbd0bce43a109074 SHA512 27891662b1e62cd3d19faf621a3e06efcc0b51ad092cde32cf7cbf5817b7e7840cb57e948389547ecfbe70a022419dbe23b46870117ccb9c26da6581da426eb9
diff --git a/net-irc/ngircd/ngircd-25.ebuild b/net-irc/ngircd/ngircd-25.ebuild
index da56e3240d4a..d6a322c5b18a 100644
--- a/net-irc/ngircd/ngircd-25.ebuild
+++ b/net-irc/ngircd/ngircd-25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos"
 IUSE="debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test zlib"
 
 RESTRICT="!test? ( test )"
diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
deleted file mode 100644
index 6a64734536ca..000000000000
--- a/net-irc/quassel-irssi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch 1192 BLAKE2B 0a4f63b24294d5b9a0dbcec257058858d5d15ecb28a8330368e5bd00f6bcaeefc3008a47f79eb5def6d7c4ee8fdcd115903ce0c477786247f8ebb558fd2e1306 SHA512 71ff7b0dd2dd14556be5dfd6b92f2ca13af51fb876e731980a979ac27d0e195170e92a915f48bdeaa3556eff7666ee9f563fd5cf89a565d9b6da93dadea5e40a
-AUX quassel-irssi-0_p20170107-tls-ssl-rename.patch 1017 BLAKE2B 21459b525312c7ca6b8d13794d340789e52f785b141b8b849adda38fabd4e5aa0d04dd569aadc99c0082caee841cc50fe38a68ff4bf622fbeac04a5a80015c94 SHA512 33d4e78d9872a24819a8b653d2d635992377ab3b6b1b990af5b14381be109a11c8a139e3fc578090dbf2bee6f1b3b5d26847f2dc1fbfcb5c4c42f52192f08d93
-DIST quassel-irssi-0_p20170107-r1.zip 42745 BLAKE2B 5f15930aa1c3c5f96cf3f36c519465c271c7e0a0884f4bd5b09cbcbb10fb862864b37893231d9c0f903c38fc018bda3530ddc420ec7f8f39228a5860939a1962 SHA512 1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814
-EBUILD quassel-irssi-0_p20170107-r1.ebuild 1762 BLAKE2B d7561bf3efb3d8723bae85a659f10834667e37e384de0faa850f857df7983cf985a5c34900b0087338aa3a3bdcbb0e78b80418e71a76c4c121b6edbff67b8e4c SHA512 b4aaacfb00912017081c755bff069dfd34944062220ac6953589c754a3e2e669630947b3e630954cc46aad7c0a06d25c6b3c46aec642f0f7ada6de871f919796
-MISC metadata.xml 482 BLAKE2B 5bd7976d541383e054b727ae7d2765278f1be40238ad1653314bdfe905b947e1d44e17bd8fb261c5b410439e6e014bdbce502d1daa5fad98da602b428688a451 SHA512 c38ead8c79e573677500102e546b503c9c7a80afa57ea9996807d47aefb4c75ca9dddb08eb2152e360155ce0a731df765267566b1efa523b5129098248c40d6a
diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
deleted file mode 100644
index ddd96ff33316..000000000000
--- a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 35555999f810f49b49ca2a6ec13d4f5b03503007 Mon Sep 17 00:00:00 2001
-From: Pierre-Hugues Husson <husson@archos.com>
-Date: Wed, 11 Jan 2017 10:24:08 +0100
-Subject: [PATCH] Fix build for irssi 1.0.0
-
----
- core/quassel-net.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/core/quassel-net.c b/core/quassel-net.c
-index 8a6eb55..9ab4829 100644
---- a/core/quassel-net.c
-+++ b/core/quassel-net.c
-@@ -117,6 +117,10 @@ static const char *get_nick_flags(SERVER_REC *server) {
- 	return "";
- }
- 
-+// IRSSI_ABI_VERSION was introduced in 0.8.18
-+#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6
-+#  define use_tls use_ssl
-+#endif
- static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
- 	Quassel_SERVER_CONNECT_REC *r = (Quassel_SERVER_CONNECT_REC*) conn;
- 
-@@ -132,10 +136,10 @@ static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
- 	ret->got = 0;
- 	server_connect_ref(SERVER_CONNECT(conn));
- 
--	if(conn->use_ssl) {
-+	if(conn->use_tls)
- 		ret->ssl = 1;
--	}
--	ret->connrec->use_ssl = 0;
-+
-+	ret->connrec->use_tls = 0;
- 
- 	ret->channels_join = quassel_irssi_channels_join;
- 	ret->send_message = quassel_irssi_send_message;
diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
deleted file mode 100644
index b38154ea0551..000000000000
--- a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rupN quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c quassel-irssi-patched/core/irssi/network-openssl.c
---- quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c	2017-01-19 14:07:24.000000000 -0500
-+++ quassel-irssi-patched/core/irssi/network-openssl.c	2017-01-20 16:07:01.599114339 -0500
-@@ -437,11 +437,11 @@ GIOChannel *irssi_ssl_get_iochannel(GIOC
- 	SSL *ssl;
- 	SSL_CTX *ctx = NULL;
- 
--	const char *mycert = server->connrec->ssl_cert;
--	const char *mypkey = server->connrec->ssl_pkey;
--	const char *cafile = server->connrec->ssl_cafile;
--	const char *capath = server->connrec->ssl_capath;
--	gboolean verify = server->connrec->ssl_verify;
-+	const char *mycert = server->connrec->tls_cert;
-+	const char *mypkey = server->connrec->tls_pkey;
-+	const char *cafile = server->connrec->tls_cafile;
-+	const char *capath = server->connrec->tls_capath;
-+	gboolean verify = server->connrec->tls_verify;
- 
- 	g_return_val_if_fail(handle != NULL, NULL);
- 
diff --git a/net-irc/quassel-irssi/metadata.xml b/net-irc/quassel-irssi/metadata.xml
deleted file mode 100644
index fe6b0fafc997..000000000000
--- a/net-irc/quassel-irssi/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">phhusson/quassel-irssi</remote-id>
-		<bugs-to>https://github.com/phhusson/quassel-irssi/issues</bugs-to>
-	</upstream>
-	<longdescription lang="en">
-	A plugin for the Irssi IRC client to allow connecting to a Quassel core
-	hosted either locally or remotely.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild b/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild
deleted file mode 100644
index 97d9cc73ba21..000000000000
--- a/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
-# allow QuasselC to be installed as a separate package.
-
-# Commit Date: Sat, 7 Jan 2017 14:50:15 +0000
-COMMIT="f23e97a6188129cfae4c52f7e1a75940185454f4"
-
-DESCRIPTION="Irssi module to connect to Quassel cores."
-HOMEPAGE="https://github.com/phhusson/quassel-irssi/"
-SRC_URI="https://github.com/phhusson/${PN}/archive/${COMMIT}.zip -> ${PF}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# fails to build with irssi-1.0
-RDEPEND=">=net-irc/irssi-1.0.0"
-DEPEND="${RDEPEND}
-	net-libs/quasselc"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-# Patches for building against irssi-1.0, obtained from:
-#   http://pkgs.fedoraproject.org/cgit/rpms/quassel-irssi.git/plain/35555999f810f49b49ca2a6ec13d4f5b03503007.patch
-#   http://pkgs.fedoraproject.org/cgit/rpms/quassel-irssi.git/plain/quassel-irssi-tls-ssl-rename.patch
-PATCHES=(
-	"${FILESDIR}/${P}-fix_build_with_irssi_1.0.patch"
-	"${FILESDIR}/${P}-tls-ssl-rename.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
-		-e 's:^CFLAGS=.*:CFLAGS+=$(IRSSI_CFLAGS) $(QUASSELC_FLAGS):' \
-		-i "${S}/core/Makefile" || die
-
-	sed -e 's:gcc -shared:$(CC) -shared:' -i "${S}/core/Makefile" || die
-
-	tc-export CC
-	export SYSTEM_QUASSELC=1
-}
-
-src_compile() {
-	emake IRSSI_LIB="${ROOT}usr/$(get_libdir)/irssi" -C core
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install
-	default
-}
-
-pkg_postinst() {
-	elog "Note that this requires additional configuration of your irssi client. See"
-	elog "    ${ROOT}usr/share/doc/${P}/README.md.bz2'"
-	elog "for instructions."
-}
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 0346d742db11..fa624a3f834e 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -4,7 +4,9 @@ AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8d
 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
+DIST unrealircd-5.0.5.1.tar.gz 4957950 BLAKE2B 7e92f941662cec0a202589aecf372578e568559360761e17735d4637785ff737ec24c07593b666dd830b0fc1f36293a700693134c34ad32095839a73e7368677 SHA512 57272afa9b758c71522730a5a5a45819731271c02b25f6e0b9da30671d38ecfbc1adc0e91eef9dc4c1d67b2e1fa4fc9a09377152f2b0e3e97e8f7fe4f144288b
 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
+EBUILD unrealircd-5.0.5.1.ebuild 5090 BLAKE2B 2403730ad38e5220d43b6227385deb58546293602c727438232ee4fd1910a9863b0fd78c1adbc6f43fe9cd32a256b67c08c43d495a03dc8e9b90c4c955e97309 SHA512 4ca8d90ddc7182b54b24153de1b30ffb3cae9298cfe664b4d914471603aa62bd50d1d4c4f1dd3e4346c1f40a239317efc8209bf29435041e578ecfb6fef452f6
 MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/unrealircd-5.0.5.1.ebuild b/net-irc/unrealircd/unrealircd-5.0.5.1.ebuild
new file mode 100644
index 000000000000..d2f7a8a96ec9
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.5.1.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/weechat/Manifest b/net-irc/weechat/Manifest
index 59cfaeb65ecf..6c0785f00060 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,6 +1,6 @@
 DIST weechat-2.7.1.tar.xz 2226768 BLAKE2B 0ce14646c8d383c3338a52bacbb9cac036c2611cc8aae2c790af73df5aab25e49f8bc2addcf4527884774925a9b222c15a7a696d93ad57197052a746a0da95f6 SHA512 eb0cc4c7e0f2cf18d522b49429fe2d77b1cee3225686d0bc09f80a69b17362af0923df4cd5f4859207d84acb762d4042cd5b57799705d0b7e4759eade6c660e0
 DIST weechat-2.8.tar.xz 2248868 BLAKE2B 756ce1719ecaa351a2780641758bb7587b45b8e6b16e5a82833009ddb27f71783a461cf89662e04118c75e2d372103eda5a11c98feb62d624b330b223bf22ede SHA512 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df
 EBUILD weechat-2.7.1.ebuild 4031 BLAKE2B bb3030970a66c9c4438f646467c57e7aeaa657de7a6753b94b0f36755c8538ecdbc875de06c3bbcf61a5c36afe982632f7d96e133a567d988dce36ec47047bf4 SHA512 48f7522555d69a4d389798202f98661436b46463937973a08ecb876b435161098c663c542ae618797e474b6ab0a845555e7250eba785a473589aed39abe3e762
-EBUILD weechat-2.8.ebuild 4034 BLAKE2B 267b0cc758bc9fc891efa337371aad866dafe7b6199fb8470c203ec4d7ce1053da1077d89fb3aa7b75ecb0704d5bf66b1785365949065f834f0b52d011f8a221 SHA512 33070e95c038ee15e1bb2cbeb72c66edcbe10f1e563fa62013532bdf686085dba38952de7fb506eb2dc1c8a48eaad0cf561d47972ddbf68e1e30e827d89fc3b0
+EBUILD weechat-2.8.ebuild 4038 BLAKE2B 6121de5bbcaaf326916f7ada4dd370f1b1994b79221cb25243ef9fe9532130b0449e0ba8d02c0af74d4db28be62a01b6030b94b89ced69b44980599962cde445 SHA512 60e77e01f0ea4aa6b3d3e44fa4a9bbd4a975ac9e19314dbd51107e33528810e6aa2372b64f0c5105126d8751457b411d31658dc6d75261a6a74c25c4f9c5bd7d
 EBUILD weechat-9999.ebuild 4034 BLAKE2B 267b0cc758bc9fc891efa337371aad866dafe7b6199fb8470c203ec4d7ce1053da1077d89fb3aa7b75ecb0704d5bf66b1785365949065f834f0b52d011f8a221 SHA512 33070e95c038ee15e1bb2cbeb72c66edcbe10f1e563fa62013532bdf686085dba38952de7fb506eb2dc1c8a48eaad0cf561d47972ddbf68e1e30e827d89fc3b0
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/weechat-2.8.ebuild b/net-irc/weechat/weechat-2.8.ebuild
index 37b7a1e45182..e7f1ef5f7341 100644
--- a/net-irc/weechat/weechat-2.8.ebuild
+++ b/net-irc/weechat/weechat-2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index c0673368a9c7..2e5c8d38e8cc 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -3,9 +3,9 @@ AUX znc-1.7.1-inttest-dir.patch 2205 BLAKE2B f322f6884170c71ba537897d38c5ca27879
 AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca28d4ac3db3924a3a1200682c19c7e6f7869f22338b492f73bf6ccbc2b723d117c9eebc10a89838 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468
 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
-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
+DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
 EBUILD znc-1.7.5.ebuild 5143 BLAKE2B 5007171b6bc56fd4ef00e28d8f386b052be58a82518261f30a8d45b08415c149c44fd51dd69c93574610b4bb5e34c6e6b09559c34059812eab48497d5ced61ad SHA512 6eb198b56afe1f8783eb345cefc6adbb4cdc885f1e5eb863ad81186399ceca51dc88e7df15a9df2d8df9b655dccb5d508948cdab2d1b704d13a748788cd688f3
-EBUILD znc-9999.ebuild 5139 BLAKE2B 14a8c7636d185678c767e17d6bd65b0e1c6ce0f07b2ab02ee6cbe397618785206bade9f440c82e19eae4d4f7c2da4c522ab2950ccc96adb686b5bac31cb2d52d SHA512 8501a3bb7f50675b069fba726e22c0a87f2333c813ae57ced1db9e7b3b433520ac81d57771ac9de4a5d88b3a9ed08d4f091211f57785149c0f033eccca964ed9
+EBUILD znc-1.8.1.ebuild 4715 BLAKE2B 571f20a718346d7d22a8ae8f01b536faf5ab2479541f231eee3461b13db1d0b10bf9c1d5b92ed10ad8c2430e9a2c2ce1597cb4d4300a25ab976549ca058bce4e SHA512 9e0099d64e848c9d9c7ab03246811ea5dbefb98f614b70c50eb39399465a3a1693ee2792512b5f5e5925b8547380a7571b484ce068a826ba6b6b4ea47f3ecfd9
+EBUILD znc-9999.ebuild 4715 BLAKE2B 571f20a718346d7d22a8ae8f01b536faf5ab2479541f231eee3461b13db1d0b10bf9c1d5b92ed10ad8c2430e9a2c2ce1597cb4d4300a25ab976549ca058bce4e SHA512 9e0099d64e848c9d9c7ab03246811ea5dbefb98f614b70c50eb39399465a3a1693ee2792512b5f5e5925b8547380a7571b484ce068a826ba6b6b4ea47f3ecfd9
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.8.1.ebuild
index 899adac5a0d4..fa6a8f89ce81 100644
--- a/net-irc/znc/znc-1.7.4.ebuild
+++ b/net-irc/znc/znc-1.8.1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
+inherit cmake python-single-r1 readme.gentoo-r1 systemd
 
 GTEST_VER="1.8.1"
 GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
@@ -22,7 +22,7 @@ else
 		https://znc.in/releases/archive/${MY_P}.tar.gz
 		test? ( ${GTEST_URL} )
 	"
-	KEYWORDS="amd64 arm x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
 
-RDEPEND="
+DEPEND="
 	icu? ( dev-libs/icu:= )
 	nls? ( dev-libs/boost:=[nls] )
 	perl? ( >=dev-lang/perl-5.10:= )
@@ -47,13 +47,26 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	zlib? ( sys-libs/zlib:0= )
 "
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	${DEPEND}
+	acct-user/znc
+	acct-group/znc
+"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	perl? ( >=dev-lang/swig-3.0.0 )
-	python? ( >=dev-lang/swig-3.0.0 )
-	test? ( dev-qt/qtnetwork:5 )
+	perl? (
+		>=dev-lang/swig-3.0.0
+		>=dev-lang/perl-5.10
+	)
+	python? (
+		>=dev-lang/swig-3.0.0
+		>=dev-lang/perl-5.10
+	)
+	test? (
+		${PYTHON_DEPS}
+		dev-qt/qtnetwork:5
+	)
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
@@ -62,13 +75,6 @@ pkg_setup() {
 	if use python; then
 		python-single-r1_pkg_setup
 	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	# The home directory was previously set to /dev/null
-	# This caused a bug with the systemd unit
-	# https://bugs.gentoo.org/521916
-	esethome ${PN} /var/lib/${PN}
 }
 
 src_prepare() {
@@ -81,7 +87,7 @@ src_prepare() {
 	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
 		test/CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -104,36 +110,29 @@ src_configure() {
 		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	cmake-utils_src_make unittest
-	if has network-sandbox ${FEATURES}; then
-		DESTDIR="${T}/inttest" cmake-utils_src_make install
-		local filter='-'
-		if ! use perl; then
-			filter="${filter}:ZNCTest.Modperl*"
-		fi
-		if ! use python; then
-			filter="${filter}:ZNCTest.Modpython*"
-		fi
-		# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
-		# invocations from inside the test
-		GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
-			CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
-			CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
-			cmake-utils_src_make inttest
-	else
-		# TODO: don't require sandbox after
-		# https://github.com/znc/znc/pull/1363 is implemented
-		ewarn "FEATURES=-network-sandbox; skipping integration tests which"
-		ewarn "temporary open local ports."
+	cmake_build unittest
+	DESTDIR="${T}/inttest" cmake_build install
+	local filter='-'
+	if ! use perl; then
+		filter="${filter}:ZNCTest.Modperl*"
+	fi
+	if ! use python; then
+		filter="${filter}:ZNCTest.Modpython*"
 	fi
+	# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
+	# invocations from inside the test
+	GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
+		CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
+		CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
+		cmake_build inttest
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	dodoc NOTICE
 	newinitd "${FILESDIR}"/znc.initd-r2 znc
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 6820a1521d18..fa6a8f89ce81 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit cmake-utils python-single-r1 readme.gentoo-r1 systemd user
+inherit cmake python-single-r1 readme.gentoo-r1 systemd
 
 GTEST_VER="1.8.1"
 GTEST_URL="https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
@@ -22,7 +22,7 @@ else
 		https://znc.in/releases/archive/${MY_P}.tar.gz
 		test? ( ${GTEST_URL} )
 	"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
@@ -34,7 +34,7 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
 
-RDEPEND="
+DEPEND="
 	icu? ( dev-libs/icu:= )
 	nls? ( dev-libs/boost:=[nls] )
 	perl? ( >=dev-lang/perl-5.10:= )
@@ -47,13 +47,26 @@ RDEPEND="
 	tcl? ( dev-lang/tcl:0= )
 	zlib? ( sys-libs/zlib:0= )
 "
-DEPEND="
-	${RDEPEND}
+RDEPEND="
+	${DEPEND}
+	acct-user/znc
+	acct-group/znc
+"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	perl? ( >=dev-lang/swig-3.0.0 )
-	python? ( >=dev-lang/swig-3.0.0 )
-	test? ( dev-qt/qtnetwork:5 )
+	perl? (
+		>=dev-lang/swig-3.0.0
+		>=dev-lang/perl-5.10
+	)
+	python? (
+		>=dev-lang/swig-3.0.0
+		>=dev-lang/perl-5.10
+	)
+	test? (
+		${PYTHON_DEPS}
+		dev-qt/qtnetwork:5
+	)
 "
 
 PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
@@ -62,13 +75,6 @@ pkg_setup() {
 	if use python; then
 		python-single-r1_pkg_setup
 	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	# The home directory was previously set to /dev/null
-	# This caused a bug with the systemd unit
-	# https://bugs.gentoo.org/521916
-	esethome ${PN} /var/lib/${PN}
 }
 
 src_prepare() {
@@ -81,7 +87,7 @@ src_prepare() {
 	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
 		test/CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -104,36 +110,29 @@ src_configure() {
 		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
-	cmake-utils_src_make unittest
-	if has network-sandbox ${FEATURES}; then
-		DESTDIR="${T}/inttest" cmake-utils_src_make install
-		local filter='-'
-		if ! use perl; then
-			filter="${filter}:ZNCTest.Modperl*"
-		fi
-		if ! use python; then
-			filter="${filter}:ZNCTest.Modpython*"
-		fi
-		# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
-		# invocations from inside the test
-		GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
-			CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
-			CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
-			cmake-utils_src_make inttest
-	else
-		# TODO: don't require sandbox after
-		# https://github.com/znc/znc/pull/1363 is implemented
-		ewarn "FEATURES=-network-sandbox; skipping integration tests which"
-		ewarn "temporary open local ports."
+	cmake_build unittest
+	DESTDIR="${T}/inttest" cmake_build install
+	local filter='-'
+	if ! use perl; then
+		filter="${filter}:ZNCTest.Modperl*"
+	fi
+	if ! use python; then
+		filter="${filter}:ZNCTest.Modpython*"
 	fi
+	# CMAKE_PREFIX_PATH and CXXFLAGS are needed for znc-buildmod
+	# invocations from inside the test
+	GTEST_FILTER="${filter}" ZNC_UNUSUAL_ROOT="${T}/inttest" \
+		CMAKE_PREFIX_PATH="${T}/inttest/usr/share/znc/cmake" \
+		CXXFLAGS="${CXXFLAGS} -isystem ${T}/inttest/usr/include" \
+		cmake_build inttest
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	dodoc NOTICE
 	newinitd "${FILESDIR}"/znc.initd-r2 znc