gentoo resync : 06.04.2022

13 files changed, 295 insertions, 28 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 8b22a6e9ff67..bcf2b0efa10f 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index ac07411c2833..4f7c8c38c42b 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -2,5 +2,5 @@ AUX atheme-services-7.2.10_p2-configure-logdir.patch 833 BLAKE2B 3809ea93546547d
 AUX atheme-services.initd 524 BLAKE2B 1388771d1d086baee885598eb448ee3daf1031e120cd21947a344aa72b24b969a5e9c6c5705b72c30a78020fbc2f27e56e0fbc618f58e8aae14c6fcae4b049c5 SHA512 3b90f60677088384c3f69b9dde40d18f4829d3435da0cdfbab003db3b68b6462ef31635b5fe4ed59d56745df9aa95a0690586b56d2f91e621aa2e708cb289cc1
 DIST atheme-services-7.2.12.tar.xz 1072992 BLAKE2B f9e1cb175c1e2f38b5d53eba8f3d391e421baaff7eb76f38b10ba02b258472ccf9b69a7a278ff05c4f620b6fe6e48362618c02d245ed5d9c5acd4bede91ac093 SHA512 0d276b9a0c96f72a739090c5b2c732ab6c000f801cbb86347b5670def56f36fb82d70fb4cb68a1d942b9765c054bc136a6b0cecc0573cf8f59076f8b91fc6bf6
 EBUILD atheme-services-7.2.12-r2.ebuild 2227 BLAKE2B 9e1d65782e4dda23a04010a4dc725cd8f003e8a0f2b4a4ca9d083719ca4f264ef361707a4a569320b40a5e7701f81327e459549a1562806f9d683c18c692ee8b SHA512 e8e871ed2a7bfa3edcb63e4ed8e9c854e2b0d1b1071cee0d7bd69217ad252b65a18e675ec6da18256aa11b888172e71bb894f22b3fbb9b773f88d47eb329cc45
-EBUILD atheme-services-7.2.12-r3.ebuild 2215 BLAKE2B c7ef51cbaef9960b4a25ccf636a64490472c66f1f7e047c0513954cbbbc901b062e50bc17cb204f692e28e80b75fddd39d4d3f868704d8b5a9d450037d9f2456 SHA512 68206b847f06391ad2f4eea64a6f7b3a1ecb76e15a0d29b97336de1c595ddd6d7ed4bb65b90a16c5c41d42a4ad27ba9e5f9e5203e680d21b892fc5520d4b411c
+EBUILD atheme-services-7.2.12-r3.ebuild 2214 BLAKE2B c263f2b1d4b24f19d862dcd4287e3210bbf913ce5b1c9fedf7c8ca6d782841ea4344251e011ee1851e47096055c4b48645b62e4b95b8b02ba25b98e1536931e2 SHA512 9aaeff0f290bb8469225cd916c29cf0ab7c1915d38e0d5980a3add4658fddeff8de667a1e8aea64e17bf0d66c2cf3de6130beac33ebd3a8432adf79767163cf7
 MISC metadata.xml 752 BLAKE2B 366887fdc8b7642cedc5c853c8337d4a86331bd7b6c17e753996f725cdecccc3f87f547afb0bda1d60571f4eeea832f151876b15366ef00e464bf1eef835af77 SHA512 3aa34340f6bff8fbf0f513d4d4a94abe8e8c2a3129c69959098f4333e6a150163b43f9ff7627e79b93dab98c3665a9552981126b6e2f3632a24b707221bc4e4c
diff --git a/net-irc/atheme-services/atheme-services-7.2.12-r3.ebuild b/net-irc/atheme-services/atheme-services-7.2.12-r3.ebuild
index 28aa60e662fa..79eddf4d3911 100644
--- a/net-irc/atheme-services/atheme-services-7.2.12-r3.ebuild
+++ b/net-irc/atheme-services/atheme-services-7.2.12-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atheme/atheme/releases/download/v${PV}/${PN}-v${PV}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
 S="${WORKDIR}/${PN}-v${PV}"
 
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index d02af1f402df..7c45d9e8c730 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -2,6 +2,8 @@ AUX irkerd.confd 535 BLAKE2B fe8484cee8e5d443c3019c9915553e503164a2e5e965b44e892
 AUX irkerd.initd 963 BLAKE2B 33e4b654eb908d5d2b5c086d821f81d959bcb71ec93b80c7aa38ffaf75f011d41f43b9369115d0ac463ecdc3781ee7360d06fa8afe9c7e66a79fc55e8340d338 SHA512 fa9247c207f4a21611e51477c31556114d83899ea7adcc8bf8f3bb3edafaa8db84b4764ac5704dfe7abff2e5f9727610b71609a620432dc939a81d2ab7fcf818
 DIST irker-2.20.tar.gz 44949 BLAKE2B 9771059b4af86406233708c6b27f082842dc9269ef14b991391524da382cb389c3d09e119ecef8b278e375bbc4fe5c168a2dfe4220b2be5db09c8891b380b8c0 SHA512 291086cc1d9342c9dca0c3c7f00c1d3a4e33528cc188c21fbee5236df33c38fafb81e9898778b4c68b3a8609bdf5588be2a186e67e1bdaa7c6a0937730006f0d
 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.20.ebuild 1523 BLAKE2B bd4b2700d91713b182dae43448bdc49b10acb39faae99469ced1ea32777a133f5b7642a305f3c1e025f0798d044c52af9ea2b53a5abdf586a314076487e48fe4 SHA512 429410d43f3157ad09c754a05130dd489e731f4ef29bfe755eaef6201a808f585977026041ba50a5ab618b1fe6ac2cc46c1d5abbc73357995adeb6c879818fd2
 EBUILD irker-2.21.ebuild 1523 BLAKE2B 935cece1754910b3d89b33c286315afc03e3286cdecb650e0cba7b2d87b646835d11ab936ee6cab649809d4e61ec25c9d7041829dba1ae7439505b4c058d554a SHA512 2fa7fe78eb5be29c306391e1a0016758e86b39b97ee3bc08785c1b93b867944d86bd5b7d8f9746808fe6d3a23708664d1df93534874d43a42c765cde1781db38
+EBUILD irker-2.22.ebuild 1530 BLAKE2B ef33718b10796cb669b8c613d64c70998cc68b23ddfc82a8e20c34bca988c6251c93910b74e5cd9d6c39a4ff37ab7fdbf251582fbcaee747440ba8415af9d0e7 SHA512 8317033a447fe910f4120459ceaebf587d2f204f7451f7a9419ce028be2e76e24cfc4233f4400bfc9ef61c2bca135b889c94f5da96e4485cc19e900e33853064
 MISC metadata.xml 338 BLAKE2B 75e1de187c8161e49dcc6ab3c7ee3020455f09f842d798404398d195495e9e5b58cc6252c092a3f411ff848acbb258a10cd6120470bd907f5daa9459b6d719a1 SHA512 f804005b7aa3039b1400eb323d254b40ddace228a638fc37901e60b95c7b10f428df40b5afbf5f4b2facf05a2f91020f001c8d58d258efee0732dbc7935ac066
diff --git a/net-irc/irker/irker-2.22.ebuild b/net-irc/irker/irker-2.22.ebuild
new file mode 100644
index 000000000000..5227a14bc99d
--- /dev/null
+++ b/net-irc/irker/irker-2.22.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/quassel/Manifest b/net-irc/quassel/Manifest
index 8b79116b5580..241601fbff7c 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -7,6 +7,6 @@ AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617f
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
 DIST quassel-0.14.0.tar.bz2 4774297 BLAKE2B c17c64a2ed6c414c94c12b2fa0b8abf40810608e3e4f35df19db597444e09594efc9569c65855c3df5e2c211c2d65a46482f20c3d912c87140c66fa4f022b3b8 SHA512 ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f
 EBUILD quassel-0.13.1-r3.ebuild 4787 BLAKE2B 541815cc29a490af20b7dd967713972e4cbe6f4ccabf992fc4c4db760b95f1f9d8d44a03808cf1370ad96deeda24b9e729722e74310398543a1c8f9e2fcc6af0 SHA512 5f14e1ed223230995f6978ac58ee0e7647510539595389557449c7238b0f0396eea75dbfc6365569b585edd361b8b3f16ef17ee7abc88301a1600b7fc675ae88
-EBUILD quassel-0.14.0-r1.ebuild 5110 BLAKE2B 6fb53124d9dd6af81fd1c96f2795e3e0e39b1524fa7abf8795c6051f479fc4d7495b2e9d9e5536e77ac5471c6538ddfccb2133fc96e5adb2eb212a16234278a5 SHA512 76ef77a9e3078a334556ff698ea71dbdf5949dc4a62176c946aead31ed25d5d1f1e0796e1409fe15e9a5933da75f783745ad6c4709db0ec405b8677c9be59bc8
-EBUILD quassel-9999.ebuild 5052 BLAKE2B 737e890c7a94350bae7cbfb1063d98c004f477b43e6833331a25010c79ec83e8d6dae7d7076150eeb720125b5069b0fc893bbe12a3d47ebe30ba52b73c1f0cf8 SHA512 5b476aee18e7071aca1368574fcaf907f084eba405d46bf0de41013e8050c7ef119bc532f721c20a9be1eae44a790bd51e5e0a760d4ea796ca0de9e27b35a77a
+EBUILD quassel-0.14.0-r1.ebuild 5259 BLAKE2B b1e2c844f497b5cce11d5ca164db6802dd61a670bd5c84ba8a6e90e9a742929102faa16d936d1009131bc6d383200252a51fb10ed79e4562849e33f532bf99f6 SHA512 9f1dc68fe3f19f251fe80a5545ad6d8ce1723663f40977c49793f63b54d9ca3c1125e1bf53e8142dc819b4638c1fffadfed6051fc7f8aa586dcadda7d6c43b4a
+EBUILD quassel-9999.ebuild 5203 BLAKE2B dbb78f17fb1f6dbba023d93f390924f1dc7a0afa52f127547f4b8d6226e689be5984b6c13ae94d822c61597f3de9cf042e0c9881f634d3ffe05689c0a7f922c5 SHA512 ad5132936fb7d8ea0fe920fb2ea9bcdfb2a430203b8ce2eaaa395436a2aa552ef4da6753c731e57628021f5d64ae43f5b21ddcf5f26e7dd766a6d7bc80609ccf
 MISC metadata.xml 1727 BLAKE2B 6c24bd6b8689db443c7e1838cd427c54fae128001704570f2a9756d6cc27770ba54f4fd237fe64c4134d21e5ee409dacb4f3e3ebb0a7a38eed9fbb465d64b8c2 SHA512 743c8e1c4b5ad3100ed71142033ad0eb7102bd275dbb3e616845059cebdc90f76a370dd99043e46a34807b1d80db175212748585895af3f5a8fba05e9515d678
diff --git a/net-irc/quassel/quassel-0.14.0-r1.ebuild b/net-irc/quassel/quassel-0.14.0-r1.ebuild
index f25fed0bc1d5..80e4b8d72d5f 100644
--- a/net-irc/quassel/quassel-0.14.0-r1.ebuild
+++ b/net-irc/quassel/quassel-0.14.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} != *9999* ]]; then
 		SRC_URI="https://github.com/quassel/quassel/archive/refs/tags/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 	else
 		SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
-		KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~sparc-solaris"
+		KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~sparc-solaris"
 	fi
 	S="${WORKDIR}/${MY_P}"
 else
@@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
+IUSE="bundled-icons crypt +dbus debug gui kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview"
 RESTRICT="!test? ( test )"
 
 SERVER_DEPEND="acct-group/quassel
@@ -68,7 +68,7 @@ DEPEND=">=dev-libs/boost-1.54:=
 	)
 	!monolithic? (
 		server? ( ${SERVER_DEPEND} )
-		X? ( ${GUI_DEPEND} )
+		gui? ( ${GUI_DEPEND} )
 	)"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-qt/linguist-tools:5
@@ -78,13 +78,13 @@ DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-REQUIRED_USE="|| ( X server monolithic )
+REQUIRED_USE="|| ( gui server monolithic )
 	crypt? ( || ( server monolithic ) )
 	kde? ( dbus spell )
 	ldap? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
-	snorenotify? ( || ( X monolithic ) )
-	spell? ( || ( X monolithic ) )
+	snorenotify? ( || ( gui monolithic ) )
+	spell? ( || ( gui monolithic ) )
 	syslog? ( || ( server monolithic ) )"
 
 PATCHES=(
@@ -99,19 +99,26 @@ src_configure() {
 		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
 		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake_use_find_package dbus dbusmenu-qt5)
-		$(cmake_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
 		-DWITH_LDAP=$(usex ldap)
 		-DWANT_MONO=$(usex monolithic)
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
-		$(cmake_use_find_package snorenotify LibsnoreQt5)
-		$(cmake_use_find_package spell KF5Sonnet)
 		-DWITH_WEBENGINE=$(usex urlpreview)
-		-DWANT_QTCLIENT=$(usex X)
+		-DWANT_QTCLIENT=$(usex gui)
 	)
 
+	if use gui || use monolithic ; then
+		# We can't always pass these (avoid "unused" warning)
+		# bug #830708
+		mycmakeargs+=(
+			$(cmake_use_find_package dbus dbusmenu-qt5)
+			$(cmake_use_find_package dbus Qt5DBus)
+			$(cmake_use_find_package snorenotify LibsnoreQt5)
+			$(cmake_use_find_package spell KF5Sonnet)
+		)
+	fi
+
 	if use server || use monolithic ; then
 		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
 	fi
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index d4dca6dc95f1..ebbf78af53cb 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://quassel-irc.org/"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview X"
+IUSE="bundled-icons crypt +dbus debug gui kde ldap monolithic oxygen postgres +server snorenotify spell syslog test urlpreview"
 RESTRICT="!test? ( test )"
 
 SERVER_DEPEND="acct-group/quassel
@@ -68,7 +68,7 @@ DEPEND=">=dev-libs/boost-1.54:=
 	)
 	!monolithic? (
 		server? ( ${SERVER_DEPEND} )
-		X? ( ${GUI_DEPEND} )
+		gui? ( ${GUI_DEPEND} )
 	)"
 RDEPEND="${DEPEND}"
 BDEPEND="dev-qt/linguist-tools:5
@@ -78,13 +78,13 @@ DEPEND+=" test? ( dev-cpp/gtest dev-qt/qttest )"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-REQUIRED_USE="|| ( X server monolithic )
+REQUIRED_USE="|| ( gui server monolithic )
 	crypt? ( || ( server monolithic ) )
 	kde? ( dbus spell )
 	ldap? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
-	snorenotify? ( || ( X monolithic ) )
-	spell? ( || ( X monolithic ) )
+	snorenotify? ( || ( gui monolithic ) )
+	spell? ( || ( gui monolithic ) )
 	syslog? ( || ( server monolithic ) )"
 
 src_configure() {
@@ -95,19 +95,26 @@ src_configure() {
 		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
 		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake_use_find_package dbus dbusmenu-qt5)
-		$(cmake_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
 		-DWITH_LDAP=$(usex ldap)
 		-DWANT_MONO=$(usex monolithic)
 		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
-		$(cmake_use_find_package snorenotify LibsnoreQt5)
-		$(cmake_use_find_package spell KF5Sonnet)
 		-DWITH_WEBENGINE=$(usex urlpreview)
-		-DWANT_QTCLIENT=$(usex X)
+		-DWANT_QTCLIENT=$(usex gui)
 	)
 
+	if use gui || use monolithic ; then
+		# We can't always pass these (avoid "unused" warning)
+		# bug #830708
+		mycmakeargs+=(
+			$(cmake_use_find_package dbus dbusmenu-qt5)
+			$(cmake_use_find_package dbus Qt5DBus)
+			$(cmake_use_find_package snorenotify LibsnoreQt5)
+			$(cmake_use_find_package spell KF5Sonnet)
+		)
+	fi
+
 	if use server || use monolithic ; then
 		mycmakeargs+=( $(cmake_use_find_package crypt Qca-qt5) )
 	fi
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 821520050c4f..9ec4088cddc9 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -4,6 +4,8 @@ AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8d
 AUX unrealircd.tmpfiles 45 BLAKE2B 302201c42d7ebc272dfabfe36b49d583ce18c3d10d7348763a710ac7a3bb853a8c5b4d1cb2444773f128eb988d6d95e73617ceb5742a14da61096a8eaed8705c SHA512 4812c3c509461085665dcfdd38a082eed2aba9b5c175cc28f893ae42d8a00f72c3cfcd5195c6224667284df4ee58274e2a782dcfc6b5a9cb8ce9d323961fa6cd
 DIST unrealircd-5.2.4.tar.gz 7201203 BLAKE2B 06afc8b5e28bbd56971b2ce21da3e000e39366444472786891bfe000754f5fed37b59850f9539b4f01914d6b33c1f9f17a15fe69569620ba5213f39fce1cfcad SHA512 b6784d011bc56b0b8253d61fb1edddb2133e791e9ce4ae978f90059563d11f3f7b3ebca1cf13765b4077ebc39f0699e101bdfc71cbb0c5cf51d508c5a5fdacb3
 DIST unrealircd-6.0.2.tar.gz 8672255 BLAKE2B d52f2984f32331c489528b429f4671189713e4e308a7a7fd2f70933bfd606a938a9b6a6e581170b41fa9a948d1cc04c0cd8bb90c595c01c39b473cf341494a27 SHA512 041f97ad82d89222ad49bdc7db83869fc5133a049dd5354c34759c33c16307b9d60c25d3ef4e19a549059e3a0030699d061bd03fa8118428ded1f1e79d483398
+DIST unrealircd-6.0.3.tar.gz 8673998 BLAKE2B 64a5f8bfa6e19abb5cf5434134b2729d460cd4564ad2ca395241f27aab26113f85249d43b8e9a14245354868f767d07e399ff1f28c606bb7b75c4955048e03ae SHA512 be3b823eee42e5ecf7ffbdcac0d56cf4ff4cde8aa082affa8c2f78518a3c54a2d8bb3956cf2b95060958d7c3382ca8da00e6f7b816670cf3ba48e3b8588adba3
 EBUILD unrealircd-5.2.4-r1.ebuild 5271 BLAKE2B 0e9108223c171ceed448ac8b671aacfdfe6bb2b3dccd900aa088bd2c623bd6f7f0e341f1950656ab8adec24173a5bbd40e43c70c9f02f9f30cd396a295a4cac9 SHA512 8970101540211879de4ffd43a764ded38435b8c9dde9af6a4f94b9a4f897d1d42bf5b322966b3cdbd06779e584d15403cfe5d48e019a8162bc30a746a2f25d8f
 EBUILD unrealircd-6.0.2-r1.ebuild 5637 BLAKE2B 3895805954430f2ba0438e503699a84eda29bdafc3153231956c4f0498b1837749a5103ad7fe10d0048dbe338202b45961be933cb6449bf1367f6bcb64645cf2 SHA512 025e38d2e8b891d6c4d4a349ffbd2bd650ebd3f6737748d28a3ccf29026239d3611949699a49ebb56c74fc67799a58bf1b2009a4337afa42e5d9e284f996b246
-MISC metadata.xml 860 BLAKE2B 198191ef6f7cc07fede5439075736be578f72cc5e76e47eaa8c6ffc7e60af0ed57b1e00d43539487b99d094ab2d79f5d1797d870f80fd5eec4bddfff4ad54849 SHA512 8dd95561f5d8e9eda8ef236b1580f76a9cb182e0c1c97926fe146e3f2240101dc71a44696229de51307b898bc9cc95a2e52fd4149110557006af7aefd25f4850
+EBUILD unrealircd-6.0.3.ebuild 5637 BLAKE2B 3895805954430f2ba0438e503699a84eda29bdafc3153231956c4f0498b1837749a5103ad7fe10d0048dbe338202b45961be933cb6449bf1367f6bcb64645cf2 SHA512 025e38d2e8b891d6c4d4a349ffbd2bd650ebd3f6737748d28a3ccf29026239d3611949699a49ebb56c74fc67799a58bf1b2009a4337afa42e5d9e284f996b246
+MISC metadata.xml 892 BLAKE2B 420637f61871853a304df1163a1f46e5810a42e21c90aa45ae0a9cff6d0223e48718135d7c4f0b2b50885d6d36066de1a646faea811cae12da9b681c0043f5f6 SHA512 076dbbef8a8e13340c74973cac5c31c9e691b5ba6dcb87d01f5d8311b11262187b3c9ab57782a3a2fcea99841fe55033ff6e4e9cfb300efa21b4dbddffcae2b6
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index cf388677214f..07099fd71169 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
+		<name>Michael Palimaka</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>sam@gentoo.org</email>
diff --git a/net-irc/unrealircd/unrealircd-6.0.3.ebuild b/net-irc/unrealircd/unrealircd-6.0.3.ebuild
new file mode 100644
index 000000000000..275c8a7ffa4b
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-6.0.3.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SSL_CERT_MANDATORY=1
+inherit autotools ssl-cert systemd tmpfiles
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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"
+
+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."
+}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 32b516246706..d51d18471332 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -4,7 +4,7 @@ DIST weechat-3.4.1.tar.xz 2617856 BLAKE2B a1e2e3e50da79041dc1500fb9c368cc3f3f2f7
 DIST weechat-3.4.1.tar.xz.asc 833 BLAKE2B 4f4a38307f1f60dd03693761605cbab2a2e8249d11e95826ec6e610e38a0625cec66704d5b62d51e83633dc3c06a98be5487c8a535ae75fdc2d53ba91a71e70f SHA512 8e45ba6f8d96f2dbaa617ee9e5071a31e94cbea418881af6866eecc7402bdff558f221db63c2e708e40119d3c5294b49485823f4e62fbae5e89da7cc380d9d6d
 DIST weechat-3.4.tar.xz 2617640 BLAKE2B fb5df8ed7d2b219c60c15f444834017504aebffa0c02c7712f0109216153be97b93560dbbb060e9cb907634856dca2733848222b5f2eea095dcceec623a00397 SHA512 b5e36802bb8b8f0e518da590d675ca63b0fa0b88acd24c2803d4f8468e6bce775691d3994db5090570f1286ad38be31615921b0d3ead697ad51986cddca57330
 EBUILD weechat-3.3.ebuild 4279 BLAKE2B 1ada556de4c02ba23a4c4f7f98fecb0113d8be1ecffd4ae5e74117f14f4db0ae3ef0fcc211d1ea30185f8b1961dfad2c7e5ff3cdf15108bd9e22b4f4e309b997 SHA512 72476c71be9f141d00441affaccf61cc1670e1b66a1610f51a875e87e00f4dfb88cfb08ce3db9d6bf2378f62ce9d4e9b33f6b2a884ac36deac914020981f482b
-EBUILD weechat-3.4.1.ebuild 4533 BLAKE2B d4a5a1cbc0c509d0a88e3d6eafae137df3a9ff28b74c218703fc8fdf77e1159f6a748b043221202fe168ddf68944cc1818f058d301901063663f947e8e36794f SHA512 24b3542c65d815a0b379e80d0c24066368d09ff648a48c9a33e68c8c97d86bdffedfcd466a45a4731d65f67892a08e0116a6b713091504fca70ad826fec6168a
+EBUILD weechat-3.4.1.ebuild 4532 BLAKE2B 25dfe4ca246a347f57d5d2f932cdebeb72434dcdf76a2e22c47d09f76e5b80d6ebcde986e2b48f29640c837c896a38af5886fd1485d555bfa17d879e19562bf7 SHA512 354aef7f602959032c43b5d49c6f90a230f325e7eeb49234a0667c9102bfbdab1611007db758fc7575503bf25f03f2fc8b4abd9a89f8cf6680f3483c844fab99
 EBUILD weechat-3.4.ebuild 4315 BLAKE2B 028b773aaa6dd0ea1ed8cff0cb36ed455dccfb98b33d4b45ac49c8fa0c3ce46a3a977af42469afd95c1c5728453c140fc10bf6d9818477ce7ea6be32d4d5cf07 SHA512 771254004d8b8362f1da777c60f3693ec94a60177a2ac56ec4ab251fcbf2ad9bd5aee7dc4306c93b70dc807f067118a70bdeda4536720c45d96908e4f2be554d
 EBUILD weechat-9999.ebuild 4535 BLAKE2B 730c0ef6097b4d67040e8e41f45eb68d4d2b8be8be106529fae8dbad4596e8dd05b211783af8f0030f737a250c807a0005aac01a5cbae0698a573a26f5f95875 SHA512 4810b306e168e2042892ffaf60a9952deed4deb52a91deb95fb55c5203f8edd4899313b6321b582ca3e6b420acac9f2d0cfabbb900e9804f6a594f4c46e32900
 MISC metadata.xml 985 BLAKE2B dfb7631e6013d342f1622f582aaa6e485cc5964d4558377987599cc3eff2270a085db1c911aff9978decd7e26c96b7a350a95701da460ec93100e88bcd1e3d3a SHA512 fe353b1581b45779f8851de08d5886514d4fddbf6098e42a290f9907aa268c0c0d5fe7f25b0d53a85d951857c00bab8bdea4aa9d912778aa3dc83970b0a5d37c
diff --git a/net-irc/weechat/weechat-3.4.1.ebuild b/net-irc/weechat/weechat-3.4.1.ebuild
index 743fc1cdd1f4..ea0796ebe23a 100644
--- a/net-irc/weechat/weechat-3.4.1.ebuild
+++ b/net-irc/weechat/weechat-3.4.1.ebuild
@@ -17,7 +17,7 @@ else
 		verify-sig? ( https://weechat.org/files/src/${P}.tar.xz.asc )"
 	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/weechat.org.asc
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-weechat )"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"