gentoo resync : 29.12.2022

46 files changed, 729 insertions, 115 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index f130821b51bf..b381c608b009 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index d9bc375d112e..e25f4f05d696 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -5,5 +5,5 @@ AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f
 DIST anope-2.0.10.tar.gz 1809378 BLAKE2B d10323ace767aff19194f7cff353aecbced6122ef72d379d050c8dab3c7013adf6b3e649ffd95edc03bc8ca4873f60ad84991ef0f5c9c454b27ec0eda29edc6d SHA512 2a0e4f14a275a6b986fd224449dddd66584de92509770311262076bd659ba0bbd6e2726fc7a22a6edef57ade5268756ac0c56e6f220fb953ed83e72017d1c67b
 DIST anope-2.0.11.tar.gz 1812305 BLAKE2B cb1579f5483df1207482458d63d5293375310f8a54ed528b749f8355f122a1a71a0c17b9ef82477bd429f0c672746f5d5c28d51e12d8695c8c1c8368fd651307 SHA512 120588a815600abb93b77d3e9cb18527a61e955e9dbc947e4e62c97bac871325863f519d20535882f3eff136743454c08af62fd3cd4825e5a956fd1a4ac4d728
 EBUILD anope-2.0.10-r1.ebuild 4190 BLAKE2B ebd7f27c1a900f9690f5fea4653af896857ff764118c6e79a3ef16f69ff4617fdcc59ff90ba8d18279806e258837b0697eeb3a66270538bc557e1fb23238f331 SHA512 c858baccb2ea3b753b98bb33a4b73c431d6b86acdb902c94e761c15b8f54661da18f291030bc96b117a3a63175f4799ceda12178fd449bd29673eddc8965c47b
-EBUILD anope-2.0.11.ebuild 4192 BLAKE2B 5c9f4e859bb44782f3455908e24e981d591ec292525b5df04bbf6621055b94db3ed02e5bfd62e982662a8a573328544d9009582bc1c8a94e170d3b4dafd38389 SHA512 2e3d9e039a81921ba33e24f9b0a23df1c1cf68b0f747f6c84808d41b5b01deeeec49c95c3e56b81e786721451625845e629c9fcd9aad34da5ffdd6a469670302
+EBUILD anope-2.0.11.ebuild 4188 BLAKE2B 403349a823279d2b44c95f747c6ac6bda078b35baa9896d41a9cc4511b5d17d591acc5f0add365d5fa2c310af7d824eed39d3f3c6c7be3592e98e97af34738e6 SHA512 1c6c108109becd0ad68f5419321639d085c5471866d2b73888c445a5f9a4c9302237c17e8924766ea5471ea19627aaf6cab6f67f28ddab72bb04212e367d0280
 MISC metadata.xml 902 BLAKE2B 4208986846c1165a25f7461e3c996107c1d178827f2d5e8d5ab6d4f6970182b42fb130ed976de90027368bd3d845dcadab00df0b430e404333db0f9d538af0f5 SHA512 8be8f6dc110e8943af544916bcae9fb71f74b40d8930c6496a257e386336b18da16c2cf83f2253e0ac925c9884d4e63bf2995ab907d2e8f1b792809f66b3bdd6
diff --git a/net-irc/anope/anope-2.0.11.ebuild b/net-irc/anope/anope-2.0.11.ebuild
index d692a1a5536c..5638effab5e0 100644
--- a/net-irc/anope/anope-2.0.11.ebuild
+++ b/net-irc/anope/anope-2.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~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/epic5/Manifest b/net-irc/epic5/Manifest
index 5683e10549e4..5ebfeb57c3b9 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,4 +1,5 @@
 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-r1.ebuild 1569 BLAKE2B 2aed4950b1217fc0592574ded6797d988f7d92b24f62e24effe6c6d25c56c27fd6001731266c655ad16f7b306fa720f0fa3f755b4d844b36a251d1d4eafe26c8 SHA512 b13887904a436678f4259bd25ec9f68610b1b5ae5973482cd022a97a2ccf3cc4cf15f46e36c333829bf3932de53e487d5383e33365e9501dcfb3b6877bc52348
+EBUILD epic5-2.0.1-r2.ebuild 1342 BLAKE2B 373953eef8a863cffd2f23431dc8cafefa7f1ea7913333f7e518005087a3a29d277eb476b307e36f4a58cf49139bde8ed99196c2b7868b07a4ca141934ff9193 SHA512 13037670836e1a8447b7eb0b26ecd2efb7b0dc7b30c1f21905f47cfe9191303d2a5f8cc562cbeba03c3183adee08fb896adb347aa362cd1a1785ced85bffbd2a
 MISC metadata.xml 448 BLAKE2B 10ddc66039b8d1682373a0dc5ad54648714620eaf086b60617603704173edaf546b9a84d03cf8a1acac7ead63cb8538136d054830b0cd85001a7b110ed3190b8 SHA512 7814c7266093439d1607b58b4d8d22340bc19ad914fe9b55c2cac19f06f73c3ffe6e0624c43261766e4532d3aec42fa74f76005c636802f075a5ba4cf8e3d8ec
diff --git a/net-irc/epic5/epic5-2.0.1-r2.ebuild b/net-irc/epic5/epic5-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..1f531895fb25
--- /dev/null
+++ b/net-irc/epic5/epic5-2.0.1-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Epic5 IRC Client"
+SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.xz"
+HOMEPAGE="http://epicsol.org/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+# Fails to build without ipv6
+IUSE="archive perl tcl socks5 valgrind" #ipv6
+
+RDEPEND="
+	>=dev-libs/openssl-0.9.8e-r3:0=
+	>=sys-libs/ncurses-5.6-r2:0=
+	virtual/libcrypt:=
+	virtual/libiconv
+	archive? ( app-arch/libarchive )
+	perl? ( >=dev-lang/perl-5.8.8-r2:= )
+	tcl? ( dev-lang/tcl:0= )
+	socks5? ( net-proxy/dante )
+"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	# From Debian
+	"${FILESDIR}/${P}-openssl-1.1.patch"
+)
+
+src_configure() {
+	econf \
+		--libexecdir="${EPREFIX}"/usr/lib/misc \
+		--with-ipv6 \
+		--without-ruby \
+		$(use_with archive libarchive) \
+		$(use_with perl) \
+		$(use_with socks5) \
+		$(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
+		$(use_with valgrind valgrind)
+}
+
+src_compile() {
+	# parallel build failure
+	emake -j1
+}
+
+src_install() {
+	default
+
+	dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES
+
+	cd "${S}"/doc || die
+	docinto doc
+	dodoc \
+		*.txt colors EPIC* IRCII_VERSIONS missing \
+		nicknames outputhelp README.SSL SILLINESS TS4
+}
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 171a25b4b992..ed94e7592301 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,5 +1,7 @@
 AUX ergo.confd-r1 115 BLAKE2B 3a01f49ee095b213507774a40aeee26f4a9b3b875fc00edd466b4fcace701a84fe941313ceabe2c58e4d2da08caa86f3e38a330a90091bc76279d34ed759c467 SHA512 8895c2f87cdbff207cbdf17f93140c97df23bea3f3b0759ddd2dc9fc582ecea26852e5ad3b71fa59c3182592ff2cf49edc8f8029014c22f1a42ceda0369f8bf7
 AUX ergo.initd-r1 768 BLAKE2B 2d14e467e05131b7e17d8ba03d9ed0c19c3dbf291b9175ad1964ce58611661ed27c7dbcf2bb218b4844c1f871b47d9dfe52df53ba9376a3ee69b584fa9a5647f SHA512 4ab75831cdb58b56afc94f1e9ed9ca23d6f23b650141d54c08be2ee26516e010ab9aef47b891150df465962fd9728bfdf34ec0b9b9b4fb32b9a0a47f1df18576
+DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111 SHA512 952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
 DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349 SHA512 5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a
+EBUILD ergo-2.10.0.ebuild 1413 BLAKE2B e4ad7c2033dff74155bd037619bab3508de6ae672abd9f9b615e7e293efc45b227c2bd7f5ada03f46dcf2ddc1a25a694ccc1ee0c74b5d14c78a830fec6c1d847 SHA512 77604443661ddc6fc552e56ee052f181846d95dccb46aab280a2c6ab3fae3d5b8ff014517ff051a1e8de50fd4a50ed6d8b76a2050f85b8cddad094b048b0e12d
 EBUILD ergo-2.9.1-r1.ebuild 1606 BLAKE2B 3cd469222058debbe4ff7defc0f743944e9112b88aa4044b4749dc57644513a0da232d1aa365580d1a8da8ed3324f680c006907c3ff29a14a987eeae28e2625f SHA512 80a51068e6e2ef2606b1db92979464f91da26ae3083cc6d9f081d4e643a7d63c42d9df55b264ed604fa411ac0d8cfb392674d409311e441bbd2c73406562e563
 MISC metadata.xml 320 BLAKE2B 3bff5defc5150caa0cae2776e69f9070d1896c9cab8e5e0fc1afb94606a1c0e0d3ab951b4ea1076929221bcfd0576540f1b1768c1f9d3ad68161d9540c6785e3 SHA512 b634cbc9628c66cfc5b2983a6da5b2322bfb5c755893e1c15aab203f6e94b15ea5be2494b0370e8b7fd4950d0d1059e60939bd945620aa0548ef665263a5672a
diff --git a/net-irc/ergo/ergo-2.10.0.ebuild b/net-irc/ergo/ergo-2.10.0.ebuild
new file mode 100644
index 000000000000..7766ec2ce07f
--- /dev/null
+++ b/net-irc/ergo/ergo-2.10.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~arm ~arm64"
+
+# We may even want to package irctest in future?
+
+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 . || die
+}
+
+src_install() {
+	einstalldocs
+
+	dobin ergo
+
+	insinto /etc/ergo
+	doins default.yaml
+
+	newinitd distrib/openrc/ergo.initd ergo
+	newconfd distrib/openrc/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/hexchat/Manifest b/net-irc/hexchat/Manifest
index a000d5a9cabb..972ba3eddc4d 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -3,4 +3,4 @@ DIST hexchat-2.16.1.tar.xz 1349536 BLAKE2B 6e1d9f7c36affc94356e0124ea445f019d8f0
 EBUILD hexchat-2.16.0.ebuild 3061 BLAKE2B aacb1bf2dc9c6bc074c6fdcee811826345ed8698d87054c1c423bf3e41702121ffee87a374f27f7490c79d0430d82eb1bb9664f752db41d37d03680b96fd2ab1 SHA512 fb43071b567c2871e1f7c5a97734b08bb3fe948c596af4dceb300279c6eb7de5ffb5e027533f3adbb5af483c69f892c77debb5cb4fb38b24fffeb9b26da6bc24
 EBUILD hexchat-2.16.1.ebuild 3130 BLAKE2B 7bb6d15fcf3b2cc10dcf89d0b713251b245bdc7343fe41ad540902faf6344754b5fc53afd4279041b44e58a8b8b1ec2052d9679c12c5304313633c472c65e037 SHA512 fe359fbb33f0d6c696f5f7eb579b12a2e3f6d60f8cf75cbd81a15df477a1fec9bc0785915927cd7a5375a614dc409f3ff98ea223644fc5e35134de74a63e619c
 EBUILD hexchat-9999.ebuild 3136 BLAKE2B 0ae9632e82b4e6a459abdb503b54df802855175e50319333b332184bd1e6cb3d24882411db79b2a2cc78a34298dca38832657dc8a85ca5b933c293420eaaf3dd SHA512 9f1c89249fd3cf0eb7a7f67b3ce8c824fb9afcb6c8cd9ceed3edf58e9e67a5ec82d31e871ab126e76f96dfc781bb5f4471a80c1c9c888cda5f657fecde0531eb
-MISC metadata.xml 990 BLAKE2B 29353a2efa001a7cf04327064f9fa0908052c4bdebb9047a92a7d9578482a8783f320ca2e0482db508a6663e23ec7bfdc6ac7ae08b5464faca357cc77c932a5b SHA512 3218fdcb5dc9e4d45181606b27ca3bb24814ad77701c819edc4875751018e6e29be5eebc379d676ab6b2bc86e2c755f049da75aeb7217b36e857aa3b5befb4a4
+MISC metadata.xml 906 BLAKE2B 9fbe7e951009a3ba242d81e74dca7d690223088ec4de80b6abd0940aed15e7f1950fbb1fcadde82ad5706a5f35bec0b117a07c4a120e74ea4796e69a673b1ff2 SHA512 5c40e972fb20258e5b53b39ea518a70326f2bd11f4cbf5d7ff99c62f681e4edc65f2077213474b2015589a0cc7c941de5859439f75b594b617b80e30c6b1bd17
diff --git a/net-irc/hexchat/metadata.xml b/net-irc/hexchat/metadata.xml
index 4151d1550643..a768dc0d2085 100644
--- a/net-irc/hexchat/metadata.xml
+++ b/net-irc/hexchat/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="libcanberra">Enable sound event support using
 			<pkg>media-libs/libcanberra</pkg></flag>
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index c49f3ecfa40e..f30dd764e8d9 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -2,5 +2,9 @@ AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-3.12.0-fix-path-builds.patch.bz2 4570 BLAKE2B 2c2cea615f9e170c249868a60dcf698ba130b33e6e0553bb8c3070698332e643f3d58fc823fe92621e5498c8606b8334afe1536c9772a24f389010a93b72bc09 SHA512 e20171d6c94c163c414c0aa2a02a22ec2de02ec20a00542ada0181abc46e229f7e9d9108b88895a1ad6134b72e3fdab6e80b6c6b33e10b8be73f3a28130c0adb
 DIST inspircd-3.12.0.tar.gz 864630 BLAKE2B eb8fc009347777bdd1e1b119465a6e9f7b6f563c855607905ae256dd0f433d460872d185d2b17ca5033dad7fc07d1e049ce714bf92b91033e5157f796c1451ed SHA512 b8ad5bef5c4ea493bb77976cf75861efb445792696b536eab875c7c5e1a5fa679a5ad48c73a2bcb448871b4398f8370cde326abf389fc21db7e5fd24cfcdca59
+DIST inspircd-3.13.0-fix-path-builds.patch.bz2 4719 BLAKE2B f0a278f2cba6a6c84c60ef34c9f15b2fbd4ecad4a3e16944b4a50437209447c70db2faffcb6f0a18a5b970721ceaea041763e5ca237129211cf8c3bb8d925bb5 SHA512 124ba020382f9efbcc1a6d79f5b6ace61a70c6b86d46ce1067d9a05172ac77db7b06c3b61037f158d2fff3356bf897fae4504212b56a242c27fa42f5ba12a3ad
+DIST inspircd-3.13.0-fix-template-files.patch.bz2 785 BLAKE2B ee559a1e92c7ff1b985fffff815e2d12c8ebda5424583fb72cd9f4997806ee0e1571f983b024b6bf1a11077b763cf30a0b05a7ff12c25a51f8020ff3360ef597 SHA512 80a35c94753c1e32c7d58778031ab02ee70afdf9968ca647079d5a8c124c2bd10473a67609c8e9d48bc66ae94ba49dc9dab49a96cdc864a418f1f48d74ba80c9
+DIST inspircd-3.13.0.tar.gz 868027 BLAKE2B 9d31917d076329d255f3b29a394a1329f286d3178573063e5af48148c14ba8a4c6b78e90251ec9d8df9dc10726435dd4aff381c65d81c902034ea527aabac51f SHA512 1466e6b4259ea0f1e62342133a6720839e01eea24f67398ab47f9d5d63703cb934b867c705f07c8e0d3a0fa25c20f9b20ce3f5dbc7bbe7c4f2d5d02b7a170cca
 EBUILD inspircd-3.12.0-r1.ebuild 3474 BLAKE2B a84d0291acb976ec7632307b9b6f8072b84bd41d8b25e1622237e2cbb6b6101197dd828c8a9a7af02d7c871f6ae4df525d7f03b4b914aa848b45972b4811efab SHA512 9ed3fe9fb5b701ea9fd5476ece30f1a60a40db64e4ebac489585039baefb984eba516018b1c9c7e3fdb6f9dfcf1fade9171a5f5e578b37bd4cb292d1f7500896
+EBUILD inspircd-3.13.0.ebuild 3190 BLAKE2B 5d97ade46b58837eebef0a5a96297a8d4374916006c6e9f8e20afacbf72ceef290ffc9ae37902c72549891591eba90c9fb019a5c69cf7ca15196cd3fcedbc7e8 SHA512 2fd367e76478e30087c9e576e8d717788aecce6b35028bb21cf705c5e5181c38fff715d47fb693af8b25e3daab85ad7e055779aac818fb607ee0a7378af7af8b
 MISC metadata.xml 1878 BLAKE2B 2c85eb9c5a0db82398ede6b597627d226b139b7758135777068bc9b84f4b2c8303243f9591fe12e0dfb3957b7d6abe638421dce936d58c7182fa3bccfa7ddf9c SHA512 25a287fd0ac8a18a751d6920395868eaf0c73e8bf13f28ffcc187f9a5ee04520677ffeb0506b5541436ac4a9ed0f493331a09ed24d7249376493cc626eecf857
diff --git a/net-irc/inspircd/inspircd-3.13.0.ebuild b/net-irc/inspircd/inspircd-3.13.0.ebuild
new file mode 100644
index 000000000000..8d51e4a14324
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.13.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://www.inspircd.org/"
+SRC_URI="
+	https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-fix-path-builds.patch.bz2
+	https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-fix-template-files.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
+
+RDEPEND="
+	acct-group/inspircd
+	acct-user/inspircd
+	dev-lang/perl
+	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+	ldap? ( net-nds/openldap:= )
+	maxminddb? ( dev-libs/libmaxminddb:= )
+	mbedtls? ( net-libs/mbedtls:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	re2? ( dev-libs/re2:= )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	ssl? ( dev-libs/openssl:= )
+	tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOCS=( docs/. .configure/apparmor )
+PATCHES=(
+	"${WORKDIR}"/${P}-fix-path-builds.patch
+	"${WORKDIR}"/${P}-fix-template-files.patch)
+
+src_configure() {
+	local extras=""
+
+	use gnutls && extras+="ssl_gnutls,"
+	use ldap && extras+="ldap,"
+	use maxminddb && extras+="geo_maxmind,"
+	use mbedtls && extras+="ssl_mbedtls,"
+	use mysql && extras+="mysql,"
+	use pcre && extras+="regex_pcre,"
+	use postgres && extras+="pgsql,"
+	use re2 && extras+="regex_re2,"
+	use regex-posix && extras+="regex_posix,"
+	use regex-stdlib && extras+="regex_stdlib,"
+	use sqlite && extras+="sqlite3,"
+	use ssl && extras+="ssl_openssl,"
+	use sslrehashsignal && extras+="sslrehashsignal,"
+	use tre && extras+="regex_tre,"
+
+	# The first configuration run enables certain "extra" InspIRCd
+	# modules, the second run generates the actual makefile.
+	if [[ -n "${extras}" ]]; then
+		./configure --enable-extras=${extras%,}
+	fi
+
+	local myconf=(
+		--disable-auto-extras
+		--disable-ownership
+		--system
+		--binary-dir="/usr/bin"
+		--data-dir="/var/lib/${PN}/data"
+		--example-dir="/usr/share/doc/${PV}"
+		--manual-dir="/usr/share/man"
+		--module-dir="/usr/$(get_libdir)/${PN}/modules")
+	CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usev debug INSPIRCD_DEBUG=2) INSPIRCD_VERBOSE=1
+}
+
+src_install() {
+	default
+
+	insinto "/usr/include/${PN}"
+	doins -r include/.
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit .configure/inspircd.service
+
+	keepdir "/var/log/${PN}"
+	insinto "/etc/logrotate.d"
+	newins .configure/logrotate "${PN}"
+
+	diropts -o"${PN}" -g"${PN}" -m0700
+	keepdir "/var/lib/${PN}/data"
+
+	rmdir "${ED}"/run{/inspircd,} || die
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "You will find example configuration files under "
+		elog "/usr/share/doc/${PN}"
+		elog "Read the ${PN}.conf.example file carefully before "
+		elog "starting the service."
+	fi
+}
diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
index c0c8dfafe05c..edb6561923ce 100644
--- a/net-irc/irssi-xmpp/Manifest
+++ b/net-irc/irssi-xmpp/Manifest
@@ -1,4 +1,6 @@
+DIST irssi-xmpp-0.54-irssi.patch.xz 4060 BLAKE2B 305120bed1e05fc144ca4bbade4894f3f7b20d3f0fe8946182db9525c0b8ed6ce37228233a36b5a24f080cac7d0496097609fd8319294e0e140d9046bfc216ce SHA512 8865084b167138cc02feec39a014c6ea3c047f32430d531b0fb84f9172cf43024c44ffafb274a5c049e4b1060bf30a7f219ba22ce2ea4e2858fe000cd2538f5a
 DIST irssi-xmpp-0.54-musl-build.patch 24443 BLAKE2B b0ed65a688d0db84f89bc65c429b4754cd4dcfb9de2c1cd5aa64f4e02badc82d26ab42b2a29a3658910dcdbf61b2d49eca4c1b4355b5566c5a3bd120e06340bb SHA512 1417c328867b59de41f71fa720cb00581352604acec9787db183820f1ffb77209623bc236aa5b6e4f661c3780ee5c3d407aecbc286176a4d850f6e40bebecd45
 DIST irssi-xmpp-0.54.tar.gz 65618 BLAKE2B 5dd1f3a858cdb397351b93800fdd2050aa8e5764ac2e03008d629dee7d825b02bce4bfc627ab2d3249392efe43ceb1530a7ccefc3241c8ca101cc2963d28f872 SHA512 31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14
-EBUILD irssi-xmpp-0.54.ebuild 891 BLAKE2B b3d49990bce3c6f74547e25465faf5e962dca086b787fbc3909d2498794c1aca4e6434306290a98e3dfaac615718c390ee70616b55a8f6460931e44aaf389425 SHA512 250dfaacb0f0ca219d8b3862e7008acbde97732af27f536f22e00ef3e577e4c31a4a4369857cbd71a9d37eb4a8c362c1bb2ed110e8cb036d04e1dde8bd9136d5
+EBUILD irssi-xmpp-0.54-r1.ebuild 1011 BLAKE2B 3ddae921941660d9557dd36530bfda272224f1d8be0c6ddbe3e77237f6b6655b6832a4b7d59be0f7948c9f6a67326ff8dd1b4505bd1d5d3f78d2676f7e20df63 SHA512 98a4461ae0544c21ec247a328f8d4f3b004f9bc0307996ec71b02901c4b6cfd23b06f703fa5f51e61fdc1ce366fa2c1e9698d963297afb33da7ed8f3673bbf01
+EBUILD irssi-xmpp-0.54.ebuild 893 BLAKE2B 9e32091f16e129cb8be6790bbec6561d279feacb2987ecae3daf151614a5423ed72c2f3e9a4dcee96da011e992bca6f11a5a650b0d2efc1574f2a5f5c970d72d SHA512 311154784ec6a7b5d47d57b6a354721d304c27385e16f628796aa26ed1c4e1eeadbaafa16b4bb8fdcacb573a3a9906cb510a138f7b5c3b83d8d3a0325b73d95c
 MISC metadata.xml 251 BLAKE2B 2747d36e680d3c177857330b264b7b16b27bf86f1929fdd93cf853c7662a243aeadb2a1f15b6de252095db9a082c3f9c53976cd9e12230dc0c1778adcc337aa6 SHA512 8ce0ede4ca516beb3ef33975a869dbe02a6ef330f759d38357ffbc5a0d22d87e2d489be7aaa1145cefd6a4ab34253c1b1c0b7676da2e21a4ab58c13ac354d640
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild
new file mode 100644
index 000000000000..f8c6c3ba96c9
--- /dev/null
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Irssi plugin providing Jabber/XMPP support"
+HOMEPAGE="https://github.com/cdidier/irssi-xmpp"
+SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-irssi.patch.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	net-irc/irssi
+	net-libs/loudmouth
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${DISTDIR}"/${P}-musl-build.patch
+	"${WORKDIR}"/${P}-irssi.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s/{MAKE} doc-install/{MAKE}/" \
+		-i Makefile || die #322355
+}
+
+src_compile() {
+	emake PREFIX=/usr CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
+	dodoc README.md NEWS TODO docs/*
+}
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
index fab3d7c47f16..785cfd482a3e 100644
--- a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
-HOMEPAGE="https://cybione.org/~irssi-xmpp/"
+DESCRIPTION="Irssi plugin providing Jabber/XMPP support"
+HOMEPAGE="https://github.com/cdidier/irssi-xmpp"
 SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-musl-build.patch"
 
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index e1271e8be985..28dd8661bd54 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1,7 @@
+AUX irssi-1.4.1-no-werror-decl.patch 486 BLAKE2B 8999e9e015c642cb79007e419882f59f51ff1faccc32b285fb7b179e2f2d2d54632707fe70fc66d03174590635439e21390c98e0455b4df382a48c4e445ca95d SHA512 b74cc0b10d0d4a138f4f6098e967a27b9c1ada5f1b5159129b7885fb9c736f1766e4a6421eae34cfc1232efed705b26b6f40d712a518a149d987f8b29706baed
 DIST irssi-1.2.3.tar.xz 1145292 BLAKE2B 7b2b7cb8d1533a06ad3cd5e0b2e45bba636cf19d26c69e19fc7e9408313f80d80a26ff2bf5f21a8763d8adec722bb33f6b076a863e6a55e178a814a3e79c9db7 SHA512 826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc
-EBUILD irssi-1.2.3.ebuild 1448 BLAKE2B 4679b9db78d0f722062eec6ac6ff1934534682a0c6d52129b5bb73a4542a4b6761d1f5e948e5869eb179ee7b84a7f0553162ab675eecfba767f6eb418510c627 SHA512 daf20def9321082ad72d554982a28c4d5b9eccc037d2e3821254c2720d115c80c077525ff1fb9c985ed51d63cf736c87e6b7cde3d8972a6f013c314cdd7d0752
-EBUILD irssi-9999.ebuild 1393 BLAKE2B 4b9591b2ba11e38df59d713a7977ad78fc6f810a770313cc11d90eb717c00e7814f4e2025c6ede5e08f373ccc7d71721598d9bd5c92fd1699c99f8b2af8284f3 SHA512 dd4ae6574e4571b21403aa8b85c38b8a3eef67968e7f04570c3a52001c751a12ae39fa16c56a1db3aca46d098c462a50423b09b54e4984d3a951d15ea90a1030
+DIST irssi-1.4.1.tar.xz 1210772 BLAKE2B b02dfeae1e3ac5d52c5d22f8d2284e0314d9c39628e5389eed2a90d22904754869567750909b65315472068113f1efa8e304696564e2c2517b7a17219cf92dda SHA512 e0c53c456bd92af60e8845dba6d338bc0f880639ba19118c22324a5044101a16f7a387377f2a15aa74364f75fe9ed0d5fac0f353c3ea2158190f76ed89dfdd22
+EBUILD irssi-1.2.3.ebuild 1455 BLAKE2B ec9f79fb5b19bf8a2f852b66e004b3597edf4c6ff50d1a80e47ebc2ffa1c71ee04d1ce8ee638d82d3e5f59c602d68e1e4ba9c5484a4feae0d4f094ce563aee1f SHA512 f7a49411bfb9ce9dcc421f71ce201b469332e8c79a0665c4572bb4c06d6b0993c868c161213dad0dd7ff784ae79f9a7572855cb4e04829931019f8acbf689c99
+EBUILD irssi-1.4.1.ebuild 1630 BLAKE2B 9fb0f62710324851f370f131780ea6507e7aa05df30ac0ee3e2a0d696e0cb68cf50146d2f584fef467c3f1a629ba40b08a0a117710f41e2ad56309ebea0ae6c2 SHA512 4bffa0e6ad03b578eab9cf047b43bcde4d492054c165c145238b4c1c059dbc5aa38adba8d37eeda0591855621bb18016d1a666f0e8b69fdf32143a825f811d65
+EBUILD irssi-9999.ebuild 1572 BLAKE2B 68ec2faff2ae5ace3b78f304092d3e0de378f8553ef32e0a4490bb0d4d687c7c6cafdff4a7cf8f9a4a9c4cd7e7b1b389fd5cb319f43159d76d3bf23f806ffcf3 SHA512 1eadd661f4f0f407e5e4e15900ee7a9a1117321c7a441ff30c1f03738de8f89bf492745f136b2a0a5c346b029ea6731ea2caa703d5612c54c74cf27f5d11e4dc
 MISC metadata.xml 701 BLAKE2B a337d1efcdc3f02d98639cf52c0c878408b1675aa261d708fef301ba34734eb296469662c6df53941829af915579cb9b4730e15b5c157839d4633ed940e5a532 SHA512 b9ee2b27c9d3482c29e4960fac77062cbbb9a593eb8576483b49e31e04b941119a5ce56b679da4377f8e488d188061272c25cb8270d948996faeb7b77e7b2a64
diff --git a/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch b/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch
new file mode 100644
index 000000000000..83b03680cd44
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.4.1-no-werror-decl.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/851522
+https://github.com/Perl/perl5/issues/19382
+--- a/meson.build
++++ b/meson.build
+@@ -553,9 +553,6 @@ configure_file(output : 'irssi-config.h',
+ # CFLAGS #
+ ##########
+ 
+-#### warnings ####
+-add_project_arguments(cc.get_supported_arguments('-Werror=declaration-after-statement'), language : 'c')
+-
+ #### personality ####
+ add_project_arguments(cc.get_supported_arguments('-fno-strict-aliasing'), language : 'c')
+ if get_option('buildtype').contains('debug')
diff --git a/net-irc/irssi/irssi-1.2.3.ebuild b/net-irc/irssi/irssi-1.2.3.ebuild
index 685df8186024..371f59c83591 100644
--- a/net-irc/irssi/irssi-1.2.3.ebuild
+++ b/net-irc/irssi/irssi-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="otr +perl selinux socks5 +proxy"
 
 COMMON_DEPEND="
diff --git a/net-irc/irssi/irssi-1.4.1.ebuild b/net-irc/irssi/irssi-1.4.1.ebuild
new file mode 100644
index 000000000000..b16a43f2e55d
--- /dev/null
+++ b/net-irc/irssi/irssi-1.4.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENTOO_DEPEND_ON_PERL="no"
+inherit perl-module meson
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	# Keep for _rc compability
+	MY_P="${P/_/-}"
+
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="otr +perl selinux +proxy"
+
+RDEPEND="
+	>=dev-libs/glib-2.6.0
+	dev-libs/openssl:=
+	sys-libs/ncurses:=
+	otr? (
+		>=dev-libs/libgcrypt-1.2.0:=
+		>=net-libs/libotr-4.1.0
+	)
+	perl? ( dev-lang/perl:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-no-werror-decl.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dwith-perl-lib=vendor
+		-Dwith-otr=$(usex otr)
+		-Dwith-proxy=$(usex proxy)
+		-Dwith-perl=$(usex perl)
+
+		# Carried over from autotools (for now?), bug #677804
+		-Ddisable-utf8proc=yes
+		-Dwith-fuzzer=no
+		-Dinstall-glib=no
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	# We don't want perl-module's src_test
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	use perl && perl_delete_localpod
+
+	dodoc AUTHORS ChangeLog README.md TODO NEWS
+}
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index a73888fc5871..833dab6c2a40 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -1,72 +1,72 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools perl-module git-r3
-
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+inherit perl-module meson
 
 DESCRIPTION="A modular textUI IRC client with IPv6 support"
 HOMEPAGE="https://irssi.org/"
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	# Keep for _rc compability
+	MY_P="${P/_/-}"
+
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="otr +perl selinux socks5 +proxy"
+IUSE="otr +perl selinux +proxy"
 
-COMMON_DEPEND="sys-libs/ncurses:0=
+RDEPEND="
 	>=dev-libs/glib-2.6.0
 	dev-libs/openssl:=
+	sys-libs/ncurses:=
 	otr? (
-		>=dev-libs/libgcrypt-1.2.0:0=
+		>=dev-libs/libgcrypt-1.2.0:=
 		>=net-libs/libotr-4.1.0
 	)
 	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/perl
-	|| (
-		www-client/lynx
-		www-client/elinks
-	)"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-irc )"
+	virtual/pkgconfig
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-irc )"
 
-src_prepare() {
-	sed -i -e /^autoreconf/d autogen.sh || die
-	NOCONFIGURE=1 ./autogen.sh || die
+src_configure() {
+	local emesonargs=(
+		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
+		-Dwith-perl-lib=vendor
+		-Dwith-otr=$(usex otr)
+		-Dwith-proxy=$(usex proxy)
+		-Dwith-perl=$(usex perl)
+
+		# Carried over from autotools (for now?), bug #677804
+		-Ddisable-utf8proc=yes
+		-Dwith-fuzzer=no
+		-Dinstall-glib=no
+	)
 
-	default
-	eautoreconf
+	meson_src_configure
 }
 
-src_configure() {
-	# Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
-	export ac_cv_lib_utf8proc_utf8proc_version=no
-
-	local myeconfargs=(
-		--with-perl-lib=vendor
-		--enable-true-color
-		$(use_with otr)
-		$(use_with proxy)
-		$(use_with perl)
-		$(use_with socks5 socks)
-	)
-	econf "${myeconfargs[@]}"
+src_test() {
+	# We don't want perl-module's src_test
+	meson_src_test
 }
 
 src_install() {
-	default
+	meson_src_install
 
 	use perl && perl_delete_localpod
 
-	rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
-
 	dodoc AUTHORS ChangeLog README.md TODO NEWS
 }
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 689476affcb9..0ee34113093b 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,6 +1,6 @@
 AUX konversationrc 346 BLAKE2B 8d236be66f983b3670bbd49578c73a1a868be0b498f965e5f91ecc96f956ba6151ebf6a90cbacd304c9fd16fe62c6cecae7027b5582d1c1b97516c7c89430c68 SHA512 37333594ee6835e61a3dec4c3f48e9a83d69b252768aa22830102199811059cbae8188388e7911503e14c0ef05dbc7d7d7f50c94d0fca4659c6b739e3b8c24dc
 DIST konversation-21.12.3.tar.xz 4275132 BLAKE2B 31ad192a3167b6ea1d82eab36a4f69f1e34fcc679ccfde06b1d0317aa3abcdb31bb7a39dd29574a182105ac6eb0e084a1e3cbe1fbe871a0d216368d9a2a8dcbe SHA512 118975e8ed0b20ab0a85b03354a0265dc7c0e1b15fba92a91357df710b9801873ac5506181baec6f106e4dd8daa15555c2ae3e22c1ddd4c9a787947afe06e408
-DIST konversation-22.04.0.tar.xz 4288088 BLAKE2B 5c733ec5438798fd8b759b9551d851d4931cfe375248a6b90ac10fb640e89f00d2696b0bf2982dde08282fee6e61d4702784f9886be21b0cb34d8f76b5dca254 SHA512 08cb23efd6511cd710e68356d4bd9898a3b7b7b86187190a9e2d0767ada67433dd8195d5bed4b38e87a8bcd10c47e56ccee1a760f25d011baa5debbff7ad69b3
+DIST konversation-22.04.2.tar.xz 4289524 BLAKE2B 1a3f6e5b1fe3e86ce308fd6d7792e960dd9b0141db18fde6f10423d71cc2f385acdf8ed2c73c970bbc30ab6901af3890fc95285778ef8d18d3b2c93fe69c0d7b SHA512 7aeb8068f251f10f9cdc59b3058d4f2af3adde8f5047244c4ed5af29b9008a2e6c824277e6f33dc5dc56caef7939e73082be9bb5a675dc1d67a7f3957cdc0aa7
 EBUILD konversation-21.12.3.ebuild 1896 BLAKE2B 19996ecd1cac774e660e46d8afc003be85f8ec4ea12911cd187bbd0b111024badccff165f930fe86c4d45d1323254cbec9560b991a78983b342efa8fac4fcb12 SHA512 925eca7e324f939ce11f06357c4951ed153aa34bcd650c3b8919326a2bc8f855e4600fdb3cc3f768fd8f10e93f1cb4aa36c1f5df2f5d78ef6d4356f491d71b5d
-EBUILD konversation-22.04.0.ebuild 1905 BLAKE2B 3c368e616a1227b05d18304e98d54cf09c73b7d69e6c000400fd4bd31a9fef6e0dbce282eaf655a61f7b61e38e6374bea03305b5198b2ef1e464d886d32ea60e SHA512 7b43aa15b1a83eaf841f8e5e5c35bd716fdd1e690d8c37c62d002cfcc3b115d1f037ddf941ce8f397ec9654a20c2b7540509147da8014efaee6eedfdec1770d0
+EBUILD konversation-22.04.2.ebuild 1905 BLAKE2B 25ba39683fd50738c28a0c164d81450ceddd5bf126e1067dfcffd1aec6ddd1f1c00525265cf063b56dd46e0da68883c0a71ac7eea926cd82dec09b04986637b4 SHA512 60521786dce52d7504f136aef827663a250ada5370121695e873d0718f7b3127be7d1d96e808f53a0999f5a813bc137f44e34767eb913b35e8fdcc3d2b062276
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-irc/konversation/konversation-22.04.0.ebuild b/net-irc/konversation/konversation-22.04.2.ebuild
index b931b1c022ef..b187b5b11637 100644
--- a/net-irc/konversation/konversation-22.04.0.ebuild
+++ b/net-irc/konversation/konversation-22.04.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_HANDBOOK="forceoptional"
 KDE_GEAR="true"
 KFMIN=5.92.0
-QTMIN=5.15.2
+QTMIN=5.15.3
 inherit ecm kde.org
 
 DESCRIPTION="User friendly IRC Client"
diff --git a/net-irc/limnoria-plugins-chantracker/Manifest b/net-irc/limnoria-plugins-chantracker/Manifest
index 8e8751748950..99da3fd989b3 100644
--- a/net-irc/limnoria-plugins-chantracker/Manifest
+++ b/net-irc/limnoria-plugins-chantracker/Manifest
@@ -1,7 +1,7 @@
-DIST limnoria-plugins-chantracker-1.6.tar.gz 48050 BLAKE2B aedf93eccbda87eb488b7a0c6e28597198ce37a68a006771b15d6044eea8d7efd9fcf5b178ff4309715534286b74c7ee81e47241ec6406c26d1b17f5bb442d5a SHA512 c7ddd629818edc85d4ebc589d85fa66ef757ac27d0710e4a5512a469892c5c3caad6b98a3ebbce0abc797e0b64bdbd4ad2445e2127c91e266abddec58c3ae859
 DIST limnoria-plugins-chantracker-1.6_p20211103.tar.gz 52922 BLAKE2B a397c4235eb0487d6e84acb8c8dabd78fe1dcd4b64a85b94168fd9be5b3cbaa32049d621348b81b026d68bc1599b7b1db2051a572258e80eb0b8be875d3c9b2a SHA512 bf1c613b1daa979e310bf566e5584004ea824a65464e1b185b58ccc45c62f052d449a25e686eb0faa9657f29ff69b89ec588cf8ea40ad4dff415b9fc02faed04
 DIST limnoria-plugins-chantracker-1.6_p20220312.tar.gz 52441 BLAKE2B 539038581ed988fc64216171d293271a811561903d23badcef36124d5ee80e26e1f67ff7d0e36e463aac92bc2442bc28766116bc9f92e5f86d8e14728180e192 SHA512 9e9cee65e3d19bab2c5079348bfbd598ecc71d3d8cc11bbcf76b79f39a14c9171c2a0a5e5ea7cf5550e9ab082ab6d764205f44e47bd1ea596d81ace68ca26075
-EBUILD limnoria-plugins-chantracker-1.6.ebuild 982 BLAKE2B e4b9f75144867651b9eef0a06906f19ed22dc99c10c3c0346d70bcd704216abaa4dda7ef8f62a625fdb18b4f3d7439390f10745ddb56684c366d8bd19f06d743 SHA512 58113806372b09d64cb48195c3bae80a4cc7dca5b49ab1c3ee70bba1e244400c66d6d4981bd5d4b1b1ca002cd839c51bd5fce41df630e7189994303593459b25
+DIST limnoria-plugins-chantracker-1.6_p20220429.tar.gz 52444 BLAKE2B cbd4187b1b288402b45680a8a7ae080028e68d8409d01ef7c53ad99aae1c94336701a98fe66de29261cb12472ebc9102e31d2862c3da872fe9f55fd40b61cb0b SHA512 ff59e7f42c8fccc2214496e884ae8ef931b8e77839d898fb23fd2551bb91d1865134047fda9001892cd29b892ca4af6b959015d7e763bbeedaf7d13382af1113
 EBUILD limnoria-plugins-chantracker-1.6_p20211103.ebuild 1027 BLAKE2B 867ad6efb43a2c2f31403239d9d06d56c1c357528a106de08d58736944a48d84a51aa669275b47fc2a1edfe9f659b7316812c4991a6b50aba8f652ec28542ccf SHA512 c1510eadc19274be4a739bd56efdf929cb4f273f18083dcec07e40a6831eaf944286742088e8851dad6783d0ed42c32614a283bad7769dae70cb2ba1c404483d
 EBUILD limnoria-plugins-chantracker-1.6_p20220312.ebuild 1027 BLAKE2B c7624e161ad947486a5037a1f76ec24daacf271d2c4f95a89504dd977abad6053518b9f93584fcb9ed687be4fead1222b3ec0d99a738cc8693ebf2f00f17aa77 SHA512 1968064e467ed0529222cb8ea18c2b153b5c78ebbabba6cdc6b77999bde606f798a761b191655e29a0ef4c3f36b112da1024eb88128ff617bbec93ed25246c41
+EBUILD limnoria-plugins-chantracker-1.6_p20220429.ebuild 1027 BLAKE2B 01bfb413516c2cae185c5f2efd49907dea0ec7d9c402c05f0e2e6b71dbc905927d136d5640ce3de38a018d64215a32ccf35031459397d5cd11a510e38eabdaa8 SHA512 8786a84f1d0db9f82f6b41fd919feb780dd84841b788885d5834977e1208db8cfd5bbe0aedc589c7aee2bea73c4df91bed35f5ca5aea473d5ead484c2789343d
 MISC metadata.xml 420 BLAKE2B 1a5976edab4e57dceef38076927cef9967fbe468237cdbfc83a5788a3dacd22890d02cbcf244eccd7c7cd370de3051340ab53c16a6df31eecce83105a1a2722f SHA512 cefb9ea55a31bae3c844b41d455e679d37e67b693cad0bb0173676bd1fb0684b4da05f2a6fc54bd6874f48f686f9c6e77a4aeb69ef8b8b866b40de3480b1b8da
diff --git a/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6.ebuild b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220429.ebuild
index b65ff5b9680c..4ecb6427352d 100644
--- a/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6.ebuild
+++ b/net-irc/limnoria-plugins-chantracker/limnoria-plugins-chantracker-1.6_p20220429.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit vcs-snapshot
 
+COMMIT="3931b790d5f339ede546dbf925ff1e327f7132db"
+
 DESCRIPTION="supybot ban management and channel flood/spam/repeat protections plugin"
 HOMEPAGE="https://github.com/ncoevoet/ChanTracker"
-SRC_URI="https://github.com/ncoevoet/ChanTracker/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ncoevoet/ChanTracker/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 KEYWORDS="~amd64 ~riscv ~x86"
diff --git a/net-irc/limnoria-plugins-progval/Manifest b/net-irc/limnoria-plugins-progval/Manifest
index 5d9b367fc95c..1cfeae8792f9 100644
--- a/net-irc/limnoria-plugins-progval/Manifest
+++ b/net-irc/limnoria-plugins-progval/Manifest
@@ -1,7 +1,7 @@
-DIST limnoria-plugins-progval-20210629.tar.gz 4940004 BLAKE2B 286b502daa37bfa5aafd8f5d92176ecc5956d0922322bc1ce1ffd4221bc6f9cef14b7cb9ca52c1d520e17852941a34006a250d8f6504134c40fc0b896b71a99c SHA512 30985a54ef6c1d027356b0f6efd0b1cbde777bb4fe2999ef63ebc94ae944933d9dc90f1ce937ccda5b54bacdd786ead79b01bc1514113a51b749cfcccba993d1
 DIST limnoria-plugins-progval-20211212.tar.gz 4947598 BLAKE2B fa944d5f6c08918a65b518de5eb75fcd0c84adf63923f06310da18a31d87efcca59eff23c402543f3216e6fa0122956615264a744072bf870b3d1b2bcf155e9f SHA512 770da93037d331103c12a17cded7d62028d6212888c9edf51ad462f907b882aaaabb5322bdb443fc0e45a411302e145c96915f9226d20e863350c17a80b56d0b
 DIST limnoria-plugins-progval-20220205.tar.gz 4950629 BLAKE2B 242dd75aca7aa6af8ebcff9f6f13965986669819129cb30ffa46c4026680e6951ae92d646aeb9506a6031f08975df98110276e2aa69ec2bc4831a474ac1f3010 SHA512 4b405a3d845761592abcff16a0c7b0ef8820921cb9c02ac7cfe3db695b535503ba63ce9945bc396b238c74e36c2a8b3f004eefe945a33af8fc91e1c740b2897a
-EBUILD limnoria-plugins-progval-20210629.ebuild 1048 BLAKE2B 066fa8144ae15effbf35b3be1f1906d0954b4dadbbe59242047944ca3cbb5edb484686cb82fef3bb615596e7ee6ecd5fa4304b09bbfa58bbafea4429554a2fa6 SHA512 5d7a5b26ddb30f099e9a5b87ee93e5932e9afd148788e4e782f61753b5fc4537285f322b38dd08b38f13c97de3cea167907dc8017d7f70eda8de4cf6961bb4c1
+DIST limnoria-plugins-progval-20220513.tar.gz 4951977 BLAKE2B e7acf8b023035cf74465287441ee8825ef6cfcbbd2279bfde8a8014ab0f29b21b381d991e1948558a1722897f2a16f2aca1942fbd118f74609c00ccf489f7540 SHA512 166967f6562946a1ee7c06a21788d7b806f1f9a56c0666dc1d515e894474dfd0da1cbb07259198410b07298ae992a3f352953f938aa850fbb9cb8da361dd58ed
 EBUILD limnoria-plugins-progval-20211212.ebuild 1048 BLAKE2B 241dd5d604b6b2bceff80b1b5bd88ccf6972a0fef730e9d17684260da348ba928ae6c4bfca93d3e17f3d5fa1a1296a165e8467d78eb73ba7f0e49cc1488606d2 SHA512 d20348e2eb3555d4a539a53f84613b47c44372b5febfa2e595973d4f5f65629c844b717bb45f985eca19f4fed9f441e9c7aabff3804889575789b3ef6d933eec
 EBUILD limnoria-plugins-progval-20220205.ebuild 1048 BLAKE2B 357496b6b7e1410497116576b4140b22177e4fd8246a4b48b2d17882daa78217948ed7a988294e204fd14ab0fe4abd6a92f7691102a495a4661abe8dfa340b79 SHA512 5b4dda09369024f1717da186c4c3af3b40cb8e158da90ce88156298c35d84045e6a5a6fe2779c736959b83fbc005341d5819567c5f0d8b33471d52f4154898c5
+EBUILD limnoria-plugins-progval-20220513.ebuild 1048 BLAKE2B 6d17d3b76464796f48e78f9aca06ab4e35b1292c27db46851e59182b234b2ae847c0d2a7346ae19c9387d111748bd134699eb1fd9a5648e84d2ad14ba031487c SHA512 1e5b86e7dce088f5bafbe59132697066125f64d4419be7221d06358eb745abe78b7085698d5733a7f5bfbb2fa2e24bb9b097002ec5bd433bf7ed5f55327cf7b9
 MISC metadata.xml 426 BLAKE2B a578b12eff0872427f4b3f8e3daeb729502db09f66ac4358a5a6d69d4f3764d9dae775d2cc3560572e8a503c308d646b69e690352257feb9bc9c39a9b183324d SHA512 6c978847187059655b25f7bc13301553f6cc4625e413fd045ceb06458b5019faa94ca1d5d842f712742d95aea64c4bb426b8551216e5418e27225aa3943ebe59
diff --git a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20210629.ebuild b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220513.ebuild
index 287348367562..e09158d15f4b 100644
--- a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20210629.ebuild
+++ b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220513.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit vcs-snapshot
 
-COMMIT="eaf99ec03bb60da78612d8a73e47fba1f6708b0a"
+COMMIT="d09a37d7caf524a4a4b70f036038aaa9fd838974"
 
 DESCRIPTION="Collection of plugins for Supybot/Limnoria I wrote or forked"
 HOMEPAGE="https://github.com/ProgVal/Supybot-plugins"
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index d846c027da51..18dc385df713 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,9 +1,8 @@
-AUX limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch 457 BLAKE2B bda2855d4d735e7a65bdbd2b42a73519f12f100020206c7f1e3371db16c929ef91a99d503090bfb46fd14a215cdc002335f3f190e7960c2d19ab56f09943be3c SHA512 35c78678b9c114802676f3850721c6641c9a970d002b184e097cfba65fc9f7c2f0968ac9cc77e03e332c706f7bf591cbc31838e4c68fd294e35465291e266aa8
-DIST limnoria-20210617.tar.gz 1094438 BLAKE2B 3253af8ad764acfaadf90ce49d0f40a47f32554d75c3860079284f98373eb3bc8f60f1f308b501265973c0e6c2a552211415f4f9c3044ce78f818d305b598cbe SHA512 25dddf843e22967a95c769c62f9398129830f63e23d506f0a9abaf7044fa9ffbeca95138c494caf3b36813919c7b1f0880b0715a06bc519de1a87837a948a039
 DIST limnoria-20211118.tar.gz 1094394 BLAKE2B cf3f10b0e489b16afba96b6f9dcc64e0f86007cb601f7cdaca66ec80f5ce01f31795d513ee5d55687902b3a65e114e841c07d5ef34e016140f93d5d8f420f73f SHA512 f0f7d632f4de837663e69df8892191f3ee20a586e073fa9f382852f2e2146b6d82556827ef68d27831938a43fa32185d11a53e1810f7e1834d08b5aeff903b70
 DIST limnoria-20220203.tar.gz 1099544 BLAKE2B fc68fb41b094978ddff159241bb4029ba8b3df2995b69f3eecf44599431cf2074a318469892c5b9c2c6660976fd7df52c76d5790b6db0ce94e390b57aa2a3e79 SHA512 50cc56885799d28ee559fffa7a3dc92189d0f41950c3e2b6062490d46c360fd18c188b64ca395963aeca62ff65f81f3536524f154e81ab9c703033e0c3ef0487
-EBUILD limnoria-20210617-r1.ebuild 2471 BLAKE2B db4104f3518836e6062dd6d9289252ec68654feb9e256e1b9c6bbf04841f4058dc3f48ff1a52edc8a7420ef16ac4f38e83419971cbac83bf25edb803c8e0eb72 SHA512 ce984d553919ee0d6a3a7021ab8710a2a5553b50ac507cc56736a423ca4282063a77c88a294a82bd41552e98738f83031cd1b43b40a5f9a638f4080abcbc744c
+DIST limnoria-20220427.tar.gz 1119981 BLAKE2B 3346d0576c1928cf074198afa2b2b613bc9672ea68d5f395e691f97b7aaac989a5ee8f388d41d9e767eea0c495974b066b8fc2a9a0bf3a7aa9db8c52bcabcec1 SHA512 d4f617cec32ebfc67c738b542a55d2a1cd92a287a107dc84d516a1431abe0e4f440fa7b4f2a4b7fce18f24582cfdcb2ad2ed66ff2779e6a64ba7788840c1adf3
 EBUILD limnoria-20211118.ebuild 2363 BLAKE2B 816fc8499a47b2b34b8028185aaad9bea467d930726976de306aa3c582f0329d043df5a8cd9df8b1a6496288a52eed9533f08b4297c7ce7f514c798b2036815c SHA512 430659904ca25221f7d3bf4128ec7f739ec3764c2bc1c2e037455a573f00cd1f7774bed0c1fb5da86358a9b859aa29b1e19e49dd9ef8f23cf1a5b97dcdd401ad
 EBUILD limnoria-20220203.ebuild 2363 BLAKE2B b5d92d084e9ff507828ed73b26f8ae5f6471da24fa56bb168a0b3d7b72845cf696f4c01c3b4a901ab1c214ca183708079aee46b290809450604cf0c40fe40551 SHA512 8806f5653f042f38837cf3d845c9e412b91bb050bcc9e522594deaa65aa8fd3668c8354aba4e8a95d638e572d41c3ab201d66996e7d542968a9e94b778f302b1
+EBUILD limnoria-20220427.ebuild 2433 BLAKE2B 2eef2bdd543796cd12faad25cd43875bd0d3a6c7c1153c9d11795b6a5d8d51c0b136d0347d53ea5b2380d09508a0d18155dd64306417ee002731d356df4dc9ca SHA512 83fc85d52c89521ab53c02706ab53db214148b7d1da197d2b87b81eea35539ca749a2bd333dcf21b480121aff54a061d0368c866a1c38cd4780fa7f8d5a781f9
 EBUILD limnoria-99999999.ebuild 2411 BLAKE2B b46e0b57921b11eb31f746c7c88cf28f67dc96527a001271179d662900e8d4790f14438bd051997ad57dbb27b55013e09207082251eb0569fd383701251a46fa SHA512 7fbe0ae0db60c2b42bdf5ba4de49a0e689352b189600fa5c44c3faec8a898a283ffc11fdaaf49bfe86cc891beb5927b3012dd6e413fed96e6e24c326c45ea599
 MISC metadata.xml 538 BLAKE2B 0595de4ad1055d77f9879ec2a4ba98fb45363a6117a363347054fb7697cdc601602bfa5010f0994dded6c143c7c28d84c08ab9fe45955a2375abfec8888e6e3a SHA512 476b61cb8fc2231ed0d6347729cfcedbccf5ebf47fd71e5b6326e5fa63e92a48b936e7f659bb342cba0256efbd79283cc631927074ad9f5d671315cb72bb232b
diff --git a/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch b/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch
deleted file mode 100644
index f3a579112848..000000000000
--- a/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/plugins/RSS/test.py b/plugins/RSS/test.py
-index eab10c61b..a9e3c07c6 100644
---- a/plugins/RSS/test.py
-+++ b/plugins/RSS/test.py
-@@ -102,6 +102,7 @@ def testCantAddDuplicatedFeed(self):
- 
-     @mock_urllib
-     def testRemoveAliasedFeed(self, mock):
-+        mock._data = xkcd_new
-         try:
-             self.assertNotError('rss announce add http://xkcd.com/rss.xml')
-             self.assertNotError('rss add xkcd http://xkcd.com/rss.xml')
diff --git a/net-irc/limnoria/limnoria-20210617-r1.ebuild b/net-irc/limnoria/limnoria-20220427.ebuild
index 93383eb215e7..22a8760bc6c4 100644
--- a/net-irc/limnoria/limnoria-20210617-r1.ebuild
+++ b/net-irc/limnoria/limnoria-20220427.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_IN_SOURCE_BUILD=yes # needed for tests
 inherit distutils-r1
 
@@ -44,13 +43,9 @@ RDEPEND="
 	!net-irc/supybot-plugins"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-rss-testRemoveAliasedFeed-mock_data.patch" # GH#1479
-)
-
 python_prepare_all() {
 	# replace "installed on ${timestamp}" with real version
-	echo "version='${MY_PV}'" > "${S}"/src/version.py || die
+	echo "version='${MY_PV//-/.}'" > "${S}"/src/version.py || die
 	distutils-r1_python_prepare_all
 }
 
@@ -60,7 +55,11 @@ python_test() {
 	EXCLUDE_PLUGINS=()
 	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
 	# runs successfully when running the tests on the installed system
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
+	EXCLUDE_PLUGINS+=(
+		--exclude="${PLUGINS_DIR}/Unix"
+		--exclude="${PLUGINS_DIR}/Aka"
+		--exclude="${PLUGINS_DIR}/Misc"
+	)
 	"${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
 		--plugins-dir="${PLUGINS_DIR}" --no-network \
 		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index 6dbb7294765c..d3249dfcc0dc 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,7 +1,9 @@
+AUX ngircd-26.1-systemd-unit.patch 674 BLAKE2B 275a8b73b550b4431f529846ccb70fcb73e193ef44bae04f130377495c8817693c634b3dd327bc4ce986be8af1db17ea1249987dafc5beb35ee614be4a1af7a6 SHA512 c631192434cc55130cb885c94b596e164bd7733dd3f854ea8fc2e4440529e64b1603015fbea7d5dcbf86feb2c60849bfd053206f1b9c15196b4588676a833ab4
 AUX ngircd.conf 35 BLAKE2B 59c5b7c2444d5d2561884db7d532fb7d4ce03cfffacf679f2e72ee0e06415bdf292bfd4f959d47f2b598254902a954a07eb48d4d5ab170e356f89d3f8fb9f15e SHA512 24525591e0ca0249aaff10746d0526fcdc7ff5a8844e98b7d31a5fd710cf92c5905653628ec03e2a491f8cc5890d63f4b05f00bb2adeba502d60c317ad2d3e1c
 AUX ngircd.conf.d 166 BLAKE2B a7e6e149bfe04bb54e97820f6d4fda2f7d81c224fb0975335a190fc41f80aa7edad5b5f509831acf9fdd0949d02e49fa8661860b62f7409c225cecac604cce6d SHA512 0c71a27130f0d918d3ba78f4e19d882bd1089e7f6e899cf89456d1e249d27fe5fe8678bccc90b5fa5eb73c0976240a7fe0722b3094d7553fbfa919dbce235d6a
 AUX ngircd.init-r2.d 1271 BLAKE2B f385805c7ae63f4046cee12449b60bc4309007fe69b52a2933a8562f5c05bd356cee49e0bd9bed389d9f42b92e94dbc37387db34eb3c5946e6cc92ea8ebf8ec2 SHA512 ceaeee66b31463273ff88c5356c63bc9b25c272dd038940adba95a8b7e3d4f4d0bd0c96bd9c99fb522b7dafa3a413b5611ecb748951ef5cc7a944384983cf45e
 DIST ngircd-26.1.tar.xz 375812 BLAKE2B 4bd7dae47b579bdfaceee0e3ff1b30ac7c70326cd9d609a128192b1efbec17ac50010cb1bf27f4ca6d921700b7bd8cf3d0e8fb5bc569a84d6a101be10ec5832a SHA512 6333244e3fb2dc00ee9812c8c45990baa95ff473a7037a0a11ca495bed86fa438110ad5151d86b9274b6187d86b7b5712fdca2b74b8cb92f7f66fa10cf1961ee
 DIST ngircd-26.1.tar.xz.sig 310 BLAKE2B 6bf3330387ef01af32c0026e12e5fe5a9a34f5d5fc221a66931312fb70d17832259b94e370ddc49f8834d0d29b9c53b52f11ddec3bfc12655472e046cc569e99 SHA512 c1bbc481dd92e487706fa0b3b18dffd214018946fad8ced77feccc1105a65fcc33c82b0e93529a14ad103ef784da20e3bf86358a8f26cdddeac9f947833d6848
 EBUILD ngircd-26.1-r4.ebuild 2533 BLAKE2B bb5d0f9d2653184ab0964afb08eb7fd803041af9005b9675e7446a13c3a63ed305e88c53d7e7fa4e116c8519a4f8edb63fa075be4845b4c94728ce49e1045120 SHA512 744ff2b19724127235a91c8b88e2f937ba7903a0ac0073e4d298276d3410171f231b907d5c114a7fd9da6157bf41186baf4a51243867a2af5b89672cf29062c5
+EBUILD ngircd-26.1-r5.ebuild 2672 BLAKE2B f9976614ed4baca6453e3713d7cf220b34eb7b76962ccc7938585c25838888a2775de74c1ca8ae868d4ac566abd2d4416137d544cb48501c6ed7fd19fba44783 SHA512 bdb0c5e4d37cee8d0a8afde1623215e647bc321f9cf1f1cab4040ee6921e5d6905588017a4d75bc5be9af6e2297de5460a95a539a13d08d1898f92bac48b8963
 MISC metadata.xml 651 BLAKE2B ba57a0fffdef6acaf3510f62bc146c9dbfec0805b9e6a5e889360fee39c3a3e539aaead44fa42c72523957c492c066a9729c2f362c84f56c0ab27627b8e92f36 SHA512 82529647ece0d29898c2ad7f5794d6376f919d0e1d30cdc7dea0bea97418c9fba26e9e9748232a7e9963d329d5a8b5f4f8d2c6acc03682a231ec3984c63980f7
diff --git a/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch b/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch
new file mode 100644
index 000000000000..f15025cc4856
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd-26.1-systemd-unit.patch
@@ -0,0 +1,24 @@
+diff --git a/contrib/ngircd.service b/contrib/ngircd.service
+index e4c30e2..ba1b513 100644
+--- a/contrib/ngircd.service
++++ b/contrib/ngircd.service
+@@ -12,8 +12,8 @@ Before=bopm.service
+ 
+ [Service]
+ Type=forking
+-User=irc
+-Group=irc
++User=ngircd
++Group=ngircd
+ # Settings & limits:
+ CapabilityBoundingSet=CAP_SYS_CHROOT CAP_NET_BIND_SERVICE
+ MemoryDenyWriteExecute=yes
+@@ -27,7 +27,7 @@ ProtectKernelTunables=yes
+ ProtectSystem=full
+ RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
+ RestrictRealtime=yes
+-RuntimeDirectory=ircd
++RuntimeDirectory=ngircd
+ RuntimeDirectoryMode=750
+ # Try to load "default files" from any Debian package variant to keep this
+ # unit generic.
diff --git a/net-irc/ngircd/ngircd-26.1-r5.ebuild b/net-irc/ngircd/ngircd-26.1-r5.ebuild
new file mode 100644
index 000000000000..4c6293a77170
--- /dev/null
+++ b/net-irc/ngircd/ngircd-26.1-r5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/alexbarton.asc
+inherit tmpfiles systemd verify-sig
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="https://ngircd.barton.de/"
+SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.xz.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
+
+# Flaky test needs investigation (bug #719256)
+RESTRICT="test"
+
+RDEPEND="
+	acct-user/ngircd
+	irc-plus? ( virtual/libiconv )
+	ident? ( net-libs/libident )
+	pam? ( sys-libs/pam )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-tcltk/expect
+		net-misc/netkit-telnetd
+	)
+	verify-sig? ( sec-keys/openpgp-keys-alexbarton )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-26.1-systemd-unit.patch
+)
+
+src_prepare() {
+	default
+
+	if ! use prefix ; then
+		sed -i \
+			-e "/;ServerUID = /s/65534/ngircd/" \
+			-e "/;ServerGID = /s/65534/ngircd/" \
+			doc/sample-ngircd.conf.tmpl || die
+	fi
+
+	# Make pidfiles work out-of-the-box
+	sed -i \
+		-e "/;PidFile = /s/;//" \
+		-e "/;ServerUID = /s/;//" \
+		-e "/;ServerGID = /s/;//" \
+		doc/sample-ngircd.conf.tmpl || die
+
+	# Note that if we need to use automake, we need a certain version (for now):
+	# https://github.com/ngircd/ngircd/issues/261
+	# WANT_AUTOMAKE=1.11
+	# eautomake
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+
+		$(use_enable debug sniffer)
+		$(use_enable debug)
+		$(use_enable irc-plus ircplus)
+		$(use_enable ipv6)
+		$(use_enable strict-rfc)
+		$(use_with irc-plus iconv)
+		$(use_with ident)
+		$(use_with pam)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with zlib)
+	)
+
+	if use ssl ; then
+		if use gnutls ; then
+			myeconfargs+=(
+				$( use_with gnutls )
+			)
+		else
+			myeconfargs+=(
+				$( use_with !gnutls openssl )
+			)
+		fi
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	fowners ngircd:ngircd /etc/ngircd/ngircd.conf
+
+	newinitd "${FILESDIR}"/ngircd.init-r2.d ngircd
+	newconfd "${FILESDIR}"/ngircd.conf.d ngircd
+
+	systemd_dounit contrib/ngircd.{service,socket}
+
+	dotmpfiles "${FILESDIR}"/ngircd.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && use pam ; then
+		elog "ngircd will use PAMIsOptionalPAM by default, please change this option."
+		elog "You may not be able to login until you change this."
+	fi
+
+	tmpfiles_process ngircd.conf
+}
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index cb0fe38c7805..6b0e8f891049 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,4 +1,6 @@
 AUX 40.0-fix-build-with-meson-0.61.1.patch 1451 BLAKE2B 0ec6cb1e654e4f9bcecd78980f5d5fe08870fcc4b8b1e35a1b639f9ef718f744365b97628db93d7cba9b4fbeb3df962ffd1e6503f984857220cfb3d2d3004d02 SHA512 96eb969bbf907b0284a16aa7d4b6fbace4a621711765d696f4c173a12822a789c513b8fffa78305d1b277786157e3204d9985b75a3dae58757475dc221e0e975
 DIST polari-40.0.tar.xz 1051416 BLAKE2B ea6aea087ff3ba74e2cf16e848c228c0984eb7e5b7cc16579bbe8ceeb3655babb5dfbf3adbe245b66b590999c5b7e0077630b659d0db00e2da6ce0ac8b0281da SHA512 267eb904286f33e6ac510357de072285889d1c72ca832eb6a8520a20b1c2487708eaa0187d4c91b46b3b8019866f37a9ac036a71dee9cd9c9ad83443df0f146c
+DIST polari-42.0.tar.xz 1125160 BLAKE2B e4edeb2023c2df2e1ad855ceea4dc9e646eca18da61643698410724d1fbe031ee609a30e139b2ab2ad6ddf22d1a4ea0b408b4b93d7ac8874c35c9d49f96f16bd SHA512 a64e1841d91809389af4b1f7eebd1b1e187f9e5f7058a84ab3b50bbbdc3786a7ec89bd4ccc4935473d1de1c40f6dbd6daf30b6bff48dd132e28a4be3e8bfb114
 EBUILD polari-40.0.ebuild 1194 BLAKE2B 7ddf02126d2757b26591715a4658e08ce8ebd36df7529faebe58bd9f1ca0be01e64a9932917b07b8c03ca2be5dceb70c7e6e3b99a077f3db7802908394e437a0 SHA512 78c8ca4908a5cb9750dab715479b67c0d2603e7a0bd8c2d5e30329009ffed2808025d8ea94ced850d828e2ec69f884f0ebf8a9b222038538ecb013386d834e2b
+EBUILD polari-42.0.ebuild 1060 BLAKE2B afab26f6183184a902ed0c51475a7190d9f507dda72e4da44bc96a0968172285ed9f1d9d33dac19dc8e718ef91bbf1a8bc2fa1b72bf53faa8a5d1ead34330d4d SHA512 78aaf253e5aad85f3107458bc1ae174519c081723295a43bf1830b5a47540f803a27264878e758a0b2cdf37cfb24678e4a53e412c14681991c26a36421cb9536
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-irc/polari/polari-42.0.ebuild b/net-irc/polari/polari-42.0.ebuild
new file mode 100644
index 000000000000..2661d7d6748c
--- /dev/null
+++ b/net-irc/polari/polari-42.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="An IRC client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/polari"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.43.4:2
+	net-libs/telepathy-glib[introspection]
+	>=dev-libs/gobject-introspection-1.50:=
+	>=dev-libs/gjs-1.69.2
+
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=app-text/gspell-1.4.0[introspection]
+	x11-libs/pango[introspection]
+	app-crypt/libsecret[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-im/telepathy-logger[introspection]
+"
+RDEPEND="${DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		dev-libs/json-glib
+	)
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index 4759f0344b6b..93e5ce8e46af 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1,3 +1,3 @@
 DIST quasselgrep-0_p20200830.tar.gz 29944 BLAKE2B 011633afee9d9519b0c343c5d0b1a9ba775c870802532515a42a7c22d39af5138a051707a82f2b6a19dda3523fe9f04d2b56b62a36c554ff873275c095e7dd94 SHA512 88f568852cc9e85e0019335d3362f192766a2ce3e94ff1947485ad6eaf43d49873d94396791165f74e95edb25601c078a947a7740b4ae2e40424b5bdfecc2a48
-EBUILD quasselgrep-0_p20200830.ebuild 786 BLAKE2B d7b910e44186f1331006d75aa970f4bf58cd9a30f9a24512c7424a0adf8afc5f9e6781c85e4efff5c1b4d99c326056797b287969f50147b717a6c96de60196c3 SHA512 e5eca98dba1b21799d37eceb92107b220bf4104e62bd9472980f0acc5b35da57cbea758784ab73a8ee4168aa5c8915ae3715da036e3671502e9ce8346160f791
+EBUILD quasselgrep-0_p20200830.ebuild 787 BLAKE2B 8fcf1cc6e4bfce7c87553f4e9e8818e92c463dc9c468ffaed0c5be88da8083b913d8288ba92033bfcdcf9eea9969f41fc446d39086300bd9fb5bdb57b1ff7a48 SHA512 53d559f71c1d403580a6430a5295ab1db28092ce0457ecd1bf602178ffe74fe38623ee9b42392ff3f4e61c929d751718174653e69fe8b5317573dc988fbe549b
 MISC metadata.xml 418 BLAKE2B 136c34c6d16bdd5c8f219eaa46bc64d5cc7b4d32e56958fefff58a7fe07a70521533a681ce4291d7fef529a959fa71a37078e62ab2ddabbd29ecd01598a10614 SHA512 5232fa57a2a81c5fad54376895302d659fa940f2a1ac73ac08217ca0f4071677089b6f8f974fb0654229349f3f66e4714fb79b3de68774637f2ad8d5032fe40a
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
index 9cf50473082b..257fb092f35d 100644
--- a/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
+++ b/net-irc/quasselgrep/quasselgrep-0_p20200830.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 optfeature
diff --git a/net-irc/znc-clientbuffer/Manifest b/net-irc/znc-clientbuffer/Manifest
index 0861b244d042..4a651889209b 100644
--- a/net-irc/znc-clientbuffer/Manifest
+++ b/net-irc/znc-clientbuffer/Manifest
@@ -1,3 +1,5 @@
+AUX CMakeLists.txt 356 BLAKE2B 334684d49d81258425935399e73d597ce038d2d685341df15766469a0cb03d8324f7b7b697930e05871b6eaa467804ebbbde98bf26126dd495f78a315f3c6a03 SHA512 d935beadd25cdebe3dc0b793d7057b1a10fbfd39d5340bdd51071341500f9db2cc272c9702a0d84f5e8146895888ef36b04fe69f2cf4f10c3645cae17540bbc5
 DIST znc-clientbuffer-1.0.48.tar.gz 5602 BLAKE2B 16a2c807df7371619f9e8456e3a65226dfd60e37872a86af11861d2130aa75fbfcfdc1c326baa0676cc253f27dda32893110638d4747a283e224bd672a49e0b1 SHA512 eac4d748b670a8e3563a424fcb5c9c411af6c9b1f9965f065936ddfcfbff946783e34e0d6b32de18fb3b87fb27db129ff58bedfb179473c804750a9b770897f6
-EBUILD znc-clientbuffer-1.0.48.ebuild 631 BLAKE2B 930e00213b4bc809065c099fe177aeece25d4df7f81e44d2eecb7d8e01613f4d9f293ac4fd287f67e89020fc798c0870a3c78066abb9f75e185558218f08b05d SHA512 f3fa7f4c26f28f77ee227c75e12e1ca1253d73da37f66a6bb6e2109064f6ecf56caee94aa2731b0907a7ffb6736b631c8670f11338325aa16727f43b1c5772b9
-MISC metadata.xml 408 BLAKE2B 87a582ad568f95548a20c0ccd8d77752752dd6b5c3063e12cc354ff122ff2d561c4d1743f05a077869d9af14a9799f527f4d36d22099d568706db7b926e54891 SHA512 27453c322d3a56a257873e0a20b22e58c7cceb5d5c4f14e816cdd9e4778d8000ad9177d8dd6dd796e43a3262cbd1be77115b777aed5bdcee1c6eb152fc4cc989
+EBUILD znc-clientbuffer-1.0.48-r1.ebuild 679 BLAKE2B 5406a7dbcdefa00962d42f3e6be1b0d8eca2904370ba40cc9ca4dd146bde26e543bfbd6b10ff702ca8f23053ada9cce547793b746c2e06f25c734e549e62636f SHA512 9ac441b75a2ced50175e21605f160754bd97820019e53e80de9bd116e027f61bcf1e1c6a786fd84b9fc618b1f6dfa192d28dd71da73f580dfc3f35cd003cbcea
+EBUILD znc-clientbuffer-1.0.48.ebuild 635 BLAKE2B 1a9b17f40c36972941b8dffa5440dcb334fd691ea4914d9f5e4aebd3f3c7e62438b26222945696c8b09fd597439b2ee65bb6b74c1e53493775c7d2e28c5b0b0c SHA512 157909102e799181feaea3033d743c579865740e8d41bffd5b830fe6b6eb2c4c3a36d7a91dc81e764b411910f278893ab20146e6c52a0bf7da947d910be7db28
+MISC metadata.xml 557 BLAKE2B 26d334308b729dceee1f3e11f5883a4a540aecaccd7143d7d29761a05aedf0d22aa38e9a47f54755eacf28d19c6f625ae8671c4fd118dccc4775c01a7ed4f602 SHA512 9f6a7e3b0d7d1c4e41b75ab87cf2d66cb34ea03df5b8f23d29ad4e70647192821311c0d93438db5744277ca969dca3aa69e7688c8586ab3e6d00d6ba374dccd6
diff --git a/net-irc/znc-clientbuffer/files/CMakeLists.txt b/net-irc/znc-clientbuffer/files/CMakeLists.txt
new file mode 100644
index 000000000000..92048a07b19d
--- /dev/null
+++ b/net-irc/znc-clientbuffer/files/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Autogenerated using znc-buildmod -v from net-irc/znc-1.8.2
+cmake_minimum_required(VERSION 3.1)
+project(ExternalModules LANGUAGES CXX)
+find_package(ZNC HINTS /usr/share/znc REQUIRED)
+
+add_library(module_clientbuffer MODULE clientbuffer.cpp)
+znc_setup_module(TARGET module_clientbuffer NAME clientbuffer)
+target_link_libraries(module_clientbuffer PRIVATE)
diff --git a/net-irc/znc-clientbuffer/metadata.xml b/net-irc/znc-clientbuffer/metadata.xml
index dc9ec3da65d1..8cca526cf091 100644
--- a/net-irc/znc-clientbuffer/metadata.xml
+++ b/net-irc/znc-clientbuffer/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+	<maintainer type="person" proxied="yes">
+		<email>nex+b-g-o@nexadn.de</email>
+		<name>Adrian Schollmeyer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://git.jordanko.ch/Igloo/Push/issues</bugs-to>
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
new file mode 100644
index 000000000000..1575980e13a7
--- /dev/null
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A ZNC module which provides client specific buffers"
+HOMEPAGE="https://github.com/CyberShadow/znc-clientbuffer"
+SRC_URI="https://github.com/CyberShadow/znc-clientbuffer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	net-irc/znc:="
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cp -v "${FILESDIR}/CMakeLists.txt" "${S}" || die
+	cmake_src_prepare
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/znc
+	doexe "${BUILD_DIR}"/clientbuffer.so
+
+	einstalldocs
+}
diff --git a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
index 7ad332d77a02..2491cc61317b 100644
--- a/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
+++ b/net-irc/znc-clientbuffer/znc-clientbuffer-1.0.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ DOCS=( README.md )
 _emake() {
 	emake \
 		-j1 \
-		PREFIX=${EPREFIX}/usr \
+		PREFIX="${EPREFIX}"/usr \
 		LIBDIR=/$(get_libdir) \
 		"$@"
 }
@@ -31,7 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR=${ED} install
+	_emake DESTDIR="${ED}" install
 
 	einstalldocs
 }
diff --git a/net-irc/znc-igloo-push/Manifest b/net-irc/znc-igloo-push/Manifest
index 31d7c8da2d9c..96fc62567fe9 100644
--- a/net-irc/znc-igloo-push/Manifest
+++ b/net-irc/znc-igloo-push/Manifest
@@ -1,3 +1,3 @@
 DIST znc-igloo-push-20200520.tar.gz 12071 BLAKE2B 41272e479b8a6e201e3981e04f88a216aee9ed7051ae5573ea5266d74219a0a3f441ccf5621e040d4feb4bb81c349dfdc73357d7d43cf3f358a181a52bf79be7 SHA512 aaf23e1ffec4c0b5e14d9abc7ce276cc27f342e24f32fdd54f451d53729ce24fbf3665f2ad266bf38bbea2485386045c1cbc46593ed2eb6b87ac8889b8b7772e
 EBUILD znc-igloo-push-20200520.ebuild 667 BLAKE2B 20f470a8ae102dfc4ca5c8dd9d0a84ee78f14f3ed9431b8c34d350c65866638785913871a2b5a5e31ee1e874dc1cecb9942e67dacbba573a2064c2cb2deb8ddc SHA512 9e653b40fab185d202a4e2e83615a75ac714911abca0a845660866faaa044646ceb7c38f9e470ae7a1f4683a288b9b34075e644e0b32c711285d17d5ea5b00be
-MISC metadata.xml 499 BLAKE2B b0961f0094041b8eec9b8de0cd6721fcd5fc288f490c9b149c500f7c40e5e986396aad7882fb9f9f2e2de6d0553c29f91ffdf635780b9a927d1af9bdde1d3f9f SHA512 95d92f84c9e57da73522fc349084e6865ca191ac62740f51efbde07538d6e4bc4fa33cf9f50f6f547dd9c81686cfe25062787edad0d349c22d9663e9aa941c04
+MISC metadata.xml 415 BLAKE2B b4c2c40a89242dd5eb74fdec5a38748d8b702db21571613934dbbd033ac6e46570023121651384bc33c9711acf7ca8bcc934a654c6e5bc24c1f31b842d9a2d44 SHA512 c6e81e0b781f3a6ded617da67cfdb115cbdda2d4168f8aa64a40399c7f1184853cd333c068f0e41bb44a43b6f31fe2d421ad7487de8889eb9930eb4f52627c47
diff --git a/net-irc/znc-igloo-push/metadata.xml b/net-irc/znc-igloo-push/metadata.xml
index e3a8e4ccc210..43814c921ee8 100644
--- a/net-irc/znc-igloo-push/metadata.xml
+++ b/net-irc/znc-igloo-push/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A ZNC module which provides push notifications through ZNC
 		for the iOS Igloo App while being disconnected from IRC.
diff --git a/net-irc/znc-playback/Manifest b/net-irc/znc-playback/Manifest
index cfd133cf58be..0673d47337b3 100644
--- a/net-irc/znc-playback/Manifest
+++ b/net-irc/znc-playback/Manifest
@@ -1,3 +1,3 @@
 DIST znc-playback-20200510.tar.gz 3139 BLAKE2B b074fb2cf98dcde39a5ec51a625196b61d7a540cbbdae374268f576756b876967a1be72f78e6ee5cf62d284c0cbfc3034d78678772cd975eb38f4757712bbabe SHA512 50e924574c71fb6ace98c654201040aa2c193f4f1f811aa2ea26ad6ce6ced21bafe61c207936164125d84509e252890b383b21d904fe4cd46490711073052daf
 EBUILD znc-playback-20200510.ebuild 673 BLAKE2B 02145d6e2dff2c5045cc30005426d070c8b6999990b18e2d0bac7a0b61a6b10c7b4b12d2f28138f4f130cf0ffabc7fa7becaa96d239ac9aacb40b721deb13d11 SHA512 7d3d3f4b4672bc50da971a750540f984439ac987014eceb77c8eb8333ae7d7090f82ff09b74cd7237499cbe1a44962c2027ff7e22e84879d1d2daa4b1efa6b73
-MISC metadata.xml 767 BLAKE2B 445a8ac6e0d0c09112412152a75d7476828de389995473b56c20a69e5129300a28b26747fd93f906d0989021cffe1f79cb2a80a0c786781fa8a0a332c82c0019 SHA512 96e980e29a34ed5e8c670c3f5baaa8529029d3bda5d44cc5f6f926a399849c6450783599110064d53bdf746347cdf594bbdd4a71a09b9fd4cd86656a72c2f69a
+MISC metadata.xml 683 BLAKE2B 4be5d5000d266e5b6f05292035b8dbb8f96c2060db5099569a8b3e149c95fb5b348719cfc6d73e512a68a51a608ae17133ce158a30615558d778542db124c850 SHA512 ed6a821feca88e3b1dc7746f105069a9b920582afb3a31fcdd5b692e28f99f494b27e7040e7c0b4dd14c4af4a0a772bdfd376479c5c2f04d4b9141d36a91e702
diff --git a/net-irc/znc-playback/metadata.xml b/net-irc/znc-playback/metadata.xml
index 9fc649a0f142..97e82cb046d9 100644
--- a/net-irc/znc-playback/metadata.xml
+++ b/net-irc/znc-playback/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		The advanced playback module for ZNC makes it possible for IRC clients
 		to avoid undesired repetitive buffer playback. IRC clients may request
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index dcdcfe87055f..c709ade80831 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -7,7 +7,7 @@ AUX znc.confd-r1 720 BLAKE2B 4857a8bcd36ed1008a558ac7b067d6fad53b5d39c0df9130ca2
 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
-EBUILD znc-1.8.2-r1.ebuild 5545 BLAKE2B 45a687a05cb165dc615b2696640ebc15f44314efe0c0f98897e4ffc7f80022f293c3901531b7e2695c5e60f91cf5f492815ef6679e3b88a19ef7cd956dbeb4ad SHA512 d5645f18a47b57138aab98cfd4a95e34763cf19b927142e7546072be3cf76931c7e09c7a839af3090f1ba6a58fdd51a27a0ad723b675f7dca4e999ba247c19d3
+EBUILD znc-1.8.2-r1.ebuild 5541 BLAKE2B f4ce98f7dcec7dd746639aadad12f2f6b0168f8b3b83772033520d38aee967fdb12d6c054ff2dbcc3790394f2c382781bb8397e923b3d49ad08c93867cf0c541 SHA512 86b192c2db84ce36cdb055c15fd0c73c21464dcb0f762c39e50b6f5244da4cff7e7337cc7959ff720acdbac01d821d642cd8d38699ec09086ee0502be44d070b
 EBUILD znc-1.8.2.ebuild 4767 BLAKE2B f7f5b485f231417c56935b094d23ac662b901bdf3c368715c035b258ddd61026008dcaa1015a72d7f885ac73dd1e5c955b15272eae28606667c2057f0d62545a SHA512 26223568c22bfb62ba138e7661635c0ced3067bded70cafaff473e10001344200a608aefef326cdea3b5e31fbce44fa7e1f9b6b57e752b3559f8d64f13cda0d0
 EBUILD znc-9999.ebuild 5393 BLAKE2B c897d9db73fba7228ccd7a582482b1201daa4a10c65282cebf181acca8552cca74621fab0d165c61652d7ce69bdf8b846485b9302ceb6d4b248ff7fa61d714a8 SHA512 97d6fafa71a1479197b74a2aa4ba46ae1d38d5ef17c70d530f1f01fd83edfd28ee96e17d435790660dbf940a0f86f3e68189c8dd082b65a824bceba2b0492f62
 MISC metadata.xml 508 BLAKE2B 55a9f6a41856dfab6261b5cc23afa06756835fd740253084e06cfa53afcf6036974aeb5455373f43432515a5a88f476471ef9fa8bb38b30b8335af469eabf0c2 SHA512 5974ad23cb5256888b7b9c2c34a6fdbe46efb3e48bc075a3ebf09612bdb70ac27b56fd0bab13e1ada8234e2a3dce725aa8fc2bcf8e5248227f27e6e8a371c438
diff --git a/net-irc/znc/znc-1.8.2-r1.ebuild b/net-irc/znc/znc-1.8.2-r1.ebuild
index 7bd58f59e5b0..a3b29fce9948 100644
--- a/net-irc/znc/znc-1.8.2-r1.ebuild
+++ b/net-irc/znc/znc-1.8.2-r1.ebuild
@@ -21,7 +21,7 @@ else
 		https://znc.in/releases/archive/${MY_P}.tar.gz
 		test? ( ${GTEST_URL} )
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~riscv x86"
 	S=${WORKDIR}/${MY_P}
 fi