gentoo resync : 02.02.2022

23 files changed, 425 insertions, 320 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 488e532432f6..b2b1e72c5ed2 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 f419f7b845c0..9d3581c60bf8 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,5 +1,7 @@
 AUX atheme-services-7.2.10_p2-configure-logdir.patch 833 BLAKE2B 3809ea93546547de99b41ff19547b027102706e5e06e40333491440a1f09b0e78e31f5956def37ea1f6b067876a72f54a275d428332f2f479c7dace476bdc200 SHA512 43ca2af5aec6a1ea4b08564c62a21ae762fd01f2c177dbf8f7c6ebb238b9302b8310f2fe96ce2b20a7f7014c488a02177d1e583aa438ceff7576e4880ca2f62f
 AUX atheme-services.initd 524 BLAKE2B 1388771d1d086baee885598eb448ee3daf1031e120cd21947a344aa72b24b969a5e9c6c5705b72c30a78020fbc2f27e56e0fbc618f58e8aae14c6fcae4b049c5 SHA512 3b90f60677088384c3f69b9dde40d18f4829d3435da0cdfbab003db3b68b6462ef31635b5fe4ed59d56745df9aa95a0690586b56d2f91e621aa2e708cb289cc1
 DIST atheme-services-7.2.11.tar.xz 1051436 BLAKE2B 99624c21adf820c8ef8e33aa9ae9036c701c4a9218e225e7871717c86010fbed56d00da43cd2ffb79a46074a5602260fabbbaf769407a00175b5127c18913c1c SHA512 adcc189b61efe295997a7456022a7595df5b14b55c2139794d380e57fe77efd42221316558391b5440f077fd951143905454b0e9893deec89108fa671b44ef2f
+DIST atheme-services-7.2.12.tar.xz 1072992 BLAKE2B f9e1cb175c1e2f38b5d53eba8f3d391e421baaff7eb76f38b10ba02b258472ccf9b69a7a278ff05c4f620b6fe6e48362618c02d245ed5d9c5acd4bede91ac093 SHA512 0d276b9a0c96f72a739090c5b2c732ab6c000f801cbb86347b5670def56f36fb82d70fb4cb68a1d942b9765c054bc136a6b0cecc0573cf8f59076f8b91fc6bf6
 EBUILD atheme-services-7.2.11-r1.ebuild 2213 BLAKE2B b9843850d65056e1bfa45ca6314e7944827875d4ee5781597ac750ad42e4d8b2c8f8ee1fdddd2ce78abe86e3ab8db0fa3a8c2f3cf07e7666b6ab081673316c3e SHA512 db5483c47a78c99cec4e072c54402056ce0b5e06fece96d29e1f8d3926eb4ba0d94014b0b749759306d12d0f714d64e09edf792481f302c4d52d7de0be97ee61
+EBUILD atheme-services-7.2.12.ebuild 2213 BLAKE2B f1f4b95723fdeba4c7a7801dc06cb8d937cd26bdeaadd45194e170bc520fdca49c393b74ad43db73482cb5a12504c4645c4a2e5c93af5eb93199c6d9a6ffe81d SHA512 e8a96818a14b633b02d4d977ad67af155996b26120ceb499ac44e4cda0a7082508fe67e64a376da3ba04aed325826f4a5485ff695f9dff9125bd06e9b7f51a0d
 MISC metadata.xml 752 BLAKE2B 366887fdc8b7642cedc5c853c8337d4a86331bd7b6c17e753996f725cdecccc3f87f547afb0bda1d60571f4eeea832f151876b15366ef00e464bf1eef835af77 SHA512 3aa34340f6bff8fbf0f513d4d4a94abe8e8c2a3129c69959098f4333e6a150163b43f9ff7627e79b93dab98c3665a9552981126b6e2f3632a24b707221bc4e4c
diff --git a/net-irc/atheme-services/atheme-services-7.2.12.ebuild b/net-irc/atheme-services/atheme-services-7.2.12.ebuild
new file mode 100644
index 000000000000..f041e74b36bc
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-7.2.12.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic perl-functions
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="https://github.com/atheme/atheme"
+SRC_URI="https://github.com/atheme/atheme/releases/download/v${PV}/${PN}-v${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+S="${WORKDIR}/${PN}-v${PV}"
+
+RDEPEND="
+	acct-group/atheme-services
+	acct-user/atheme-services
+	>=dev-libs/libmowgli-2.1.0:2
+	virtual/libcrypt:=
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	perl? ( dev-lang/perl:= )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+# 'dev-vcs/git' required as per bug #665802
+BDEPEND="
+	dev-vcs/git
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.2.10_p2-configure-logdir.patch)
+
+src_configure() {
+	# perl scriping module support is also broken in 7.0.0. Yay for QA failures.
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--disable-warnings \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_enable nls) \
+		$(use_enable profile) \
+		$(use_with pcre) \
+		$(use_with perl) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		local confdest=${conf##*/}
+		newins ${conf} ${confdest%.example}
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	mv "${ED}"/usr/bin/{,atheme-}dbverify || die
+
+	# contributed scripts and such:
+	docinto contrib
+	dodoc contrib/*.{c,pl,php,py,rb}
+
+	use perl && perl_domodule -r contrib/Atheme{,.pm}
+
+	rm "${ED}/usr/share/doc/${PF}/WINDOWS" || die
+
+	# Bug #454840 #520490
+	rm -rf "${ED}/var/run" || die
+}
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index f3c3e8fb494c..6125fb33a9a6 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -4,6 +4,6 @@ DIST hexchat-2.16.0.tar.xz 1348320 BLAKE2B d5c6da74152e7ca08b629ee86cc45acb8232f
 DIST hexchat-add-libera-chat.patch 696 BLAKE2B cd5f0736abd7895d017e835335a6ff9a0f6301cba7e7b8c2a4e9da7047885aac2f8b7b25b0723966bd103118c99d833d3e99481865bf20d202b0f95c0a9131bb SHA512 e3cc7df3f114a2374c1653c4ab7262dad87191f74ca759c41beecd731472478e8bdc929b0a13475a1248ed045ee1faf93cd80a225b6ed670f449d4495d4ab2ae
 DIST hexchat-default-network.patch 1423 BLAKE2B b11982d50abb4fb7d8aab4758195cbfea1691cd7c6487ca56f995e449ff0445e2427a68064c0d8ee4b4b4e7764e438bfd68bb5402a266624cb6cfb93fbfdb30b SHA512 2691786d360278b4334e9129912ca0abde7b98f0d72f5e530b34e109eaf624d8e7280e137490dab218bacfb5bed952b2d7827640777ad73da5585517de308f42
 EBUILD hexchat-2.14.3-r101.ebuild 3675 BLAKE2B 53d3fdffc0355e944a99479907390e6c9170f512ef8036366301fa9b5a2893c9ac953e6c322e08ab2c64a68718d8e4b101d4d6920c5712c289922c60af22dcf0 SHA512 c10dfd87b5668e713b6d108e9d36ed6dc244c6a69389bf6e294b1456b14a2375edd250f2e075884116e9b055935c9fd336760afb5e25845385794f8462d63bc9
-EBUILD hexchat-2.16.0.ebuild 3031 BLAKE2B 7cfd28d8df9915468f958cca946db2d2701c49226276f2250c04ee173b9a7ea5fe4490a249368176fb905fef181f3a95a14e8993591e624da9c6f92811bed173 SHA512 9611941b4f0d56c3e8bd5b8bddda6b5cd495ab7a8ee2fcb98c80dfdc628c3044d8ae8910fa4449b0d5c231186400ad57acf53c02649f6c3ff6bea8a7e7517e3e
+EBUILD hexchat-2.16.0.ebuild 3027 BLAKE2B 982e4a43c1287f465eab7bf9fac6d3e71fe1efc38006bd9b396eca1cc100cf7004012ba7d47ed30939a1b9b2a37772404003e2e4514bfbef9ba9b606a57c2a29 SHA512 597dfe69eb32fb8f21e2ee9dae86fc754a893f77a3916bd79b56265ccf8c88f75fedac5056a204ff84142cb7e0be39dad686f1049898180b63e44eba30ac236b
 EBUILD hexchat-9999.ebuild 3024 BLAKE2B 5f20620c7a0d893d16c7213a668768a955d5df1e545eba02c53fb80bf8ab5dc6ca8ca7c9ff815b3c390d7462777dd1e1a2c2af4e25a9125fcf7a453e8ed809d7 SHA512 ef339dee122f1b7784a5b507caa499feee16180a3c441b2a7ef1c59b3c083df2b3d70a30721a2abe962d9e63260c7eb07787a245e5646fa98cbe5b0906d08e12
 MISC metadata.xml 1043 BLAKE2B dfeaaac78bd640c7298de4683f65b096233a92a2ea47f66fb94ac0dcc02087715299aa816deb51824de943c4832c8b3b37fdb493aea467118caa9fa52f4e53db SHA512 f68fed2523456624edad9c44f00fe16940cc10d44c97e523e5b159a7d31b0b74cf2dcc3c7e3eafff0c97c1cb2ce3aec8213b004ffc16a112b60320fbad0e192c
diff --git a/net-irc/hexchat/hexchat-2.16.0.ebuild b/net-irc/hexchat/hexchat-2.16.0.ebuild
index e304753869a7..c2fe6fdf85ea 100644
--- a/net-irc/hexchat/hexchat-2.16.0.ebuild
+++ b/net-irc/hexchat/hexchat-2.16.0.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=7
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index 27329b7da957..568f4d3eedd7 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,5 +1,7 @@
 AUX irkerd.confd 535 BLAKE2B fe8484cee8e5d443c3019c9915553e503164a2e5e965b44e89200fd71c8a2152bf5ca0dc43e5e93b46dfff6e683d8fc2d364dd27048d16642c4043a4f936d3af SHA512 00656916acb9fa2cbee57442a7a90bfbc7213c03ad3ee38b01314679b66177fa6152400ad3401e87be3711e6e38e09b084ea90cb71ae5774c8eba5cf9ab8e070
 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
 EBUILD irker-2.20.ebuild 1523 BLAKE2B bd4b2700d91713b182dae43448bdc49b10acb39faae99469ced1ea32777a133f5b7642a305f3c1e025f0798d044c52af9ea2b53a5abdf586a314076487e48fe4 SHA512 429410d43f3157ad09c754a05130dd489e731f4ef29bfe755eaef6201a808f585977026041ba50a5ab618b1fe6ac2cc46c1d5abbc73357995adeb6c879818fd2
+EBUILD irker-2.21.ebuild 1530 BLAKE2B ef33718b10796cb669b8c613d64c70998cc68b23ddfc82a8e20c34bca988c6251c93910b74e5cd9d6c39a4ff37ab7fdbf251582fbcaee747440ba8415af9d0e7 SHA512 8317033a447fe910f4120459ceaebf587d2f204f7451f7a9419ce028be2e76e24cfc4233f4400bfc9ef61c2bca135b889c94f5da96e4485cc19e900e33853064
 MISC metadata.xml 338 BLAKE2B 75e1de187c8161e49dcc6ab3c7ee3020455f09f842d798404398d195495e9e5b58cc6252c092a3f411ff848acbb258a10cd6120470bd907f5daa9459b6d719a1 SHA512 f804005b7aa3039b1400eb323d254b40ddace228a638fc37901e60b95c7b10f428df40b5afbf5f4b2facf05a2f91020f001c8d58d258efee0732dbc7935ac066
diff --git a/net-irc/irker/irker-2.21.ebuild b/net-irc/irker/irker-2.21.ebuild
new file mode 100644
index 000000000000..5227a14bc99d
--- /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/kvirc/Manifest b/net-irc/kvirc/Manifest
index 93b7aa581131..ca9d4635ddd2 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,4 @@
-DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1
 DIST kvirc-5.2_pre20210630233331.tar.gz 6173417 BLAKE2B dcdb5fed3250de08d8e2896ba799e142ee04fff409006d7b7d06bdcf1cf2f6df9f7abeeb055e550d99f9cca6182d68b4f5b9ff224f78d91b1efb7f42118458e5 SHA512 625712cc69a2ab3a33b72b2e9935bec8f307ef1f8d5a9a0672d7eb8e7daa5ab3e6202a2b8932493c30374f0451821db161e47cb3af840c0324e27ca2e58272ef
-EBUILD kvirc-5.2_pre20200605155236-r2.ebuild 4642 BLAKE2B b00138565ed817577506495d684a2967cfd5d18fb214d680feffcb17438bbd4a7946ef299a54f30882eb50ded4a771fef3fe1650649c1e927e8389693b208445 SHA512 a979a2028d1a17486c0dff100011ec1d98b0a37f8f2b372145fad0dda850ff97554bfe1715a684af45fda21ec2e31eafd165848c44956ad08ae0c83f536532f4
-EBUILD kvirc-5.2_pre20210630233331-r1.ebuild 4337 BLAKE2B 5d6ce666c7b227ab3e37b3613c85360568ee4d812d9afe9870e393e3d3ea7f57a9bc65fbdeb0ec5b7dce962637cad96113ec1642f95e3e3acf696c6c8de2b233 SHA512 58af26de24f57382ee88dc53c4e509da2fae24f79d5310e0a777d9fcd008c2486475d2ea6b767122e98f9e7c4b762aca52bdc6c274e55f3dbb17dcab47f6a9f7
-EBUILD kvirc-9999.ebuild 4267 BLAKE2B 188fb4abdab17615e94896d1bb76cab72006f99d0be8fd97808ddbe7d5456f4c9464bfa461d0623a489d9ba37917e4f108314fd5b2d49d6046fc4c70fe2ccf31 SHA512 23db2fcbf120fc5accc4ea257306a18bee13b2500a4ebfe29affe723616eb26b690e6a56f91f91063232ef0afd56582357fb5f9806f9b6d62d8939bce5bc82ea
-MISC metadata.xml 639 BLAKE2B 14486493e5a2241a08171e8d9bf2a4d1e33eab4c012720b4fc9927c0b3838c655dd6c66b17af96f59340bfef0845ff8ff763203db26cbbdfb37a1036ce6929fc SHA512 7fc9e62f0a7f2e3449a3faf5f3ee4f9d521e122c77fefa364584030b64e168651b8c323b633f6e13459b3a4c2302edc09f0fa1cb7c0a87d4d2e632ac62042a09
+EBUILD kvirc-5.2_pre20210630233331.ebuild 4313 BLAKE2B 938de226467f28507be2a2d1c1ccec1af4cd45b5637e766f52aa7cf97324d4f74ee6bc4de3cc29a3eef78b389e687548af90af1dd97bd649c1122af432da675a SHA512 cc78a2995fcf73a442ec4f3ce67d06d909e6f5702bfcd59ec77ee38bed9dbc210b6cdd121057516f9fa4d571fe536360c7ec44070496687ecc7f845c424a8d3d
+EBUILD kvirc-9999.ebuild 4245 BLAKE2B 4732309595f7a78490c8fb648df0e9455d919473bbc8d5d8867d89106d293ba7d9d2afda5c3919407df1ad68ee9534bed585cceb53919f146094d0df825ae4dd SHA512 37aa1ca3fadbeb9e3f59caaa96eb5fdfaadd309f0fcaccf09d575e8037ca2499842636156ae7d9f243daecbc21d02ed097602cf5deb74a1e7d56aa96794f03ef
+MISC metadata.xml 640 BLAKE2B 5e04e58bf81ace5077343e0c80539e2046a9545a3d9ca9aed6ff10926fcb1f7d0e08502281b9db65eb358e4e4d6f4f7ef5f9b8509121934402b3c3c73e314d5c SHA512 0a57e5e81813f57964f8eda1cae1a86ca3d1c0bd6b22f1fe82704ab0b368f597359472f03e8fc3677f9ec01e2bbb61c87c27798cc037cce81f092528a8e896c5
diff --git a/net-irc/kvirc/kvirc-5.2_pre20200605155236-r2.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236-r2.ebuild
deleted file mode 100644
index dd4434e337ee..000000000000
--- a/net-irc/kvirc/kvirc-5.2_pre20200605155236-r2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 2009-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_8,3_9})
-
-inherit cmake flag-o-matic python-single-r1 xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-	KVIRC_GIT_REVISION=""
-	KVIRC_GIT_SOURCES_DATE=""
-else
-	KVIRC_GIT_REVISION="e66a5106ef55a92e2532c38aa255ac376ba6afe1"
-	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
-	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
-fi
-
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="dev-lang/perl:0
-	>=dev-util/cmake-3.16
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc-video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:0= )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${DEPEND}
-	gsm? ( media-sound/gsm )"
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
-fi
-
-DOCS=()
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-	fi
-	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-
-	# https://github.com/kvirc/KVIrc/issues/2504
-	# https://github.com/kvirc/KVIrc/commit/fa2b4a9f98e2820432e3a7561b3ca914982a4454
-	sed -e "s/KWindowInfo wi = KWindowSystem::windowInfo(activeId, NET::WMState);/KWindowInfo wi = KWindowInfo(activeId, NET::WMState);/" -i src/modules/notifier/NotifierWindow.cpp || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_ENV_FLAGS=ON
-		-DWANT_VERBOSE=ON
-
-		-DWANT_CRYPT=ON
-		-DWANT_DCC_VOICE=ON
-		-DWANT_IPC=ON
-		-DWANT_IPV6=ON
-		-DWANT_TRANSPARENCY=ON
-
-		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
-		-DWANT_DCC_VIDEO=$(usex dcc-video ON OFF)
-		-DWANT_DEBUG=$(usex debug ON OFF)
-		-DWANT_DOXYGEN=$(usex doc ON OFF)
-		-DWANT_GETTEXT=$(usex nls ON OFF)
-		-DWANT_GSM=$(usex gsm ON OFF)
-		-DWANT_KDE=$(usex kde ON OFF)
-		-DWANT_MEMORY_PROFILE=$(usex profile ON OFF)
-		-DWANT_OGG_THEORA=$(usex theora ON OFF)
-		-DWANT_OPENSSL=$(usex ssl ON OFF)
-		-DWANT_OSS=$(usex oss ON OFF)
-		-DWANT_PERL=$(usex perl ON OFF)
-		-DWANT_PHONON=$(usex phonon ON OFF)
-		-DWANT_PYTHON=$(usex python ON OFF)
-		-DWANT_QTDBUS=$(usex dbus ON OFF)
-		-DWANT_QTWEBKIT=OFF
-		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=OFF
-	)
-	if use python; then
-		mycmakeargs+=(
-			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
-			-DPython3_LIBRARY="$(python_get_library_path)"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use doc; then
-		cmake_src_compile devdocs
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		(
-			docinto html
-			dodoc -r "${BUILD_DIR}/doc/api/html/"*
-		)
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-irc/kvirc/kvirc-5.2_pre20210630233331-r1.ebuild b/net-irc/kvirc/kvirc-5.2_pre20210630233331.ebuild
index b57765acd661..deedb6e27437 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20210630233331-r1.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20210630233331.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2009-2021 Gentoo Authors
+# Copyright 2009-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake flag-o-matic python-single-r1 xdg-utils
 
@@ -29,12 +29,11 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
 IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="dev-lang/perl:0
-	>=dev-util/cmake-3.16
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	kde? ( kde-frameworks/extra-cmake-modules:5 )
@@ -71,8 +70,7 @@ DEPEND="dev-qt/qtcore:5
 		media-libs/libogg
 		media-libs/libtheora
 		media-libs/libvorbis
-	)
-"
+	)"
 RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index c123daed9574..6f6e004ab580 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2009-2021 Gentoo Authors
+# Copyright 2009-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake flag-o-matic python-single-r1 xdg-utils
 
@@ -34,7 +34,6 @@ IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="dev-lang/perl:0
-	>=dev-util/cmake-3.16
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	kde? ( kde-frameworks/extra-cmake-modules:5 )
@@ -71,8 +70,7 @@ DEPEND="dev-qt/qtcore:5
 		media-libs/libogg
 		media-libs/libtheora
 		media-libs/libvorbis
-	)
-"
+	)"
 RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index af62521cb796..f89c73d76ba7 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
 	<maintainer type="person" proxied="proxy">
-		<email>floppym@gentoo.org</email>
-		<name>Mike Gilbert</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<use>
 		<flag name="dcc-video">Support video connections over DCC protocol</flag>
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index f989e4576331..cb0fe38c7805 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,7 +1,4 @@
-DIST polari-3.36.3.tar.xz 1030640 BLAKE2B 72cee290c21cd0a1f96d25e02993dadba14247bb3b38d2ce62ebbe8670a9c7498e7dd123bef2ab3ffaea78019109697186cee409dd78a554afbbc5b5c4db56b5 SHA512 dcf8018ffdaffe2867ab7c3bbc1c874090df0ff5435ec16746780ae081dc61a0b7ec0e58d706b6e7eb8957b1f3fe9c24b586db831ab8b0565fa05c1bf3adae38
-DIST polari-3.38.1.tar.xz 1050280 BLAKE2B 7c1e640a62003bda2217d914f9f19d6eea3994f780785334fd681c792653aa3ef1b4e3e4bc05d7bb15a614cc70e317f8e8a55445fe6e03c249f66b6b3e97af3d SHA512 196fd58324e1ee24eb58efcf9e11b9bec1cfd11781cba5d09b34344b7d3715f9bc215c7a3ec3b021ac5e1d2575a8200d8ab896b201488bf7da2acb10beb04262
+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
-EBUILD polari-3.36.3.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a
-EBUILD polari-3.38.1.ebuild 1066 BLAKE2B d9445e6b750a1d794efaa5e0a3f655fdf46040f9dc8aae0cbf98c8feba3afc54663838c22027e65a2056dfb66d10b65f0b3d922c38bd8abd0399c7a8715c00a1 SHA512 e5d49b48436e9fb4b452f838bc53eaf248ffc71061272d63c866abfad21bc5e7d550f300746d755bf6ee70b3e3d8a33609f13378b5f5d99a098e86627349a84c
-EBUILD polari-40.0.ebuild 1126 BLAKE2B 40dab0e2731c190c41ebfe338f961589f65ca7ccaf4467dafc74968b94f4459abfce804c36ebbd4dc8159e37c0c9578dee014e1fef5daec465cc97bcd7ba21c6 SHA512 bcd855e5f444f2b4e80267be0db8c65678a758af6196030f15ebd4d402aa85a1e551c79b3b49f98df177bed847393864452e004c3224c29cd9a594d186d149a5
+EBUILD polari-40.0.ebuild 1194 BLAKE2B 7ddf02126d2757b26591715a4658e08ce8ebd36df7529faebe58bd9f1ca0be01e64a9932917b07b8c03ca2be5dceb70c7e6e3b99a077f3db7802908394e437a0 SHA512 78c8ca4908a5cb9750dab715479b67c0d2603e7a0bd8c2d5e30329009ffed2808025d8ea94ced850d828e2ec69f884f0ebf8a9b222038538ecb013386d834e2b
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-irc/polari/files/40.0-fix-build-with-meson-0.61.1.patch b/net-irc/polari/files/40.0-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..2decad2dc23f
--- /dev/null
+++ b/net-irc/polari/files/40.0-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,45 @@
+https://gitlab.gnome.org/GNOME/polari/-/commit/0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d
+https://bugs.gentoo.org/831922
+
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:32:00 +0000
+Subject: [PATCH] meson: Drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+
+Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
+---
+ data/appdata/meson.build | 2 +-
+ data/meson.build         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 88b4a0be..781ba22f 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,5 +1,5 @@
+ appdata_name = app_id + '.appdata.xml'
+-appdata = i18n.merge_file(appdata_name,
++appdata = i18n.merge_file(
+   input: appdata_name + '.in',
+   output: appdata_name,
+   po_dir: '../../po',
+diff --git a/data/meson.build b/data/meson.build
+index cedfd57b..655ae700 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('appdata')
+ subdir('icons')
+ 
+ desktop_filename = app_id + '.desktop'
+-desktop_file = i18n.merge_file(desktop_filename,
++desktop_file = i18n.merge_file(
+   input: desktop_filename + '.in',
+   output: desktop_filename,
+   po_dir: '../po',
+-- 
+GitLab
+
diff --git a/net-irc/polari/polari-3.36.3.ebuild b/net-irc/polari/polari-3.36.3.ebuild
deleted file mode 100644
index dad3791fcd02..000000000000
--- a/net-irc/polari/polari-3.36.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="An IRC client for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.21.6:3[introspection]
-	net-libs/telepathy-glib[introspection]
-	>=dev-libs/gobject-introspection-1.50:=
-	>=dev-libs/gjs-1.57.3
-
-	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-lang/spidermonkey:60 )
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-irc/polari/polari-3.38.1.ebuild b/net-irc/polari/polari-3.38.1.ebuild
deleted file mode 100644
index 3fb6c5d6fffc..000000000000
--- a/net-irc/polari/polari-3.38.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="An IRC client for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.21.6:3[introspection]
-	net-libs/telepathy-glib[introspection]
-	>=dev-libs/gobject-introspection-1.50:=
-	>=dev-libs/gjs-1.57.3
-
-	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-lang/spidermonkey:78 )
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-irc/polari/polari-40.0.ebuild b/net-irc/polari/polari-40.0.ebuild
index 05f24422d4b5..fca653dc7065 100644
--- a/net-irc/polari/polari-40.0.ebuild
+++ b/net-irc/polari/polari-40.0.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=7
@@ -43,6 +43,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 7cbc6aa21d52..a74e59ee8fa4 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -9,5 +9,5 @@ AUX psybnc.conf 313 BLAKE2B c56022b42942b100479b6c539e9da85178db679b6596fc2b4162
 AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f0e686b504c2caf980c5a97864fac86a251431126c5a0338bb50a8eba9d3976156cf1eaf1b7681 SHA512 e58704dec299271d9a450eb243d0af1323aca58d555b61fc3aa899324a6bdc9aa82afc0597c190dc07c278f22c7cb448592a271e9ee6e4aa3552518ce6254753
 AUX psybnc.initd 898 BLAKE2B 7be60ef0dda81cb917e23e06e3fec88af952d71c2eef4255c316baf5a218e8bdc2d8d8bc4eb353ab7c19a697e97685441ec2a0c3503e4f22adf0d55c9a895e13 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd
 DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
-EBUILD psybnc-2.3.2.9-r4.ebuild 4625 BLAKE2B 2571a726868eb83cce5f8bc571c30337c0ed34b4901401cc7cb285a444532a01013e5d985b357f5be46f62c9360506a5c0149d64d01e801a1863083cf846f912 SHA512 e2517c73bf434eaa1a826f2665ebb9f3748d6da4eb7ffd52c10296ebb6354e8669d9c6e26c51cb6cc1a15e80a3175fbceab72cc558bb26e1e5d5e8d5ca64626d
+EBUILD psybnc-2.3.2.9-r4.ebuild 4649 BLAKE2B 851a1637104a77a1de206b12f3efbdb89d2884856003a792ca906a7c7441cb81a462afb649f723cb88b698f5f7cbd8ee7de23a0406c9a65e30f570ec93bdf332 SHA512 f4fcc6f4b22fe4539d7e54edc930171e86da1d91eead652296e5c280d4718b8bce456aeadc379efb4697b69978ee6e2b19d5af8b2dd1dad67d4565c88e7725a4
 MISC metadata.xml 361 BLAKE2B 66e3ce95043d6691e73a6e5efc2637e0f0d0e6638e034fe7687ba67f9e5c40c6e416ae020e1508e9d0f9636c5e833aa364051bacedb15ad3ca9f48cd726854d1 SHA512 75103320e23878d078c05c1a763aa2526ed79a7cf953f3f3c2a272e7d215b5ba95dcc60581186ac73db07a2891abe9ab4e82d906f4e2494e63004ce435a8f9e8
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
index eaa17997c338..001c32520db9 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r4.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=7
@@ -84,8 +84,8 @@ src_install() {
 	doins "${FILESDIR}"/psybnc.conf
 
 	keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
-	dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
-	dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
+	dosym ../../../usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
+	dosym ../../../usr/share/psybnc/help "${PSYBNC_HOME}"/help
 
 	fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf
 	fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
@@ -93,7 +93,7 @@ src_install() {
 
 	if use ssl; then
 		keepdir /etc/psybnc/ssl
-		dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
+		dosym ../../../etc/psybnc/ssl "${PSYBNC_HOME}"/key
 	else
 		# Drop SSL listener from psybnc.conf
 		sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf || die
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index b1cc2db59e7b..bc6b7756e99a 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -3,8 +3,11 @@ AUX unrealircd.confd-r4 1458 BLAKE2B d7687443262931323142a4b14a484988386610f610f
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 AUX unrealircd.initd-r3 2024 BLAKE2B d4774cf73b96382a5576153c93db918663089aa99a22568ff906a22ce37e619fea1b357bb28a98c290cf72d67f7875e7f8e4b1f7fc27b2b6aa3d88cadc7562f0 SHA512 cf1a5797498f47164ba48e55e108aa24ded262029d53649cc3e19238ca9985754d6d7567b77f4ef8f34b88007e06d15f24a9b5c277389d9b110c2cb7268a367c
 AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8dfc3e9eab968008ad681a8b9f353bff4951bba8023d5c04affda6b58fde5db8232d0f1f9ae3e470424f0 SHA512 99163776104f2f27a585332004221fac16a9fbf9c8930b0603b5f33aca4c5ac13bdded4d5917143796b3893a19d2f709b0c4d4d635d85bd681f643b3b59131f5
+AUX unrealircd.tmpfiles 45 BLAKE2B 302201c42d7ebc272dfabfe36b49d583ce18c3d10d7348763a710ac7a3bb853a8c5b4d1cb2444773f128eb988d6d95e73617ceb5742a14da61096a8eaed8705c SHA512 4812c3c509461085665dcfdd38a082eed2aba9b5c175cc28f893ae42d8a00f72c3cfcd5195c6224667284df4ee58274e2a782dcfc6b5a9cb8ce9d323961fa6cd
 DIST unrealircd-5.2.2.tar.gz 7192024 BLAKE2B aa700c943cbab1dcc751e32c6cc0608cd27936b0910bbc62987dd2fe87ee5261e7a5eb2aa67dd77ed5ecb39d1d4f149c8810159e2c6f752ee65ce34e46548f60 SHA512 9d36eb1567431bc4a5420bc830bfc8dc89daa08ed1746efd6102e5ef161f67baf52e75e373454df7df6a443c4f575fb300d3c289d4dd99239a6de7d2b2a555a0
-DIST unrealircd-5.2.3.tar.gz 7200834 BLAKE2B af15b97219d5552a8fe6ecd77b4d0d0b8bcbe8c2f65ab531a7322471c05af3001000cc3799db68291b9abe8c3a5ea7d04559f858774d1b12a764a20fb4ab2bd0 SHA512 c92c631340cb81b030006646a047fde4ee738edc8362870ba4eb979133d851806c7d4764848a35cbd48c787708eab9f051f257008798a494673d9986d16b2405
+DIST unrealircd-5.2.4.tar.gz 7201203 BLAKE2B 06afc8b5e28bbd56971b2ce21da3e000e39366444472786891bfe000754f5fed37b59850f9539b4f01914d6b33c1f9f17a15fe69569620ba5213f39fce1cfcad SHA512 b6784d011bc56b0b8253d61fb1edddb2133e791e9ce4ae978f90059563d11f3f7b3ebca1cf13765b4077ebc39f0699e101bdfc71cbb0c5cf51d508c5a5fdacb3
+DIST unrealircd-6.0.2.tar.gz 8672255 BLAKE2B d52f2984f32331c489528b429f4671189713e4e308a7a7fd2f70933bfd606a938a9b6a6e581170b41fa9a948d1cc04c0cd8bb90c595c01c39b473cf341494a27 SHA512 041f97ad82d89222ad49bdc7db83869fc5133a049dd5354c34759c33c16307b9d60c25d3ef4e19a549059e3a0030699d061bd03fa8118428ded1f1e79d483398
 EBUILD unrealircd-5.2.2.ebuild 5268 BLAKE2B e5fb4bd6ed46fc0c99ce094ad089471e37e6d9f4f3c22e594de6426c8d75d656339240725a9c5c156aeaf43dee1f1b07469a3933871a41d5ae0393f77a25dc07 SHA512 122cbe8285642c2ca079c5317fa0093f55d94ae559c60d66e2ab78e8f3830b6ae9462e535faed45a078724945a0ccf250c0d59abcf82ee9e4c0ea13d3fb7d543
-EBUILD unrealircd-5.2.3.ebuild 5276 BLAKE2B 2ff18079f9874a922b14d45b3d7caa1954bc8be0f29b56c75c396097f0f2c79acdba23072ce892426a956122bacc2760734ea2fbb1167bbe5423579958a727fc SHA512 53870177150b00d90a5f760d428f772e4d5e2b5cdc433d910efa2a016b8e68294a3b19d1b3d20277b9aa5bae07212026299fceb1969c103a1365d0a6db2657fd
+EBUILD unrealircd-5.2.4.ebuild 5276 BLAKE2B cbc80b73548186d18b53a354ee2aefe57de3865d7c564251e6af57f78554c3e03b86e5c2b543e9c86dee7e9e68c20f043ae1d9bf305e1c992a3f8fff0504348e SHA512 be10142c437c11fd66ebc257a792d2151062f49792f2de942a338a5e156d018e726863338495fa917eb915719683910f80ec98f1170702e56f390575d6948bfd
+EBUILD unrealircd-6.0.2.ebuild 5637 BLAKE2B 3895805954430f2ba0438e503699a84eda29bdafc3153231956c4f0498b1837749a5103ad7fe10d0048dbe338202b45961be933cb6449bf1367f6bcb64645cf2 SHA512 025e38d2e8b891d6c4d4a349ffbd2bd650ebd3f6737748d28a3ccf29026239d3611949699a49ebb56c74fc67799a58bf1b2009a4337afa42e5d9e284f996b246
 MISC metadata.xml 860 BLAKE2B 198191ef6f7cc07fede5439075736be578f72cc5e76e47eaa8c6ffc7e60af0ed57b1e00d43539487b99d094ab2d79f5d1797d870f80fd5eec4bddfff4ad54849 SHA512 8dd95561f5d8e9eda8ef236b1580f76a9cb182e0c1c97926fe146e3f2240101dc71a44696229de51307b898bc9cc95a2e52fd4149110557006af7aefd25f4850
diff --git a/net-irc/unrealircd/files/unrealircd.tmpfiles b/net-irc/unrealircd/files/unrealircd.tmpfiles
new file mode 100644
index 000000000000..37afe71d1d30
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.tmpfiles
@@ -0,0 +1,2 @@
+d /run/unrealircd 755 unrealircd unrealircd
+
diff --git a/net-irc/unrealircd/unrealircd-5.2.3.ebuild b/net-irc/unrealircd/unrealircd-5.2.4.ebuild
index cf63b49a2637..8c1dd56eddc6 100644
--- a/net-irc/unrealircd/unrealircd-5.2.3.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.2.4.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=7
diff --git a/net-irc/unrealircd/unrealircd-6.0.2.ebuild b/net-irc/unrealircd/unrealircd-6.0.2.ebuild
new file mode 100644
index 000000000000..275c8a7ffa4b
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-6.0.2.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."
+}