gentoo resync : 09.07.2022

26 files changed, 396 insertions, 158 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index b381c608b009..85528bdabe13 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 5ebfeb57c3b9..8554e3344929 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,5 +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-r1.ebuild 1569 BLAKE2B 2aed4950b1217fc0592574ded6797d988f7d92b24f62e24effe6c6d25c56c27fd6001731266c655ad16f7b306fa720f0fa3f755b4d844b36a251d1d4eafe26c8 SHA512 b13887904a436678f4259bd25ec9f68610b1b5ae5973482cd022a97a2ccf3cc4cf15f46e36c333829bf3932de53e487d5383e33365e9501dcfb3b6877bc52348
-EBUILD epic5-2.0.1-r2.ebuild 1342 BLAKE2B 373953eef8a863cffd2f23431dc8cafefa7f1ea7913333f7e518005087a3a29d277eb476b307e36f4a58cf49139bde8ed99196c2b7868b07a4ca141934ff9193 SHA512 13037670836e1a8447b7eb0b26ecd2efb7b0dc7b30c1f21905f47cfe9191303d2a5f8cc562cbeba03c3183adee08fb896adb347aa362cd1a1785ced85bffbd2a
+EBUILD epic5-2.0.1-r2.ebuild 1340 BLAKE2B e3f9b4ff9fc3e33079566e391f687befe33d03f9f246b32786d36bc42d51e48afe0243389117f5f520b9dda7524b4a88c04db3478301d8a0c146eaa92ef9992f SHA512 3bee2e64ea8ebbe62ba2df89f0bd9dad177c53d960b575d0a0b46844deae452c8c3215ba5cf840cd7c61cd8f331f20fcd414c52140f46411f9041d17b1e49839
 MISC metadata.xml 448 BLAKE2B 10ddc66039b8d1682373a0dc5ad54648714620eaf086b60617603704173edaf546b9a84d03cf8a1acac7ead63cb8538136d054830b0cd85001a7b110ed3190b8 SHA512 7814c7266093439d1607b58b4d8d22340bc19ad914fe9b55c2cac19f06f73c3ffe6e0624c43261766e4532d3aec42fa74f76005c636802f075a5ba4cf8e3d8ec
diff --git a/net-irc/epic5/epic5-2.0.1-r1.ebuild b/net-irc/epic5/epic5-2.0.1-r1.ebuild
deleted file mode 100644
index df6800edb35e..000000000000
--- a/net-irc/epic5/epic5-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-single
-
-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 ruby 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 )
-	ruby? ( ${RUBY_DEPS} )
-"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-
-S="${WORKDIR}/${P}"
-
-PATCHES=(
-	# From Debian
-	"${FILESDIR}/${P}-openssl-1.1.patch"
-)
-
-src_configure() {
-	# Because of our REQUIRED_USE constraints above, we know that
-	# ruby_get_use_implementations will only ever return one ruby
-	# implementation.
-	econf \
-		--libexecdir="${EPREFIX}"/usr/lib/misc \
-		--with-ipv6 \
-		$(use_with archive libarchive) \
-		$(use_with perl) \
-		$(use_with ruby) \
-		$(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/epic5/epic5-2.0.1-r2.ebuild b/net-irc/epic5/epic5-2.0.1-r2.ebuild
index 1f531895fb25..a8525b1ed375 100644
--- a/net-irc/epic5/epic5-2.0.1-r2.ebuild
+++ b/net-irc/epic5/epic5-2.0.1-r2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://epicsol.org/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~riscv x86"
 
 # Fails to build without ipv6
 IUSE="archive perl tcl socks5 valgrind" #ipv6
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index ed94e7592301..a71d9562bee6 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -2,6 +2,6 @@ AUX ergo.confd-r1 115 BLAKE2B 3a01f49ee095b213507774a40aeee26f4a9b3b875fc00edd46
 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.10.0.ebuild 1412 BLAKE2B 99871c7097f276df3aa4baf259b8e7d86356a8506157e460838c8d2d13fc8acfcabd9e7eb75c9883522295cb1be625b062dc8bc484cf29eb72501d97f374bad1 SHA512 20a5987e2eafc389d4fee3219ed3f14a4f3928b9fc3dd7dd121e5a2886f52b4416c35f59d43a8a39fe025ebefe4b2b6c84a609b1857f88c2d567e4bcfb0a0133
 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
index 7766ec2ce07f..4a3df207138a 100644
--- a/net-irc/ergo/ergo-2.10.0.ebuild
+++ b/net-irc/ergo/ergo-2.10.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64"
 
 # We may even want to package irctest in future?
 
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 972ba3eddc4d..685a03f0a95a 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 906 BLAKE2B 9fbe7e951009a3ba242d81e74dca7d690223088ec4de80b6abd0940aed15e7f1950fbb1fcadde82ad5706a5f35bec0b117a07c4a120e74ea4796e69a673b1ff2 SHA512 5c40e972fb20258e5b53b39ea518a70326f2bd11f4cbf5d7ff99c62f681e4edc65f2077213474b2015589a0cc7c941de5859439f75b594b617b80e30c6b1bd17
+MISC metadata.xml 1109 BLAKE2B be9c2bdb1e3573d1a092c71033f31dbd62adab49c50b90511f8075be8c7563f0704e8b53e62240764c06865fe64f3459e3bdb80e6d5fea5777b1921f1b9cd74f SHA512 f1db6273bc192b69778d18954b180f5fe349e748f7795211b2deaa3219cc128ed3e9f8b8727713e9148c0da16dac3c21e6fc52f74aded098803669e70af6e902
diff --git a/net-irc/hexchat/metadata.xml b/net-irc/hexchat/metadata.xml
index a768dc0d2085..b6b23a6c55b0 100644
--- a/net-irc/hexchat/metadata.xml
+++ b/net-irc/hexchat/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>nex+b-g-o@nexadn.de</email>
+		<name>Adrian Schollmeyer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="libcanberra">Enable sound event support using
 			<pkg>media-libs/libcanberra</pkg></flag>
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index cab41561cd62..0f319078666b 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,5 +1,10 @@
+AUX irker-2.22-fix-tcpserver.patch 1068 BLAKE2B e2aaef99a33f5464194feb4dc61e99325ae0012dfd7065049e54351b192bd46cbfc86a5c4b7ebcc42213dbfa3dd5177eb17dbc0ba8499ac482ae6f6ce9e0fd25 SHA512 220ebc5376ba0e4be95d21816147bf871f233dd23de24d3b52a0215d91015d83d2d4678c1725331151725f187fe465d49f81f9f8ae9539feccde710c5773a5be
 AUX irkerd.confd 535 BLAKE2B fe8484cee8e5d443c3019c9915553e503164a2e5e965b44e89200fd71c8a2152bf5ca0dc43e5e93b46dfff6e683d8fc2d364dd27048d16642c4043a4f936d3af SHA512 00656916acb9fa2cbee57442a7a90bfbc7213c03ad3ee38b01314679b66177fa6152400ad3401e87be3711e6e38e09b084ea90cb71ae5774c8eba5cf9ab8e070
 AUX irkerd.initd 963 BLAKE2B 33e4b654eb908d5d2b5c086d821f81d959bcb71ec93b80c7aa38ffaf75f011d41f43b9369115d0ac463ecdc3781ee7360d06fa8afe9c7e66a79fc55e8340d338 SHA512 fa9247c207f4a21611e51477c31556114d83899ea7adcc8bf8f3bb3edafaa8db84b4764ac5704dfe7abff2e5f9727610b71609a620432dc939a81d2ab7fcf818
+AUX irkerd.service 517 BLAKE2B de89f8ff4d98928b8d4035e545a2c0628b849246ce5eae393341cf894a89ec1b33087da6c756d8b3b17784175541bd366dbf0b17c38e1e36cacd2b0da48a2391 SHA512 d31699cef084bfeb2272e49c7eeb050148e942286cd9cb2cd6491a97210628f08f05c04ddd052a8ee9cccba33ecd3e460f99aeb52dd1c1ae1ef65ef8754ddf49
+DIST irker-2.21.tar.gz 45563 BLAKE2B d2bb9ee1c33640c049919a0d0ec92cd01dbd9fd086120123b5344f44180dbd94d6b0beb56387968f6feaf526b8a11300d415d87b3243bcd2d5c1fa5c8d4aaa5d SHA512 d90922abd61fef13d8030ce666a32fd79e17812f06517796c933d62a9b7cd814bdbeb3de11357ca1766bbffafb0379f0a8b2f288a2be58fa6be82cc764e0b225
 DIST irker-2.22.tar.gz 46037 BLAKE2B fbd9deaaa5cc509989b15d16d733bec351b7b2ab9d3bedd8b20713ba110755a43ccb91b1482a6deb0f71497b3b1d6f8ed5faae395c06c33ac4c9ea7da30d2726 SHA512 a3f2ebe113e4fcb4589c31a44c157bc0f91e8792fd7819e9f350fd25847669d2cb3fcd51cc0e09ef352952c5175f8b4eb56ac9969f0bff1544e28268728f0595
-EBUILD irker-2.22.ebuild 1523 BLAKE2B 935cece1754910b3d89b33c286315afc03e3286cdecb650e0cba7b2d87b646835d11ab936ee6cab649809d4e61ec25c9d7041829dba1ae7439505b4c058d554a SHA512 2fa7fe78eb5be29c306391e1a0016758e86b39b97ee3bc08785c1b93b867944d86bd5b7d8f9746808fe6d3a23708664d1df93534874d43a42c765cde1781db38
+EBUILD irker-2.21.ebuild 1523 BLAKE2B 935cece1754910b3d89b33c286315afc03e3286cdecb650e0cba7b2d87b646835d11ab936ee6cab649809d4e61ec25c9d7041829dba1ae7439505b4c058d554a SHA512 2fa7fe78eb5be29c306391e1a0016758e86b39b97ee3bc08785c1b93b867944d86bd5b7d8f9746808fe6d3a23708664d1df93534874d43a42c765cde1781db38
+EBUILD irker-2.22-r2.ebuild 1626 BLAKE2B 763a942fba5d3acf7ea659c651f5cb3385d6c9ddba3aea8115077de3c76a0aa7d2dc9ddf4bde1bd1e7bb1d7c7be3e30137445b3c062bb108efdf405b4675a00b SHA512 9b094c0fed3d59a633dc391b23c50f6f2993eec97fae36237154d096bec3f0c1c09b13f345807db698a1052c4c70f31d8ed4793e38e0177453722dacd3e5714c
+EBUILD irker-2.22.ebuild 1530 BLAKE2B ef33718b10796cb669b8c613d64c70998cc68b23ddfc82a8e20c34bca988c6251c93910b74e5cd9d6c39a4ff37ab7fdbf251582fbcaee747440ba8415af9d0e7 SHA512 8317033a447fe910f4120459ceaebf587d2f204f7451f7a9419ce028be2e76e24cfc4233f4400bfc9ef61c2bca135b889c94f5da96e4485cc19e900e33853064
 MISC metadata.xml 338 BLAKE2B 75e1de187c8161e49dcc6ab3c7ee3020455f09f842d798404398d195495e9e5b58cc6252c092a3f411ff848acbb258a10cd6120470bd907f5daa9459b6d719a1 SHA512 f804005b7aa3039b1400eb323d254b40ddace228a638fc37901e60b95c7b10f428df40b5afbf5f4b2facf05a2f91020f001c8d58d258efee0732dbc7935ac066
diff --git a/net-irc/irker/files/irker-2.22-fix-tcpserver.patch b/net-irc/irker/files/irker-2.22-fix-tcpserver.patch
new file mode 100644
index 000000000000..1848a4430cc7
--- /dev/null
+++ b/net-irc/irker/files/irker-2.22-fix-tcpserver.patch
@@ -0,0 +1,22 @@
+https://gitlab.com/esr/irker/-/merge_requests/29
+
+From da933d5188d88ef0557bda59f02188f164ad427c Mon Sep 17 00:00:00 2001
+From: "Frank Ch. Eigler" <fche@elastic.org>
+Date: Mon, 11 Apr 2022 15:43:22 +0000
+Subject: [PATCH] irkerd: correct typo to our internal TCP/UDP ipv6 server
+ classes
+
+--- a/irkerd
++++ b/irkerd
+@@ -1131,8 +1131,8 @@ if __name__ == '__main__':
+             tcpserver = socketserver.TCPServer((args.host, PORT), IrkerTCPHandler)
+             udpserver = socketserver.UDPServer((args.host, PORT), IrkerUDPHandler)
+             # pylint: disable=undefined-variable
+-            tcp6server = TCPServer((args.host6, PORT), IrkerTCPHandler)
+-            udp6server = UDPServer((args.host6, PORT), IrkerUDPHandler)
++            tcp6server = TCP6Server((args.host6, PORT), IrkerTCPHandler)
++            udp6server = UDP6Server((args.host6, PORT), IrkerUDPHandler)
+             for server in [tcpserver, udpserver, tcp6server, udp6server]:
+                 server = threading.Thread(target=server.serve_forever)
+                 server.setDaemon(True)
+GitLab
diff --git a/net-irc/irker/files/irkerd.service b/net-irc/irker/files/irkerd.service
new file mode 100644
index 000000000000..232a8d5811a5
--- /dev/null
+++ b/net-irc/irker/files/irkerd.service
@@ -0,0 +1,21 @@
+# Copyright 2012 Wulf C. Krueger <philantrop@exherbo.org>
+# Copyright 2022 Arthur Zamarin <arthurzam@gentoo.org>
+# Distributed under the terms of the BSD LICENSE
+
+[Unit]
+Description=Internet Relay Chat (IRC) notification daemon
+Requires=network.target
+Documentation=man:irkerd(8) man:irkerhook(1) man:irk(1)
+
+[Service]
+ExecStart=@EPREFIX@/usr/bin/irkerd
+User=irker
+DynamicUser=yes
+NoNewPrivileges=yes
+CapabilityBoundingSet=
+PrivateDevices=yes
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
+Alias=irker.service
diff --git a/net-irc/irker/irker-2.21.ebuild b/net-irc/irker/irker-2.21.ebuild
new file mode 100644
index 000000000000..87717d39727a
--- /dev/null
+++ b/net-irc/irker/irker-2.21.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ssl"
+
+inherit optfeature python-single-r1 systemd
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Dependency notes:
+# NOTE: No pkgconfig dep here because of the systemd sed below
+# NOTE: No need for asciidoc here as it's only used for the
+# 'release' makefile target.
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	${PYTHON_DEPS}
+"
+RDEPEND="${PYTHON_DEPS}"
+
+DOCS=( NEWS README hacking.adoc security.adoc )
+HTML_DOCS=( irkerd.html irkerhook.html )
+
+src_prepare() {
+	default
+
+	# Rely on systemd eclass for systemd service install
+	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
+		|| die "sed failed"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}/:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	default
+
+	python_doscript "${ED}"/usr/bin/irkerd
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}"/irkerd.initd irkerd
+	newconfd "${FILESDIR}"/irkerd.confd irkerd
+
+	systemd_dounit irkerd.service
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
+
+pkg_postinst() {
+	optfeature "SOCKS5 proxy support" dev-python/PySocks
+}
diff --git a/net-irc/irker/irker-2.22-r2.ebuild b/net-irc/irker/irker-2.22-r2.ebuild
new file mode 100644
index 000000000000..085be79ae727
--- /dev/null
+++ b/net-irc/irker/irker-2.22-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ssl"
+
+inherit optfeature python-single-r1 systemd
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/ https://gitlab.com/esr/irker"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Dependency notes:
+# NOTE: No pkgconfig dep here because of the systemd sed below
+# NOTE: No need for asciidoc here as it's only used for the
+# 'release' makefile target.
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	${PYTHON_DEPS}
+"
+RDEPEND="${PYTHON_DEPS}"
+
+DOCS=( NEWS README hacking.adoc security.adoc )
+HTML_DOCS=( irkerd.html irkerhook.html )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.22-fix-tcpserver.patch
+)
+
+src_prepare() {
+	default
+
+	# Rely on systemd eclass for systemd service install
+	sed -e "/^SYSTEMDSYSTEMUNITDIR/d" -i Makefile || die "sed failed"
+
+	# Prefix support
+	sed -e "s|@EPREFIX@|${EPREFIX}|" "${FILESDIR}"/irkerd.service > "${WORKDIR}"/irkerd.service || die "sed failed"
+}
+
+src_install() {
+	default
+
+	python_doscript "${ED}"/usr/bin/irkerd
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}"/irkerd.initd irkerd
+	newconfd "${FILESDIR}"/irkerd.confd irkerd
+
+	systemd_dounit "${WORKDIR}"/irkerd.service
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
+
+pkg_postinst() {
+	optfeature "SOCKS5 proxy support" dev-python/PySocks
+}
diff --git a/net-irc/irker/irker-2.22.ebuild b/net-irc/irker/irker-2.22.ebuild
index 87717d39727a..5227a14bc99d 100644
--- a/net-irc/irker/irker-2.22.ebuild
+++ b/net-irc/irker/irker-2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Dependency notes:
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 28dd8661bd54..e51f6e33679d 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,7 +1,5 @@
 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
 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-1.4.1.ebuild 1622 BLAKE2B a8ea26cced365e4e6b024a25ff01c394f8f2daf1f997583c7c3314e1998f2c4326e662c767ad803ce0e1089b0bc5b75fe0b6a2bcb11187c9e7ccb1ef231bbc08 SHA512 6e54115a71295ea1bd1844d292ec611b189026214fd345c8e77e7cbe813d1f08ebb64e7043e58201c42d3c96f4e0747ce0aeeff66cf6ed15aaaef087577125ac
 EBUILD irssi-9999.ebuild 1572 BLAKE2B 68ec2faff2ae5ace3b78f304092d3e0de378f8553ef32e0a4490bb0d4d687c7c6cafdff4a7cf8f9a4a9c4cd7e7b1b389fd5cb319f43159d76d3bf23f806ffcf3 SHA512 1eadd661f4f0f407e5e4e15900ee7a9a1117321c7a441ff30c1f03738de8f89bf492745f136b2a0a5c346b029ea6731ea2caa703d5612c54c74cf27f5d11e4dc
 MISC metadata.xml 701 BLAKE2B a337d1efcdc3f02d98639cf52c0c878408b1675aa261d708fef301ba34734eb296469662c6df53941829af915579cb9b4730e15b5c157839d4633ed940e5a532 SHA512 b9ee2b27c9d3482c29e4960fac77062cbbb9a593eb8576483b49e31e04b941119a5ce56b679da4377f8e488d188061272c25cb8270d948996faeb7b77e7b2a64
diff --git a/net-irc/irssi/irssi-1.2.3.ebuild b/net-irc/irssi/irssi-1.2.3.ebuild
deleted file mode 100644
index 371f59c83591..000000000000
--- a/net-irc/irssi/irssi-1.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit perl-module
-
-# Keep for _rc compability
-MY_P="${P/_/-}"
-
-DESCRIPTION="A modular textUI IRC client with IPv6 support"
-HOMEPAGE="https://irssi.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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="
-	sys-libs/ncurses:0=
-	>=dev-libs/glib-2.6.0
-	dev-libs/openssl:=
-	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-		>=net-libs/libotr-4.1.0 )
-	perl? ( dev-lang/perl:= )
-	socks5? ( >=net-proxy/dante-1.1.18 )"
-
-DEPEND="
-	${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-irc )"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-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_install() {
-	default
-	use perl && perl_delete_localpod
-	rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
-}
diff --git a/net-irc/irssi/irssi-1.4.1.ebuild b/net-irc/irssi/irssi-1.4.1.ebuild
index b16a43f2e55d..cd3cd5bffa2d 100644
--- a/net-irc/irssi/irssi-1.4.1.ebuild
+++ b/net-irc/irssi/irssi-1.4.1.ebuild
@@ -17,7 +17,7 @@ else
 	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"
+	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"
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 0ee34113093b..03569ed3a995 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.2.tar.xz 4289524 BLAKE2B 1a3f6e5b1fe3e86ce308fd6d7792e960dd9b0141db18fde6f10423d71cc2f385acdf8ed2c73c970bbc30ab6901af3890fc95285778ef8d18d3b2c93fe69c0d7b SHA512 7aeb8068f251f10f9cdc59b3058d4f2af3adde8f5047244c4ed5af29b9008a2e6c824277e6f33dc5dc56caef7939e73082be9bb5a675dc1d67a7f3957cdc0aa7
+DIST konversation-22.04.3.tar.xz 4286084 BLAKE2B 4d457c59331e7a9944364a6f56dfa03253d0a8c94750d3d05077feecc10a280c65b9fff83c261365c92664d2a3a249131fb0ad25202cd5edf1bb7690959a9def SHA512 ba2c4695db6f4d1c3ab58b8457f3c8120fe93837899c53f76337a20cc21a1d8be928b8c3a11b512893a259cef3b6fa426a2206560bf9428eac15b6fcefacbec1
 EBUILD konversation-21.12.3.ebuild 1896 BLAKE2B 19996ecd1cac774e660e46d8afc003be85f8ec4ea12911cd187bbd0b111024badccff165f930fe86c4d45d1323254cbec9560b991a78983b342efa8fac4fcb12 SHA512 925eca7e324f939ce11f06357c4951ed153aa34bcd650c3b8919326a2bc8f855e4600fdb3cc3f768fd8f10e93f1cb4aa36c1f5df2f5d78ef6d4356f491d71b5d
-EBUILD konversation-22.04.2.ebuild 1905 BLAKE2B 25ba39683fd50738c28a0c164d81450ceddd5bf126e1067dfcffd1aec6ddd1f1c00525265cf063b56dd46e0da68883c0a71ac7eea926cd82dec09b04986637b4 SHA512 60521786dce52d7504f136aef827663a250ada5370121695e873d0718f7b3127be7d1d96e808f53a0999f5a813bc137f44e34767eb913b35e8fdcc3d2b062276
+EBUILD konversation-22.04.3.ebuild 1905 BLAKE2B 223d5952da097b09055fc9e0f82b70ab8d330367ad98265326da83d2154647995871a0f21da76b8a4b579a543152d41a6d710701084cca5ae9815785f6d006b5 SHA512 396ef69a1f260973aa4dad4798865809cec909e7c79029a27d4025568be7ad8bf37977b59c02e2f7b3d12c24b93ffeb2a4fd9836a3c54296b276697ec47e1baa
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-irc/konversation/konversation-22.04.2.ebuild b/net-irc/konversation/konversation-22.04.3.ebuild
index b187b5b11637..85ac215887e3 100644
--- a/net-irc/konversation/konversation-22.04.2.ebuild
+++ b/net-irc/konversation/konversation-22.04.3.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 ECM_HANDBOOK="forceoptional"
 KDE_GEAR="true"
 KFMIN=5.92.0
-QTMIN=5.15.3
+QTMIN=5.15.4
 inherit ecm kde.org
 
 DESCRIPTION="User friendly IRC Client"
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 6b0e8f891049..13dcf77ed152 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -2,5 +2,5 @@ AUX 40.0-fix-build-with-meson-0.61.1.patch 1451 BLAKE2B 0ec6cb1e654e4f9bcecd7898
 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
+EBUILD polari-42.0.ebuild 1058 BLAKE2B a8b84f2ef48fe1e0a42c41fb5fa25fe48558c0edc2ec0ed74aef06fbec2b0cb69f8de3db5e3b37b58884b61ca55327480f7b30017714af664533af60b3f8be98 SHA512 22cfe5afe01e7ec962e0341d5e782c30c8f98c709ba885c703c8d1ce76f24a2c84df217e909e019968c1fd1cb777cfed2498beb4c34184c56b20a20efdece9d5
 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
index 2661d7d6748c..c423aa098f2c 100644
--- a/net-irc/polari/polari-42.0.ebuild
+++ b/net-irc/polari/polari-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/pola
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index af05d515acce..afdab6aee50b 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -7,7 +7,10 @@ DIST unrealircd-5.2.4.tar.gz.asc 866 BLAKE2B 9fc520e93f80a548650b016690036c4e995
 DIST unrealircd-6.0.2.tar.gz 8672255 BLAKE2B d52f2984f32331c489528b429f4671189713e4e308a7a7fd2f70933bfd606a938a9b6a6e581170b41fa9a948d1cc04c0cd8bb90c595c01c39b473cf341494a27 SHA512 041f97ad82d89222ad49bdc7db83869fc5133a049dd5354c34759c33c16307b9d60c25d3ef4e19a549059e3a0030699d061bd03fa8118428ded1f1e79d483398
 DIST unrealircd-6.0.3.tar.gz 8673998 BLAKE2B 64a5f8bfa6e19abb5cf5434134b2729d460cd4564ad2ca395241f27aab26113f85249d43b8e9a14245354868f767d07e399ff1f28c606bb7b75c4955048e03ae SHA512 be3b823eee42e5ecf7ffbdcac0d56cf4ff4cde8aa082affa8c2f78518a3c54a2d8bb3956cf2b95060958d7c3382ca8da00e6f7b816670cf3ba48e3b8588adba3
 DIST unrealircd-6.0.3.tar.gz.asc 866 BLAKE2B 4605034a7f4bdd240f20d96c0c7933e03b842d6aca2b481639b9e6aca7d32531f9a76cd07a7bb736c41586ec9ce3fe1f53864b8c06601d61df22d635c9a5f522 SHA512 a55cb7647f8efbddc65b6779baa816040f26ba32c6d86efe52ea10a96f51ca9f52d56e311bbac1f984a37b59b2771b8f346716c269df5a79867c0ab9c08c36b9
-EBUILD unrealircd-5.2.4-r1.ebuild 5490 BLAKE2B 33ca2e66a47897ea5f4753c7ec5169589e55bb126b70e477bf968efdf59bb529a2a3eec6d5a3df3bc672e92755a9d9e14e4271fd30909030d5e9dd0ec5217f00 SHA512 094d841f19dac13132cd2cc5597fbd3febe90323e86895bcf131c3fc4ae52d828d192d4a78e5686f153a70d3ed5a5a2aaad359a2021d30d09365c41368ab76c0
-EBUILD unrealircd-6.0.2-r1.ebuild 5637 BLAKE2B 3895805954430f2ba0438e503699a84eda29bdafc3153231956c4f0498b1837749a5103ad7fe10d0048dbe338202b45961be933cb6449bf1367f6bcb64645cf2 SHA512 025e38d2e8b891d6c4d4a349ffbd2bd650ebd3f6737748d28a3ccf29026239d3611949699a49ebb56c74fc67799a58bf1b2009a4337afa42e5d9e284f996b246
-EBUILD unrealircd-6.0.3.ebuild 5856 BLAKE2B f19a5542a1077b36417446c1eaa36a4ddc1542842c6b3b377ff7fc1e510ea081a69ae871af5f9ecbfcbe5bcf651a66403115fd1537282cc45d8417d78a15737d SHA512 e3b24303f45ef9a54b9eace7233730554c75bed3944e60a6b34a8aef5148669387f635101c04d83f090d3f2944556d71aad9def4ae433bd1fdb286f09d456417
+DIST unrealircd-6.0.4.tar.gz 8696690 BLAKE2B 25960ce78d56f7e5c2ad62751f3359ffc8df1885351f5a8bc36461f2a0a45aed1e99adb207e56988f9bf637d51f8cc17ca3d82f232f09e659a26c0afc3655a93 SHA512 fddce374dc7480e0f02d91965926028993e965450cfe871985ffbfadf38c86198d55be024eddc3dac65e44ff859a6e5e7e8176110d87042b489ce4b14deeeca2
+DIST unrealircd-6.0.4.tar.gz.asc 866 BLAKE2B 79bc065c7b24398bee53660c9dc4a7cfca857c7368b3667d2fdd30c87a160126dff0b255b3a20cc436026b923eb6dd744ca21a010f3a0b5df13af185bec211db SHA512 467b3cc1d291da76fea6b4e8fbeb02ffd24a3bd94b6eddf1e94ceabe9fc97e573fd6a3860b49370088a9c60ba0e0485af0f9f5a48e854e1b30f4d45be873ac20
+EBUILD unrealircd-5.2.4-r1.ebuild 5491 BLAKE2B a82c2aab7db44a19a1d752434d86f092e90c7ac88931a45bf1c7f12d0459759eef445ba73d03f9ba828debe30b79d56bd4b2d0d828462f1b21799b883469ebe6 SHA512 ba0fe9538fdc7bf601e318b30b3529fcb0c5da14c71689c7e2fe6ce2e4465d74c6e72ec4aab2db1ad6a20d7267feba745a302c068f2542a278c72b984b4aaa5f
+EBUILD unrealircd-6.0.2-r1.ebuild 5638 BLAKE2B 09859964af0c3d200f291c27233c9fb41d763a4a1ac315050818705b78ce6ba2a08d36360c0ef03c3e665ddcfc132579b9b838dced69133ed0acc541241e43f6 SHA512 78d1e201448bc09f4e94533d702389f3dcae3a3f7ab0c258358d27fb0cb1b8dbc4642403a78a16f9bf9dbb0380495ba153a7ab801f560cff195f67a3b3114ff6
+EBUILD unrealircd-6.0.3.ebuild 5857 BLAKE2B 47fabbc2879e41c4108b2dbf0b7f3240fe7cc5f5a219f3a9026d17d98f8cd567b5f4f0205323a0e5d80683b8b4a00ae10bb40a5f0abe14b2bf67788e6c33a393 SHA512 be8cf1005007ffed85812e02f0feb8a77695aa285c503e956293c2f039c2ade72e07d7a1a2e2ae7a2c3f7c105eec6020dc86fa4e65f3b08913438454d72ef66b
+EBUILD unrealircd-6.0.4.ebuild 5857 BLAKE2B 47fabbc2879e41c4108b2dbf0b7f3240fe7cc5f5a219f3a9026d17d98f8cd567b5f4f0205323a0e5d80683b8b4a00ae10bb40a5f0abe14b2bf67788e6c33a393 SHA512 be8cf1005007ffed85812e02f0feb8a77695aa285c503e956293c2f039c2ade72e07d7a1a2e2ae7a2c3f7c105eec6020dc86fa4e65f3b08913438454d72ef66b
 MISC metadata.xml 892 BLAKE2B 420637f61871853a304df1163a1f46e5810a42e21c90aa45ae0a9cff6d0223e48718135d7c4f0b2b50885d6d36066de1a646faea811cae12da9b681c0043f5f6 SHA512 076dbbef8a8e13340c74973cac5c31c9e691b5ba6dcb87d01f5d8311b11262187b3c9ab57782a3a2fcea99841fe55033ff6e4e9cfb300efa21b4dbddffcae2b6
diff --git a/net-irc/unrealircd/unrealircd-5.2.4-r1.ebuild b/net-irc/unrealircd/unrealircd-5.2.4-r1.ebuild
index fd04bd2d4c70..f3b264371203 100644
--- a/net-irc/unrealircd/unrealircd-5.2.4-r1.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.2.4-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.unrealircd.org/"
 SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
 SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes"
diff --git a/net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild b/net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild
index 275c8a7ffa4b..f4720c15ff43 100644
--- a/net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild
+++ b/net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild
@@ -10,7 +10,7 @@ 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"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="class-nofakelag curl geoip +operoverride operoverride-verify"
diff --git a/net-irc/unrealircd/unrealircd-6.0.3.ebuild b/net-irc/unrealircd/unrealircd-6.0.3.ebuild
index 77d6ea598803..7cc9feca1c71 100644
--- a/net-irc/unrealircd/unrealircd-6.0.3.ebuild
+++ b/net-irc/unrealircd/unrealircd-6.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.unrealircd.org/"
 SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
 SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="class-nofakelag curl geoip +operoverride operoverride-verify"
diff --git a/net-irc/unrealircd/unrealircd-6.0.4.ebuild b/net-irc/unrealircd/unrealircd-6.0.4.ebuild
new file mode 100644
index 000000000000..7cc9feca1c71
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-6.0.4.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SSL_CERT_MANDATORY=1
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/unrealircd.asc
+inherit autotools ssl-cert systemd tmpfiles verify-sig
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl geoip +operoverride operoverride-verify"
+
+RDEPEND="acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	dev-libs/jansson:=
+	>=net-dns/c-ares-1.7:=
+	virtual/libcrypt:=
+	curl? ( net-misc/curl[adns] )
+	geoip? ( dev-libs/libmaxminddb )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-unrealircd )"
+
+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
+
+	# File is missing from the 5.0.9.1 tarball
+	sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die
+
+	default
+	eautoreconf
+}
+
+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 \
+		--with-system-sodium \
+		--with-system-jansson \
+		--enable-dynamic-linking \
+		--with-controlfile="${EPREFIX}"/run/${PN}/unrealircd.ctl \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify) \
+		$(use_enable geoip libmaxminddb)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+	dobin src/unrealircdctl
+
+	newtmpfiles "${FILESDIR}"/unrealircd.tmpfiles unrealircd.conf
+
+	(
+		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-r3 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r4 ${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
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	tmpfiles_process unrealircd.conf
+
+	# 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 '"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 6 | head -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/"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";/'${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 ${EROOT}/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."
+}