gentoo resync : 03.07.2021

36 files changed, 304 insertions, 59 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 9e307e8c29ac..ca9bd3b057ce 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index dbe9a13f3de4..eed3934bf792 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD atheme-services-7.2.11.ebuild 2191 BLAKE2B 9c63a8bac619335afa6937a1db865137d0e5cd0ebd4d2fef136af2dcfdb278f5a987952c4613f06687a949c2eca7711c2c2f7f54e54d98be09b3df865f57f634 SHA512 d2ebc02dadb1c47214883d0d5af58a4398b02e286e369a466c66232c4ada3688213edb111a8aa51feaa28963aedad15bca8c835ee89b262d8e76f72a1c619df6
+EBUILD atheme-services-7.2.11-r1.ebuild 2213 BLAKE2B b9843850d65056e1bfa45ca6314e7944827875d4ee5781597ac750ad42e4d8b2c8f8ee1fdddd2ce78abe86e3ab8db0fa3a8c2f3cf07e7666b6ab081673316c3e SHA512 db5483c47a78c99cec4e072c54402056ce0b5e06fece96d29e1f8d3926eb4ba0d94014b0b749759306d12d0f714d64e09edf792481f302c4d52d7de0be97ee61
 MISC metadata.xml 751 BLAKE2B 8259810e42bad77feab76dde2384181dbb70d96f997fe470382aca47708a8a202eaed7d818d444b2314d7129f52b23945be88cd14a527944eeca8636e76edb87 SHA512 f6b53df954381a28968140eff320896bfaa1321fab360e3b9871f06f0f26b33e7447c34099ade0cca57190aa3a3ec60a38b5945740edcad41161a93e01d2bc35
diff --git a/net-irc/atheme-services/atheme-services-7.2.11.ebuild b/net-irc/atheme-services/atheme-services-7.2.11-r1.ebuild
index 2f74842aa725..dc7e351945f6 100644
--- a/net-irc/atheme-services/atheme-services-7.2.11.ebuild
+++ b/net-irc/atheme-services/atheme-services-7.2.11-r1.ebuild
@@ -19,9 +19,10 @@ RDEPEND="
 	acct-group/atheme-services
 	acct-user/atheme-services
 	>=dev-libs/libmowgli-2.1.0:2
+	virtual/libcrypt:=
 	cracklib? ( sys-libs/cracklib )
 	ldap? ( net-nds/openldap )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	pcre? ( dev-libs/libpcre )
 	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}"
diff --git a/net-irc/bnc/Manifest b/net-irc/bnc/Manifest
index 356b5cf4121f..3f14f31e684f 100644
--- a/net-irc/bnc/Manifest
+++ b/net-irc/bnc/Manifest
@@ -1,5 +1,5 @@
 AUX bnc-2.9.3-64bit.patch 402 BLAKE2B 1221f1dfef7f1c8d5c1815ec61c859882bba466cba1e9f4a3a30dda3d22024105c5a25bf9ea9ec0d46d46abfe0549082316c17b2ab55dd876d4e27fbf9abe870 SHA512 e257416b88fa147ab532389893ecbf3ee5c47a3680bf8c3c54fb03408fb97b04ffd01222ce8e6c0a1257f9618c18dd95f3eb1799ae3a83922617a630b557604f
 AUX respect-cflags-ldflags.patch 2766 BLAKE2B dff6f29ca5bce13a033c261375463c3b5081f58b0724f48dc1400ea5845ed3d477f2fb6ad025b68f7f98aafd266e8eb5a60921880738c5e99dd80230c7233c96 SHA512 2b865f67d1999cc7c5ab85c828b8d442906306df23f48fdff17ffb7e7f4f5279a5f0aed0acce3708b558b4cd2e7d7885a585b0cae06b2a78425430ee786362ed
 DIST bnc2.9.4.tar.gz 76896 BLAKE2B fcb09e8c75986d51f69fa4b75458c95419da90789a81b5dbb2504f876d610ed72eb6a15aaae5b18eee03b77a7e374f4f88dc73b67e0daf20cb59d48a5a2dc77a SHA512 131c25624c2a72494f900c6247e5569df48700223664487944ac42b0d892ea62f7d0e67a9ba4609cd936718365075c428e756074e349e1e041186c43cd16da23
-EBUILD bnc-2.9.4-r1.ebuild 969 BLAKE2B 943dc068150632a61356c60c0931754d98a0d1c35448dba3fa4ac8abc0763e64b29634c9253a3a03a680e80ab56c21e82b9bd78e84650066b4ba89cfa0e9fea3 SHA512 896e3a43c35d37c1654c2cdde8f5250da77bc6235e92bf37042671d6483e0827dac2841adce7519312e9ffb3fde71a99308de927f67b705e506b2b03e7bff3a2
+EBUILD bnc-2.9.4-r2.ebuild 988 BLAKE2B 8b68ec4f25f019e95bd7b94ab88763b4d24971705f27852489b359a742fe0a294fe5a0a3b9f360c79b50a0dd270b6e74cb2432237010d419cde3a851f9cd407a SHA512 5b63eb9d40b17b781302c91e1eb7492b2fcf862f137c4e87a3d366e6c178473e38760bea66bda01ce7f033eaf8dabef02abd9e17fa81f95494d7b495abbb4057
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/bnc/bnc-2.9.4-r1.ebuild b/net-irc/bnc/bnc-2.9.4-r2.ebuild
index c59d47de39eb..15f92bbc17b2 100644
--- a/net-irc/bnc/bnc-2.9.4-r1.ebuild
+++ b/net-irc/bnc/bnc-2.9.4-r2.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MY_P="${P/-/}"
 DESCRIPTION="BNC (BouNCe) is used as a gateway to an IRC Server"
 HOMEPAGE="http://gotbnc.com/"
 SRC_URI="http://gotbnc.com/files/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ppc ppc64 ~s390 sparc x86"
 IUSE="ssl"
 
-DEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="virtual/libcrypt:=
+	ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}/respect-cflags-ldflags.patch"
 	"${FILESDIR}/${PN}-2.9.3-64bit.patch"
diff --git a/net-irc/emech/Manifest b/net-irc/emech/Manifest
index 4b1b6b4b8e1d..163d771436d4 100644
--- a/net-irc/emech/Manifest
+++ b/net-irc/emech/Manifest
@@ -1,4 +1,4 @@
 AUX emech-3.0.99_p3-buildfix.patch 2732 BLAKE2B b5af908f431049c8e3f5d631477a62769ef578ec1b610182a71fdf0811d0da37b77601c4d2de78d4f78de6a7330488a5878b7c11612c85263fef1573a807a0c4 SHA512 40119107c596f29838474fd3828c08736abdbf0fdf069556da6842393e64a3514d2fbb31dbe8c267649e12bf9ec678295b07c725f11161da852dc285ef3c6151
 DIST emech-3.0.99p3.tar.gz 249209 BLAKE2B 8ff0806275f7b1c9e49bb2eeda2afa0ac94b894426a2f56508492f970070e4141f14f88ffb3c1c46855817c405d29454cf85ebba53c85b4038d7d9d079f4dff6 SHA512 8ce6f8889e060791ab3af6fa63623469a457c436b4e23c51dcd1833fd09e7692270a324ad1d15beb4ad390e9d481267a8ea60eb17c9fd3195b5ad0daf7341165
-EBUILD emech-3.0.99_p3.ebuild 1823 BLAKE2B 114978224d6baf351bc8635454e1975d54a780cc23ec7bd47ccd774d0a9cbb53ad40db977864b6d70acee677ae6611518522875577e58504f65be6a118ac83ec SHA512 38ace68ec4fb9c75025091a0dcdefc58a40cf1c2d1d023dc63ee983477392be63e8d5c9498354223f9b32a0b66be811596c8fb37df97a0aa1e5240891abe6c4f
+EBUILD emech-3.0.99_p3-r1.ebuild 1872 BLAKE2B 4f50aa3cdc66174d23d24388361634452c1b02762e466910fa4517c1df1ea7084e2c4d5712670112a71fa4a1cc924aef2445526ef912a67f8642d9c5708537ad SHA512 af12e37b56053ca9bb7a1b16e271f122f11d9140dce7f4f5a50638dfabe7809c7606a86c87730c5376d832da1523af6fb8dc464686c6ed80fe3af1c4c6a75cf9
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/net-irc/emech/emech-3.0.99_p3.ebuild b/net-irc/emech/emech-3.0.99_p3-r1.ebuild
index 68daec2e5664..6b5a308bbf18 100644
--- a/net-irc/emech/emech-3.0.99_p3.ebuild
+++ b/net-irc/emech/emech-3.0.99_p3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,13 +8,15 @@ inherit readme.gentoo-r1 toolchain-funcs
 DESCRIPTION="UNIX compatible IRC bot programmed in the C language"
 HOMEPAGE="http://www.energymech.net/"
 SRC_URI="http://www.energymech.net/files/${P/_/}.tar.gz"
+S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE="debug session tcl"
 KEYWORDS="amd64 ppc x86"
 
-IUSE="debug session tcl"
-S="${WORKDIR}/${P/_/}"
+RDEPEND="virtual/libcrypt:="
+DEPEND="${RDEPEND}"
 
 DOC_CONTENTS="You can find a compressed sample config file at /usr/share/doc/${PF}"
 
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index da6fae2672ff..86ba57953261 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.ebuild 1552 BLAKE2B d37c0d333f875be8096b702432157cff223a4a0feba50c72f70d2698323e10746ab8d03b982cb4c74bbe359c894a3db300adb0c50ede90559faa198f70c251fb SHA512 c0b2be7dec14639c568f71096755cd39f1c723fd6aea93067a50712cd89bafa5da4165d9ccd2c71a43316d81a8f6817a3b1bfceacc700eac0bf9ad015c98066a
+EBUILD epic5-2.0.1-r1.ebuild 1572 BLAKE2B fa13662755594ebcb3847a40e22a24517583d1a2b442b4c235361326bcc1fc4b994b6af824e91c20b0f885292cd6e3119295998cf0aae396f104525bb272b4c8 SHA512 82e62f81fb497d774baddf257225f2a7ee0513e4e50d8a9e9a4dab0e0448f9395007fe780560cee58393f53285c5dbc3a2a8913e5e912a634cb76bbc80641aba
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1-r1.ebuild
index 45d0990c99fd..681e43cb0b3b 100644
--- a/net-irc/epic5/epic5-2.0.1.ebuild
+++ b/net-irc/epic5/epic5-2.0.1-r1.ebuild
@@ -20,6 +20,7 @@ IUSE="archive perl tcl ruby socks5 valgrind" #ipv6
 RDEPEND="
 	>=dev-libs/openssl-0.9.8e-r3:0=
 	>=sys-libs/ncurses-5.6-r2:0=
+	virtual/libcrypt:=
 	virtual/libiconv
 	archive? ( app-arch/libarchive )
 	perl? ( >=dev-lang/perl-5.8.8-r2:= )
diff --git a/net-irc/ircii/Manifest b/net-irc/ircii/Manifest
index 8aba1d3e770e..da177b82735f 100644
--- a/net-irc/ircii/Manifest
+++ b/net-irc/ircii/Manifest
@@ -1,4 +1,4 @@
 AUX ircii-manpage-path.patch 514 BLAKE2B 09723e9e2d80654c9ca05535b8e14e833af7ed423bad9a32cc8b8200b3263129d85cc614db4a2f77d5778464fc28d2663675a909b7e2b16e570128cb7264cbdf SHA512 ef19be0ac1b5794da5d761131100b85d5d928f6a204fbce1c32b2deedf638cdaf8fe3a92cd06ac9ca0ddcb0b4f918b56ab298731201d54b94550287cddb4d693
 DIST ircii-20210314.tar.bz2 590626 BLAKE2B d9b785fd043f277ab7824b2161e9f8635f106802c502a905755fd7cfa1d34f8d7533e9bed7158f3ce0639787894c5f8f4ba4c96d628d3a50a34339f5a3d8466e SHA512 3dc3a4ddb000133907edb9b867ae7cb0b36488c875f5d4f56e70d7263cf042da6c429f60a8ed6cced89bca077aec42c9d992ea6b56b2ed8b4e91f125eeced310
-EBUILD ircii-20210314.ebuild 847 BLAKE2B 219b8acfba11060977c66f4ce1878b0a18326823c0d913391e1ca019e44fa21b024807b400ddcc59b695307e81a52c7ba059c883dcba75e763c6cc2fafca1d9b SHA512 b36f02acc4f739c856dc800ac5198de6b2dabab21f2c428cf3124f6dfc6c567d945e900d43315b960a26ea7473456dbf5f31b451d05cdd6e16ba6bd7e812f6a8
+EBUILD ircii-20210314-r1.ebuild 860 BLAKE2B 453b7c3a9a2e5e7d64dc6004647feb3e1c2b7f6f311d9654a0045709a6c8bf0ff215b8f29d0b579075e5ed6bc226aed212f4399d75ef8c08f1c01881be8db4bc SHA512 fdfa9b0b4b9265fa2db4d10994de92edf3b80f3e1970eab7aaaff7f88bfe6c7ee8dfe9e9dccdab7ce47677b2cfda1a805a206d1efa202a30aed8f4a4bc8927d2
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/net-irc/ircii/ircii-20210314.ebuild b/net-irc/ircii/ircii-20210314-r1.ebuild
index 873dc09a5e9e..81b72ece0e57 100644
--- a/net-irc/ircii/ircii-20210314.ebuild
+++ b/net-irc/ircii/ircii-20210314-r1.ebuild
@@ -10,12 +10,12 @@ SRC_URI="https://ircii.warped.com/${P}.tar.bz2
 	https://ircii.warped.com/old/${P}.tar.bz2"
 HOMEPAGE="http://eterna.com.au/ircii/"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
 
 DEPEND="sys-libs/ncurses:0=
+	virtual/libcrypt:=
 	virtual/libiconv"
 RDEPEND="${DEPEND}"
 
@@ -27,7 +27,7 @@ src_configure() {
 }
 
 src_install() {
-	#Still needed as of 20210314, otherwise man dirs don't exist at the right time
+	# Still needed as of 20210314, otherwise man dirs don't exist at the right time
 	emake -j1 DESTDIR="${D}" install
 
 	dodoc ChangeLog INSTALL NEWS README \
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index 9b1a5684d075..d003e424b230 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -7,7 +7,7 @@ AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9
 DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d
 DIST iroffer-dinoex-3.31.tar.gz 527712 BLAKE2B 8e57058af9aad9537d29a15140ab59c921d2549eb9e7a2ce9145fc1c27a4307bea882927012b04fc9f0737a8853d927c79cc0f3156dfa311072c59589fe0221f SHA512 677aa03a33b99d8062db077bba47fb18b2e9279243691981bbd09cb2859fcb4792e1383225b9698edb23370ce0f60667a09480644d31171e9a8234d80052dd80
 DIST iroffer-dinoex-3.32.tar.gz 1321125 BLAKE2B 3a124d16911d97d0ec937b86c9e0ad513ebdcea5e09e4cb1a53753c03d5e13347d0bf1116bf9abe0137fb7a05bbc7a8e31c2c0da5c15cc4e0b55e067d62b1461 SHA512 03d662cf7eb3093b1f050eda8777011d6e7a833dc2fcf65d29ef0294a0d6ce4e2cea273e2d4e6ee6ba2364c088890ac6338a3aa8e6477d5e2a1a990a6e4e9603
-EBUILD iroffer-dinoex-3.30-r1.ebuild 2667 BLAKE2B f771115e1b1771efb1f7a5edb74a188a89714efe2ddd45f257b3ccb670b516d08e38a545aa04e8f4e1e233d7df4170e6dae7920df30794ab1c152e182ced94ef SHA512 f884b72be1dc570c8faef33d328c0a4574ea31795febc07a1ff1db2764f2765f84a12d86842a8ca1b5ae53988655572a70b55089a288f1a5755468ab5ad78f1a
-EBUILD iroffer-dinoex-3.31.ebuild 2660 BLAKE2B 6d7398ffe8a3227650505116f57e918627e6a7e79d06b2b78a08e4daea4b391bfbd9244ef6e3668446b50e7588abf9234d7a803665ba307a58505487d700f4a1 SHA512 df5cd09c89b9d4ab6a1a098c77c3bba623bda69c1f3b1abaff983900b67ab7a029ebd6871bac25d852fc65c01387ba94be8992a15284f16127e7cf6b7322f445
-EBUILD iroffer-dinoex-3.32-r1.ebuild 2614 BLAKE2B 5906f0915d54ff97f493ec247c4e876d6e32a2ef3530d029bb81b7e669bb5f8da2e7b2b0c19fc429bd4f195e2dc5bf784289e41536813f6707f33a0347df0247 SHA512 939b12d2b73b4d328aae40756602c1def1617d62188dd066b7f63b8f1e8c96fff6b22e4235db5f73fc4bddbf6cdb79353b2e696ad860c6c920efa94d258c008f
+EBUILD iroffer-dinoex-3.30-r2.ebuild 2687 BLAKE2B a6dd75334a6fbc0ce89f47803199a5bb692bf267b935dc1c4cfe09b6dcebec252781bd031ed044ba1b62aca6d4847dc0ca348493184b65836dffa85634d720eb SHA512 55b513cc3da30e7810f9f5e163db2b4716af156960863c1994bcb4dd9f4c9dee4d5998b48077c0e06fd8d52f9a7b1b039d595f69b7fab3c183e029e5854c80ed
+EBUILD iroffer-dinoex-3.31-r1.ebuild 2680 BLAKE2B ab79887b9ded2f25c3c63bee6f1b5a9b12016e0e3578e183163ce90898f46d72a7d51a871af69c6bd285efdc946206e08b358d637a1d340ef0d89cb504941f2b SHA512 5ef890a997c40fa84c3de4312a5450f0a8536cbe5cdc9f226994644f9d1285495cc9996ae003f5f30fe81f1da191e7443b79f1b48dcd5bcebe435d5ffab80d2a
+EBUILD iroffer-dinoex-3.32-r2.ebuild 2634 BLAKE2B 3cafcc083c31e40a04f8564cac68d97492347874d94f06ab3136b866c10cf1aee3d4951eda8f686a52dc4d2632c7c298066c3649cb93952b6be5fbab36bdc8f1 SHA512 a3d6dda7d2eb225b0781fc78f8557c32ebd7cb5e5ce475ebdba304bce1540de7d7ea880731e28e29670ffe318b72a11eb4c700067d40d86f15d8382efc0e1081
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r2.ebuild
index 4779e79651ed..621370b736b8 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,8 @@ REQUIRED_USE="
 	gnutls? ( ssl )
 "
 
-RDEPEND="chroot? ( dev-libs/nss )
+RDEPEND="virtual/libcrypt:=
+	chroot? ( dev-libs/nss )
 	curl? (
 		net-misc/curl[ssl?]
 		gnutls? ( net-misc/curl[curl_ssl_gnutls] )
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31-r1.ebuild
index 1fb0085c0a07..d61e239eceff 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.31.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.31-r1.ebuild
@@ -23,7 +23,8 @@ REQUIRED_USE="
 	gnutls? ( ssl )
 "
 
-RDEPEND="chroot? ( dev-libs/nss )
+RDEPEND="virtual/libcrypt:=
+	chroot? ( dev-libs/nss )
 	curl? (
 		net-misc/curl[ssl?]
 		gnutls? ( net-misc/curl[curl_ssl_gnutls] )
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r1.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
index 8de5d34ef91b..2a9bb01ec157 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r1.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.32-r2.ebuild
@@ -23,7 +23,8 @@ REQUIRED_USE="
 	gnutls? ( ssl )
 "
 
-RDEPEND="acct-user/iroffer
+RDEPEND="virtual/libcrypt:=
+	acct-user/iroffer
 	chroot? ( dev-libs/nss )
 	curl? (
 		net-misc/curl[ssl?]
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 3652afa650ba..143b71b7df01 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,4 +1,6 @@
 DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1
-EBUILD kvirc-5.2_pre20200605155236-r1.ebuild 4701 BLAKE2B 6a4f172adfbaf392deea9b8278bf4c72a632fab5f8b6a17510b035e728bce0511f903cf6ce282d706a1ff5162ce5014e9787fa530c6c87f8c3e28ce2f154a966 SHA512 9d2ad051316f3a129b527b8ba58a2c2f8faea808ec23055703037225f46c3609f46e1e099c069d046e143416898413952bcb2a9877c29eed6e4147603c1a661c
-EBUILD kvirc-9999.ebuild 4326 BLAKE2B 8bec9ae6434f0378b4f01814bf927dcf1bbdeb2906fb5f4bfc26fc068105df93cbea0803aeb95cf92077c001e0ff932f01d599240e8f50777369b34a5c831f13 SHA512 fc701d0994a82a6b5c8004a36cf4ccd6e0cb93ebd361d678baf8645436eb2618fa86bf74e0aea1ae5c6d55cb92abe02d330ea3903c7f1345da11bb818bb6de3c
-MISC metadata.xml 638 BLAKE2B 66f7c48cfa5e35db6763821efcf483ca829d50e9b534076fbefb209e6c3c46880b2c110d2305a4bc1e6580781e4ef5fb646e83a23a3fbf609801a84c0ddbc108 SHA512 68853129b4bf5b62be097022091d3402eaa33da641483f666c05e6eaae195f1b6672bf18313b0f98155aa16a4429d543d2885a04e7ea008065cb7d9e2bdda9e8
+DIST kvirc-5.2_pre20210630233331.tar.gz 6173417 BLAKE2B dcdb5fed3250de08d8e2896ba799e142ee04fff409006d7b7d06bdcf1cf2f6df9f7abeeb055e550d99f9cca6182d68b4f5b9ff224f78d91b1efb7f42118458e5 SHA512 625712cc69a2ab3a33b72b2e9935bec8f307ef1f8d5a9a0672d7eb8e7daa5ab3e6202a2b8932493c30374f0451821db161e47cb3af840c0324e27ca2e58272ef
+EBUILD kvirc-5.2_pre20200605155236-r1.ebuild 4697 BLAKE2B 784afc228a3ae0cd17a693b8c0f310fc282e68288b421e6fe7adfa53bfdb53696f616f2217bed8e601dc9c0d84c072be18783472cba7cd94da202f7b32e42aa4 SHA512 c3fdb6fb8bab951a787dcb40010eb3cbb868941abb16c64460db0cf7131586ddc551436aa432a9fb37b1320425077044ef9c323f58eaa0633d3d53bf36e8a071
+EBUILD kvirc-5.2_pre20210630233331.ebuild 4385 BLAKE2B f2da5634a15e6762af628324d8f8a0d86589d845d175fbf10e02bef8182081a79dfde26c5161b8637eb336b1c88c04170febef5e35ef3ff60014c9bd83e5c95f SHA512 545e94d07f2b450508c90ec7ee1a84cc3503d3afece0bca8273e28da2d2713ef282c38785a30082e2f91bb622fea861dfd396c78ef823cc78ff5515b97049b34
+EBUILD kvirc-9999.ebuild 4322 BLAKE2B 6d56fd720c48322b592fdc8d016900f2ebfac4c13b4ece9790aef2022e7b628c1ab2ca4e868fb2abb7b80f0d7496bd7a0da8e157180d78577d29cf6dcd09bba3 SHA512 e173009ac0d28e8d78fabeb2cd871af5e76c1443c80083b5959208fd22ba8a4dada7360c8ec836d45caa9b1347c97f99e51058da9b748970d7bd414428b7c0c1
+MISC metadata.xml 638 BLAKE2B 826b6313262009d9f59123268c64bf9dbf483a15d517ef8eac920cdf90079c4cd5fd16f54aa6c0de1ca2bdc4373534507ed07a3de9c4eaf5cfa1a134f1db02e7 SHA512 eaff2974be880f79976afb0115df513e717768ed5080dc9a824001c214ac42e8b8e9931994d49f8608ddd1ec47eb9ddc7aad8279f5fc04358af2f31feb8255a0
diff --git a/net-irc/kvirc/kvirc-5.2_pre20200605155236-r1.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236-r1.ebuild
index d5d66657bf4e..c92018013e98 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20200605155236-r1.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20200605155236-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_8,3_9})
 
 inherit cmake flag-o-matic python-single-r1 xdg-utils
 
@@ -30,7 +30,7 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="dev-lang/perl:0
@@ -53,7 +53,7 @@ DEPEND="dev-qt/qtcore:5
 	x11-libs/libXScrnSaver
 	audiofile? ( media-libs/audiofile )
 	dbus? ( dev-qt/qtdbus:5 )
-	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
+	dcc-video? ( dev-qt/qtmultimedia:5[widgets] )
 	kde? (
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/ki18n:5
@@ -121,7 +121,7 @@ src_configure() {
 		-DWANT_TRANSPARENCY=ON
 
 		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
-		-DWANT_DCC_VIDEO=$(usex dcc_video ON OFF)
+		-DWANT_DCC_VIDEO=$(usex dcc-video ON OFF)
 		-DWANT_DEBUG=$(usex debug ON OFF)
 		-DWANT_DOXYGEN=$(usex doc ON OFF)
 		-DWANT_GETTEXT=$(usex nls ON OFF)
diff --git a/net-irc/kvirc/kvirc-5.2_pre20210630233331.ebuild b/net-irc/kvirc/kvirc-5.2_pre20210630233331.ebuild
new file mode 100644
index 000000000000..06907a5543b4
--- /dev/null
+++ b/net-irc/kvirc/kvirc-5.2_pre20210630233331.ebuild
@@ -0,0 +1,177 @@
+# Copyright 2009-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=(python{3_8,3_9})
+
+inherit cmake flag-o-matic python-single-r1 xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE=""
+else
+	KVIRC_GIT_REVISION="d86b79f657bb7388d7ec1d3e0d91e7c4221c2394"
+	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
+	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
+fi
+
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="dev-lang/perl:0
+	>=dev-util/cmake-3.16
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	sys-libs/zlib:0=
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	audiofile? ( media-libs/audiofile )
+	dbus? ( dev-qt/qtdbus:5 )
+	dcc-video? ( dev-qt/qtmultimedia:5[widgets] )
+	kde? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/kservice:5
+		kde-frameworks/kwindowsystem:5
+		kde-frameworks/kxmlgui:5
+	)
+	perl? ( dev-lang/perl:0= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant:0= )
+	ssl? ( dev-libs/openssl:0= )
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis
+	)
+	webkit? ( dev-qt/qtwebkit:5 )"
+RDEPEND="${DEPEND}
+	gsm? ( media-sound/gsm )"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
+fi
+
+DOCS=()
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if [[ "${PV}" == "9999" ]]; then
+		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
+		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	fi
+	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
+	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		-DWANT_ENV_FLAGS=ON
+		-DWANT_VERBOSE=ON
+
+		-DWANT_CRYPT=ON
+		-DWANT_DCC_VOICE=ON
+		-DWANT_IPC=ON
+		-DWANT_IPV6=ON
+		-DWANT_TRANSPARENCY=ON
+
+		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
+		-DWANT_DCC_VIDEO=$(usex dcc-video ON OFF)
+		-DWANT_DEBUG=$(usex debug ON OFF)
+		-DWANT_DOXYGEN=$(usex doc ON OFF)
+		-DWANT_GETTEXT=$(usex nls ON OFF)
+		-DWANT_GSM=$(usex gsm ON OFF)
+		-DWANT_KDE=$(usex kde ON OFF)
+		-DWANT_MEMORY_PROFILE=$(usex profile ON OFF)
+		-DWANT_OGG_THEORA=$(usex theora ON OFF)
+		-DWANT_OPENSSL=$(usex ssl ON OFF)
+		-DWANT_OSS=$(usex oss ON OFF)
+		-DWANT_PERL=$(usex perl ON OFF)
+		-DWANT_PHONON=$(usex phonon ON OFF)
+		-DWANT_PYTHON=$(usex python ON OFF)
+		-DWANT_QTDBUS=$(usex dbus ON OFF)
+		-DWANT_QTWEBKIT=$(usex webkit ON OFF)
+		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
+
+		# COMPILE_SVG_SUPPORT not used in source code.
+		-DWANT_QTSVG=OFF
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
+			-DPython3_LIBRARY="$(python_get_library_path)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_src_compile devdocs
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		(
+			docinto html
+			dodoc -r "${BUILD_DIR}/doc/api/html/"*
+		)
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index d73b347ff47d..2393d5ae4c23 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_8,3_9})
 
 inherit cmake flag-o-matic python-single-r1 xdg-utils
 
@@ -30,7 +30,7 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+IUSE="audiofile +dbus dcc-video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="dev-lang/perl:0
@@ -53,7 +53,7 @@ DEPEND="dev-qt/qtcore:5
 	x11-libs/libXScrnSaver
 	audiofile? ( media-libs/audiofile )
 	dbus? ( dev-qt/qtdbus:5 )
-	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
+	dcc-video? ( dev-qt/qtmultimedia:5[widgets] )
 	kde? (
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/ki18n:5
@@ -117,7 +117,7 @@ src_configure() {
 		-DWANT_TRANSPARENCY=ON
 
 		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
-		-DWANT_DCC_VIDEO=$(usex dcc_video ON OFF)
+		-DWANT_DCC_VIDEO=$(usex dcc-video ON OFF)
 		-DWANT_DEBUG=$(usex debug ON OFF)
 		-DWANT_DOXYGEN=$(usex doc ON OFF)
 		-DWANT_GETTEXT=$(usex nls ON OFF)
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index c447f818e684..9636c611569e 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Mike Gilbert</name>
 	</maintainer>
 	<use>
-		<flag name="dcc_video">Support video connections over DCC protocol</flag>
+		<flag name="dcc-video">Support video connections over DCC protocol</flag>
 		<flag name="phonon">Support Phonon for audio output</flag>
 	</use>
 	<upstream>
diff --git a/net-irc/muh/Manifest b/net-irc/muh/Manifest
index 15e78d2b558c..f31be92ca643 100644
--- a/net-irc/muh/Manifest
+++ b/net-irc/muh/Manifest
@@ -1,3 +1,3 @@
 DIST muh-2.2a.tar.gz 130672 BLAKE2B dd1f925539e7656822c8d66b35ea84ccbf23278e78c5c5d692400a192bb2d93197ad4205169c76de5386dc2fd1bdd191e3979082766af5d759f79c9ceaa44536 SHA512 2e3ba080f420cf063627d4d9b1f4001c76575efb1d3e99ff9c5eee4a483d5beda6e326f0c0d60c3d848b78cac092aac51a98cabc351760ccfa38fe1549c4b4ee
-EBUILD muh-2.2a-r1.ebuild 705 BLAKE2B 004571337cb88ae60b724bfb11d5d370f02d62fe16d3e0185cb4f73672300aa060d7509a1e1eafefb8d5ba7d0648192cda56ff234746552dfbc08154d15acfa0 SHA512 e97d4efc1295757a9a0dd5c8f6539a78d415299ae70d165f251acea7f511a1503e726a28eadaac7e0a4ce7fcb3f5b423af942ec6e76434debd8ded6f3cfc5759
+EBUILD muh-2.2a-r2.ebuild 751 BLAKE2B 3410a3f56a3abd8407f6213319cb180fa45b24f4e3afc1474ad26004de565a9407943bf3af690cf5a36d0e8a53e9b025860d8395e07b4a800bc3e4a2ae0a0691 SHA512 991dba8d25b541e522ace9e74e90a90acd88e68d9698ee0d803a2d7b9a562e218ecb49dce621cd6359b8e1621ebe42e0110fa072cc9be26e783accb236110937
 MISC metadata.xml 245 BLAKE2B b2bab5f6bb760f76ede22b4c9a562996fe5af5bfa95860b7ee2cae535b12057912e6f0cc0a132fef280e07e2c3afeced09545cffd2d184f8c7ac09916c2ba83f SHA512 aea5221991928997b12a582f7fcce164b9fbf764587c04236389ec5f01904891d2745040ede04da83287fa5810826d77bea413c253f5c45e2f1c03aea2909f1d
diff --git a/net-irc/muh/muh-2.2a-r1.ebuild b/net-irc/muh/muh-2.2a-r2.ebuild
index 4a90c58d0c86..620f26da6f48 100644
--- a/net-irc/muh/muh-2.2a-r1.ebuild
+++ b/net-irc/muh/muh-2.2a-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Persistent IRC bouncer"
 HOMEPAGE="http://mind.riot.org/muh/"
@@ -12,8 +12,13 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="ipv6"
 
+RDEPEND="virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+
 src_configure() {
-	econf --datadir=/usr/share/muh $(use_enable ipv6)
+	econf \
+		--datadir=/usr/share/muh \
+		$(use_enable ipv6)
 }
 
 src_install() {
@@ -22,10 +27,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog
 	elog "You'll need to configure muh before running it."
 	elog "Put your config in ~/.muh/muhrc"
 	elog "A sample config is /usr/share/muh/muhrc"
 	elog "For more information, see the documentation."
-	elog
 }
diff --git a/net-irc/ninja/Manifest b/net-irc/ninja/Manifest
index 39c34b58e0fc..ae29894665ec 100644
--- a/net-irc/ninja/Manifest
+++ b/net-irc/ninja/Manifest
@@ -1,3 +1,3 @@
 DIST ninja-1.5.9pre14.tar.gz 920668 BLAKE2B c2aa578848bb3f2db5a199615bb9a3eeb592627b974c9a989acfeb2306dce7285429b7910f83a77443c2160e936129900f0ca042672dd9f8c0242d8d93f59ba5 SHA512 5a379ed355c06d28f26ed7b97e657b463deec0832ebf822424ed92379e85066e8aca971943ad751e695c003a6ef1ab7fa46ff29e5febe30c439cdfdf6b4d6cfb
-EBUILD ninja-1.5.9_pre14-r1.ebuild 762 BLAKE2B a7803537f5cab687e8ca13c530bb8613f362b9fd7f71a04bf8df2e60f233f6ec817804e7af10c422ed03539a11f39b5e0ec1986e0f4d430b18e887f241f1223c SHA512 da1af4261ef926d126fed6c35ca87444cb0e80c1a6b27d1411b1b2d564f753177251ccf4bc11640341be3909ca8b9aa293ab785b88388c4f6d419506a7861093
+EBUILD ninja-1.5.9_pre14-r2.ebuild 782 BLAKE2B 37da6ca993cd079f143c7c4fa58977c6891b99156c16f2ea28c3795b59781f4a19cee3635d460468c0d1e89cf618a0b16afe829f5e735de76f1d3ec78788abda SHA512 e6a1dec091e9b55fc26905155ec95a6146a56feedb1e1794492980054b2afd12470d443250c51ed9946d4b942093d1ca3c7a573e0e1e865d2a941f0b2d2e4445
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild b/net-irc/ninja/ninja-1.5.9_pre14-r2.ebuild
index d4712c50f4b8..65954943f9fb 100644
--- a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
+++ b/net-irc/ninja/ninja-1.5.9_pre14-r2.ebuild
@@ -10,14 +10,15 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz"
 S="${WORKDIR}"/${P/_*/}
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
 IUSE="ncurses ipv6 ssl"
 
 RESTRICT="test"
 
 DEPEND="
+	virtual/libcrypt:=
 	ncurses? ( sys-libs/ncurses:= )
 	ssl?  ( dev-libs/openssl:= )
 "
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index 846445543190..6d637abd0f55 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,3 +1,5 @@
 DIST polari-3.36.3.tar.xz 1030640 BLAKE2B 72cee290c21cd0a1f96d25e02993dadba14247bb3b38d2ce62ebbe8670a9c7498e7dd123bef2ab3ffaea78019109697186cee409dd78a554afbbc5b5c4db56b5 SHA512 dcf8018ffdaffe2867ab7c3bbc1c874090df0ff5435ec16746780ae081dc61a0b7ec0e58d706b6e7eb8957b1f3fe9c24b586db831ab8b0565fa05c1bf3adae38
+DIST polari-3.38.1.tar.xz 1050280 BLAKE2B 7c1e640a62003bda2217d914f9f19d6eea3994f780785334fd681c792653aa3ef1b4e3e4bc05d7bb15a614cc70e317f8e8a55445fe6e03c249f66b6b3e97af3d SHA512 196fd58324e1ee24eb58efcf9e11b9bec1cfd11781cba5d09b34344b7d3715f9bc215c7a3ec3b021ac5e1d2575a8200d8ab896b201488bf7da2acb10beb04262
 EBUILD polari-3.36.3.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a
+EBUILD polari-3.38.1.ebuild 1066 BLAKE2B d9445e6b750a1d794efaa5e0a3f655fdf46040f9dc8aae0cbf98c8feba3afc54663838c22027e65a2056dfb66d10b65f0b3d922c38bd8abd0399c7a8715c00a1 SHA512 e5d49b48436e9fb4b452f838bc53eaf248ffc71061272d63c866abfad21bc5e7d550f300746d755bf6ee70b3e3d8a33609f13378b5f5d99a098e86627349a84c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-irc/polari/polari-3.38.1.ebuild b/net-irc/polari/polari-3.38.1.ebuild
new file mode 100644
index 000000000000..3fb6c5d6fffc
--- /dev/null
+++ b/net-irc/polari/polari-3.38.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="An IRC client for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.21.6:3[introspection]
+	net-libs/telepathy-glib[introspection]
+	>=dev-libs/gobject-introspection-1.50:=
+	>=dev-libs/gjs-1.57.3
+
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=app-text/gspell-1.4.0[introspection]
+	x11-libs/pango[introspection]
+	app-crypt/libsecret[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-im/telepathy-logger[introspection]
+"
+RDEPEND="${DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( dev-lang/spidermonkey:78 )
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 27a8a3a6a6bd..72ea42fb2693 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -4,5 +4,5 @@ AUX rbot.conf2 1111 BLAKE2B 22cfbcb92f8d0df664a03b26db6027837463c5f8f543829b772d
 AUX rbot.init 1459 BLAKE2B 3b58ca09d2073ef01f94ae1980ed9203d4cadc1a9512842e1ce53709ddb1cfab15228b41656aca5e69999ca933bfe45c94ac18af214b0e890f04912a56830ba8 SHA512 57f5504829ed7524b70102833a5de168f7ea08e594a92ece6d7c0f2eab7de8c9dd14a6d199c5e63b6298209bdf5de4adcb06aded0c23d05c35f7e9774742ecea
 AUX rbot.init2 1345 BLAKE2B 137df6384fde1e3ee9501ce38b31470605bf308827213924033b291f8aa567e90cb8421be6865f4df269aa9b8cc3b20c4b729f3cc4aaaa90959dec39382752ea SHA512 b3d8b83eea4d429a47657f4f9b6cb0aed6c283aa4e7535307305f33bc84c53c0c82e2b76a7cf45ec192c7db68c71e70ee5b000ffbd6f0ff59039de8f69f88dff
 DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160
-EBUILD rbot-0.9.15_p20160325-r2.ebuild 5218 BLAKE2B e6cf5c29ef591bf25665364673b11793b36df4b73f68965fcbc56d0e484886406242ccb4deb39b68586864591c555029e6ab878d95db3e653ce4db4292f346e9 SHA512 fea97215f7a921cf9cbd55c5223c5ecfdacd79d2abc508341bbb4ab69a65d6430f0af4d3608d0528077267426539ccdda784aefa06c83cc548f5f2e748e616a6
+EBUILD rbot-0.9.15_p20160325-r2.ebuild 5227 BLAKE2B 4d59e06fa44c51c75e3652dbb56c500e85a5514d4d57ff2ee7e69bcbcdec17a0485d1320125d227f2b2fb59ce40809e49ffdf697e0da57c51d9fd21ce0cc35a6 SHA512 76f57cf985223d6842b7b307f75382e5d63c27c76dbb2585a1b70bb45be6dd00c8a75107b086acd3ba89ee9ec74082e7bf3a456a350557f1862381a9f4f3eda2
 MISC metadata.xml 2429 BLAKE2B 74471471dec1be09b55dfa02344e81acddef59e9ec6e8aef5b777297ccef5a858dff6e6f955a1c22e970e93d2cd8864ef35002bfa5e0bbe8aeac799bc3d3dfa2 SHA512 3e91bac4f83db11e76233e1d60dbabe171a6235a57a95a130234cdc07de688ace7869ebe4358600d2b0e2f1c0beb450ab429279ca871bf8b6a2bbf3e437f343b
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild
index d4bbfeb5e719..a49349572b5f 100644
--- a/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20160325-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 USE_RUBY="ruby25 ruby26 ruby27"
 
 GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2"
-inherit ruby-ng l10n user
+inherit ruby-ng strip-linguas user
 
 DESCRIPTION="A ruby IRC bot"
 HOMEPAGE="https://ruby-rbot.org/"
diff --git a/net-irc/scrollz/Manifest b/net-irc/scrollz/Manifest
index bc63161c9ff3..b293aeec0dd4 100644
--- a/net-irc/scrollz/Manifest
+++ b/net-irc/scrollz/Manifest
@@ -1,4 +1,4 @@
 AUX scrollz-2.3-fcommon.patch 566 BLAKE2B 454bbb7beec42378855dd64cd4a9826dd39deb549a75006dda80cec99463b45eaacf666c2ac25b3285ab71e2a57256e8c640c427373f56c6780d3172257c1071 SHA512 839109aaf8bc3429e7a215de5b7018dbcb718181d9e4026bd918fbb86665df20542d0f5e7884bf582cbd63238185d9e4fb180c6b16797200dd972ee1ea679dd4
 DIST ScrollZ-2.3.tar.gz 981707 BLAKE2B ee7c1955dbd2515204d805052d091274c3c7e08257a798c357c5a195c12d7ebc85a160cd40ddf1b2aa87a1b628bebf630c3b7428bde1f230bf9b372f74cc74d2 SHA512 cb3dc2f462452c605c688805ed5128e0197eb4daae895c03f00631c4e9a0994f89a9c55b7e0591588f3f313dab66fcbeb1683b42ef75c3b714185b40703b1979
-EBUILD scrollz-2.3.ebuild 1173 BLAKE2B 3a82216bbc79ed79e0875c2e77898ca9aa49de9ec3f7dd1484f7d6b9a6d94be3abf44ae96e41d4d345c6874575f9165d32aa545127bc078b8a25144425b5e7da SHA512 68e1022b504437b0ea4c80f1d2e5c16a3330d60ec8125a9b49e19cc868735c2e3265324428db307961d4be88c083333b4464e76c27a26783e6bc36e0571aa06f
+EBUILD scrollz-2.3-r1.ebuild 1191 BLAKE2B 9fbb0616162158eb9a79013add065c83fb2ab28fa5760ab545746888c83c72ec4ed53b3578396fb78195d5f8fb856fc86074a5bf97882c6671ccea8b7b9dd658 SHA512 ee90a90c28e3a317f0980794bbf4b1d4558364475e041a45b848870e08ea85dd0202161594f768c92cf45d3b9a2f492b702a4b814315bd4ceca1511507932cc2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/scrollz/scrollz-2.3.ebuild b/net-irc/scrollz/scrollz-2.3-r1.ebuild
index a76e2d53cdc3..2cb6e53ecd82 100644
--- a/net-irc/scrollz/scrollz-2.3.ebuild
+++ b/net-irc/scrollz/scrollz-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,17 +10,18 @@ MY_P="ScrollZ-${PV}"
 DESCRIPTION="Advanced IRC client based on ircII"
 HOMEPAGE="https://www.scrollz.info/"
 SRC_URI="https://www.scrollz.info/download/${MY_P}.tar.gz"
+S="${WORKDIR}/ScrollZ-${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
 IUSE="gmp gnutls ipv6 ssl"
 REQUIRED_USE="gnutls? ( ssl )"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
 	sys-libs/ncurses:0=
+	virtual/libcrypt:=
 	gmp? ( dev-libs/gmp:0= )
 	ssl? (
 		gnutls? ( net-libs/gnutls:0= )
@@ -29,8 +30,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/ScrollZ-${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}/${PN}-2.3-fcommon.patch"
 )
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 75f953abd897..b8e08f9561e5 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -4,7 +4,7 @@ AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8d
 DIST unrealircd-5.0.8.tar.gz 5013231 BLAKE2B 57365a06b8108239ab10f6cff7d4553b08aa428acb5c635c4b9241c3f82459a5aac18c916a4534f3a8fc9ac1fd4c1d9418c7395233603e576eda40c56d81b110 SHA512 45fc0758a870dbb9c3ff55fc7029d1ecff9dcf65680f31ff331f012efbf9c9bffa60a6fe27b9bab69302d26b8293a1089cfaf1c550a3f2802a549f25e4644770
 DIST unrealircd-5.0.9.1.tar.gz 5210836 BLAKE2B 1b71c54106a038501782004b183bfc4b148c381150cd293bdbf74f33dd8a244083e7ce55adcf16aee5cd344707d6b1d1843bbf3d83fea0749532f68a954da950 SHA512 1d45be1904c415a60bd5b7e279ee528e0f559207fe763ea8b10a9809a253b0e10d781b8624c85600206a8484bde0ba162c62dc96e12d581d904d483b0b89193a
 DIST unrealircd-5.2.0.2.tar.gz 7169870 BLAKE2B 205435fe9b00e5c16432c79fa20562402276fc51a8e2173d9d46a25911cfeff7973520014ccb819370400628d0abe3663a1ea87dce621f275c587e983387da42 SHA512 78ef0637fc7e7d1b6a6f047e6922b61ec7da5173df6a768e0832f02922a0054e1ad23dc8bcd476d64124f5f7956b199d00f98d4c61af2d7e4800cefc5b56ccf1
-EBUILD unrealircd-5.0.8.ebuild 5083 BLAKE2B 72e72a0b9d169e83eea716169d352265ab56c17dcf0ad80b6b5ca99706c5b37bc9c02329b5c6842c0310002ecfb0c5f0dcd34786f93761de27a860abd603181e SHA512 9b59ddb1ac70b6c332f04445a67130d8bd16f30f1f359f44ae02a2d13aa32eb3c25c6d6c132b31d3297c16cebbba577cefd24e558af92ae0d796c477b4ee9d6d
-EBUILD unrealircd-5.0.9.1.ebuild 5212 BLAKE2B e557f44267a1b0ac99c65ab057fac0ff7dbad35a38cee8a35fadef2c5760f86df5af0e41082d972d70cee581063d070fbd89b230e4b0541c05610042c3c6c9f0 SHA512 a037f04a5f3d976094fa2214af549d63e6d4c469687a891a3c6185fd0324ce3b0a6bdfc1ce46333f205e59ad38ae296c704c06f067f43f140e86c2ca7397fc0d
-EBUILD unrealircd-5.2.0.2.ebuild 5234 BLAKE2B 094674a2d20833a7a2e04d1207d4c709b7a513cce087f76ba76438aa342b7d16339ddfce711d209ab8b9d51b829854532f3c4be62bf47243a74d36be99f44a2e SHA512 72e69a869e9442b263e73aa3887ff26c38b3bb7b059c3c8b7741df61c72ac92d26541099766eaaa297140a800f03e41f1249710867466d338efdf4b2093773fc
+EBUILD unrealircd-5.0.8-r1.ebuild 5103 BLAKE2B e2cce9448e9b294a146307cd779c961f33a14e08569a2c3e205ecbea36029a8d5042f0e5e51469e064579bcff709cad4d71b51090ea5e4ede9611f7a675858d7 SHA512 207ab5044c645d1165e9f94d2d166377c54efb224ee8ad76df32b26cd9a6bc39297a4882f81e59110fa9da0e2547f381fcc718daa90e1f415584e3e6303ddcc7
+EBUILD unrealircd-5.0.9.1-r1.ebuild 5232 BLAKE2B de63ae083c9f5f1ba8159d6b7e66b7e2cd94e8654210dfb8cb171d61846d928cc12461a92e5c2cf33927b3cc893ac1fa877661ed8deb195fb1df76df39d2b639 SHA512 6a977e3e710e4832ba5d5ef0810620eb14d0f1962b943b2cdafad02fbe123c9591468d75d0446142114b350a0fac0d8de74db158954d9233553345b0ceeb3277
+EBUILD unrealircd-5.2.0.2-r1.ebuild 5254 BLAKE2B ac6e634ff7c444ee5b21128b87585cb991298d12adc06f82ac7826862c40793936951c671161aaaf8c9b84b195fa7795c8afa666f317fcb8a646f87b7940f26b SHA512 1b34ab84465516e45cbcc7c2d35c5b88dc33c06c3328bd10b3ab8fe53c95fe00e880c5568c057a7df00ebff45848be2a4cbf0d0b3f73c2d9d46cb57c8d217a09
 MISC metadata.xml 859 BLAKE2B bea2149aa6ecf19297e79bbffe9d3d76cac8016324f40cd056ae34544cf9aacb9976b36f0090ab1bb60a21c40cd735d85cc6766cb741393e106326f61bb5b2e3 SHA512 7b35b9fa89319fc0c7743ce4b2af6244b9d56a715ecbc74a0385f93c66651153c7e8be0171a1e0642a90767a94e1b809b49741d26472e9e5f40809450b222237
diff --git a/net-irc/unrealircd/unrealircd-5.0.8.ebuild b/net-irc/unrealircd/unrealircd-5.0.8-r1.ebuild
index 0e19fdab8d30..dc7f960667c9 100644
--- a/net-irc/unrealircd/unrealircd-5.0.8.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.0.8-r1.ebuild
@@ -20,8 +20,9 @@ RDEPEND="
 	acct-user/unrealircd
 	>=app-crypt/argon2-20171227-r1:=
 	dev-libs/libpcre2
-	>=net-dns/c-ares-1.7:=
 	dev-libs/openssl:0=
+	>=net-dns/c-ares-1.7:=
+	virtual/libcrypt:=
 	curl? ( net-misc/curl[adns] )
 "
 DEPEND="${RDEPEND}"
diff --git a/net-irc/unrealircd/unrealircd-5.0.9.1.ebuild b/net-irc/unrealircd/unrealircd-5.0.9.1-r1.ebuild
index 7432e3222b48..4dc1c176bdc0 100644
--- a/net-irc/unrealircd/unrealircd-5.0.9.1.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.0.9.1-r1.ebuild
@@ -20,8 +20,9 @@ RDEPEND="
 	acct-user/unrealircd
 	>=app-crypt/argon2-20171227-r1:=
 	dev-libs/libpcre2
-	>=net-dns/c-ares-1.7:=
 	dev-libs/openssl:0=
+	>=net-dns/c-ares-1.7:=
+	virtual/libcrypt:=
 	curl? ( net-misc/curl[adns] )
 "
 DEPEND="${RDEPEND}"
diff --git a/net-irc/unrealircd/unrealircd-5.2.0.2.ebuild b/net-irc/unrealircd/unrealircd-5.2.0.2-r1.ebuild
index 5716205a4010..9b28edcdac42 100644
--- a/net-irc/unrealircd/unrealircd-5.2.0.2.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.2.0.2-r1.ebuild
@@ -21,8 +21,9 @@ RDEPEND="
 	>=app-crypt/argon2-20171227-r1:=
 	dev-libs/libpcre2
 	dev-libs/libsodium:=
-	>=net-dns/c-ares-1.7:=
 	dev-libs/openssl:0=
+	>=net-dns/c-ares-1.7:=
+	virtual/libcrypt:=
 	curl? ( net-misc/curl[adns] )
 "
 DEPEND="${RDEPEND}"
diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
index 62ac9d8c2af1..ba386e58e25a 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 1126 BLAKE2B 75a472a5627ae9901432d72bd922874882b7dea3a18bfd128260f161435509cf663f3eb47b9cc1e888aa633b51c07e3dc5e64deab1e5668bdf64a4b614e6b5ba SHA512 280d1fad39dad849f2d651cd9061d6af730479451db3818067f6ffc6e33351a674075eda3dcc93ba7ca2b750d1da32c6882389c6d92a9f3d32180b5ee5596db3
+EBUILD znc-palaver-1.2.1.ebuild 1132 BLAKE2B ca6e52de23ff2eb013c0f61f136d3bfd91ba728a5d9170bb7591a580b83454e82ce49d6510aa11609ea9e8ce839d9c7a341490670cea8466e349dc652639aab1 SHA512 b810e01fbf319be577a290e1a29141953a7ca4e9662c378e63117443010ff5658a15346219b3012b2a45185f65c3e99d2d0cb0733912f63f82bd1a2785cf711e
 MISC metadata.xml 572 BLAKE2B fad08970b057379dcfe02d6450cbe7a67f4d5f9470bf575c0eb2de733e7ac63fe2d620f8df5e923b23335ccadac1569da7ee2783d08d1e33c466b05dea36c6ac SHA512 6eca6cd820299e817e07720dc21c9843af259467fce8a79a6f76cca3bc0ed7b3ab03757c91ffe15429780f8f54a372d9e54111d9f7d18672337b71314a05229c
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
index 7668f69d0217..a39dad1cfee9 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-single-r1 toolchain-funcs