gentoo resync : 15.06.2021

33 files changed, 206 insertions, 388 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 4ade799a98e8..f6ed91b8bf75 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index e29c89c9f168..48e04bc7d54c 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -3,6 +3,8 @@ AUX eggdrop-1.8.4-respect-ldflags.patch 1316 BLAKE2B 43c0ca341a328f08fe8beb735c6
 AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715
 DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49
 DIST eggdrop-1.9.0.tar.gz 2206230 BLAKE2B 1c6c5c77558323ae80b4f486f30d106b2f336c61c50adc10302657c2878a755b48d8286ba70f662b6be132ffd569de5eb269cfca1e6e42675b007de43ccf4746 SHA512 e78e220c8207361c6d7bda06be6d0094d747809ff8554fed2ce4a5fb63df1d87f8b82a98d4f0b98909042af8f6719f4a7bf548f864d3d6dfa8caa57b346d32dc
+DIST eggdrop-1.9.1.tar.gz 2271120 BLAKE2B 73fadeddcebeba5de42328f6f02c05e850e47c19812bc1a868da09f55fd1d297e3596c5a4b167806237554966e7dfbebadcee6215932c56a76b3e67a77d5ee47 SHA512 d8907d265f7e22f3bcd3e28b256c5788d5959ad11cc1425d59eb4411ebbc172fe8d90c31fd9f033369ab80cd29a36a5856f6bd32bc6c9cdfedea1d6509ea7f3b
 EBUILD eggdrop-1.8.4-r1.ebuild 1604 BLAKE2B 021484a3fd61e38f6dc68f4d17054935590255a05cfba9b69e912a44e90ed9fee806416c0d1b7b6953bbb4558b4ad20b2cc67ab8d5affdd91281330d919fd94c SHA512 2be5f820597450688778c9f2ae1a999f1be85dfc105ee80d66d6d182f55df32c2d6514dd4196aeec5459b3b85bad504aac4ef14369b92fbdc2f086ce61a97bbe
 EBUILD eggdrop-1.9.0.ebuild 1458 BLAKE2B 7c9160373af31b1d9a03db59ba46b568fae83c7eca3d5f4cdaecd9bd7b65f7d2a5dee8fe19afd1f93b9035349d5b222640b6dd4dbba27a99ef921ab1e2bc4953 SHA512 2ab3ecf6f61e109fdda976b3373da8255d7998f693eb8aca98bd2e251d58457de43224c52411176953afe45fe2f1888e9c07f7ba89a3adebc11804db549356c4
+EBUILD eggdrop-1.9.1.ebuild 1458 BLAKE2B 7c9160373af31b1d9a03db59ba46b568fae83c7eca3d5f4cdaecd9bd7b65f7d2a5dee8fe19afd1f93b9035349d5b222640b6dd4dbba27a99ef921ab1e2bc4953 SHA512 2ab3ecf6f61e109fdda976b3373da8255d7998f693eb8aca98bd2e251d58457de43224c52411176953afe45fe2f1888e9c07f7ba89a3adebc11804db549356c4
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.9.1.ebuild b/net-irc/eggdrop/eggdrop-1.9.1.ebuild
new file mode 100644
index 000000000000..5d6de0a857df
--- /dev/null
+++ b/net-irc/eggdrop/eggdrop-1.9.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+MY_P="${PN}-${PV/_rc/rc}"
+DESCRIPTION="An IRC bot extensible with C or TCL"
+HOMEPAGE="https://www.eggheads.org/"
+SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sparc ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc ipv6 ssl static"
+
+DEPEND="
+	dev-lang/tcl:0=
+	ssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="
+	sys-apps/gentoo-functions
+	${DEPEND}
+"
+
+DOCS=( AUTHORS FEATURES INSTALL NEWS README THANKS UPGRADING )
+
+src_configure() {
+	econf $(use_enable ssl tls) \
+		$(use_enable ipv6 ipv6)
+
+	emake config
+}
+
+src_compile() {
+	local target
+
+	if use static && use debug; then
+		target="sdebug"
+	elif use static; then
+		target="static"
+	elif use debug; then
+		target="debug"
+	fi
+
+	emake ${target}
+}
+
+src_install() {
+	emake DEST="${D}"/opt/eggdrop install
+
+	use doc && HTML_DOCS=( doc/html/. )
+	rm -r "${D}"/opt/eggdrop/doc/html || die
+	DOC_CONTENTS="
+		Additional documentation can be found
+		in ${EPREFIX}/opt/eggdrop/doc
+	"
+	readme.gentoo_create_doc
+	einstalldocs
+
+	dobin "${FILESDIR}"/eggdrop-installer
+	doman doc/man1/eggdrop.1
+}
+
+pkg_postinst() {
+	# Only display this for new installs
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please run ${EPREFIX}/usr/bin/eggdrop-installer to install your eggdrop bot."
+	fi
+}
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 9dc613481b8b..da6fae2672ff 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,4 +1,4 @@
 AUX epic5-2.0.1-openssl-1.1.patch 2817 BLAKE2B f3ed4fa602b174f41700fdf5fcddb8a20626637fb5e416b82fd1e1216a846987a3afcf3fffd73317a6e2090e49b0fe3b1777ee4e870f597ca981be078c4e3c0e SHA512 af1f822f1660bc7528beef26b991a69896d0e94005aacd412256a5f8789024bfba6eec169d2115c626a70c0e89cc6625999c7b939390742aef932f1020e4fdad
 DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25
-EBUILD epic5-2.0.1.ebuild 1568 BLAKE2B 100df9db7341e429f863877e5f46f2de16bde3400d721fc8f657b8eb4c5de2d30cbc87877df31635823813a6710b76568123315903d367ce89e929b23df3fe97 SHA512 ff66e641e7f2ea0a24f41d5c97da58c172a2ae7362da77f4d07287cada4aff0b5946f15e333b1462b18d594728311db1ba3d191ea5c30967ee3822febb8ca717
+EBUILD epic5-2.0.1.ebuild 1552 BLAKE2B d37c0d333f875be8096b702432157cff223a4a0feba50c72f70d2698323e10746ab8d03b982cb4c74bbe359c894a3db300adb0c50ede90559faa198f70c251fb SHA512 c0b2be7dec14639c568f71096755cd39f1c723fd6aea93067a50712cd89bafa5da4165d9ccd2c71a43316d81a8f6817a3b1bfceacc700eac0bf9ad015c98066a
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1.ebuild
index d38b780348b7..45d0990c99fd 100644
--- a/net-irc/epic5/epic5-2.0.1.ebuild
+++ b/net-irc/epic5/epic5-2.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit autotools ruby-single toolchain-funcs
+inherit autotools ruby-single
 
 DESCRIPTION="Epic5 IRC Client"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.xz"
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
new file mode 100644
index 000000000000..689af2e2b83c
--- /dev/null
+++ b/net-irc/ergo/Manifest
@@ -0,0 +1,9 @@
+AUX ergo.confd 92 BLAKE2B 02dd8cc089593bb207268c1f91e106b2e78b5aba92774cf7b0ee0b38a09c55db409fce72517965f1929d26bdafbe1b9d781708500b286c05f7e161819c177c86 SHA512 3908e273045e5d94f358913e669bf2802a82306ce8eabffa6b7b6e5f022f2fe069a577c69c4070ddf61ec85287b2bca362a02585ecdb779cba4435750de5c5b2
+AUX ergo.initd 210 BLAKE2B 9e0931e6ac4e8850d20fd4a5395dbf7313b6b5b45a9311e8b55883ab527be21d82beaff8492bc4f347f36e688efcd0453f5f74fab02096e6ed14cdd82fb87690 SHA512 3fed0a766b08919dee8d0a7efc64ccf0fe06d6ee7f6058d22a415bf16102743c5e73ba9677be7fc7266e9f2e2ffca2a200d3aa792015cba35b24a1104c43855c
+AUX oragono.confd 104 BLAKE2B 8e1f9372d43f979a768b516f0b7c4e00540a1547592bae12b576e8b182b94eefadfda09208e14a7f3fe1c8480d447e487a1df86807041bca33a53b87f208822a SHA512 7b54c8ad9ed552fd91bda17605118599a8f3853156c0d8b9d1c64630b984095096c74dcd38000b2d13ab0e3015ee81e994ea5d90b20edbc6b5c174f6efbdb307
+AUX oragono.initd 228 BLAKE2B 5ccdbc0762223f0311ea80f104cb814bd1990720bc35befbb3b19d4e71226e773ea60a2a37ab249fa18f01ca680d6c2f5b86d8cf283a0eef8a08a28f438dd458 SHA512 428c1a350d3720434a727f1f68463519941e6e27f985be51417001bbfb55b7a68fc874977dec6d63bd1fb1dff496e88b9bccb2a6e079f34b726ce78d76a8f53b
+DIST ergo-2.6.1.tar.gz 3099502 BLAKE2B 2d9aea062f1f0f827febe704a1148bf0c559ad905d709f530fceeb5bbd85297402a076d62bd53315b7c48556a9aba94f968758b26c9a31f970daf93b6cbe5807 SHA512 c9b7d14394bb0ed4425c6c8fb24c6fb73cb312ed8224887a52acb0776a5ec6c4cf2cfd73e92cbfb6385bf467bdcd443f751966fc6671d9d6446f6efd2b5d4d80
+DIST ergo-2.7.0.tar.gz 3115191 BLAKE2B 13bc6f4ddb26369912ed28205f4cee1f39d483481ffe5c6b87db1b2a49c0357d639c35d72d667bd63e2d1feec4cca4d0fb696e3edc2941be8f1bea8c5730adb7 SHA512 ac1171c68c07d0e1f5204ba14acc3eff7eb367e1a85cdeef79fb91bb9acc98109507a34a788cf99cd32125fb1a0f0b5b5c8afbb46b631d5d0da8dc70ab5c651c
+EBUILD ergo-2.6.1.ebuild 1530 BLAKE2B 28252d49b8133d926da8e5da8256631fb7308273cbffb2d09a01efaaf9ba75a02a9713367597ef99a98147b4b2afc1153ce648415b8f146e053163921ffac57c SHA512 ceb0a6f6433a1b03a451ac5ca7bb04255735f1c1cab805fd575ac93f40c0f3f89d1c769b7582fa22c92628fb3e7d20e7feb1fad55a343d1f6d3c07b37d119746
+EBUILD ergo-2.7.0.ebuild 1497 BLAKE2B 76a7e0043b50b1d9d7504eb560164bfb77193aa903db01bb9bd8ba90e82ac78e1091ca942e167cfacb88b11365ba0e1f37d649143b205e5e5c98ad21ea0f1204 SHA512 f545f00d43e7548f6696764592267120d2e7ceb5dc24dbdb4f9bb060f290256b61a4ec7415f1477c68102bf5babf1cd1bc497172d4d1107b5fc1b16e04ffce5b
+MISC metadata.xml 319 BLAKE2B d82fdd20f65f3c9c6d544701fd4542c7ea14a10869210f24a966e6c512127c132d9a8e58e116196999159cbcff6017b20ec5c5f4b918471a32cb91e81e84fdf2 SHA512 721af15195dda9a790c7cd38bd36792a0411bb45a34e5b0a2b5e9d3343a1c41d7aa583e8be8ea97a639cafafe70c8a5e0219d6b5f175e5eeb166d6afca2e464b
diff --git a/net-irc/oragono/oragono-2.6.1.ebuild b/net-irc/ergo/ergo-2.6.1.ebuild
index 2f2b1a51efdb..f434edca6b5f 100644
--- a/net-irc/oragono/oragono-2.6.1.ebuild
+++ b/net-irc/ergo/ergo-2.6.1.ebuild
@@ -7,7 +7,7 @@ inherit go-module systemd
 
 DESCRIPTION="A modern IRC server written in Go"
 HOMEPAGE="https://oragono.io/ https://github.com/oragono/oragono"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/oragono/oragono/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
 SLOT="0"
diff --git a/net-irc/ergo/ergo-2.7.0.ebuild b/net-irc/ergo/ergo-2.7.0.ebuild
new file mode 100644
index 000000000000..edff5c53fda6
--- /dev/null
+++ b/net-irc/ergo/ergo-2.7.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module systemd
+
+DESCRIPTION="A modern IRC server written in Go"
+HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo"
+SRC_URI="https://github.com/ergochat/ergo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# No test files are included in release tarballs
+# We may even want to package irctest
+RESTRICT="test"
+
+BDEPEND=">=dev-lang/go-1.14"
+RDEPEND="
+	acct-user/oragono
+	acct-group/oragono
+"
+
+DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
+
+src_prepare() {
+	default
+
+	# Minor fiddling with paths
+	sed -i \
+		-e 's:/home/ergo/ergo:/usr/bin/ergo:' \
+		-e 's:/home/ergo:/var/lib/ergo:' \
+		-e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \
+		-e 's:User=ergo:User=oragono:' \
+		distrib/systemd/ergo.service || die
+}
+
+src_compile() {
+	go build -mod=vendor . || die
+}
+
+src_install() {
+	einstalldocs
+
+	dobin ergo
+
+	insinto /etc/ergo
+	doins default.yaml
+
+	newinitd "${FILESDIR}"/ergo.initd ergo
+	newconfd "${FILESDIR}"/ergo.confd ergo
+
+	keepdir /var/lib/ergo
+	fowners oragono:oragono /var/lib/ergo
+
+	insinto /var/lib/ergo
+	doins -r languages/
+
+	systemd_dounit distrib/systemd/ergo.service
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog "Please copy the example config in ${EROOT}/etc/ergo:"
+		elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml"
+	fi
+}
diff --git a/net-irc/ergo/files/ergo.confd b/net-irc/ergo/files/ergo.confd
new file mode 100644
index 000000000000..336ca1de7ab0
--- /dev/null
+++ b/net-irc/ergo/files/ergo.confd
@@ -0,0 +1,3 @@
+# /etc/conf.d/ergo: config file for /etc/init.d/ergo
+ERGO_CONFIGFILE="/etc/ergo/ircd.yaml"
+
diff --git a/net-irc/ergo/files/ergo.initd b/net-irc/ergo/files/ergo.initd
new file mode 100644
index 000000000000..bc2b7dd064d1
--- /dev/null
+++ b/net-irc/ergo/files/ergo.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+command=/usr/bin/ergo
+command_args="--conf ${ERGO_CONFIGFILE:-"/etc/ergo/ircd.yaml"}"
+pidfile=/var/run/ergo.pid
+name="ergo"
+description="ergo IRC daemon"
+
+depend() {
+	use dns
+	provide ircd
+}
diff --git a/net-irc/oragono/files/oragono.confd b/net-irc/ergo/files/oragono.confd
index 3e694bb97038..3e694bb97038 100644
--- a/net-irc/oragono/files/oragono.confd
+++ b/net-irc/ergo/files/oragono.confd
diff --git a/net-irc/oragono/files/oragono.initd b/net-irc/ergo/files/oragono.initd
index 2379aaea301c..2379aaea301c 100644
--- a/net-irc/oragono/files/oragono.initd
+++ b/net-irc/ergo/files/oragono.initd
diff --git a/net-irc/oragono/metadata.xml b/net-irc/ergo/metadata.xml
index d03f63171752..d03f63171752 100644
--- a/net-irc/oragono/metadata.xml
+++ b/net-irc/ergo/metadata.xml
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 18f982781c1b..86ae6f914c00 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,5 +1,5 @@
 AUX hexchat-2.14.3-python38.patch 1005 BLAKE2B 150783fae40e10aa32fdbf42aa5d1f70eefa69c6ea0a5fc7a0fbb243c1ad65bbc8d3fa1bbfcef530e366cf23d1905e70a7692208d06fc6feb0d24228888b17c7 SHA512 877da47f35d5c743429fc8c84768e70135d04573e7aed72e9f6e09062d619a8d4ed717930801a524bd81848f1a393919c1d8ae041899b07d9337e3fd7426a003
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
 EBUILD hexchat-2.14.3-r100.ebuild 3408 BLAKE2B adc3571828a0feaa942b017d2d798b084daa65a5cc0fb31b1d0ca668782976ea263087fb44433a00b14968071793a53cfe58b69d36a72c018bd5d48f30f965a6 SHA512 b05d26307793d4a53b76e4ac4dae85284832947108375294a143c7882f95240f34e7a701c57914f2836c487d5a1f5771f1b006f4857cb875edfcb994b9ad8cd3
-EBUILD hexchat-9999.ebuild 3355 BLAKE2B 2d349f4ebf93889acd22f0a74ba2d389f403025858f0823d2a70f898c09a1ea7951d4526b6ab2b80d7e51f4c2309ff0fdf994e6b4f4b29677ae6b693623ca12d SHA512 0613a2c0178c6abbfaac579749363d93c6cec105fc48b55b5a8928765fe7be9bc986e370bd0b41fa1ed3073ea2734789f2eeb9aa287df0ede0fb23fbe7692dbc
+EBUILD hexchat-9999.ebuild 3356 BLAKE2B 590627e46339dd3a23d9e4c06d79192b9921674c0777b8d13a82a53c2942b513a76c15e3a199606eb5e366bb43fc4daa98d067dfb106fa7d8b4b46928c46c371 SHA512 28385e63e4968628000ffdd815d445c968762872c7a5f264f388e677ea0ed9fd3c881e8a72602dceffb2c1e3e0bd5cbc3e2f04fe5541275660468c84952379b9
 MISC metadata.xml 1042 BLAKE2B a8b2d37197b07fb76badeb4439d07f5b8acc0ab888f277050306ccf7b906de3bc4dc8b7a13af4b398494c350ea83eb373b107528055e6e502667b2a56e052133 SHA512 aac3a4017b0e64d98a71fcfffaec8a8245ccb7f691d40fc327599202831462e09eb7e382ed4230f5f3c584dfe0ebd9c0e3bd8f157103109cad037c9e597ef68d
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 7e74c663c59c..5de62a8f2e7f 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit lua-single meson mono-env python-single-r1 xdg
 
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index a51c644cebd2..09eea9093c3f 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -2,4 +2,4 @@ AUX irkerd.confd 535 BLAKE2B fe8484cee8e5d443c3019c9915553e503164a2e5e965b44e892
 AUX irkerd.initd 963 BLAKE2B 33e4b654eb908d5d2b5c086d821f81d959bcb71ec93b80c7aa38ffaf75f011d41f43b9369115d0ac463ecdc3781ee7360d06fa8afe9c7e66a79fc55e8340d338 SHA512 fa9247c207f4a21611e51477c31556114d83899ea7adcc8bf8f3bb3edafaa8db84b4764ac5704dfe7abff2e5f9727610b71609a620432dc939a81d2ab7fcf818
 DIST irker-2.19.tar.gz 44502 BLAKE2B d777ed3b4308dca7f6bb2483bc03ba8ba50a55574da3e4de63138fe88483ae6d3ac46f414a94801d7f27c740e38ddcde494cea4c846fbc59d736441b692747f4 SHA512 7516ebe8adc74902eacc657f0a1d421c285a72f4ce08b84fd93b22635d49ba52acf7aedd03dde9012bc16496be3162bda9fa8486af3df1657af4cabf8719d7c7
 EBUILD irker-2.19.ebuild 1524 BLAKE2B c8c35c008025017eac7eea89a0c1fc5e3066134dda5b4d462ae5f5ddac5a29fca5a2fe04707c7682234f2a598e2345a50fec05a0663831716e476592b1e09587 SHA512 566e2531236ddba05058bad5d5368fd6c312d075cd1969163f774dde9990143d4702604cb2a18c5d7a75420f44681782d232e7f21d41978dbba3d70138efbbdb
-MISC metadata.xml 445 BLAKE2B ea6b8447fcdd793e0e13d49c545ee8496a82ef50929fa405aeb4b3afc192dbed4636bc23840ca8131ca7d31891f765b25dbed475eb607a5a2b2fd9f70e1a4f51 SHA512 9de852aad0221fb33017a9cd424f9125313bcb367fed5ebadf53cda3b6eba40a2f78c22154f9569e7ac38b2f3c2ab7168807d726aa94fc240a292a3cfed18c26
+MISC metadata.xml 337 BLAKE2B 362096f6a3657b40509b5e8deb3cc906422d4b5d04e192673822ece2208caec207cb8e0a30d8e75a5a15daa7360be2cdebef63d5706ca22afb9ec601ee7373b9 SHA512 3d4cc6526ca00e3ebaa9fa918338beabf30c9bf541ce530e3d3e6df9a41c3f5852085394a1ba06f823fea2cd956945a7e51ddef5303397b7e31d4606a7955014
diff --git a/net-irc/irker/metadata.xml b/net-irc/irker/metadata.xml
index ee05af555f14..c7cdd1d661fe 100644
--- a/net-irc/irker/metadata.xml
+++ b/net-irc/irker/metadata.xml
@@ -5,10 +5,6 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="gitlab">esr/irker</remote-id>
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 851447fc313a..5a84d7be7cdd 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,6 +1,6 @@
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-20.12.3.tar.xz 4242136 BLAKE2B 2483b34dde69a73029d15e8d626c77ebc9f91aaca0dc7b83f4b92629bbf773873de52bf8fd1ead3d862fbb496f2dcc3823320d983ea0c0f2c0ba8ac831ce379f SHA512 022854edac9e2b834e9c6795cd02e9d9fe5ab54f4d3facaff9f60cac680e1b6df12ef3ac3281a07d4ce732f491fe2b49f47fd467751c9b87549e02df3ef27bae
-DIST konversation-21.04.1.tar.xz 4230632 BLAKE2B b0415b9d3e740e6c4d6cfb33abe6b68e41d2e748a84c851615b9bd931be03988aa15d0396121660a964577bdeb257b0a93b498235cb2e1c40f9bde94548b824e SHA512 78b2964cb2beb2e2a7e4ad86398e5a78606f4558492e77417ded604cce19f00534bca99899ac8ff59105e9004a012fdf36d47f490fe9b53c751702d038edac4e
+DIST konversation-21.04.2.tar.xz 4252240 BLAKE2B 1e5459f3c0bf0168b4936550ec88064328ff68c00c093c26cee54a89936044653d0f4833fbd6173460958dc925d97d78d1ca74b450ba9237250687dfc751e651 SHA512 4b05d290c9c8350b60a77d9fc9dcc53671496218e162319bc37ec20cd26cbc8db8f9e3b1ad7e9c86cf9a656da5a6fdb814c80e9bb3413e12e436267b8da04f7e
 EBUILD konversation-20.12.3.ebuild 1900 BLAKE2B 7d40422131f9c31abeda4c3d47b087bcd347cc94bd27c309c14d9df3c25e7c105d72ed1295710ef1450d4c6501a6ee87a18a5a39612bd544315a1e81a00a2c8c SHA512 aecec20212c5cdc90ebc7509f5865463a49dbbdb2113882fdf7e84bcef37a58a9f349335b2c4a4fc62de973851308b14b21ea892fa461d6c7280eb6e9e112236
-EBUILD konversation-21.04.1.ebuild 1892 BLAKE2B ccf0502196052468c5ae2cc654c2d4a84d3510583a9f0275c904b95d6859192fd868e862ea361328ee7b7c4fbb4b0aae4c1349c26bfecf326bf47ba01193b744 SHA512 01ecd6b2e19274f36847f57317b09d272080aa06d6fabbb671464846acdc529eadee70721b2b5e392d6842ffb7f3b1ae9cbae4614e91bca61034aab4a76ca21e
+EBUILD konversation-21.04.2.ebuild 1892 BLAKE2B ccf0502196052468c5ae2cc654c2d4a84d3510583a9f0275c904b95d6859192fd868e862ea361328ee7b7c4fbb4b0aae4c1349c26bfecf326bf47ba01193b744 SHA512 01ecd6b2e19274f36847f57317b09d272080aa06d6fabbb671464846acdc529eadee70721b2b5e392d6842ffb7f3b1ae9cbae4614e91bca61034aab4a76ca21e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-21.04.1.ebuild b/net-irc/konversation/konversation-21.04.2.ebuild
index 73a3fb36feee..73a3fb36feee 100644
--- a/net-irc/konversation/konversation-21.04.1.ebuild
+++ b/net-irc/konversation/konversation-21.04.2.ebuild
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index e9caa8161205..3652afa650ba 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,4 +1,4 @@
 DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1
-EBUILD kvirc-5.2_pre20200605155236.ebuild 4387 BLAKE2B b7c5f21a0ac44e0e7b03652bf64d0274025d7af9e57965bc3de9e36a41b632f6a1f21eee5162de7bb289e63555877f9c8a48591391bba6ed988f6428424594c5 SHA512 9c101f622a40abc5f88c4ed0792c677f8781b24231073d29c09f7a48977de748c6f1d963419943523b017ebf680f3a687168af3e96f408d593e1c5d2ddf0454c
+EBUILD kvirc-5.2_pre20200605155236-r1.ebuild 4701 BLAKE2B 6a4f172adfbaf392deea9b8278bf4c72a632fab5f8b6a17510b035e728bce0511f903cf6ce282d706a1ff5162ce5014e9787fa530c6c87f8c3e28ce2f154a966 SHA512 9d2ad051316f3a129b527b8ba58a2c2f8faea808ec23055703037225f46c3609f46e1e099c069d046e143416898413952bcb2a9877c29eed6e4147603c1a661c
 EBUILD kvirc-9999.ebuild 4326 BLAKE2B 8bec9ae6434f0378b4f01814bf927dcf1bbdeb2906fb5f4bfc26fc068105df93cbea0803aeb95cf92077c001e0ff932f01d599240e8f50777369b34a5c831f13 SHA512 fc701d0994a82a6b5c8004a36cf4ccd6e0cb93ebd361d678baf8645436eb2618fa86bf74e0aea1ae5c6d55cb92abe02d330ea3903c7f1345da11bb818bb6de3c
 MISC metadata.xml 638 BLAKE2B 66f7c48cfa5e35db6763821efcf483ca829d50e9b534076fbefb209e6c3c46880b2c110d2305a4bc1e6580781e4ef5fb646e83a23a3fbf609801a84c0ddbc108 SHA512 68853129b4bf5b62be097022091d3402eaa33da641483f666c05e6eaae195f1b6672bf18313b0f98155aa16a4429d543d2885a04e7ea008065cb7d9e2bdda9e8
diff --git a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236-r1.ebuild
index 7c2667377c17..d5d66657bf4e 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20200605155236-r1.ebuild
@@ -97,6 +97,10 @@ src_prepare() {
 	fi
 	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
 	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
+
+	# https://github.com/kvirc/KVIrc/issues/2504
+	# https://github.com/kvirc/KVIrc/commit/fa2b4a9f98e2820432e3a7561b3ca914982a4454
+	sed -e "s/KWindowInfo wi = KWindowSystem::windowInfo(activeId, NET::WMState);/KWindowInfo wi = KWindowInfo(activeId, NET::WMState);/" -i src/modules/notifier/NotifierWindow.cpp || die
 }
 
 src_configure() {
diff --git a/net-irc/oragono/Manifest b/net-irc/oragono/Manifest
deleted file mode 100644
index 67ba4bf364f3..000000000000
--- a/net-irc/oragono/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX oragono.confd 104 BLAKE2B 8e1f9372d43f979a768b516f0b7c4e00540a1547592bae12b576e8b182b94eefadfda09208e14a7f3fe1c8480d447e487a1df86807041bca33a53b87f208822a SHA512 7b54c8ad9ed552fd91bda17605118599a8f3853156c0d8b9d1c64630b984095096c74dcd38000b2d13ab0e3015ee81e994ea5d90b20edbc6b5c174f6efbdb307
-AUX oragono.initd 228 BLAKE2B 5ccdbc0762223f0311ea80f104cb814bd1990720bc35befbb3b19d4e71226e773ea60a2a37ab249fa18f01ca680d6c2f5b86d8cf283a0eef8a08a28f438dd458 SHA512 428c1a350d3720434a727f1f68463519941e6e27f985be51417001bbfb55b7a68fc874977dec6d63bd1fb1dff496e88b9bccb2a6e079f34b726ce78d76a8f53b
-DIST oragono-2.6.1.tar.gz 3099750 BLAKE2B d07a699fd2330e270f623cd452fa5cd6833ad541f4be76bdea0fed85ca6947f35a93876f684cd611f40d1482192cd3fcc4d8ac22f5c08dce5098ca2ad6a913fd SHA512 ce7e28f71dbd99fd304cfbf343aa3a494ceef8b3680691982f1caa16b0c1162f354eceacc3deab6d8c1a9b9d6d5fa009953f2735ab87991801ec2e6958b8fb9b
-EBUILD oragono-2.6.1.ebuild 1526 BLAKE2B 3f4ae8e5e54dd75c22bf07b112693cc7b7f3bcea18c578e1bdabc5e8d4de8d61312318a794b82ee4e988da99224723d719d5347c4d53c4a3e2b10b768d82167c SHA512 57000d21064464c62072c2385cd62ab31b11c273d2070c8cd664b1d1a099c867308718cc2f9b3db04ed9b26a98e7e01ab935e2cd1af67963619b4441e36abd6d
-MISC metadata.xml 319 BLAKE2B d82fdd20f65f3c9c6d544701fd4542c7ea14a10869210f24a966e6c512127c132d9a8e58e116196999159cbcff6017b20ec5c5f4b918471a32cb91e81e84fdf2 SHA512 721af15195dda9a790c7cd38bd36792a0411bb45a34e5b0a2b5e9d3343a1c41d7aa583e8be8ea97a639cafafe70c8a5e0219d6b5f175e5eeb166d6afca2e464b
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 6232dab3be76..acfe6157df19 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -6,4 +6,4 @@ AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617f
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
 EBUILD quassel-0.13.1-r2.ebuild 4701 BLAKE2B 11e47ac3b8346b0fcc7521b642a1422dc3d69a162d9da95a746a9764c735fe18829e2ee481d02078c406773200f0f9b1a174f36fdd24a88e268959fd30f9acc1 SHA512 a02f17fbae75b52f2890ffaf87d282bdc43fd3d0396674db15eb902f68e4fdcf4391ca1fc743d7938f559001dce363be0dc8837357b6a84c1ce5b223ca83c928
 EBUILD quassel-9999.ebuild 4583 BLAKE2B 59c518587b305ad28b40594af715e2aa54396feb6f596a9273b884b4280bed8152649bc7da6f662a7762d5d01b16d798160e1414d5e5649662d2b18c0bd9863d SHA512 c0de1abaa3fd51e64378c15d425371f9214ebfd0933f4cb64d8dbf4684fbcead6ce19049593ed1b7bbc6d60d6b661d8f0afd6e9e9600ad272c7432aa6bbe2d08
-MISC metadata.xml 1840 BLAKE2B ce192c0c4987d04d874967c26d9febfe2061391921e013ff8d16af93cad58a6d75475f32903f1ff7dc242547f11bd2ff9981c5b0fc24bc0dc3adc434d7d358f1 SHA512 9fe3bb49838a4b5c400f31934d00ddd15704f30137d35d7ea3d85d45679015e5fefa11d726f5a86dadbc2dc68c0ffd37867fb98ee69e7cd0f2d06624d52944e9
+MISC metadata.xml 1726 BLAKE2B 79f198e894613f560bbcef0b5e0be76058864585c87fae9bfac31caa3b48c83df34379287a2e01d41c8e79b08984d9573011c41cd218dad7b5c96cae1407b214 SHA512 ddd96db79f3cba84b48c3f9fd27c15bdfa8301fc04d0d9c032921c55e148150350c56bdf7589eeaa61c6349573ae5fb15b9b44c272dc61a6b2ed7e22994c92e5
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 57498aeffbe6..2d67d24b3107 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
 	</maintainer>
 	<use>
 		<flag name="bundled-icons">
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 06b91e72cae2..6fc128350d51 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -2,11 +2,9 @@ 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-5.0.6.tar.gz 4975195 BLAKE2B 3ba459e0ec932e9f240825ba9f1fa40e300fe7958f999de86d5653f2e6e4940be8b8da9c885c97bd738abefef601d61da6c4e6c7199c7052d29a74fcf5048828 SHA512 7532e9ab2e039f21796ae813881aec9d34b502ab64efc4323c938232c8901ce882dbcce497ad93df270e4b5fa2e9633c0971f2a6b3213ad458756aea92aa1612
-DIST unrealircd-5.0.7.tar.gz 4995220 BLAKE2B a2996f62b3fe943f9af2cd570866101a501d24f7966378d8e651cf84b9b9d0981fad441b785c6293f4a0668a914cdf191dec52cc6b1e86aac2a51640ca32dbfe SHA512 0b851af26da2ea5d3a04d2ef324d7bd3d3fc820f24d7dfd7e975d6bf1f3954884eb98dc348d291a118d98a214922d3ca1132800381e6f025264856aa06498779
 DIST unrealircd-5.0.8.tar.gz 5013231 BLAKE2B 57365a06b8108239ab10f6cff7d4553b08aa428acb5c635c4b9241c3f82459a5aac18c916a4534f3a8fc9ac1fd4c1d9418c7395233603e576eda40c56d81b110 SHA512 45fc0758a870dbb9c3ff55fc7029d1ecff9dcf65680f31ff331f012efbf9c9bffa60a6fe27b9bab69302d26b8293a1089cfaf1c550a3f2802a549f25e4644770
+DIST unrealircd-5.0.9.1.tar.gz 5210836 BLAKE2B 1b71c54106a038501782004b183bfc4b148c381150cd293bdbf74f33dd8a244083e7ce55adcf16aee5cd344707d6b1d1843bbf3d83fea0749532f68a954da950 SHA512 1d45be1904c415a60bd5b7e279ee528e0f559207fe763ea8b10a9809a253b0e10d781b8624c85600206a8484bde0ba162c62dc96e12d581d904d483b0b89193a
 EBUILD unrealircd-5.0.6.ebuild 5028 BLAKE2B d23a34d8de21ba5e8191cf4511c3adc5f6faf533a74bbb03c4fa74897f6662d90da13aaf004fe4a2926348b4a370fe578a198cde5879a019fbc7b98df34bfb3e SHA512 a6878cda9a6fb0ba0282f39b8b3a2c58295b78fec01c0c74f43d8d165793c60b7c5846ded2c1d44803d4820627145aca5d586bd8cc4d122ef9e3bf47508267b3
-EBUILD unrealircd-5.0.7-r1.ebuild 5115 BLAKE2B 165f871d7f503aa7aae552dc7c6933a7688102f21c7c6bbcc1081c713f97ef7eeaeaee017034a959f1e285fc84144064e12611676cb44356a66036d9eef59bd4 SHA512 c26c6e34806fe78891cd75a6ddabf17f6bcb70e0dfd3ee7b901c6e0e2386a5a226b6ee9d1b99ffe66c2a6c0e88491721da4d52267351c9b21532a8c4135f32c2
-EBUILD unrealircd-5.0.7-r2.ebuild 5086 BLAKE2B eb66856e878748a4a1fcca1cf5a90a3ed47722278a71285b607373fe03dd088778bcd42ad49431f84ca21470edab7509180581fe0df2726a24012fc10e80e1f9 SHA512 a7f31f92904ce56fe4a744fdf256e5cea7106b6ac4ca7b778af27bbb6a595ba876e033a7e6e0383e656f66f8a053f9818713c43ea982bf9adda6cb9581da5ffe
-EBUILD unrealircd-5.0.7.ebuild 5112 BLAKE2B baacf3c411245a398367f546113725af2ca4fd7f24b18f2a858da3cea26bcf1dcb3505c68fc53222828080d7bd8ca0836757a681c73490cf48bd314ad39640a8 SHA512 00f65c0070e86a5315687a99c2cd940f07cb25e4d9374a5c758158e8346b53842eb6ff67e3026cec60671d319fa00afa675c6024d2c7555acad559983a3983dd
-EBUILD unrealircd-5.0.8.ebuild 5086 BLAKE2B eb66856e878748a4a1fcca1cf5a90a3ed47722278a71285b607373fe03dd088778bcd42ad49431f84ca21470edab7509180581fe0df2726a24012fc10e80e1f9 SHA512 a7f31f92904ce56fe4a744fdf256e5cea7106b6ac4ca7b778af27bbb6a595ba876e033a7e6e0383e656f66f8a053f9818713c43ea982bf9adda6cb9581da5ffe
-MISC metadata.xml 759 BLAKE2B 5194eba7f1cb19272370b3d6d54a316201e52cfe79fa3a4a250feae84cfc37c00ee5882a352a13516924dbb393422c8052146309a5e2af888b7e1385d25dc5cb SHA512 30291788f7a41dd006eff3b2edffb2814f4ea27a16eadfb5126bc24f9013fbe76fd175b1ae1720b2d9ecb627d11a4a744cfcdac14cd1dc1c20b56a426bc8997a
+EBUILD unrealircd-5.0.8.ebuild 5083 BLAKE2B 72e72a0b9d169e83eea716169d352265ab56c17dcf0ad80b6b5ca99706c5b37bc9c02329b5c6842c0310002ecfb0c5f0dcd34786f93761de27a860abd603181e SHA512 9b59ddb1ac70b6c332f04445a67130d8bd16f30f1f359f44ae02a2d13aa32eb3c25c6d6c132b31d3297c16cebbba577cefd24e558af92ae0d796c477b4ee9d6d
+EBUILD unrealircd-5.0.9.1.ebuild 5212 BLAKE2B e557f44267a1b0ac99c65ab057fac0ff7dbad35a38cee8a35fadef2c5760f86df5af0e41082d972d70cee581063d070fbd89b230e4b0541c05610042c3c6c9f0 SHA512 a037f04a5f3d976094fa2214af549d63e6d4c469687a891a3c6185fd0324ce3b0a6bdfc1ce46333f205e59ad38ae296c704c06f067f43f140e86c2ca7397fc0d
+MISC metadata.xml 859 BLAKE2B bea2149aa6ecf19297e79bbffe9d3d76cac8016324f40cd056ae34544cf9aacb9976b36f0090ab1bb60a21c40cd735d85cc6766cb741393e106326f61bb5b2e3 SHA512 7b35b9fa89319fc0c7743ce4b2af6244b9d56a715ecbc74a0385f93c66651153c7e8be0171a1e0642a90767a94e1b809b49741d26472e9e5f40809450b222237
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index a265e93f2b47..33dbb368f95e 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<use>
 		<flag name="class-nofakelag">Enable an unsupported class::options flag called “nofakelag” allowing you to grant fakelag exemption to normal user (instead of just opers).</flag>
 		<flag name="prefixaq">Enable chanadmin and chanowner prefixes</flag>
diff --git a/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild b/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild
deleted file mode 100644
index 5f185b996545..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 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 +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:=
-	dev-libs/openssl:0=
-	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
-
-	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || 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.7.ebuild b/net-irc/unrealircd/unrealircd-5.0.7.ebuild
deleted file mode 100644
index bfc04f2575fb..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.7.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2021 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 +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:=
-	dev-libs/openssl:0=
-	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
-
-	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || 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.8.ebuild b/net-irc/unrealircd/unrealircd-5.0.8.ebuild
index 759107f92ff0..0e19fdab8d30 100644
--- a/net-irc/unrealircd/unrealircd-5.0.8.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.0.8.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 +operoverride operoverride-verify +prefixaq showlistmodes"
 
 RDEPEND="
diff --git a/net-irc/unrealircd/unrealircd-5.0.7-r2.ebuild b/net-irc/unrealircd/unrealircd-5.0.9.1.ebuild
index 759107f92ff0..7432e3222b48 100644
--- a/net-irc/unrealircd/unrealircd-5.0.7-r2.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.0.9.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 SSL_CERT_MANDATORY=1
-inherit ssl-cert systemd
+inherit autotools ssl-cert systemd
 
 DESCRIPTION="An advanced Internet Relay Chat daemon"
 HOMEPAGE="https://www.unrealircd.org/"
@@ -43,7 +43,11 @@ src_prepare() {
 		sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
 	fi
 
-	eapply_user
+	# File is missing from the 5.0.9.1 tarball
+	sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die
+
+	default
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 3b1bb4c7cd8a..1f4c2622cacf 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.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
 DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
 EBUILD znc-1.8.1.ebuild 4645 BLAKE2B 5d1be110a6532adb7880286cd21be2e8bf242a9b9959976e5235504cd57d9a70196a13344e8554b4662447e35ed83927dd9d11179e58c96505813d296d5d085d SHA512 bd5e96e5b733d17b5f7e3995c6d086836728a5ab4f5a837aa097898d3c8f2a22a257f06a8131ef25cd63066da81f13870f8c76f6bb45762f2678162ed7816828
-EBUILD znc-1.8.2.ebuild 4769 BLAKE2B 19f03e9c012643d51adde453fb84d0aa5085d614fec069025d8d2310d6890f00c1876c9e35f1f5fe439050f9b70023be51be3b6e525d0227b51758f05d9944dd SHA512 4ec76a47c60c4176cf400d316aab9b6d3df2777102436829c337ec812f8090f324d92239c94e7ba918bebac2c7498f947a5d0b16eb680e3b31208d493ef86f36
-EBUILD znc-9999.ebuild 4782 BLAKE2B ab39adc6189c2b673c4f040beabacdea5e59de5e10b13ce344fdffa51fd3e3c9e769355d6a05e63726dbae12c5cc7bfc941b2db0df891d97339879b6d139897b SHA512 15b738ca529cf94f6e51dce4919991ee377e0f02bd684b7c87e2fdc9ab5519da20d81676f721eec41383d57090023aea43e887905db7c12a7261d921ce6e50a9
+EBUILD znc-1.8.2.ebuild 4767 BLAKE2B f7f5b485f231417c56935b094d23ac662b901bdf3c368715c035b258ddd61026008dcaa1015a72d7f885ac73dd1e5c955b15272eae28606667c2057f0d62545a SHA512 26223568c22bfb62ba138e7661635c0ced3067bded70cafaff473e10001344200a608aefef326cdea3b5e31fbce44fa7e1f9b6b57e752b3559f8d64f13cda0d0
+EBUILD znc-9999.ebuild 4771 BLAKE2B 739df11a6b463895fe54e4b16a953b317aafe96fa86f1917a90a6d41949c99018aefa18ea8c652115c59cb97a1d29bda824daa2c418c3b2ab2da7c1973659c47 SHA512 6fd680144b722e2a89fdc84aead46dacda33ff279a73bfaef60a48ae17c4d9d7a5e720d34f579c766b047ca60f2f05ac9fb357bfdb083a3e0d42fdff0c3864bc
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 915c424ab54e..8993eb8037d9 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -23,14 +23,14 @@ 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
 
 HOMEPAGE="https://znc.in"
 LICENSE="Apache-2.0"
+# "If you upgrade your ZNC version, you must recompile all your modules."
+# - https://wiki.znc.in/Compiling_modules
+SLOT="0/${PV}"
 IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index a8bc97c74b97..303be8154904 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -23,15 +23,14 @@ 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
 
 HOMEPAGE="https://znc.in"
 LICENSE="Apache-2.0"
-SLOT="0"
+# "If you upgrade your ZNC version, you must recompile all your modules."
+# - https://wiki.znc.in/Compiling_modules
+SLOT="0/${PV}"
 IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
 RESTRICT="!test? ( test )"