gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /net-irc
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
56 files changed, 679 insertions, 543 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index b2b1e72c5ed2..408f3f271dfb 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index e63e3cf477a7..7aa3e422da92 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -3,5 +3,5 @@ AUX anope-2.0.7-example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519
 AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
 DIST anope-2.0.10.tar.gz 1809378 BLAKE2B d10323ace767aff19194f7cff353aecbced6122ef72d379d050c8dab3c7013adf6b3e649ffd95edc03bc8ca4873f60ad84991ef0f5c9c454b27ec0eda29edc6d SHA512 2a0e4f14a275a6b986fd224449dddd66584de92509770311262076bd659ba0bbd6e2726fc7a22a6edef57ade5268756ac0c56e6f220fb953ed83e72017d1c67b
-EBUILD anope-2.0.10.ebuild 4189 BLAKE2B 0f6ea198e7308e0c49c5f2da54143f24179cd64f9260620a744a54f958f369a417d7be648ffe4c564b3d46b9a910ff3c985642f8b7c2abb720b36f7a787cd79c SHA512 b37e77c19f794602f0ef47fc06a5e58b20f51506612d987a453524912d88af1c418c394a315f2ae48aa1f56bd7d0134d467505d89098b6ad5fd0cdd9727c4ebc
+EBUILD anope-2.0.10.ebuild 4188 BLAKE2B 956333d4914bbed5860cceb2db1336e93fcddd8e49dcd886a9d05ba0f12c2c66a899491d9487a736d983c292833c6794d5adaee798c2b3447a3a3843e7435ef8 SHA512 7bc7ba49301f04eb1a58c964ef652121a128d954a7a3a15d3ce9213c43b53fe22b379e15dccac845717809eb8bd6dd376bfdb7f99ffbba098a4d1687658b5bd8
 MISC metadata.xml 902 BLAKE2B 4208986846c1165a25f7461e3c996107c1d178827f2d5e8d5ab6d4f6970182b42fb130ed976de90027368bd3d845dcadab00df0b430e404333db0f9d538af0f5 SHA512 8be8f6dc110e8943af544916bcae9fb71f74b40d8930c6496a257e386336b18da16c2cf83f2253e0ac925c9884d4e63bf2995ab907d2e8f1b792809f66b3bdd6
diff --git a/net-irc/anope/anope-2.0.10.ebuild b/net-irc/anope/anope-2.0.10.ebuild
index 0c847fd54a22..cccfac4907f2 100644
--- a/net-irc/anope/anope-2.0.10.ebuild
+++ b/net-irc/anope/anope-2.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
 REQUIRED_USE="sql? ( || ( mysql sqlite ) )"
 
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 9d3581c60bf8..9d3d63b76242 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,7 +1,6 @@
 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
+EBUILD atheme-services-7.2.12-r1.ebuild 2213 BLAKE2B b76bbdb7487ba2ccc7765ee0fa5d2069585e5c3cf5f52b42d874c8159bd982a806c64fb245ffb0dc9fe34cdf67fda9dfad926b7ec094d51b840da8b7eec65572 SHA512 7b11129c242e1339e7fa0b09607c4822f714476d97d2e6173b268bfd63310dd0d07485fa651e479602ebe0ebd3361b7e59d11ebd15f906e7a81c1c690239b4c4
+EBUILD atheme-services-7.2.12.ebuild 2225 BLAKE2B 378bcc1989a2b701789c7a8b000d28afb929dfb7973a5801552573a6f303b299dcdaee81b738a27053eab8ce5f825ac20941266dcb8958d070fb3802a3786430 SHA512 e7daaf7757513703282ab13620e2a32b7538cbfd385affbfcb8d052be3f85538a2d6ea611719fc788570ba35101d4580f4e836619bc3655d92792796fdf1b655
 MISC metadata.xml 752 BLAKE2B 366887fdc8b7642cedc5c853c8337d4a86331bd7b6c17e753996f725cdecccc3f87f547afb0bda1d60571f4eeea832f151876b15366ef00e464bf1eef835af77 SHA512 3aa34340f6bff8fbf0f513d4d4a94abe8e8c2a3129c69959098f4333e6a150163b43f9ff7627e79b93dab98c3665a9552981126b6e2f3632a24b707221bc4e4c
diff --git a/net-irc/atheme-services/atheme-services-7.2.11-r1.ebuild b/net-irc/atheme-services/atheme-services-7.2.12-r1.ebuild
index dc7e351945f6..3604b77d858b 100644
--- a/net-irc/atheme-services/atheme-services-7.2.11-r1.ebuild
+++ b/net-irc/atheme-services/atheme-services-7.2.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic perl-functions
+inherit perl-functions
 
 DESCRIPTION="A portable and secure set of open-source and modular IRC services"
 HOMEPAGE="https://github.com/atheme/atheme"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atheme/atheme/releases/download/v${PV}/${PN}-v${PV}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
 S="${WORKDIR}/${PN}-v${PV}"
 
diff --git a/net-irc/atheme-services/atheme-services-7.2.12.ebuild b/net-irc/atheme-services/atheme-services-7.2.12.ebuild
index f041e74b36bc..4388ab319e07 100644
--- a/net-irc/atheme-services/atheme-services-7.2.12.ebuild
+++ b/net-irc/atheme-services/atheme-services-7.2.12.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"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
 S="${WORKDIR}/${PN}-v${PV}"
 
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 1fba9481933b..9066097eed55 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -2,9 +2,9 @@ AUX eggdrop-1.8.4-fix-array-bounds-warning.patch 864 BLAKE2B d35686e21c7a531b25b
 AUX eggdrop-1.8.4-respect-ldflags.patch 1316 BLAKE2B 43c0ca341a328f08fe8beb735c678bcf0c8fd547acbc7c1614995d5fc75261924cb435b0c0fc4d9f94c2fee3781aba407f3cb09e26958d1e09e1338e7e1781fb SHA512 f0d7c699d648f4a89d622f3f2238b967cae7ff139f25390853b195efd3a76c74af80389c20fcd2c1203fc33d006e7e27d9bdfcab4772c7a688fce7d0649d28be
 AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715
 DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49
-DIST eggdrop-1.9.0.tar.gz 2206230 BLAKE2B 1c6c5c77558323ae80b4f486f30d106b2f336c61c50adc10302657c2878a755b48d8286ba70f662b6be132ffd569de5eb269cfca1e6e42675b007de43ccf4746 SHA512 e78e220c8207361c6d7bda06be6d0094d747809ff8554fed2ce4a5fb63df1d87f8b82a98d4f0b98909042af8f6719f4a7bf548f864d3d6dfa8caa57b346d32dc
 DIST eggdrop-1.9.1.tar.gz 2271120 BLAKE2B 73fadeddcebeba5de42328f6f02c05e850e47c19812bc1a868da09f55fd1d297e3596c5a4b167806237554966e7dfbebadcee6215932c56a76b3e67a77d5ee47 SHA512 d8907d265f7e22f3bcd3e28b256c5788d5959ad11cc1425d59eb4411ebbc172fe8d90c31fd9f033369ab80cd29a36a5856f6bd32bc6c9cdfedea1d6509ea7f3b
+DIST eggdrop-1.9.2.tar.gz 2296300 BLAKE2B ed409896718e45daab2b21c25e7f1a5a2664ef8afec7127943abb3018ce963413e714618ee730ef2c49e4542c6e87377cff405ee36ce91448335adf6c7ab5a8a SHA512 67c8053a79ab5c4c418164e4e12f89a6e111b06b4e6dfdc69c52913b2f3b9a58b065a7601165112071c9ca2a778269aeb95c749a9da787c1932e6471a23146ce
 EBUILD eggdrop-1.8.4-r1.ebuild 1604 BLAKE2B 021484a3fd61e38f6dc68f4d17054935590255a05cfba9b69e912a44e90ed9fee806416c0d1b7b6953bbb4558b4ad20b2cc67ab8d5affdd91281330d919fd94c SHA512 2be5f820597450688778c9f2ae1a999f1be85dfc105ee80d66d6d182f55df32c2d6514dd4196aeec5459b3b85bad504aac4ef14369b92fbdc2f086ce61a97bbe
-EBUILD eggdrop-1.9.0.ebuild 1458 BLAKE2B 7c9160373af31b1d9a03db59ba46b568fae83c7eca3d5f4cdaecd9bd7b65f7d2a5dee8fe19afd1f93b9035349d5b222640b6dd4dbba27a99ef921ab1e2bc4953 SHA512 2ab3ecf6f61e109fdda976b3373da8255d7998f693eb8aca98bd2e251d58457de43224c52411176953afe45fe2f1888e9c07f7ba89a3adebc11804db549356c4
-EBUILD eggdrop-1.9.1.ebuild 1465 BLAKE2B 0d8cdd268427548ac3751b1e87d7ecc2aef96b1a22acf6941874b4e19088332053aac1dc3f61556d892e3a800f9c077a659e74b2e2cda340692d19df1c1155ac SHA512 d15c22fbdeeccd6882497a813fc28849e897c43fe3e79cf17fd0601150a5c9df1eac25e0c53bd4b509d0d8e7279036d9afbb5b20145a385b425cf679aaa5308f
+EBUILD eggdrop-1.9.1.ebuild 1461 BLAKE2B de6dce1137ff3c735085233198bedc86587c9f1aee7b5f34e5599e988a0a389efae04433fee85b327ed61b7ab8bab5990833421fd14cb2b4925c817ed6cc81af SHA512 25331e586565fe7a7ca21e3201c9f21ead9e5e24700ab81547deee10fcb16990b34664e6b5d0008cbf7248782f8da918ab6ddfc4dc2d1fabd1f06e5559878087
+EBUILD eggdrop-1.9.2.ebuild 1465 BLAKE2B 26a777f636c80fe908edc93a7595ce2b4d4bb36a4328f9285ffb6f2d5ee18d2283ac622809678a754ac258bea6725af56c8232b3f8705188b366a62186f9b7fd SHA512 a308c437359018a1a383f1082d8268241b2e03d385c154d9e90d74aac36e932e922b3981cb399dbe93acd85de7d7503ca35cdecb85f23f641325f235463a0169
 MISC metadata.xml 391 BLAKE2B 0d25698de67e0c9276e04b4de933fd3f2d4ac74915074e11f034392debff1c120b038525cd32b9d02f7ad27418617230add5558b7fe2a9069b94918830bcb219 SHA512 729cd651c3516681bce295292e513a47c178e4ea3893bc083a8d96fcfe969fd8da96fc3347e37591d31a5fe03fb2dbef52e1599950833933622976f78492d293
diff --git a/net-irc/eggdrop/eggdrop-1.9.1.ebuild b/net-irc/eggdrop/eggdrop-1.9.1.ebuild
index f76cbee2176d..c1c361570d65 100644
--- a/net-irc/eggdrop/eggdrop-1.9.1.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.9.1.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.eggheads.org/"
 SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~riscv sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
diff --git a/net-irc/eggdrop/eggdrop-1.9.0.ebuild b/net-irc/eggdrop/eggdrop-1.9.2.ebuild
index 5d6de0a857df..31868072cbc1 100644
--- a/net-irc/eggdrop/eggdrop-1.9.0.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.9.2.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.eggheads.org/"
 SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~riscv ~sparc ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 128ebc48a39a..5683e10549e4 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,4 +1,4 @@
 AUX epic5-2.0.1-openssl-1.1.patch 2817 BLAKE2B f3ed4fa602b174f41700fdf5fcddb8a20626637fb5e416b82fd1e1216a846987a3afcf3fffd73317a6e2090e49b0fe3b1777ee4e870f597ca981be078c4e3c0e SHA512 af1f822f1660bc7528beef26b991a69896d0e94005aacd412256a5f8789024bfba6eec169d2115c626a70c0e89cc6625999c7b939390742aef932f1020e4fdad
 DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25
-EBUILD epic5-2.0.1-r1.ebuild 1579 BLAKE2B 6c1dc3060494a5e747e43460c67b29a490214a12775b5f874a886d8cf1b1dbf67989ebd0ba8d41e7df464cc896fc1bae0d72110f2117074c7879254fc4804c7a SHA512 e15c83bb1d142d8c161ed68fb15525cdbc94bc45be3fe2b0dbd988ab9d80a5ca9cd09df3f1e88f3f0ebcc1f2444a653066617bf91ef631b9416c96f552f58048
+EBUILD epic5-2.0.1-r1.ebuild 1569 BLAKE2B 2aed4950b1217fc0592574ded6797d988f7d92b24f62e24effe6c6d25c56c27fd6001731266c655ad16f7b306fa720f0fa3f755b4d844b36a251d1d4eafe26c8 SHA512 b13887904a436678f4259bd25ec9f68610b1b5ae5973482cd022a97a2ccf3cc4cf15f46e36c333829bf3932de53e487d5383e33365e9501dcfb3b6877bc52348
 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
index 41846f2258af..df6800edb35e 100644
--- a/net-irc/epic5/epic5-2.0.1-r1.ebuild
+++ b/net-irc/epic5/epic5-2.0.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit autotools ruby-single
+inherit ruby-single
 
 DESCRIPTION="Epic5 IRC Client"
 SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.xz"
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index f55325c3d9c4..600666608226 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,7 +1,8 @@
 AUX ergo.confd 92 BLAKE2B 02dd8cc089593bb207268c1f91e106b2e78b5aba92774cf7b0ee0b38a09c55db409fce72517965f1929d26bdafbe1b9d781708500b286c05f7e161819c177c86 SHA512 3908e273045e5d94f358913e669bf2802a82306ce8eabffa6b7b6e5f022f2fe069a577c69c4070ddf61ec85287b2bca362a02585ecdb779cba4435750de5c5b2
+AUX ergo.confd-r1 115 BLAKE2B 3a01f49ee095b213507774a40aeee26f4a9b3b875fc00edd466b4fcace701a84fe941313ceabe2c58e4d2da08caa86f3e38a330a90091bc76279d34ed759c467 SHA512 8895c2f87cdbff207cbdf17f93140c97df23bea3f3b0759ddd2dc9fc582ecea26852e5ad3b71fa59c3182592ff2cf49edc8f8029014c22f1a42ceda0369f8bf7
 AUX ergo.initd 382 BLAKE2B 916ef2bc1371e4f62328b22f4072d5c2a39249bfa53e59d6e8877d2ad8a92ed333dae806d65269a343351a93f5d995383c01f65291cc2f24db0ebba0e4fb24f1 SHA512 0b2c1cc5e12458e02efd7e5a6e80f301ce96163c68f1e7e5311dded5c6c99b5ea4a9d707c2f549b56ee77fa4b5758a4d66ce78602011bc30a8ef48d762bd5de4
-DIST ergo-2.8.0.tar.gz 3150109 BLAKE2B 07b725e9db49f101544a7f7cbbb197c77187f35c59e07055ff46a6ffb0a62cb250915c36209fce453e3158000f8b0eeb16189303b5dc78fda3daf6c2e8a35b28 SHA512 4f3c33286be91cf12cf6cc6b56598bf6adf60c88cd22290d3221457e4d08d7957b1922a18b151726a341825a65168daf1174c622c54268c5aa744ed9c9a0326b
+AUX ergo.initd-r1 768 BLAKE2B 2d14e467e05131b7e17d8ba03d9ed0c19c3dbf291b9175ad1964ce58611661ed27c7dbcf2bb218b4844c1f871b47d9dfe52df53ba9376a3ee69b584fa9a5647f SHA512 4ab75831cdb58b56afc94f1e9ed9ca23d6f23b650141d54c08be2ee26516e010ab9aef47b891150df465962fd9728bfdf34ec0b9b9b4fb32b9a0a47f1df18576
 DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349 SHA512 5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a
-EBUILD ergo-2.8.0.ebuild 1497 BLAKE2B 76a7e0043b50b1d9d7504eb560164bfb77193aa903db01bb9bd8ba90e82ac78e1091ca942e167cfacb88b11365ba0e1f37d649143b205e5e5c98ad21ea0f1204 SHA512 f545f00d43e7548f6696764592267120d2e7ceb5dc24dbdb4f9bb060f290256b61a4ec7415f1477c68102bf5babf1cd1bc497172d4d1107b5fc1b16e04ffce5b
+EBUILD ergo-2.9.1-r1.ebuild 1606 BLAKE2B 3cd469222058debbe4ff7defc0f743944e9112b88aa4044b4749dc57644513a0da232d1aa365580d1a8da8ed3324f680c006907c3ff29a14a987eeae28e2625f SHA512 80a51068e6e2ef2606b1db92979464f91da26ae3083cc6d9f081d4e643a7d63c42d9df55b264ed604fa411ac0d8cfb392674d409311e441bbd2c73406562e563
 EBUILD ergo-2.9.1.ebuild 1499 BLAKE2B ae51cc22d1a6f2c9996ec8e17e2c5a624764cdaaecbf7413257f39b52ac0ff8e91a929ee93f81889ee8ccd87afb500a3d6915543ce4e72014fb01511ce81517a SHA512 67034caddae3e7b84ed44700a0cc4d47d2307a35f5aa73a7f7b63d872c93e1652a4e3321830d4b392394b43f577c4e3e44a88ec068bb8b6df80813a9b9f736c8
 MISC metadata.xml 320 BLAKE2B 3bff5defc5150caa0cae2776e69f9070d1896c9cab8e5e0fc1afb94606a1c0e0d3ab951b4ea1076929221bcfd0576540f1b1768c1f9d3ad68161d9540c6785e3 SHA512 b634cbc9628c66cfc5b2983a6da5b2322bfb5c755893e1c15aab203f6e94b15ea5be2494b0370e8b7fd4950d0d1059e60939bd945620aa0548ef665263a5672a
diff --git a/net-irc/ergo/ergo-2.8.0.ebuild b/net-irc/ergo/ergo-2.9.1-r1.ebuild
index edff5c53fda6..1b189203c307 100644
--- a/net-irc/ergo/ergo-2.8.0.ebuild
+++ b/net-irc/ergo/ergo-2.9.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit go-module systemd
 
@@ -11,17 +11,12 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64"
 
-# No test files are included in release tarballs
-# We may even want to package irctest
-RESTRICT="test"
+# We may even want to package irctest in future?
 
-BDEPEND=">=dev-lang/go-1.14"
-RDEPEND="
-	acct-user/oragono
-	acct-group/oragono
-"
+RDEPEND="acct-user/oragono
+	acct-group/oragono"
 
 DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
 
@@ -38,7 +33,7 @@ src_prepare() {
 }
 
 src_compile() {
-	go build -mod=vendor . || die
+	go build . || die
 }
 
 src_install() {
@@ -49,8 +44,13 @@ src_install() {
 	insinto /etc/ergo
 	doins default.yaml
 
-	newinitd "${FILESDIR}"/ergo.initd ergo
-	newconfd "${FILESDIR}"/ergo.confd ergo
+	# Swap back in next release?
+	# Forked locally for https://github.com/ergochat/ergo/issues/1914 changes
+	#newinitd distrib/openrc/ergo.initd ergo
+	#newconfd distrib/openrc/ergo.confd ergo
+
+	newinitd "${FILESDIR}"/ergo.initd-r1 ergo
+	newconfd "${FILESDIR}"/ergo.confd-r1 ergo
 
 	keepdir /var/lib/ergo
 	fowners oragono:oragono /var/lib/ergo
diff --git a/net-irc/ergo/files/ergo.confd-r1 b/net-irc/ergo/files/ergo.confd-r1
new file mode 100644
index 000000000000..71f4585060e5
--- /dev/null
+++ b/net-irc/ergo/files/ergo.confd-r1
@@ -0,0 +1,3 @@
+# /etc/conf.d/ergo: config file for /etc/init.d/ergo
+ERGO_CONFIGFILE="/etc/ergo/ircd.yaml"
+ERGO_USERNAME="oragono"
diff --git a/net-irc/ergo/files/ergo.initd-r1 b/net-irc/ergo/files/ergo.initd-r1
new file mode 100644
index 000000000000..8bd1aba2b230
--- /dev/null
+++ b/net-irc/ergo/files/ergo.initd-r1
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+name=${RC_SVCNAME}
+description="ergo IRC daemon"
+
+command=/usr/bin/ergo
+command_args="run --conf ${ERGO_CONFIGFILE:-'/etc/ergo/ircd.yaml'}"
+command_user=${ERGO_USERNAME:-ergo}
+command_background=true
+
+pidfile=/var/run/${RC_SVCNAME}.pid
+
+output_log="/var/log/${RC_SVCNAME}.out"
+error_log="/var/log/${RC_SVCNAME}.err"
+# --wait: to wait 1 second after launching to see if it survived startup
+start_stop_daemon_args="--wait 1000"
+
+extra_started_commands="reload"
+
+depend() {
+	use dns
+	provide ircd
+}
+
+start_pre() {
+	checkpath --owner ${command_user}:${command_user} --mode 0640 --file /var/log/${RC_SVCNAME}.out /var/log/${RC_SVCNAME}.err
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 6125fb33a9a6..3d62de421a05 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,9 +1,11 @@
 AUX hexchat-2.14.3-python38.patch 1005 BLAKE2B 150783fae40e10aa32fdbf42aa5d1f70eefa69c6ea0a5fc7a0fbb243c1ad65bbc8d3fa1bbfcef530e366cf23d1905e70a7692208d06fc6feb0d24228888b17c7 SHA512 877da47f35d5c743429fc8c84768e70135d04573e7aed72e9f6e09062d619a8d4ed717930801a524bd81848f1a393919c1d8ae041899b07d9337e3fd7426a003
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
 DIST hexchat-2.16.0.tar.xz 1348320 BLAKE2B d5c6da74152e7ca08b629ee86cc45acb8232fbdad3d508cf56aba0c09d558b77644b704b5489e5f08a70133813f37c12e45b1529162e41b62acc9f61bca0b108 SHA512 4802f6efe0883f48d3d56ee949be1fc224b76a3c76956dcba3f913679e91424ba53c5c0d68bb4e0e790b16a08689111098958ead4c83c35cddf39855fe07c207
+DIST hexchat-2.16.1.tar.xz 1349536 BLAKE2B 6e1d9f7c36affc94356e0124ea445f019d8f00b643896ec004af17059befadfcd8fc1b75ef9fba277542dcf8593e8e4683a709a4c4cbaaaf4f3122d8488dc6ce SHA512 9e6baa30ec8c3ce4fb56e2c82625da63295040eaf93a542aec8a4a18a6a3c95d69d1d4ffabc952bcdcd7b754afef234b348f296143991fafd0550342db95ce0e
 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 3027 BLAKE2B 982e4a43c1287f465eab7bf9fac6d3e71fe1efc38006bd9b396eca1cc100cf7004012ba7d47ed30939a1b9b2a37772404003e2e4514bfbef9ba9b606a57c2a29 SHA512 597dfe69eb32fb8f21e2ee9dae86fc754a893f77a3916bd79b56265ccf8c88f75fedac5056a204ff84142cb7e0be39dad686f1049898180b63e44eba30ac236b
-EBUILD hexchat-9999.ebuild 3024 BLAKE2B 5f20620c7a0d893d16c7213a668768a955d5df1e545eba02c53fb80bf8ab5dc6ca8ca7c9ff815b3c390d7462777dd1e1a2c2af4e25a9125fcf7a453e8ed809d7 SHA512 ef339dee122f1b7784a5b507caa499feee16180a3c441b2a7ef1c59b3c083df2b3d70a30721a2abe962d9e63260c7eb07787a245e5646fa98cbe5b0906d08e12
+EBUILD hexchat-2.16.0.ebuild 3061 BLAKE2B aacb1bf2dc9c6bc074c6fdcee811826345ed8698d87054c1c423bf3e41702121ffee87a374f27f7490c79d0430d82eb1bb9664f752db41d37d03680b96fd2ab1 SHA512 fb43071b567c2871e1f7c5a97734b08bb3fe948c596af4dceb300279c6eb7de5ffb5e027533f3adbb5af483c69f892c77debb5cb4fb38b24fffeb9b26da6bc24
+EBUILD hexchat-2.16.1.ebuild 3136 BLAKE2B 0ae9632e82b4e6a459abdb503b54df802855175e50319333b332184bd1e6cb3d24882411db79b2a2cc78a34298dca38832657dc8a85ca5b933c293420eaaf3dd SHA512 9f1c89249fd3cf0eb7a7f67b3ce8c824fb9afcb6c8cd9ceed3edf58e9e67a5ec82d31e871ab126e76f96dfc781bb5f4471a80c1c9c888cda5f657fecde0531eb
+EBUILD hexchat-9999.ebuild 3136 BLAKE2B 0ae9632e82b4e6a459abdb503b54df802855175e50319333b332184bd1e6cb3d24882411db79b2a2cc78a34298dca38832657dc8a85ca5b933c293420eaaf3dd SHA512 9f1c89249fd3cf0eb7a7f67b3ce8c824fb9afcb6c8cd9ceed3edf58e9e67a5ec82d31e871ab126e76f96dfc781bb5f4471a80c1c9c888cda5f657fecde0531eb
 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 c2fe6fdf85ea..4ac16a414855 100644
--- a/net-irc/hexchat/hexchat-2.16.0.ebuild
+++ b/net-irc/hexchat/hexchat-2.16.0.ebuild
@@ -17,13 +17,14 @@ 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 )"
 SLOT="0"
 IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	plugin-fishlim? ( ssl )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -46,7 +47,10 @@ RDEPEND="
 	ssl? ( dev-libs/openssl:0= )
 	theme-manager? (
 		|| (
-			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
+			(
+				dev-lang/mono[minimal]
+				dev-dotnet/libgdiplus
+			)
 			dev-lang/mono[-minimal]
 		)
 	)"
diff --git a/net-irc/hexchat/hexchat-2.16.1.ebuild b/net-irc/hexchat/hexchat-2.16.1.ebuild
new file mode 100644
index 000000000000..06de44ed5d3d
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.16.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit lua-single meson mono-env python-single-r1 xdg
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	# We need to empty SRC_URI or else mono-env breaks the live ebuild
+	SRC_URI=""
+	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"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	plugin-fishlim? ( ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dbus? ( dev-libs/dbus-glib )
+	gtk? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	libcanberra? ( media-libs/libcanberra )
+	lua? ( ${LUA_DEPS} )
+	perl? ( dev-lang/perl:= )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? (
+		${PYTHON_DEPS}
+		virtual/python-cffi
+	)
+	ssl? ( dev-libs/openssl:0= )
+	theme-manager? (
+		|| (
+			(
+				dev-lang/mono[minimal]
+				dev-dotnet/libgdiplus
+			)
+			dev-lang/mono[-minimal]
+		)
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-arch/xz-utils
+	app-text/iso-codes
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddbus-service-use-appid=false
+		-Dinstall-appdata=false
+		-Dplugin=true
+		$(meson_feature dbus)
+		$(meson_feature libcanberra)
+		$(meson_feature ssl tls)
+		$(meson_use gtk gtk-frontend)
+		$(meson_use !gtk text-frontend)
+		$(meson_use theme-manager)
+
+		$(meson_use plugin-checksum with-checksum)
+		$(meson_use plugin-fishlim with-fishlim)
+		-Dwith-lua="$(usex lua "${ELUA}" false)"
+		-Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
+		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
+		$(meson_use plugin-sysinfo with-sysinfo)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc readme.md
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		xdg_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		xdg_pkg_postinst
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	fi
+
+	if use theme-manager ; then
+		elog "Themes are available at:"
+		elog "  https://hexchat.github.io/themes.html"
+	fi
+
+	elog
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		xdg_pkg_postrm
+	fi
+}
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 0184ad5a0be2..06de44ed5d3d 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit lua-single meson mono-env python-single-r1 xdg
 
@@ -13,17 +13,19 @@ HOMEPAGE="https://hexchat.github.io/"
 
 if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
+	# We need to empty SRC_URI or else mono-env breaks the live ebuild
 	SRC_URI=""
 	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 ~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 )"
 SLOT="0"
 IUSE="dbus debug +gtk libcanberra lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	plugin-fishlim? ( ssl )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -46,7 +48,10 @@ RDEPEND="
 	ssl? ( dev-libs/openssl:0= )
 	theme-manager? (
 		|| (
-			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
+			(
+				dev-lang/mono[minimal]
+				dev-dotnet/libgdiplus
+			)
 			dev-lang/mono[-minimal]
 		)
 	)"
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index 71c5f732ed84..a7bb6383b497 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -1,4 +1,6 @@
 DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d9d168d0ebd7de927a478b42a591631f2c193f3816b2a1b39cf79607326b073bcbeefe4291e0fb95f6 SHA512 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
+DIST ii-1.9.tar.gz 12672 BLAKE2B 95da596de00fb311a69b907ab25c0089aafa512085b25fe5753206cdeaa0fec3d9a16eb38d60c68542f7002efd1052e69e1f5542f535363d38760cab508b3d99 SHA512 a665a6d1e1ffe56e370da2d703e677436ef4e18e763bb3cadbbf55e01812454ce4b79e8a20eda23846fdbe5a441ec8c534c9394995b3441472ce8a74c9035279
 EBUILD ii-1.8.ebuild 681 BLAKE2B b91c1438d2126cd64e484fb3bdbbfe2f0733615a234f7a4f4e37767b5eb17568a08f5d95e594dbd5cc3e2d489bca0114e1deb54e1ce24248ec49d3f2708c9084 SHA512 a673a6739c66535c39b458de7816cf3b7eadee202dacf9468fb22d1fae81c6887c260b2347da28d17ffe157d2c4b836945e8f9c2d091c1457d6fdb54ff213aa1
+EBUILD ii-1.9.ebuild 727 BLAKE2B 4bfd64e11730b424a4c0037c35e01af145878dcc5ca2c92dab65f7e8a076465f91602a5effcafbd74876b12f9045715bab65a4721f480fa5db523dbddac6b57d SHA512 b2ca3d7a27b76b280c3124be5a08ba20d407a54530f5621323e862342475abd6f3f02a16651437b789263cc16775e6dbfdf4b0380ee30e2d2da604b32049d99f
 EBUILD ii-9999.ebuild 626 BLAKE2B 2aed56b684403351e4cc87e8dea2869a62ea3bdb0bbb6596a3a36edca3a341fc2a9b71482f626f9bf02bae88bd32b3cab6425f03887a918f4560cbe7970169f1 SHA512 80f87b524ce3ec34f0b6bb85f30ee0f9c5093442b094fc3feb76d2ea21a3e2267113646ee1ee4c9bd1af4b356a3b324bd752ecf9b97ffd9c48bd07488c7bd961
 MISC metadata.xml 399 BLAKE2B befed27e539720bd0181729b2bad9ae3d2a08455842ffc8ffc74e221c0bcce28b9081821d9c4d8963159c729af972ac7719b51f37991964770f60116ba129fce SHA512 783203ecd1b1934c4a52d9588bd449e340d9cfadcc35316e7986a2a144494e0a508a6a91daa9e0551e5b96483a1050fc97ff24cac75e045bd3e70d8011038be3
diff --git a/net-irc/ii/ii-1.9.ebuild b/net-irc/ii/ii-1.9.ebuild
new file mode 100644
index 000000000000..77398ef92d7e
--- /dev/null
+++ b/net-irc/ii/ii-1.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
+HOMEPAGE="https://tools.suckless.org/ii/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+		-e 's|doc|doc/${PF}|' config.mk || die
+
+	sed -i -e 's|(DOCPREFIX)/ii|(DOCPREFIX)|' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		install
+}
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index cf576864b3a6..817b6c781b6a 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,9 +1,6 @@
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
-DIST inspircd-3.11.0-fix-path-builds.patch.bz2 4564 BLAKE2B 5414c6bff651f179bb7f214198d13c08ce1e92b6946729d617a56a2dd451a239520bc946823603b2e3ab0a78577f077c1d566bfa6771d6c9866ef5249269653c SHA512 92feddfa23acac2f1813539f9fae0e1c6c7332565c5d63df02e6f800b4457ed1ac1eff4f3aee8fb155dbae5b6d1d16536b435734549f740ae294382330837d5c
-DIST inspircd-3.11.0.tar.gz 859767 BLAKE2B a0924d302577dcb471e22c0df21b7259c5b68b1ee2080233c31e84bc5cf8c32fbe134a359bf4d7f7541f512e078a9e75717df2dc7178670b3e3d7c7dfb2930b7 SHA512 59a277de041f1b0d44204c36190b6bd728f981997ba377f5bf9b7745fce122271e3df35223ff11d8d31d70f1f378977ea6603963ff2bb1a4fbaac958903b0da3
 DIST inspircd-3.12.0-fix-path-builds.patch.bz2 4570 BLAKE2B 2c2cea615f9e170c249868a60dcf698ba130b33e6e0553bb8c3070698332e643f3d58fc823fe92621e5498c8606b8334afe1536c9772a24f389010a93b72bc09 SHA512 e20171d6c94c163c414c0aa2a02a22ec2de02ec20a00542ada0181abc46e229f7e9d9108b88895a1ad6134b72e3fdab6e80b6c6b33e10b8be73f3a28130c0adb
 DIST inspircd-3.12.0.tar.gz 864630 BLAKE2B eb8fc009347777bdd1e1b119465a6e9f7b6f563c855607905ae256dd0f433d460872d185d2b17ca5033dad7fc07d1e049ce714bf92b91033e5157f796c1451ed SHA512 b8ad5bef5c4ea493bb77976cf75861efb445792696b536eab875c7c5e1a5fa679a5ad48c73a2bcb448871b4398f8370cde326abf389fc21db7e5fd24cfcdca59
-EBUILD inspircd-3.11.0.ebuild 3715 BLAKE2B 61f99c98cf1cd27bb97d637a3d1acde8947259ee6a961f8ae4a422580c4f4b1b7f3b6cc5a7bc6d1398f10304c6a41f924d8150938286e193eade456f22fea54d SHA512 0530c0f26cbe82327da62ea29c05511da5f4f7f5de1fc1a06eb429ba75beb9aaf1581127d22f88eb8e1c755e2c85095259bcfdc33cb606177bbf1217a00132c7
-EBUILD inspircd-3.12.0.ebuild 3461 BLAKE2B fdad5781365d62079f4ea146a2c3f842722f3d500a6e4a629bd174d9ef48fac2392d479978e0f28fdae7fecef8c9babf41664ee37c1bc7caf27927bbc6dce7bb SHA512 f0cde9ce0eb5e36e1fa7666c1767eb404d3869b64b800bbefe16276a6f5af81cd88e47ad3b438c820fea1e4741420e5bff719620055473f856dfd5d4a01ee5f2
+EBUILD inspircd-3.12.0.ebuild 3471 BLAKE2B 000bbb5767d2557023e12ae725185d10280eb50ed178d9d4e1b441450cf61676b3b3d772d74cd3db32b40067b561c2a02a058ea773d3b93a6c4a90d4b5994e13 SHA512 a2032e436fac827864e9a1a8ffae54d620fc5a3811ca6a4aa9981c12ec7e37862617d3f480d687c4a8d6c9e9270ed6393c893e627037b05ae0d03dc45d4de044
 MISC metadata.xml 1878 BLAKE2B 2c85eb9c5a0db82398ede6b597627d226b139b7758135777068bc9b84f4b2c8303243f9591fe12e0dfb3957b7d6abe638421dce936d58c7182fa3bccfa7ddf9c SHA512 25a287fd0ac8a18a751d6920395868eaf0c73e8bf13f28ffcc187f9a5ee04520677ffeb0506b5541436ac4a9ed0f493331a09ed24d7249376493cc626eecf857
diff --git a/net-irc/inspircd/inspircd-3.11.0.ebuild b/net-irc/inspircd/inspircd-3.11.0.ebuild
deleted file mode 100644
index b8aa1c3f23b4..000000000000
--- a/net-irc/inspircd/inspircd-3.11.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://www.inspircd.org/"
-SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-fix-path-builds.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
-
-RDEPEND="
-	acct-group/inspircd
-	acct-user/inspircd
-	dev-lang/perl
-	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
-	ldap? ( net-nds/openldap )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	re2? ( dev-libs/re2:= )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	ssl? ( dev-libs/openssl:= )
-	tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-DOCS=( docs/. )
-PATCHES=( "${WORKDIR}"/${PF}-fix-path-builds.patch )
-
-src_prepare() {
-	default
-
-	# Patch the inspircd launcher with the inspircd user
-	sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
-}
-
-src_configure() {
-	local extras=""
-
-	use gnutls && extras+="m_ssl_gnutls.cpp,"
-	use ldap && extras+="m_ldap.cpp,"
-	use maxminddb && extras+="m_geo_maxmind.cpp,"
-	use mbedtls && extras+="m_ssl_mbedtls.cpp,"
-	use mysql && extras+="m_mysql.cpp,"
-	use pcre && extras+="m_regex_pcre.cpp,"
-	use postgres && extras+="m_pgsql.cpp,"
-	use re2 && extras+="m_regex_re2.cpp,"
-	use regex-posix && extras+="m_regex_posix.cpp,"
-	use regex-stdlib && extras+="m_regex_stdlib.cpp,"
-	use sqlite && extras+="m_sqlite3.cpp,"
-	use ssl && extras+="m_ssl_openssl.cpp,"
-	use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
-	use tre && extras+="m_regex_tre.cpp,"
-
-	# The first configuration run enables certain "extra" InspIRCd
-	# modules, the second run generates the actual makefile.
-	if [[ -n "${extras}" ]]; then
-		./configure --disable-interactive --enable-extras=${extras%,}
-	fi
-
-	local myconf=(
-		--disable-interactive
-		--disable-auto-extras
-		--prefix="/usr/$(get_libdir)/${PN}"
-		--config-dir="/etc/${PN}"
-		--data-dir="/var/lib/${PN}/data"
-		--log-dir="/var/log/${PN}"
-		--binary-dir="/usr/bin"
-		--module-dir="/usr/$(get_libdir)/${PN}/modules"
-		--manual-dir="/usr/share/man")
-	CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1
-}
-
-src_install() {
-	default
-
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	keepdir "/var/log/${PN}"
-
-	diropts -o"${PN}" -g"${PN}" -m0700
-	keepdir "/var/lib/${PN}/data"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You will find example configuration files under "
-		elog "/usr/share/doc/${PN}"
-		elog "Read the ${PN}.conf.example file carefully before "
-		elog "starting the service."
-	fi
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test "${pv}" -lt "2.0.24-r1"; then
-			elog "Starting with 2.0.24-r1 the daemon is no longer started"
-			elog "with the --logfile option and you are thus expected to define"
-			elog "logging in the InspIRCd configuration file if you want it."
-		fi
-		if ver_test "${pv}" -lt "3.0.0"; then
-			elog "Version 3.0 is a major upgrade which contains breaking"
-			elog "changes.  You will need to update your configuration files."
-			elog "See: https://docs.inspircd.org/3/configuration-changes"
-		fi
-	done
-}
diff --git a/net-irc/inspircd/inspircd-3.12.0.ebuild b/net-irc/inspircd/inspircd-3.12.0.ebuild
index ffef87177d73..6d81793c4524 100644
--- a/net-irc/inspircd/inspircd-3.12.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://github.com/clinew/gentoo-distfiles/raw/master/inspircd-${PV}-
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
 
 RDEPEND="
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index 568f4d3eedd7..d02af1f402df 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -3,5 +3,5 @@ AUX irkerd.initd 963 BLAKE2B 33e4b654eb908d5d2b5c086d821f81d959bcb71ec93b80c7aa3
 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
+EBUILD irker-2.21.ebuild 1523 BLAKE2B 935cece1754910b3d89b33c286315afc03e3286cdecb650e0cba7b2d87b646835d11ab936ee6cab649809d4e61ec25c9d7041829dba1ae7439505b4c058d554a SHA512 2fa7fe78eb5be29c306391e1a0016758e86b39b97ee3bc08785c1b93b867944d86bd5b7d8f9746808fe6d3a23708664d1df93534874d43a42c765cde1781db38
 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
index 5227a14bc99d..87717d39727a 100644
--- a/net-irc/irker/irker-2.21.ebuild
+++ b/net-irc/irker/irker-2.21.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/konversation/Manifest b/net-irc/konversation/Manifest
index d0d594639dea..41f74ae6c34f 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,8 +1,7 @@
 AUX konversation-21.08.3-fix-case-sensitive-tap-compl.patch 1018 BLAKE2B d068372d5d594e058b961db734536d6718844890776a9494d642ea3121e809669bf7e3b10774945bc2fea2aad6bac6887a49755762ce24ecb4cffe6583599cc4 SHA512 95d24174780f09fe4085bb7b759218a5027b0ee0764713c6bbb8cf78d85bb65e98a37fde630d58bd220c528a82f824f9ecb84cf1412c0073ae3710209a24307c
 AUX konversationrc 346 BLAKE2B 8d236be66f983b3670bbd49578c73a1a868be0b498f965e5f91ecc96f956ba6151ebf6a90cbacd304c9fd16fe62c6cecae7027b5582d1c1b97516c7c89430c68 SHA512 37333594ee6835e61a3dec4c3f48e9a83d69b252768aa22830102199811059cbae8188388e7911503e14c0ef05dbc7d7d7f50c94d0fca4659c6b739e3b8c24dc
 DIST konversation-21.08.3.tar.xz 4251372 BLAKE2B e368cdba433b4dc00c51c4804323951aefd8034660b3ab84c418f000f45ff6ed5525a2baaabddd36a30ebcb6ee15aa39baa7a0d7fdbf703f8a64df8557f5e3cf SHA512 7cf3e8c0fb455c708f37b1112cd1cc6649770dfa0dc6106ebfe52bf152817f27a31ee1bfeb561a55a728bc270a384eade595b676a900763eeaa724b1bca086c0
-DIST konversation-21.12.1.tar.xz 4254944 BLAKE2B 180317e871900420a4c1cad20cac1633b3fe08e7b9541d36d9ca13d6beb3401f86a8c2385b26aa680458a30807cb325c30395085c1e673203395afc2d945a031 SHA512 a0df7526baba9c614e61dc9dd06d4a812f8a179ad072c81831b6efe15d3e04d85ce7cdf04769fa27cf22e7cf096692b01d8703372a7176f8f76d135ee0796a59
-EBUILD konversation-21.08.3-r1.ebuild 1964 BLAKE2B 6873efd7631a0fcc17e17539e9803db379573db104d4725429afc27ded24ac4d8f5f371a4c39ec87a817c584babe0a8eb29abf3f442888b9c4bad377a9d4ff0c SHA512 0044ac7742b5e390114fcc0ef893c69b706c0f55b337f53f973996823a0e7a11a13e9b2d0db70e9d032dbc64a5ab6437ef1ccad9804972a719621c752f1c81d6
-EBUILD konversation-21.08.3.ebuild 1896 BLAKE2B ee27ea48e0283e151f1d222aa0784771de8962a982a392e453a3b9680078f9c4f09d9a97295aab7b95318ec44e9fbf1cfae4b069d54d39a8dbcbebf5c7f3cdc9 SHA512 a5cb105e4f60c489b1b25425d4853d5b4f1ae4353897b2c77e37e86e27efdbe040e9b0bc1b0b215c8f0764412c19d664d06bf05f3f9db57edbf6a18b94f74967
-EBUILD konversation-21.12.1.ebuild 1899 BLAKE2B 469a70fd836c6ddb43ac5194fb1fed838b7fed4c0322e132a8c896ee3d20377de4b33ec07c6fb26809184f7b5724141f2d85a524a4ec2553093c45e205c55672 SHA512 7239e9cc05f2bfa2e3d97203eca567d8fcd66863137c7d46def24f73867b418bea340a38b200f99f6f968384a4e040658c86849311a2aa765834c9fb5756e613
+DIST konversation-21.12.3.tar.xz 4275132 BLAKE2B 31ad192a3167b6ea1d82eab36a4f69f1e34fcc679ccfde06b1d0317aa3abcdb31bb7a39dd29574a182105ac6eb0e084a1e3cbe1fbe871a0d216368d9a2a8dcbe SHA512 118975e8ed0b20ab0a85b03354a0265dc7c0e1b15fba92a91357df710b9801873ac5506181baec6f106e4dd8daa15555c2ae3e22c1ddd4c9a787947afe06e408
+EBUILD konversation-21.08.3-r1.ebuild 1963 BLAKE2B 5993fb405a9bb88d485fc4411a0f424f44a1cbd6e2a2bfad0c37cea46d6ff4764a20c439a7cfde61b59592fab0b8cdf83dc416ab9be7e97d3bfd2b9952495ac5 SHA512 6eb0e0a82b4f507e48d4c661e66fbe9062822d90c832786207147e805758b2315b1ab2165df26531c1b213ecb67256ceaa958dfd2289246dc7811b78386b60fa
+EBUILD konversation-21.12.3.ebuild 1899 BLAKE2B 469a70fd836c6ddb43ac5194fb1fed838b7fed4c0322e132a8c896ee3d20377de4b33ec07c6fb26809184f7b5724141f2d85a524a4ec2553093c45e205c55672 SHA512 7239e9cc05f2bfa2e3d97203eca567d8fcd66863137c7d46def24f73867b418bea340a38b200f99f6f968384a4e040658c86849311a2aa765834c9fb5756e613
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-irc/konversation/konversation-21.08.3-r1.ebuild b/net-irc/konversation/konversation-21.08.3-r1.ebuild
index 05c1d29432e7..d91f00f2b520 100644
--- a/net-irc/konversation/konversation-21.08.3-r1.ebuild
+++ b/net-irc/konversation/konversation-21.08.3-r1.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=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="+crypt"
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-irc/konversation/konversation-21.08.3.ebuild b/net-irc/konversation/konversation-21.08.3.ebuild
deleted file mode 100644
index da59d8454405..000000000000
--- a/net-irc/konversation/konversation-21.08.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_GEAR="true"
-KFMIN=5.84.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-IUSE="+crypt"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=media-libs/phonon-4.11.0
-	crypt? ( >=app-crypt/qca-2.3.0:2 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtsvg-${QTMIN}:5
-	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# Bug 616162
-	insinto /etc/xdg
-	doins "${FILESDIR}"/konversationrc
-}
diff --git a/net-irc/konversation/konversation-21.12.1.ebuild b/net-irc/konversation/konversation-21.12.3.ebuild
index ecaddf574605..ecaddf574605 100644
--- a/net-irc/konversation/konversation-21.12.1.ebuild
+++ b/net-irc/konversation/konversation-21.12.3.ebuild
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index ca9d4635ddd2..0825ac7f21d3 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,4 +1,4 @@
 DIST kvirc-5.2_pre20210630233331.tar.gz 6173417 BLAKE2B dcdb5fed3250de08d8e2896ba799e142ee04fff409006d7b7d06bdcf1cf2f6df9f7abeeb055e550d99f9cca6182d68b4f5b9ff224f78d91b1efb7f42118458e5 SHA512 625712cc69a2ab3a33b72b2e9935bec8f307ef1f8d5a9a0672d7eb8e7daa5ab3e6202a2b8932493c30374f0451821db161e47cb3af840c0324e27ca2e58272ef
-EBUILD kvirc-5.2_pre20210630233331.ebuild 4313 BLAKE2B 938de226467f28507be2a2d1c1ccec1af4cd45b5637e766f52aa7cf97324d4f74ee6bc4de3cc29a3eef78b389e687548af90af1dd97bd649c1122af432da675a SHA512 cc78a2995fcf73a442ec4f3ce67d06d909e6f5702bfcd59ec77ee38bed9dbc210b6cdd121057516f9fa4d571fe536360c7ec44070496687ecc7f845c424a8d3d
+EBUILD kvirc-5.2_pre20210630233331-r1.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_pre20210630233331.ebuild b/net-irc/kvirc/kvirc-5.2_pre20210630233331-r1.ebuild
index deedb6e27437..deedb6e27437 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20210630233331.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20210630233331-r1.ebuild
diff --git a/net-irc/limnoria-plugins-jlu5/Manifest b/net-irc/limnoria-plugins-jlu5/Manifest
index 5670df0e53e8..66185a537f03 100644
--- a/net-irc/limnoria-plugins-jlu5/Manifest
+++ b/net-irc/limnoria-plugins-jlu5/Manifest
@@ -1,7 +1,7 @@
-DIST limnoria-plugins-jlu5-20200105_p20210610.tar.gz 100971 BLAKE2B 4000ce710f287d40e0ce84946fc682f702bfa562cfc114b98a8951714d30cdceff32a599850818cf4e2072167797e6db1f3fa9a3209712a04b16ecea491b87ba SHA512 bd1eaa294af7909f400c622008dfcedbe0ac9df2eb2414f2bfe97b5eff83c0d635c09861686359ec1d8103f404ce6ea606db3434917caf1b406a8875bbfb1dac
 DIST limnoria-plugins-jlu5-20200105_p20210703.tar.gz 98161 BLAKE2B 939f91bc4deff6bdd31b2c8897e6842a07f4e93c61b9b63b5753e13f85791ce907583664955fe0e471cbe567b6f1ba909ad4579984e41bd7d0de8f47b6dac781 SHA512 5e3608449eaccc0a6559107d1e5bc2279026d3ff0c2df60e3f06f3b7bec72dd779f385ffa91b4a5b0c6d051871c23f8c62744b91423c6b30e0935d2dcaa061b0
 DIST limnoria-plugins-jlu5-20210801.tar.gz 98414 BLAKE2B 6ad5bb32171fd9169cf5e31c7f360e95f5450445eef36e0274a49ce175f80fd8b4f629482dfd8b7adf93de847597548d75ffb61418077de6df9f09399b0c0960 SHA512 bd5aa8ece48064b7783d72a40595dee3fd78c7305d1b1d52e3c37b13476a28f6234d2ed0773ea9566e47d1454d7d6daa66fb16b1c5e1f0d5b81a305bff39eaac
-EBUILD limnoria-plugins-jlu5-20200105_p20210610.ebuild 1031 BLAKE2B d508c77d78ea174db7a043265ddd836a0cc5e5fb9eb00a6ffc95ced44b79ee65143b992d4ec7f8335942b5df56116e48d657e33026dbdda1b90e890c7a3116d8 SHA512 07b8577d6832f27db330d2c20fc8f03f5e2a3a1feb48c27e588052df63dc8b7b7ee90fe638fc344dbaccdda2aa28ca7da7d0edf4e4940e5aed672da28c209841
+DIST limnoria-plugins-jlu5-20220201.tar.gz 93602 BLAKE2B 6585c459081314c93565b381c3a8ba90c53acb08cd72f690a4f46069c87edefcdc2fd5a60bd7b76239da92edcc490784bbc2f0e8ae67c6c564fcec0229b2e7e0 SHA512 1386654f182131b1f2c6acb495f1fdd7ab67970bfae0366cf73f5eddc7fcfb4e019ab0e7347f32f71f1f4d3369bb33b9237fbd01cb27e5ced71fe69c4c0e520f
 EBUILD limnoria-plugins-jlu5-20200105_p20210703.ebuild 1038 BLAKE2B ac97663735f35e2c03a6f4718b998ce7edad83ee8430b36aa0c98bbc775f90320517c9043bab8c2c1afc4a2ee85886e60928b513ddca656754b802dd0bbcbb56 SHA512 0cb581e88178803e2576f1a91350e37ceddac0853ad401080842e4a2cfbad7d2cae7f275293d42480e8d55ebf6eef649da85ac7dc565137564c1243309998b57
 EBUILD limnoria-plugins-jlu5-20210801.ebuild 1035 BLAKE2B 33844d8d1a3b8bce28fc90b391eee16792b2fdae1969c52e6b384d592d7a0b3b426516ef58943d3e1ac561ecdb596f1d533bea0d002bd0fa4a65096324128064 SHA512 0fc6b9c3adb1972d10a7612987cb6d6975ea438c79fdb06db52ff6ef7bd5701ff91e7aa57cd26a223282223ad1837f6446ee8a671981dd8313cde1becf401032
+EBUILD limnoria-plugins-jlu5-20220201.ebuild 1035 BLAKE2B 6350581a484f146c5028b1131fe4b395eb9422e900647051f66ec3cfa4be964a0e4155f874e21ea66c58e5f2866de397eae492ed88d82ab69e0093c58f14cd54 SHA512 d0bb80f1ca502b6c9ab59d17d3ebedc3374cb3135f78263e365b4a8c7e65208ce0471fbda3ec0967a427c358166407305ecb5e82aa19a2f3acc4d0235e8df463
 MISC metadata.xml 412 BLAKE2B 08533a6226538090f9c9c51f9096a016a19ee0f868cd8c0690bb790c41a384a487e954684343dd102a963d7e70f0e7512298a282b0ab9e886c61da0bc5fe0cf2 SHA512 aa8f2d38d6912e64bb8b5f7f301d9e6c7536c5ab6a4f537f74aedd897a4f9513fa88ab58365f483a36cc89025f50ac0604ae085e59777f34a68cd9458f6cd467
diff --git a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210610.ebuild b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201.ebuild
index de4a1554ff76..b5f393a796e5 100644
--- a/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20200105_p20210610.ebuild
+++ b/net-irc/limnoria-plugins-jlu5/limnoria-plugins-jlu5-20220201.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit vcs-snapshot
 
-COMMIT="3ea070a8036e7262c6fdbd39bf2c7d6407a20f7c"
+MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
 
 DESCRIPTION="A collection of plugins for the Limnoria IRC bot"
 HOMEPAGE="https://github.com/jlu5/SupyPlugins"
-SRC_URI="https://github.com/jlu5/SupyPlugins/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/jlu5/SupyPlugins/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 SLOT=0
 
 RDEPEND="
diff --git a/net-irc/limnoria-plugins-progval/Manifest b/net-irc/limnoria-plugins-progval/Manifest
index 340acd84bd7d..5d9b367fc95c 100644
--- a/net-irc/limnoria-plugins-progval/Manifest
+++ b/net-irc/limnoria-plugins-progval/Manifest
@@ -1,7 +1,7 @@
-DIST limnoria-plugins-progval-20210616.tar.gz 4940211 BLAKE2B c6bdc9e1949303c18081d7ab16bb12e6c51b3af6ac70c5ba5cf5352fe13befe7b1896a8178df4b60c19ff10bb81f9454d20cff89218ead55ea218bb9d5e5c728 SHA512 b2f962890bf0d125ec77f0cdfec0e4449444565bd429c3bb6c2f0386e2dfdee9f9bdaa8c25334fced4866c19cb29220a045e83f40c6e35476d44e2c1d0d4c325
 DIST limnoria-plugins-progval-20210629.tar.gz 4940004 BLAKE2B 286b502daa37bfa5aafd8f5d92176ecc5956d0922322bc1ce1ffd4221bc6f9cef14b7cb9ca52c1d520e17852941a34006a250d8f6504134c40fc0b896b71a99c SHA512 30985a54ef6c1d027356b0f6efd0b1cbde777bb4fe2999ef63ebc94ae944933d9dc90f1ce937ccda5b54bacdd786ead79b01bc1514113a51b749cfcccba993d1
 DIST limnoria-plugins-progval-20211212.tar.gz 4947598 BLAKE2B fa944d5f6c08918a65b518de5eb75fcd0c84adf63923f06310da18a31d87efcca59eff23c402543f3216e6fa0122956615264a744072bf870b3d1b2bcf155e9f SHA512 770da93037d331103c12a17cded7d62028d6212888c9edf51ad462f907b882aaaabb5322bdb443fc0e45a411302e145c96915f9226d20e863350c17a80b56d0b
-EBUILD limnoria-plugins-progval-20210616.ebuild 1041 BLAKE2B 34185018f5f94912c3b59147b038d35b7d0dc52d62991c9efce6d44bd657ce52bcde3eb02dc9b243854b85f7d3344fcfa4da8a53112014dadd68be00c1dd7102 SHA512 4602c403d2d5bc1757a3616f29d567a557e4475811c20889d8a998d1d5ad2cde40d7fd820bae864949f75871480e4b0d49bc31d3a52ae2ca3cd63a3f40e30de9
+DIST limnoria-plugins-progval-20220205.tar.gz 4950629 BLAKE2B 242dd75aca7aa6af8ebcff9f6f13965986669819129cb30ffa46c4026680e6951ae92d646aeb9506a6031f08975df98110276e2aa69ec2bc4831a474ac1f3010 SHA512 4b405a3d845761592abcff16a0c7b0ef8820921cb9c02ac7cfe3db695b535503ba63ce9945bc396b238c74e36c2a8b3f004eefe945a33af8fc91e1c740b2897a
 EBUILD limnoria-plugins-progval-20210629.ebuild 1048 BLAKE2B 066fa8144ae15effbf35b3be1f1906d0954b4dadbbe59242047944ca3cbb5edb484686cb82fef3bb615596e7ee6ecd5fa4304b09bbfa58bbafea4429554a2fa6 SHA512 5d7a5b26ddb30f099e9a5b87ee93e5932e9afd148788e4e782f61753b5fc4537285f322b38dd08b38f13c97de3cea167907dc8017d7f70eda8de4cf6961bb4c1
 EBUILD limnoria-plugins-progval-20211212.ebuild 1048 BLAKE2B 241dd5d604b6b2bceff80b1b5bd88ccf6972a0fef730e9d17684260da348ba928ae6c4bfca93d3e17f3d5fa1a1296a165e8467d78eb73ba7f0e49cc1488606d2 SHA512 d20348e2eb3555d4a539a53f84613b47c44372b5febfa2e595973d4f5f65629c844b717bb45f985eca19f4fed9f441e9c7aabff3804889575789b3ef6d933eec
+EBUILD limnoria-plugins-progval-20220205.ebuild 1048 BLAKE2B 357496b6b7e1410497116576b4140b22177e4fd8246a4b48b2d17882daa78217948ed7a988294e204fd14ab0fe4abd6a92f7691102a495a4661abe8dfa340b79 SHA512 5b4dda09369024f1717da186c4c3af3b40cb8e158da90ce88156298c35d84045e6a5a6fe2779c736959b83fbc005341d5819567c5f0d8b33471d52f4154898c5
 MISC metadata.xml 426 BLAKE2B a578b12eff0872427f4b3f8e3daeb729502db09f66ac4358a5a6d69d4f3764d9dae775d2cc3560572e8a503c308d646b69e690352257feb9bc9c39a9b183324d SHA512 6c978847187059655b25f7bc13301553f6cc4625e413fd045ceb06458b5019faa94ca1d5d842f712742d95aea64c4bb426b8551216e5418e27225aa3943ebe59
diff --git a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20210616.ebuild b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220205.ebuild
index 6f0edf899d91..961b1410ead4 100644
--- a/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20210616.ebuild
+++ b/net-irc/limnoria-plugins-progval/limnoria-plugins-progval-20220205.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit vcs-snapshot
 
-COMMIT="2049ffbf1fe1e6f26ffad74e628c2adbb84097fb"
+COMMIT="73620183d46855498cc4642d2bc0d466635dfb41"
 
 DESCRIPTION="Collection of plugins for Supybot/Limnoria I wrote or forked"
 HOMEPAGE="https://github.com/ProgVal/Supybot-plugins"
 SRC_URI="https://github.com/ProgVal/Supybot-plugins/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD GPL-2 GPL-3 MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 SLOT=0
 
 RDEPEND="net-irc/limnoria"
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index 979c71b5764e..d846c027da51 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,9 +1,9 @@
 AUX limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch 457 BLAKE2B bda2855d4d735e7a65bdbd2b42a73519f12f100020206c7f1e3371db16c929ef91a99d503090bfb46fd14a215cdc002335f3f190e7960c2d19ab56f09943be3c SHA512 35c78678b9c114802676f3850721c6641c9a970d002b184e097cfba65fc9f7c2f0968ac9cc77e03e332c706f7bf591cbc31838e4c68fd294e35465291e266aa8
-DIST limnoria-20210527.tar.gz 1092017 BLAKE2B 1c01ecbb47927d62e30e1768bb8e4574bad7422fea379ddd3d6700351a2f8dd006370a24aeeb7a5b10003e53f1010c8fb3998ecf1ef4f11a2ce48f9145605d30 SHA512 2e09415931cb3bdc358d4a243be3f1abccd569f2371d5d2b2c67e856492475affa473c8c32c77cb2c973b64202f9c6657397fa35b5b16086fbaf4e5b44706184
 DIST limnoria-20210617.tar.gz 1094438 BLAKE2B 3253af8ad764acfaadf90ce49d0f40a47f32554d75c3860079284f98373eb3bc8f60f1f308b501265973c0e6c2a552211415f4f9c3044ce78f818d305b598cbe SHA512 25dddf843e22967a95c769c62f9398129830f63e23d506f0a9abaf7044fa9ffbeca95138c494caf3b36813919c7b1f0880b0715a06bc519de1a87837a948a039
 DIST limnoria-20211118.tar.gz 1094394 BLAKE2B cf3f10b0e489b16afba96b6f9dcc64e0f86007cb601f7cdaca66ec80f5ce01f31795d513ee5d55687902b3a65e114e841c07d5ef34e016140f93d5d8f420f73f SHA512 f0f7d632f4de837663e69df8892191f3ee20a586e073fa9f382852f2e2146b6d82556827ef68d27831938a43fa32185d11a53e1810f7e1834d08b5aeff903b70
-EBUILD limnoria-20210527.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
+DIST limnoria-20220203.tar.gz 1099544 BLAKE2B fc68fb41b094978ddff159241bb4029ba8b3df2995b69f3eecf44599431cf2074a318469892c5b9c2c6660976fd7df52c76d5790b6db0ce94e390b57aa2a3e79 SHA512 50cc56885799d28ee559fffa7a3dc92189d0f41950c3e2b6062490d46c360fd18c188b64ca395963aeca62ff65f81f3536524f154e81ab9c703033e0c3ef0487
 EBUILD limnoria-20210617-r1.ebuild 2471 BLAKE2B db4104f3518836e6062dd6d9289252ec68654feb9e256e1b9c6bbf04841f4058dc3f48ff1a52edc8a7420ef16ac4f38e83419971cbac83bf25edb803c8e0eb72 SHA512 ce984d553919ee0d6a3a7021ab8710a2a5553b50ac507cc56736a423ca4282063a77c88a294a82bd41552e98738f83031cd1b43b40a5f9a638f4080abcbc744c
 EBUILD limnoria-20211118.ebuild 2363 BLAKE2B 816fc8499a47b2b34b8028185aaad9bea467d930726976de306aa3c582f0329d043df5a8cd9df8b1a6496288a52eed9533f08b4297c7ce7f514c798b2036815c SHA512 430659904ca25221f7d3bf4128ec7f739ec3764c2bc1c2e037455a573f00cd1f7774bed0c1fb5da86358a9b859aa29b1e19e49dd9ef8f23cf1a5b97dcdd401ad
+EBUILD limnoria-20220203.ebuild 2363 BLAKE2B b5d92d084e9ff507828ed73b26f8ae5f6471da24fa56bb168a0b3d7b72845cf696f4c01c3b4a901ab1c214ca183708079aee46b290809450604cf0c40fe40551 SHA512 8806f5653f042f38837cf3d845c9e412b91bb050bcc9e522594deaa65aa8fd3668c8354aba4e8a95d638e572d41c3ab201d66996e7d542968a9e94b778f302b1
 EBUILD limnoria-99999999.ebuild 2411 BLAKE2B b46e0b57921b11eb31f746c7c88cf28f67dc96527a001271179d662900e8d4790f14438bd051997ad57dbb27b55013e09207082251eb0569fd383701251a46fa SHA512 7fbe0ae0db60c2b42bdf5ba4de49a0e689352b189600fa5c44c3faec8a898a283ffc11fdaaf49bfe86cc891beb5927b3012dd6e413fed96e6e24c326c45ea599
 MISC metadata.xml 538 BLAKE2B 0595de4ad1055d77f9879ec2a4ba98fb45363a6117a363347054fb7697cdc601602bfa5010f0994dded6c143c7c28d84c08ab9fe45955a2375abfec8888e6e3a SHA512 476b61cb8fc2231ed0d6347729cfcedbccf5ebf47fd71e5b6326e5fa63e92a48b936e7f659bb342cba0256efbd79283cc631927074ad9f5d671315cb72bb232b
diff --git a/net-irc/limnoria/limnoria-20210527.ebuild b/net-irc/limnoria/limnoria-20220203.ebuild
index 03b9171f694b..aabebd11444b 100644
--- a/net-irc/limnoria/limnoria-20210527.ebuild
+++ b/net-irc/limnoria/limnoria-20220203.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=yes # needed for tests
 inherit distutils-r1
 
 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Python based extensible IRC infobot and channel bot"
@@ -43,10 +43,10 @@ RDEPEND="
 	!net-irc/supybot-plugins"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
-python_prepare() {
-	einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
-	einfo "bindings and feedparser."
-	rm -r "plugins/RSS" || die
+python_prepare_all() {
+	# replace "installed on ${timestamp}" with real version
+	echo "version='${MY_PV//-/.}'" > "${S}"/src/version.py || die
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
@@ -56,8 +56,6 @@ python_test() {
 	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
 	# runs successfully when running the tests on the installed system
 	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
-	# Runs despite --no-network (GH #1392)
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Aka" )
 	"${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
 		--plugins-dir="${PLUGINS_DIR}" --no-network \
 		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index aac8d67a35ba..4c6a6f59e76e 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,5 +1,9 @@
+AUX ngircd.conf 35 BLAKE2B 59c5b7c2444d5d2561884db7d532fb7d4ce03cfffacf679f2e72ee0e06415bdf292bfd4f959d47f2b598254902a954a07eb48d4d5ab170e356f89d3f8fb9f15e SHA512 24525591e0ca0249aaff10746d0526fcdc7ff5a8844e98b7d31a5fd710cf92c5905653628ec03e2a491f8cc5890d63f4b05f00bb2adeba502d60c317ad2d3e1c
+AUX ngircd.conf.d 166 BLAKE2B a7e6e149bfe04bb54e97820f6d4fda2f7d81c224fb0975335a190fc41f80aa7edad5b5f509831acf9fdd0949d02e49fa8661860b62f7409c225cecac604cce6d SHA512 0c71a27130f0d918d3ba78f4e19d882bd1089e7f6e899cf89456d1e249d27fe5fe8678bccc90b5fa5eb73c0976240a7fe0722b3094d7553fbfa919dbce235d6a
 AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158
+AUX ngircd.init-r2.d 1271 BLAKE2B f385805c7ae63f4046cee12449b60bc4309007fe69b52a2933a8562f5c05bd356cee49e0bd9bed389d9f42b92e94dbc37387db34eb3c5946e6cc92ea8ebf8ec2 SHA512 ceaeee66b31463273ff88c5356c63bc9b25c272dd038940adba95a8b7e3d4f4d0bd0c96bd9c99fb522b7dafa3a413b5611ecb748951ef5cc7a944384983cf45e
 DIST ngircd-26.1.tar.gz 562938 BLAKE2B a1a4ca8b6e12a02cb4ba2e07d777cf77051b5330464c91634cfac0b385157ab7c648e3b71151247bc8ee6cc847e84755fdca3d9b4a25205bbb57b8296995dd17 SHA512 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c
 DIST ngircd-26.1.tar.gz.sig 310 BLAKE2B 108daa66aeccd51468aa0c6ab2de18c3ce476e812145902186ac4b3b8b29b0da32057c5a6f44133cfa4507310a9a76a001301ebe2d37ca809e1b7d8502aaa492 SHA512 e0b6b28c65f1363c0e8043378d52bccc0a634d7c17018edbc33130c9dbc4c2896f3b3a3ab758746707b37e3e527abbd61e5af8c1455d5fcc5b1b202758c82576
-EBUILD ngircd-26.1-r2.ebuild 2228 BLAKE2B dee7c482b4e2fa68af0a9f21d54a12dd94dae024064b7acd5a2e1317d39db41de2f60c4060da6c4717550dbc74d5a2d877ab457eec04164705fee5b280c32457 SHA512 ef1bb3eb58032f90f2135e4db7404a8aaf9453e298eb8682a962ae2d1b4a13f83800fa92ac6c8383aba597f01d9626026999cc79c56afec9a0a0e6f940b9b379
+EBUILD ngircd-26.1-r2.ebuild 2227 BLAKE2B dcfae5025958855a4c6dbaf06c90dd64fb7a16fe284d8c48b9cdf9a3b47576b7cd5f6a69999a6ce30bd843f5d1cdea2fb85c3efc9d056412f1005a21f22af43d SHA512 d0692d827123ea9dd848dcba579e9b12a65f37c0cf9986afd0a06f6fbaa786b6ef639dcd6f8eba5b65421658fcf6f85ca67c24ec8b752c2442434c0dc879e71a
+EBUILD ngircd-26.1-r4.ebuild 2537 BLAKE2B 7a341056a992697a7c73c2b1c36d2f93988f5f848913d8f4a728d904c7c9923a1316fc28424692f99c320cea739d6ef6401191675bdf01a96ae6b509e084fe43 SHA512 297f9c67eeb9a4be9ea72b4ec333bdb6189d87929835c67ccd6172c96eb8aed47293d56eb862a9678a58fe25c168eb89ad89517e8627a21e8b28289e4fd74f09
 MISC metadata.xml 651 BLAKE2B ba57a0fffdef6acaf3510f62bc146c9dbfec0805b9e6a5e889360fee39c3a3e539aaead44fa42c72523957c492c066a9729c2f362c84f56c0ab27627b8e92f36 SHA512 82529647ece0d29898c2ad7f5794d6376f919d0e1d30cdc7dea0bea97418c9fba26e9e9748232a7e9963d329d5a8b5f4f8d2c6acc03682a231ec3984c63980f7
diff --git a/net-irc/ngircd/files/ngircd.conf b/net-irc/ngircd/files/ngircd.conf
new file mode 100644
index 000000000000..e9993a3430ef
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd.conf
@@ -0,0 +1 @@
+d /run/ngircd 0755 ngircd ngircd -
diff --git a/net-irc/ngircd/files/ngircd.conf.d b/net-irc/ngircd/files/ngircd.conf.d
new file mode 100644
index 000000000000..6088e5dae69a
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd.conf.d
@@ -0,0 +1,8 @@
+# Configuration file
+#NGIRCD_CONFIGFILE="/etc/ngircd/ngircd.conf"
+
+# PID file
+#NGIRCD_PIDFILE="/var/run/ngircd/ngircd.pid"
+
+# Options for ngircd
+#NGIRCD_OPTS="-d -s"
diff --git a/net-irc/ngircd/files/ngircd.init-r2.d b/net-irc/ngircd/files/ngircd.init-r2.d
new file mode 100644
index 000000000000..1a54154ff417
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd.init-r2.d
@@ -0,0 +1,52 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+description="IRC server"
+description_configtest="Run ngircd's internal config check."
+description_reload="Reload the ngircd's configuration."
+
+: ${NGIRCD_CONFIGFILE:=/etc/ngircd/${RC_SVCNAME}.conf}
+
+command="/usr/sbin/ngircd"
+command_args="${NGIRCD_OPTS} -f \"${NGIRCD_CONFIGFILE}\""
+command_args_foreground="-n"
+command_user="ngircd:ngircd"
+pidfile="${NGIRCD_PIDFILE:-/var/run/ngircd/${RC_SVCNAME}.pid}"
+
+depend() {
+	need net
+	use logger
+	provide ircd
+}
+
+start_pre() {
+	checkpath -f "${pidfile}" -o ${command_user} || return 1
+	if [ "${RC_CMD}" != "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+stop_pre() {
+	if [ "${RC_CMD}" = "restart" ]; then
+		configtest || return 1
+	fi
+}
+
+reload() {
+	configtest || return 1
+	ebegin "Refreshing ${RC_SVCNAME}'s configuration"
+	start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+	eend $? "Failed to reload ${RC_SVCNAME}"
+}
+
+configtest() {
+	ebegin "Checking ${RC_SVCNAME}'s configuration"
+	# "press enter to continue"
+	echo | ${command} -f "${NGIRCD_CONFIGFILE}" -t >/dev/null
+
+	eend $? "failed, please correct errors in the config file"
+}
diff --git a/net-irc/ngircd/ngircd-26.1-r2.ebuild b/net-irc/ngircd/ngircd-26.1-r2.ebuild
index c5aa2c96348a..284e4d034cce 100644
--- a/net-irc/ngircd/ngircd-26.1-r2.ebuild
+++ b/net-irc/ngircd/ngircd-26.1-r2.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
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.gz.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
 IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
 
 # Flaky test needs investigation (bug 719256)
diff --git a/net-irc/ngircd/ngircd-26.1-r4.ebuild b/net-irc/ngircd/ngircd-26.1-r4.ebuild
new file mode 100644
index 000000000000..a5474e5b57a6
--- /dev/null
+++ b/net-irc/ngircd/ngircd-26.1-r4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/alexbarton.asc"
+inherit tmpfiles verify-sig
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="https://ngircd.barton.de/"
+SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
+SRC_URI+=" verify-sig? ( https://arthur.barton.de/pub/${PN}/${P}.tar.gz.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="debug gnutls ident irc-plus +ipv6 pam +ssl strict-rfc tcpd test zlib"
+
+# Flaky test needs investigation (bug 719256)
+RESTRICT="test"
+
+RDEPEND="
+	acct-user/ngircd
+	irc-plus? ( virtual/libiconv )
+	ident? ( net-libs/libident )
+	pam? ( sys-libs/pam )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-tcltk/expect
+		net-misc/netkit-telnetd
+	)
+	verify-sig? ( sec-keys/openpgp-keys-alexbarton )
+"
+
+src_prepare() {
+	default
+
+	if ! use prefix ; then
+		sed -i \
+			-e "/;ServerUID = /s/65534/ngircd/" \
+			-e "/;ServerGID = /s/65534/ngircd/" \
+			doc/sample-ngircd.conf.tmpl || die
+	fi
+
+	# make pidfiles work out-of-the-box
+	sed -i \
+		-e "/;PidFile = /s/;//" \
+		-e "/;ServerUID = /s/;//" \
+		-e "/;ServerGID = /s/;//" \
+		doc/sample-ngircd.conf.tmpl || die
+
+	# Note that if we need to use automake, we need a certain version (for now):
+	# https://github.com/ngircd/ngircd/issues/261
+	# WANT_AUTOMAKE=1.11
+	# eautomake
+}
+
+src_configure() {
+	local myeconf=(
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+		$(use_enable debug sniffer)
+		$(use_enable debug)
+		$(use_enable irc-plus ircplus)
+		$(use_enable ipv6)
+		$(use_enable strict-rfc)
+		$(use_with irc-plus iconv)
+		$(use_with ident)
+		$(use_with pam)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with zlib)
+	)
+
+	if use ssl ; then
+		if use gnutls ; then
+			myeconf+=(
+				$( use_with gnutls )
+			)
+		else
+			myeconf+=(
+				$( use_with !gnutls openssl )
+			)
+		fi
+	fi
+
+	econf "${myeconf[@]}"
+}
+
+src_install() {
+	default
+
+	fowners ngircd:ngircd /etc/ngircd/ngircd.conf
+	newinitd "${FILESDIR}"/ngircd.init-r2.d ngircd
+	newconfd "${FILESDIR}"/ngircd.conf.d ngircd
+	dotmpfiles "${FILESDIR}"/ngircd.conf
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && use pam ; then
+		elog "ngircd will use PAMIsOptionalPAM by default, please change this option."
+		elog "You may not be able to login until you change this."
+	fi
+
+	tmpfiles_process ngircd.conf
+}
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index bc6b7756e99a..821520050c4f 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,13 +1,9 @@
-AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.confd-r4 1458 BLAKE2B d7687443262931323142a4b14a484988386610f610fcce6321a45333feadb58c5849ae8743bedb19540b02045f72a5ee6f07299e1bcadc089bf93358f04b8d8c SHA512 90f6f5985dfe15ac400aa133d1404099c11fca4a2f0c3a21e4cd996051fb27bd131074dba576b2e6b8961d70ec98cc43f750ecf94483e050c0a3886d45249d3d
-AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
-AUX unrealircd.initd-r3 2024 BLAKE2B d4774cf73b96382a5576153c93db918663089aa99a22568ff906a22ce37e619fea1b357bb28a98c290cf72d67f7875e7f8e4b1f7fc27b2b6aa3d88cadc7562f0 SHA512 cf1a5797498f47164ba48e55e108aa24ded262029d53649cc3e19238ca9985754d6d7567b77f4ef8f34b88007e06d15f24a9b5c277389d9b110c2cb7268a367c
+AUX unrealircd.initd-r3 2172 BLAKE2B 76aea4ea6083a4b8ac4fe49ecf1cd3ce3a35747f83a745be6fcca2dba11402df7ce2c28b480959dafd92606b9a41cc3b63a22cd47ca9035431b387154a2b5789 SHA512 dd962a299135e99c089fab41f0393f8afde5ce368eb50eb942f1563e34d771e31f75e4add821dae4a9739ca21c34ee5d8bd85931c9fa9c06be7fed4170473ef0
 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.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.4.ebuild 5276 BLAKE2B cbc80b73548186d18b53a354ee2aefe57de3865d7c564251e6af57f78554c3e03b86e5c2b543e9c86dee7e9e68c20f043ae1d9bf305e1c992a3f8fff0504348e SHA512 be10142c437c11fd66ebc257a792d2151062f49792f2de942a338a5e156d018e726863338495fa917eb915719683910f80ec98f1170702e56f390575d6948bfd
-EBUILD unrealircd-6.0.2.ebuild 5637 BLAKE2B 3895805954430f2ba0438e503699a84eda29bdafc3153231956c4f0498b1837749a5103ad7fe10d0048dbe338202b45961be933cb6449bf1367f6bcb64645cf2 SHA512 025e38d2e8b891d6c4d4a349ffbd2bd650ebd3f6737748d28a3ccf29026239d3611949699a49ebb56c74fc67799a58bf1b2009a4337afa42e5d9e284f996b246
+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
diff --git a/net-irc/unrealircd/files/unrealircd.confd-r3 b/net-irc/unrealircd/files/unrealircd.confd-r3
deleted file mode 100644
index 66d9878f014c..000000000000
--- a/net-irc/unrealircd/files/unrealircd.confd-r3
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Which configuration file to load instead of unrealircd.conf. If you
-# want to run multiple instances of unrealircd, you must edit
-# files::pidfile to match UNREALIRCD_PIDFILE. You should also ensure
-# that files::tunefile is different for each unrealircd instance. See
-# https://www.unrealircd.org/docs/Configuration#Files_block
-#
-# To support multiple instances of unrealircd, you may create symlinks
-# in /etc/init.d pointing to /etc/init.d/unrealircd. It is recommended
-# that the scheme unrealircd.${instance_name} be used. For each
-# instance, you may make a copy of this file with the appropriate name
-# to override default options specific to that instance.
-UNREALIRCD_CONF="/etc/unrealircd/${SVCNAME}.conf"
-
-# The path where unrealircd is configured to create its pidfile.
-UNREALIRCD_PIDFILE="/run/unrealircd/${SVCNAME#unreal}.pid"
-
-# extra options to pass to unrealircd ...
-# You should not specify the -f option here; use
-# UNREALIRCD_CONF instead.
-#
-# [-h servername]
-# [-p portnumber]
-# [-x loglevel]
-# [-t] (to enable debug output)
-UNREALIRCD_OPTS=""
-
-# Extra flags to pass to start-stop-daemon. When initially
-# debugging, removing --quiet may help.
-UNREALIRCD_SSD_OPTS="--quiet"
diff --git a/net-irc/unrealircd/files/unrealircd.initd-r2 b/net-irc/unrealircd/files/unrealircd.initd-r2
deleted file mode 100644
index 7d733a6e185a..000000000000
--- a/net-irc/unrealircd/files/unrealircd.initd-r2
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Defaults
-: ${UNREALIRCD_CONF:=/etc/unrealircd/${SVCNAME}.conf}
-: ${UNREALIRCD_PIDFILE:=/run/unrealircd/${SVCNAME#unreal}.pid}
-
-command="/usr/bin/unrealircd"
-# Run the daemon in the foreground and let OpenRC background it.
-# This way the PID file is created securely, as root.
-command_args="-F -f ${UNREALIRCD_CONF} ${UNREALIRCD_OPTS}"
-command_user=unrealircd
-command_background=true
-pidfile="${UNREALIRCD_PIDFILE}"
-start_stop_daemon_args="${UNREALIRCD_SSD_OPTS}"
-extra_started_commands="reload"
-
-depend() {
-	use dns net
-	provide ircd
-}
-
-# It is unsafe for the unrealircd user to be able to write to its own
-# PID file, since root will be sending e.g. kill signals to the PID
-# listed in that file. Ensure that we overwrite the ownership and
-# permissions on /run/unrealircd from previous init scripts.
-start_pre() {
-	checkpath --directory --owner root:root --mode 0700 /run/unrealircd
-}
-
-reload() {
-	ebegin "Reloading ${RC_SVCNAME}"
-	start-stop-daemon --signal HUP \
-			  --pidfile "${pidfile}" \
-			  ${UNREALIRCD_SSD_OPTS}
-	eend $?
-}
diff --git a/net-irc/unrealircd/files/unrealircd.initd-r3 b/net-irc/unrealircd/files/unrealircd.initd-r3
index d2ff1a64c969..5bc03001e87f 100644
--- a/net-irc/unrealircd/files/unrealircd.initd-r3
+++ b/net-irc/unrealircd/files/unrealircd.initd-r3
@@ -32,8 +32,9 @@ else
 fi
 
 checkconfig() {
-	# command_args weirdness because We want to preserve the chroot arguments if it's set
-	su -s /bin/sh ${command_user:=root} -c "${command} ${command_args%${UNREALIRCD_COMMAND_ARGS}}" configtest
+	# command_args weirdness because we want to preserve the chroot arguments if it's set
+	# Only run the configtest for the main instance; it can't work right now for others (no way to specify config file)
+	[ ${SVCNAME} = unrealircd ] && su -s /bin/sh ${command_user:=root} -c "${command} ${command_args%${UNREALIRCD_COMMAND_ARGS}}" configtest
 }
 
 depend() {
diff --git a/net-irc/unrealircd/unrealircd-5.2.2.ebuild b/net-irc/unrealircd/unrealircd-5.2.2.ebuild
deleted file mode 100644
index 401ba6e89ae9..000000000000
--- a/net-irc/unrealircd/unrealircd-5.2.2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SSL_CERT_MANDATORY=1
-inherit autotools ssl-cert systemd
-
-DESCRIPTION="An advanced Internet Relay Chat daemon"
-HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes"
-
-RDEPEND="
-	acct-group/unrealircd
-	acct-user/unrealircd
-	>=app-crypt/argon2-20171227-r1:=
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:0=
-	>=net-dns/c-ares-1.7:=
-	virtual/libcrypt:=
-	curl? ( net-misc/curl[adns] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
-
-src_prepare() {
-	# QA check against bundled pkgs
-	rm -r extras || die
-
-	# building third-party modules (which we don't do) cause a sandbox violation
-	# bug 704444
-	echo "" > src/buildmod || die
-
-	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
-
-	if use class-nofakelag; then
-		sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
-	fi
-
-	# 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 \
-		--enable-dynamic-linking \
-		--enable-ssl="${EPREFIX}"/usr \
-		$(use_enable curl libcurl "${EPREFIX}"/usr) \
-		$(use_enable prefixaq) \
-		$(use_with showlistmodes) \
-		$(use_with !operoverride no-operoverride) \
-		$(use_with operoverride-verify)
-}
-
-src_install() {
-	keepdir /var/log/${PN}
-	keepdir /var/lib/${PN}/tmp
-
-	newbin src/ircd ${PN}
-
-	(
-		cd src/modules || die
-		for subdir in $(find . -type d -print); do
-			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
-				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
-				doexe "${subdir}"/*.so
-			fi
-		done
-	)
-
-	insinto /etc/${PN}
-	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
-	# is redundant with app-misc/ca-certificates and examples will all
-	# be in docs anyway.
-	doins -r doc/conf/{aliases,help}
-	doins doc/conf/*.conf
-	newins doc/conf/examples/example.conf ${PN}.conf
-	keepdir /etc/${PN}/tls
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
-
-	# config should be read-only
-	fperms -R 0640 /etc/${PN}
-	fperms 0750 /etc/${PN}{,/aliases,/help}
-	fperms 0750 /etc/${PN}/tls
-	# state is editable but not owned by unrealircd directly
-	fperms 0770 /var/log/${PN}
-	fperms 0770 /var/lib/${PN}{,/tmp}
-	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
-
-	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
-	# that to look for ca-certificates-provided file instead. %s is
-	# CONFDIR. #618066
-	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	# Move docert call from src_install() to install_cert in pkg_postinst for
-	# bug #201682
-	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
-		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
-			ewarn "The location ${PN} looks for SSL certificates has changed"
-			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
-			ewarn "Please move your existing certificates."
-		else
-			(
-				umask 0037
-				install_cert /etc/${PN}/tls/server.cert
-				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
-				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
-			)
-		fi
-	fi
-
-	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
-	# Fix up the default cloak keys.
-	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
-		ebegin "Generating cloak-keys"
-		local keys=(
-			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
-		)
-		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
-		eend $?
-
-		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
-		sed -i \
-			-e '/cloak-keys/ {
-n
-s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
-n
-s/"and another one";/"'"${keys[1]}"'";/
-n
-s/"and another one";/"'"${keys[2]}"'";/
-}' \
-			"${unrealircd_conf}"
-		eend $?
-	fi
-
-	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
-	elog
-	elog "You can also configure ${PN} start at boot with rc-update(1)."
-	elog "It is recommended to run unrealircd as an unprivileged user."
-	elog "The provided init.d script does this for you."
-}
diff --git a/net-irc/unrealircd/unrealircd-5.2.4.ebuild b/net-irc/unrealircd/unrealircd-5.2.4-r1.ebuild
index 8c1dd56eddc6..64b4c85052ae 100644
--- a/net-irc/unrealircd/unrealircd-5.2.4.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.2.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="class-nofakelag curl +operoverride operoverride-verify +prefixaq showlistmodes"
 
 RDEPEND="acct-group/unrealircd
diff --git a/net-irc/unrealircd/unrealircd-6.0.2.ebuild b/net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild
index 275c8a7ffa4b..275c8a7ffa4b 100644
--- a/net-irc/unrealircd/unrealircd-6.0.2.ebuild
+++ b/net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index ed4cde7c7180..877a6ac70870 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,7 +1,10 @@
 AUX weechat-3.3-cmake_lua_version.patch 292 BLAKE2B 1eb735429ece6431ad190e63beea3e036659ee7c2c1462601ed102f1f5e7df982807df741ee49eb1a3e9dc37de415ae927e59c8204d3735af8c593489ae3b13c SHA512 c8bced50df1119311d8db38f586d99d805a3f13d5bf8e4e3098c486906bb847a67446ec60f0819c410e7f57d33c5789ab8f948ba62d4caf0b25b8afe59d48821
 DIST weechat-3.3.tar.xz 2564280 BLAKE2B 9cb119c2506ff5f9b4844b8016790af34347e300a1217762afc1307191cd0831c2c23e019a024c8161ff2e46607eddf94f94b3db9bd351bc51b7f057ddb375eb SHA512 18bbaa93620185ead64f64833e4c5df6a1cbc49dc6f60362614e955947221b78baaa93a2748f153bbb6f7867c7760f7a8fa8d6d9ed30040ad5e12af127526e13
+DIST weechat-3.4.1.tar.xz 2617856 BLAKE2B a1e2e3e50da79041dc1500fb9c368cc3f3f2f799b867e5c6b2cb0742dac680bf3fd5449dcf19296845266f97cf6ee120c71d10cdb8cf4e20badb56fd4b55888c SHA512 3715975d0b8cb5ac1946ceb0fa87fcecffebccf1687cb3b8c3d91429f31e69000808994885bef580a0cfd9c5b1bcf6a51642bd653cf887be981188281901a04e
+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 4534 BLAKE2B 1bd1a856d4a423b6b33bdac82a927a0968718534d506d617a91c723bad8a0ecb95e53a7a6c30502a020becb09c9c0e0dd2e9217e4df8cdd97e91b0aeb7c80578 SHA512 9e720dbd93a9c1d5b528899ccd5939225e6522cba6c85451d6e54f405a918ef0fe95649514cf7b909b720a969a5c0ebc29bde36819af9d7113e82691780a7be0
 EBUILD weechat-3.4.ebuild 4315 BLAKE2B 028b773aaa6dd0ea1ed8cff0cb36ed455dccfb98b33d4b45ac49c8fa0c3ce46a3a977af42469afd95c1c5728453c140fc10bf6d9818477ce7ea6be32d4d5cf07 SHA512 771254004d8b8362f1da777c60f3693ec94a60177a2ac56ec4ab251fcbf2ad9bd5aee7dc4306c93b70dc807f067118a70bdeda4536720c45d96908e4f2be554d
-EBUILD weechat-9999.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
new file mode 100644
index 000000000000..6ba63ba853d4
--- /dev/null
+++ b/net-irc/weechat/weechat-3.4.1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake lua-single python-single-r1 xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	inherit verify-sig
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz
+		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"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +typing +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr it ja pl ru"
+IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:*[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		|| (
+			dev-lang/ruby:3.0
+			dev-lang/ruby:2.7
+			dev-lang/ruby:2.6
+		)
+	)
+	selinux? ( sec-policy/selinux-irc )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND+="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_TYPING=$(usex typing)
+		-DENABLE_XFER=$(usex xfer)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		cmake_src_test -V
+	else
+		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
+		die "required locale missing"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index d1a572afb9da..9588270e0169 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.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
@@ -12,7 +12,11 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	inherit verify-sig
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz
+		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"
 fi
 
@@ -64,7 +68,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-util/cpputest )
 "
 
-BDEPEND="
+BDEPEND+="
 	virtual/pkgconfig
 	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
 	man? ( >=dev-ruby/asciidoctor-1.5.4 )
diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
index 99405700efa0..52a9a109364f 100644
--- a/net-irc/znc-palaver/Manifest
+++ b/net-irc/znc-palaver/Manifest
@@ -1,5 +1,5 @@
 AUX znc-palaver-1.2.1-python310.patch 2084 BLAKE2B c764435ddcbe2ae6a00b4c937e030b5bb9f8c5f612d97dab6c655c4658523b66dcd8b0bf99a00dbcaffca704e61e191b2bcce43abbd79952b1f156e47bff2564 SHA512 171307c0cc374fe88bb59f5c344d14fc85088edc34b8ff2d85efb731efdeff8159a6ac640e36aec308b1bb3a39d8991323f956937482636aec46ffd6ee379f56
 AUX znc-palaver-1.2.1-xunit2.patch 803 BLAKE2B c56e25f2961257f2a02e6f50d22542c484285460c51cba2b7e7ae9b115a182d79a2f1f2785f5bbc64381bf33062c0d2ffcad2569670e139f8360c769470fe136 SHA512 d37c7ef8e50852096ac152a984a67802ff65002ce94ae0d3e8fed76ebed8aa3b79f04cbc6587b316522cbb1d12f69e82693892e5f273600c5ce72553d03dc032
 DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B 0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4 SHA512 0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a
-EBUILD znc-palaver-1.2.1.ebuild 1132 BLAKE2B ca6e52de23ff2eb013c0f61f136d3bfd91ba728a5d9170bb7591a580b83454e82ce49d6510aa11609ea9e8ce839d9c7a341490670cea8466e349dc652639aab1 SHA512 b810e01fbf319be577a290e1a29141953a7ca4e9662c378e63117443010ff5658a15346219b3012b2a45185f65c3e99d2d0cb0733912f63f82bd1a2785cf711e
+EBUILD znc-palaver-1.2.1-r1.ebuild 1132 BLAKE2B 9a2d10fc8c97276313388bf07ce49ba17de0444f164d6e6c4d665aca13f05ef835510550ed5549a5d65b2c73815a180760cd7cb361225670635a64532ab63d07 SHA512 71d2c3d35fd4aa6f256561ed32b4eb41874d3be596178a985254c0d1b14696db285a385de7594bbc1bbdbbc2910c514904271f7f4f9a1980c86be0629f4f6d09
 MISC metadata.xml 573 BLAKE2B 69a013a18c6c19b2211f70a09e80201d98c4909723f843043855751ddf6aa8545e2dc2b47ba5bfc0e932e25b9de609e5afebc1e9b2a4d81da0bee48cedea6397 SHA512 916557c4e13fe0f1044d427bb9041dcf5829bfc77fdbeb6874d0b75702f27a5a358d821e0db6154b1f3326ed393f7a1b72781acca5110856b0fffbb5b29736f3
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild
index a39dad1cfee9..73185c6ac198 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /net-irc
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)