gentoo resync : 16.09.2020

19 files changed, 63 insertions, 234 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 751f0f0ce027..d12494c9da29 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index 6d1c1ce9d7f4..07209b8ac370 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,5 +1,5 @@
 AUX irkerd.confd 474 BLAKE2B 150e953ff1db373cb2b9010d4136866156fac7b6816ea12041bbb7d49862e93288d329605da5e935ec92f809d8b9774b5086cb910d1e9741efff707d8fde0edb SHA512 62e2242cbacd6ed35419b6ef78b969602c2c091e0500bf00d989444d96551087a4eef80ec5b70b5a8f88ecfebb633eb628f7912678862fde8ce7bddb75c87010
 AUX irkerd.initd 1125 BLAKE2B 4675bb07c523414810432b22954629e80758745b3ebcd8d9b6e203a699d776066871819a505cc4c249425b01fe04b4e818365d78bb2161f92cac89f3e62fe592 SHA512 c22838ef63cd2165af958724b4306a260018104224969e612b7175d63619f12a18908c155e94210030f0ada6dcedaabaee6eb0690bd6e327a65ee9934b8d4368
 DIST irker-2.19.tar.gz 44502 BLAKE2B d777ed3b4308dca7f6bb2483bc03ba8ba50a55574da3e4de63138fe88483ae6d3ac46f414a94801d7f27c740e38ddcde494cea4c846fbc59d736441b692747f4 SHA512 7516ebe8adc74902eacc657f0a1d421c285a72f4ce08b84fd93b22635d49ba52acf7aedd03dde9012bc16496be3162bda9fa8486af3df1657af4cabf8719d7c7
-EBUILD irker-2.19.ebuild 1513 BLAKE2B 3ae54a387df16313cfce2423d444b275f135d31b4d0feb0b296830dbf40e58f5e880a2f8d780424c27cc33af93a90f87b12273ac2412dfb8e865203d87c46138 SHA512 8b93a6fe5cc45271c1d950f85864044cfe2ca126e4c101c0f7048f729fa6886ef424aa1e4d81055bf3fef41bac9ebcf437b948d6f2a49b830ab67e5c053b34b3
+EBUILD irker-2.19.ebuild 1517 BLAKE2B cc4591f5dc0937beb6f2dd42bb8d9dc7f0f9f7023dca4061ef86abd12ed42a9e27669a7f0eb068c4efe945818b06985763e65c667a4bdfed99e098e1a03fd9f0 SHA512 8d7c64af305faac28805f55623eb3e5dcdcb6c4dc0c637394a1e3bf73c28eb68e5730366d6670f9846a6c45b0efdd11792991f28a79bb8e6c9c98dbceaf332b9
 MISC metadata.xml 445 BLAKE2B ea6b8447fcdd793e0e13d49c545ee8496a82ef50929fa405aeb4b3afc192dbed4636bc23840ca8131ca7d31891f765b25dbed475eb607a5a2b2fd9f70e1a4f51 SHA512 9de852aad0221fb33017a9cd424f9125313bcb367fed5ebadf53cda3b6eba40a2f78c22154f9569e7ac38b2f3c2ab7168807d726aa94fc240a292a3cfed18c26
diff --git a/net-irc/irker/irker-2.19.ebuild b/net-irc/irker/irker-2.19.ebuild
index 308db034b269..11787ff90119 100644
--- a/net-irc/irker/irker-2.19.ebuild
+++ b/net-irc/irker/irker-2.19.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="ssl"
 
-inherit eutils python-single-r1 systemd
+inherit optfeature python-single-r1 systemd
 
 DESCRIPTION="Submission tools for IRC notifications"
 HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker"
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 10ee01d233af..a84553811ed6 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -2,4 +2,4 @@ DIST polari-3.34.1.tar.xz 1270300 BLAKE2B 37a7a5bd5e1850b03100d8465aeddb4f558ec9
 DIST polari-3.36.3.tar.xz 1030640 BLAKE2B 72cee290c21cd0a1f96d25e02993dadba14247bb3b38d2ce62ebbe8670a9c7498e7dd123bef2ab3ffaea78019109697186cee409dd78a554afbbc5b5c4db56b5 SHA512 dcf8018ffdaffe2867ab7c3bbc1c874090df0ff5435ec16746780ae081dc61a0b7ec0e58d706b6e7eb8957b1f3fe9c24b586db831ab8b0565fa05c1bf3adae38
 EBUILD polari-3.34.1.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a
 EBUILD polari-3.36.3.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a
-MISC metadata.xml 383 BLAKE2B fe4acd5e1d8f9336124e6a8588c3d25df25d7a60fac88b1eb637a1b169fd0805bc59030ec776257bfd664df72e6a3dfefcbde1d60bd08384281587ec062f2ad7 SHA512 98707a009259fafe782cd442524620d79465fadf8304becb5c4de4e15763245bd7c21fda7081749a7bfb551e1dd9d3168236862bb704bfb9091ca087ce348deb
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-irc/polari/metadata.xml b/net-irc/polari/metadata.xml
index 09079e5df225..996e7cacd217 100644
--- a/net-irc/polari/metadata.xml
+++ b/net-irc/polari/metadata.xml
@@ -5,5 +5,4 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
-	<longdescription lang="en">Polari is a simple IRC Client that is designed to integrate seamlessly with GNOME 3</longdescription>
 </pkgmetadata>
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index dc31d12cabd5..c0d7b5ff31c3 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1,3 +1,3 @@
 DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27 SHA512 0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56
-EBUILD quasselgrep-0_p20190211.ebuild 893 BLAKE2B 65db422640071f6757ba7d562c7723fded623d2fe7ac67ae8392abf61921db8d39fbd6343feb224da9b62936cfa688e2e72b4dc4ab827baaece79b9b70074daa SHA512 704f8b1b61bc1111d2d510449094f8baa1132bc72b0efe3365a6fa5c7a31b61fb4ef5359ce095f93b16252bed0472881928fc2ca7b2f7e489d797c29407ac56b
+EBUILD quasselgrep-0_p20190211.ebuild 897 BLAKE2B 818b7a0a43f1717e2087a7328830699409e0498c2232bce66cd1986776ae46590e3881230eb0d7d0010d046cb93cf7ed2bf343b41ca636d7d8d646b18e14b263 SHA512 cab300247c0947b78c09ccfd00edfcb65938bd07b9e8e8ad5b34c053d964d47dab7cb6f979d94efe98553b39a0c268990c1cdd058346c5dfc4aa5c2f510810ef
 MISC metadata.xml 337 BLAKE2B c37cb1554be7305dd495441947f001f72094595dea87cc7b1da483f6f57b40ca227ff0635ec594f3943384e0980a624418ed633de8f7c582458ec34e84f0212c SHA512 e17f17fadcbc243db54d9db5a49d9720feff4bfd92e3ea91526600e46bc6c96b3b79c1491146356287893ca71dfee73336d8c88b7e7047d8f5d41d3d1a5e6bf1
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
index ca0bbcdb471a..0d8f12d972b9 100644
--- a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
+++ b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE=( sqlite )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 optfeature
 
 DESCRIPTION="Tool for searching quassel logs from the commandline"
 HOMEPAGE="https://github.com/fish-face/quasselgrep"
diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest
index 1ac506b8da12..16c99999016d 100644
--- a/net-irc/telepathy-idle/Manifest
+++ b/net-irc/telepathy-idle/Manifest
@@ -1,4 +1,4 @@
 AUX telepathy-idle-0.2.0-fixes.patch 9363 BLAKE2B 6980114c9b030c1589f618fe67e88051bc414abe849fa6e08152625d1f66c00634cf572f4220fd9e31bb1706167869541e571fca04ca70e19c648dd094af263e SHA512 2c7b8f4069bc3907fea7c506af671a3d46ca56b55cbe6798589437751c598b549fcec4cf7cfdde93b2b7f5f3d858decf8218a7633f0e91cd3b2c883a301b746f
 DIST telepathy-idle-0.2.0.tar.gz 566492 BLAKE2B d0e12bb23b96b7df5afb101ae2c62994777de616d5ea70a10fb2141e68066c7dfaae713340c7f8a2d8ce1f259f302729efa1927eaf7d2a9555120c58e89046f2 SHA512 f5e36afc3ab4b52eb865f2c1e6565b99011a7540fc1a7783d3bbd7bbf50bc671a2147df6bde646c82059a466cc1df9bdb10e2500db5b7bb06d57a989a75c261b
 EBUILD telepathy-idle-0.2.0-r2.ebuild 1058 BLAKE2B 4c47daad0167e997667166d517ea25c8e252d0999fb31b2801784423c3b3147a9bbc8daec1abf2039405b285e961c8649d254bcef531423317cda7e9fc3396aa SHA512 7d5a37120962a00120e44879a624d3ab8794fe9bdb3e5027c65a45673b81225f8fee528bed5ff43134c1ba0d528896cfe764ec579bdb34e0da4b4901cec06486
-MISC metadata.xml 349 BLAKE2B 0d82c3faf7643837ffb97efe203a7ababac9a0576673270294b9a68a5ce557e6f91b06bf6efc14217147fcceb6635aa287ec7c8c449d9060d407095e0226b7cc SHA512 f40f301daf4884299f797c2effeaaf6fec1f1a8cca1cd85cea1ff3e7853919c9803a9dfe0eea19a59e11a0e58f8686602708528d141434479708c485f2f8892a
+MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-irc/telepathy-idle/metadata.xml b/net-irc/telepathy-idle/metadata.xml
index d8896381ac8b..4cbddcaa19ad 100644
--- a/net-irc/telepathy-idle/metadata.xml
+++ b/net-irc/telepathy-idle/metadata.xml
@@ -5,5 +5,4 @@
     <email>gnome@gentoo.org</email>
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
-  <longdescription>Telepathy connection manager featuring IRC protocol.</longdescription>
 </pkgmetadata>
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index d712bbd7e858..99d41c29d00b 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -2,9 +2,7 @@ AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f45
 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.5.1.tar.gz 4957950 BLAKE2B 7e92f941662cec0a202589aecf372578e568559360761e17735d4637785ff737ec24c07593b666dd830b0fc1f36293a700693134c34ad32095839a73e7368677 SHA512 57272afa9b758c71522730a5a5a45819731271c02b25f6e0b9da30671d38ecfbc1adc0e91eef9dc4c1d67b2e1fa4fc9a09377152f2b0e3e97e8f7fe4f144288b
 DIST unrealircd-5.0.6.tar.gz 4975195 BLAKE2B 3ba459e0ec932e9f240825ba9f1fa40e300fe7958f999de86d5653f2e6e4940be8b8da9c885c97bd738abefef601d61da6c4e6c7199c7052d29a74fcf5048828 SHA512 7532e9ab2e039f21796ae813881aec9d34b502ab64efc4323c938232c8901ce882dbcce497ad93df270e4b5fa2e9633c0971f2a6b3213ad458756aea92aa1612
 EBUILD unrealircd-4.2.4.1.ebuild 5452 BLAKE2B 356dfc371b2c8757cd710ba93401f4a34e069b545cc77573b9942ac1672e0a4367be3fb1a47fdf9ef7cdee3a1ba40bc57d0ae0366c16262665a03cdc63fae242 SHA512 b875c731c0712ab570b1d18fe0ca30abe5ed235d24a3beafa169f98d94cc6f52130d935d21ba732bbf74b368adfd9754283e61688339b1a2599523fd3e3d3d98
-EBUILD unrealircd-5.0.5.1.ebuild 5090 BLAKE2B 2403730ad38e5220d43b6227385deb58546293602c727438232ee4fd1910a9863b0fd78c1adbc6f43fe9cd32a256b67c08c43d495a03dc8e9b90c4c955e97309 SHA512 4ca8d90ddc7182b54b24153de1b30ffb3cae9298cfe664b4d914471603aa62bd50d1d4c4f1dd3e4346c1f40a239317efc8209bf29435041e578ecfb6fef452f6
-EBUILD unrealircd-5.0.6.ebuild 5088 BLAKE2B 3d48ec8f3b4c69c55c185aee4409772bd686070ec6dc02029d48fd01420456605f55bcf6a4324514c7973a2dc9703844be05133f9f0a223a1b828023adbff125 SHA512 00832d5357e4f8e37df531eb1e563db8a5d5c20dbf404a8826f8ac72774432e5cafe64c417d22cdbaf08f54845409cfb6aa0bd02fc38b85d8ad4986540c08654
+EBUILD unrealircd-5.0.6.ebuild 5087 BLAKE2B 82341a54c9c04c7a1e91a53d14979520ce02b0b3824fe7e3bc124a4bff054a43e1124c5b9205c776ff7961a10ab88461c4fc11e28008a19dc32996bc92edc7e3 SHA512 c97b8b352b8f927ab9ada81f75903a0bb47f3882da8630a3bfd55cfc4a66b4e518418bbffef2b011535a47795d2d9024cf6619d446be55bcb146c1ea7ca66625
 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
deleted file mode 100644
index d2f7a8a96ec9..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.5.1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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/unrealircd/unrealircd-5.0.6.ebuild b/net-irc/unrealircd/unrealircd-5.0.6.ebuild
index af6bd63d0f52..f7f86359b533 100644
--- a/net-irc/unrealircd/unrealircd-5.0.6.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux"
 IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
 
 RDEPEND="
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 4363ca620669..1633141f51be 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,6 +1,6 @@
 DIST weechat-2.8.tar.xz 2248868 BLAKE2B 756ce1719ecaa351a2780641758bb7587b45b8e6b16e5a82833009ddb27f71783a461cf89662e04118c75e2d372103eda5a11c98feb62d624b330b223bf22ede SHA512 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df
 DIST weechat-2.9.tar.xz 2206584 BLAKE2B 8089cd846ca192ec666a50e8071ed57e1c2518b2d5ea98733b8e3fa6c8c684e8ed14253d787b3f9995a8f481a7413444c3ba262dcb6c100283192bcafb502627 SHA512 c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e
-EBUILD weechat-2.8.ebuild 3951 BLAKE2B bac3b0c695d3f2a09514d20af581eb4d1ac442e8cd8fc9e124eb972220c69d38a0fb3981bc6088df8884c73dde26f9136cc3fc15895b98174b8267192bcb9824 SHA512 41ed688abdd5dbacce66e4ec50e8edcd204411ea64514691c6141b32edf29ca04a2454537fd38aa01aa0cbe809dc6c13d10172b3149a492453d4decb0cc22b44
-EBUILD weechat-2.9.ebuild 3884 BLAKE2B 09cb1759e3b1fb8e7da5a142f9cd2c1b075e26a01260419fee92c9fab736697204a2a1bb88eb2b2df482b9c02974733b0e41dff23352f718e29b6d0b1a60b1b8 SHA512 809fe6481d81d171391db677a9bd19a8f9f5ae7d677e2725e21846f1729ee87cd231bba8db75f7db9643de7fab536b678c0b58618cfd45ab45b5f5cd827d9809
-EBUILD weechat-9999.ebuild 3884 BLAKE2B 09cb1759e3b1fb8e7da5a142f9cd2c1b075e26a01260419fee92c9fab736697204a2a1bb88eb2b2df482b9c02974733b0e41dff23352f718e29b6d0b1a60b1b8 SHA512 809fe6481d81d171391db677a9bd19a8f9f5ae7d677e2725e21846f1729ee87cd231bba8db75f7db9643de7fab536b678c0b58618cfd45ab45b5f5cd827d9809
+EBUILD weechat-2.8.ebuild 3933 BLAKE2B 1c32e71f4cb79033ce4a3a456bfb148579938303c0168bc2c3ef026f154bd1ad13b07e212b6f5e8a1cdb95b09a96b40adf933ef5f7d17d214a1fdc5d901ddf9c SHA512 75017557e53d46f388e1014c35d68ea975448832b33a493bc63904022c8b424f954048e862da027638aaf2af783ff309ff9808c8381bff50e3f844d54967a111
+EBUILD weechat-2.9.ebuild 3869 BLAKE2B b4c38df263b14b585050197dae33b7b6f8b414514350af964d3344edba025ecae9349d651c02a844ca299b4ddc01435e16ac58ec0fdbdafa380909857db75fa1 SHA512 e4deff8a473c185c7badec9e3542a86bc587d765ab2344a72c609aa4c0d847ab91f5016afbfa0fc585991c0dab8785cf65d32b9ee60ea396f07b6b097b42847a
+EBUILD weechat-9999.ebuild 3866 BLAKE2B df87311a9cb02d04260f21e5626a2f380cbe3193e5064c5cdd4a09bf8b5704f1503498848bace98166a63d583ae3e419ac2867526a9aca797f6ca87333690acb SHA512 12b5f285dd4051152541be8f1b4440f55f4e678fbdc1f46686e4ca0941e9b8b0fb074740189246f5e1e1f9631078475b20284aaf27e16edca80ce727fdf616ad
 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 115554943a06..021b3b610729 100644
--- a/net-irc/weechat/weechat-2.8.ebuild
+++ b/net-irc/weechat/weechat-2.8.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
+	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
 	ssl? ( net-libs/gnutls )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
diff --git a/net-irc/weechat/weechat-2.9.ebuild b/net-irc/weechat/weechat-2.9.ebuild
index 7ea49b6dc653..d9bee70c87f4 100644
--- a/net-irc/weechat/weechat-2.9.ebuild
+++ b/net-irc/weechat/weechat-2.9.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 ~arm64 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ppc64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -42,7 +42,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
+	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
 "
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 7ea49b6dc653..de9e048a74ce 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
+	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
 "
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 13877ce28daa..90d3bfc50941 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.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
 DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
-EBUILD znc-1.7.5.ebuild 5143 BLAKE2B 5007171b6bc56fd4ef00e28d8f386b052be58a82518261f30a8d45b08415c149c44fd51dd69c93574610b4bb5e34c6e6b09559c34059812eab48497d5ced61ad SHA512 6eb198b56afe1f8783eb345cefc6adbb4cdc885f1e5eb863ad81186399ceca51dc88e7df15a9df2d8df9b655dccb5d508948cdab2d1b704d13a748788cd688f3
+DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
 EBUILD znc-1.8.1.ebuild 4711 BLAKE2B 8b8182c6627e7aa58d56b5575d1e8e615adc5beff9639b04e5cea2821b20bea48f3449adffab0deed76b073ff3cf97b4d9f10abe1577a50d969c57beef9b6e86 SHA512 6acb23f885ebcdcd38fee1f8df5e43a4cb66b32f9c644c2848c75c0f84e10b017ea0acf7a8f49d9e78a810dbe1cf4f73d7696df9caeb79ae83cef71d59c9fe1a
-EBUILD znc-9999.ebuild 4715 BLAKE2B 571f20a718346d7d22a8ae8f01b536faf5ab2479541f231eee3461b13db1d0b10bf9c1d5b92ed10ad8c2430e9a2c2ce1597cb4d4300a25ab976549ca058bce4e SHA512 9e0099d64e848c9d9c7ab03246811ea5dbefb98f614b70c50eb39399465a3a1693ee2792512b5f5e5925b8547380a7571b484ce068a826ba6b6b4ea47f3ecfd9
+EBUILD znc-1.8.2.ebuild 4839 BLAKE2B 247882a7d030319ec78132621619a5a25158c0acb3a7762b935ee215c2fd42670fa59d1fe64ab8fa824f9967c1ae92b695cf1c234ff7444696b15b5163b4fa5c SHA512 5c97f2b6c1dbaa34865a27ba6117d11b2e49113d2764b4006dc1e8a2a4bfe7e4c3de384b193434fa4e9e6366854f1c0c4c877f44506d3cd11c16ba42abcce8fe
+EBUILD znc-9999.ebuild 4848 BLAKE2B 2227d552a5e2dde5096765721782ae24b89ecd7cf8632c8b0bb4c97779df5efe1ec94f197d443f5a4bbdaef8b70d97e39783ab89f80b0c427d7b2464b87d7ebd SHA512 0e8818db7492c151377bdefbf64cc47b3f36458ddf12bd89fa7f51225f4447991467c1b0d44eb3fece2a3ccae5fee48a9f2e9be5cf56711e21053f1461b11513
 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.8.2.ebuild
index 6f190e2ca05f..975978dcf4e3 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.8.2.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,19 +22,21 @@ else
 		https://znc.in/releases/archive/${MY_P}.tar.gz
 		test? ( ${GTEST_URL} )
 	"
-	KEYWORDS="amd64 arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	# "If you upgrade your ZNC version you must recompile all your modules."
+	# - https://wiki.znc.in/Compiling_modules
+	SLOT="0/${PV}"
 	S=${WORKDIR}/${MY_P}
 fi
 
 HOMEPAGE="https://znc.in"
 LICENSE="Apache-2.0"
-SLOT="0"
 IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
 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 +49,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 +77,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 +89,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 +112,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 fa6a8f89ce81..764c35c45dcc 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -23,6 +23,9 @@ else
 		test? ( ${GTEST_URL} )
 	"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	# "If you upgrade your ZNC version you must recompile all your modules."
+	# - https://wiki.znc.in/Compiling_modules
+	SLOT="0/${PV}"
 	S=${WORKDIR}/${MY_P}
 fi