gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-irc
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
49 files changed, 238 insertions, 1330 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index de392a62d581..a622c1a3ba22 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 6a84fc24d350..dbe9a13f3de4 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 2192 BLAKE2B ca910460545073820d4d6d8a2e425a11a328b9aeb231d5c9efefa65ba135ea46a5ba6cb2eba8bdd235aa05174ae3c8799e742022cef5c0a13ed36e9a25b067c8 SHA512 7ef63bcfbd30237ccfebb55f2dacb0c00b16c39c2c1b52b51624e1734403259f4110d4eb3dca17c6681df2cf7f1654afce129e04b30f269042faa4d57654be8a
+EBUILD atheme-services-7.2.11.ebuild 2191 BLAKE2B 9c63a8bac619335afa6937a1db865137d0e5cd0ebd4d2fef136af2dcfdb278f5a987952c4613f06687a949c2eca7711c2c2f7f54e54d98be09b3df865f57f634 SHA512 d2ebc02dadb1c47214883d0d5af58a4398b02e286e369a466c66232c4ada3688213edb111a8aa51feaa28963aedad15bca8c835ee89b262d8e76f72a1c619df6
 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.ebuild
index b547246f6bfa..2f74842aa725 100644
--- a/net-irc/atheme-services/atheme-services-7.2.11.ebuild
+++ b/net-irc/atheme-services/atheme-services-7.2.11.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"
 IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
 S="${WORKDIR}/${PN}-v${PV}"
 
diff --git a/net-irc/cgiirc/Manifest b/net-irc/cgiirc/Manifest
index 3f8d8cd2f552..3b55c87b1b75 100644
--- a/net-irc/cgiirc/Manifest
+++ b/net-irc/cgiirc/Manifest
@@ -1,3 +1,3 @@
 DIST cgiirc-0.5.10.tar.gz 133827 BLAKE2B 39120abb8caaaab64f326239d3f557f6cf96d36d69bdc03d6631402e3bd69d03bc89bedf19929e3b9647dc21564c39a5a1f7e76409ab6e3f7f750763e4c146ee SHA512 57001051a31f8a1494e8b31b256b5f244ed7e1d23f38f27184374f1becf91e6ea3bd61621679e046ae0a11a2eb3e5909d9d284df2a896bf5aac38f5314c7ae55
-EBUILD cgiirc-0.5.10.ebuild 887 BLAKE2B d5233b7e796e910a0ad73e2d7530c4b5683535183a76313c279e2014319b7c28ab003fb2c8da8f7743f5478485eb2d49d16bd1c3515ad9582f11a1619b3701e7 SHA512 27a7f4dd9f3c59050521812757cde2e7740252333447666d26966dc0b7136dd3baf3c735e915b2804b9cc62bff0edb0c04f988f78bf2f3e9d8c44ae3232241a8
+EBUILD cgiirc-0.5.10.ebuild 880 BLAKE2B 73cba39a99c9f0fd8844278e9b148293dc2bbd5bf29598b7e093b04dc0c0838360dce58aab8ce978a69069869ff3ca15189182e08a012d6664918977e677ca6b SHA512 3f8294f4696a98f45336856d8e2b5679eb69fa36db7733d813855a6242bf00f69d3183b0e87b8abf29b40facac3e1333801b6334973a03e29deaa9c204921222
 MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
diff --git a/net-irc/cgiirc/cgiirc-0.5.10.ebuild b/net-irc/cgiirc/cgiirc-0.5.10.ebuild
index 72da20317ceb..265a8f97d840 100644
--- a/net-irc/cgiirc/cgiirc-0.5.10.ebuild
+++ b/net-irc/cgiirc/cgiirc-0.5.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit webapp eutils vcs-clean
+inherit webapp vcs-clean
 
 DESCRIPTION="A perl/CGI program to use IRC from a web browser"
 HOMEPAGE="http://cgiirc.org/"
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 02069435ebb8..e29c89c9f168 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,9 +1,8 @@
 AUX eggdrop-1.8.4-fix-array-bounds-warning.patch 864 BLAKE2B d35686e21c7a531b25ba6b06420dfd45914d4aff5321ccd9129239e7f66182d91800371f14c81ee4ac6eb39ad96063d7750a40a25e1eccb9dcebbe50502f0bc9 SHA512 de10ae6d6328da636afd8ec0de187b3f29677c3854e111a64df9b15c9d41ef8ec92f2efd65bc361b2fb6b879016b44e2ce9639da937370d71781aca569991d75
 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.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3
 DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49
-EBUILD eggdrop-1.8.3.ebuild 1720 BLAKE2B c10f202e1ef55e875b1182d50240f2f1555e13d7d357202dd682d55866eabee4660695f5711139b11ada087dfb47e1367b7ddc55ff6bbee9f4a303b0b177e165 SHA512 8ebf2205e9bbd244a99bd3b9af23ec423bd773f77978d2cf9cf46e174cdd3a01868aad71781175e97d27d5fd5ce609d0aff872e217a4eeafc5acdd8ff70883ba
+DIST eggdrop-1.9.0.tar.gz 2206230 BLAKE2B 1c6c5c77558323ae80b4f486f30d106b2f336c61c50adc10302657c2878a755b48d8286ba70f662b6be132ffd569de5eb269cfca1e6e42675b007de43ccf4746 SHA512 e78e220c8207361c6d7bda06be6d0094d747809ff8554fed2ce4a5fb63df1d87f8b82a98d4f0b98909042af8f6719f4a7bf548f864d3d6dfa8caa57b346d32dc
 EBUILD eggdrop-1.8.4-r1.ebuild 1604 BLAKE2B 021484a3fd61e38f6dc68f4d17054935590255a05cfba9b69e912a44e90ed9fee806416c0d1b7b6953bbb4558b4ad20b2cc67ab8d5affdd91281330d919fd94c SHA512 2be5f820597450688778c9f2ae1a999f1be85dfc105ee80d66d6d182f55df32c2d6514dd4196aeec5459b3b85bad504aac4ef14369b92fbdc2f086ce61a97bbe
-EBUILD eggdrop-1.8.4.ebuild 1399 BLAKE2B f9815ed0c9b1fa803c0816ff4628af510623f9ca042b1ce76db6d197723c55a8ea96e681a0b2fb1dd175807f3c29925dcd814740d09791ed3d38039020dc3822 SHA512 bd6df9a7c19e318b210720a5669d142646ac18116a483509decf72468c47bfd81d3a024d4de92987fdd6218990d8a4efe02fb300c62edb0ac134802a1d57f61f
+EBUILD eggdrop-1.9.0.ebuild 1458 BLAKE2B 7c9160373af31b1d9a03db59ba46b568fae83c7eca3d5f4cdaecd9bd7b65f7d2a5dee8fe19afd1f93b9035349d5b222640b6dd4dbba27a99ef921ab1e2bc4953 SHA512 2ab3ecf6f61e109fdda976b3373da8255d7998f693eb8aca98bd2e251d58457de43224c52411176953afe45fe2f1888e9c07f7ba89a3adebc11804db549356c4
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
deleted file mode 100644
index 89a942bbaebf..000000000000
--- a/net-irc/eggdrop/eggdrop-1.8.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="An IRC bot extensible with C or TCL"
-HOMEPAGE="https://www.eggheads.org/"
-SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc sparc x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc ipv6 ssl static"
-
-DEPEND="
-	dev-lang/tcl:0=
-	ssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="
-	sys-apps/gentoo-functions
-	${DEPEND}
-"
-
-DOCS=( AUTHORS FEATURES INSTALL NEWS README THANKS UPGRADING )
-
-src_prepare() {
-	# https://bugs.gentoo.org/335230
-	# https://github.com/eggheads/eggdrop/issues/526
-	sed -i \
-		-e '/\$(LD)/s/-o/$(CFLAGS) $(LDFLAGS) &/' \
-		src/mod/*.mod/Makefile* src/Makefile.in || die
-	default
-}
-
-src_configure() {
-	econf $(use_enable ssl tls) \
-		$(use_enable ipv6 ipv6)
-
-	# https://github.com/eggheads/eggdrop/issues/527
-	emake -j1 config
-}
-
-src_compile() {
-	local target
-
-	if use static && use debug; then
-		target="sdebug"
-	elif use static; then
-		target="static"
-	elif use debug; then
-		target="debug"
-	fi
-
-	emake ${target}
-}
-
-src_install() {
-	# https://github.com/eggheads/eggdrop/issues/527
-	emake -j1 DEST="${D}"/opt/eggdrop install
-
-	use doc && HTML_DOCS=( doc/html/. )
-	rm -r "${D}"/opt/eggdrop/doc/html || die
-	DOC_CONTENTS="
-		Additional documentation can be found
-		in ${EPREFIX}/opt/eggdrop/doc
-	"
-	readme.gentoo_create_doc
-	einstalldocs
-
-	dobin "${FILESDIR}"/eggdrop-installer
-	doman doc/man1/eggdrop.1
-}
-
-pkg_postinst() {
-	# Only display this for new installs
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Please run ${EPREFIX}/usr/bin/eggdrop-installer to install your eggdrop bot."
-	fi
-}
diff --git a/net-irc/eggdrop/eggdrop-1.8.4.ebuild b/net-irc/eggdrop/eggdrop-1.9.0.ebuild
index c629643aa509..5d6de0a857df 100644
--- a/net-irc/eggdrop/eggdrop-1.8.4.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.9.0.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit readme.gentoo-r1
 
+MY_P="${PN}-${PV/_rc/rc}"
 DESCRIPTION="An IRC bot extensible with C or TCL"
 HOMEPAGE="https://www.eggheads.org/"
-SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
+SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sparc ~x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index f19d5ebc14ed..2c0485cce265 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -5,5 +5,5 @@ AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987f
 DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86 SHA512 be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa
 DIST inspircd-3.9.0.tar.gz 853862 BLAKE2B 68134412f12ac06dc5ab5f9ffc94cb6053d88430210cb516e3569aad5e06dacd985038f51e057c9d7bd88179f472f685be5cd6fb31031e79948b0d3aee60eac3 SHA512 2adc4c39fc80d0095a9157a4c72f1df8288c364d909b2200eb04fb7e6bf5eb6172fe80153b79fdd437882d0b252999abad5912cef28f29cbceb9ab540df8db70
 EBUILD inspircd-3.8.1.ebuild 3617 BLAKE2B 05ecb591fe2351b28b0a3b23cd5bcf36c83ca04579f417eb183e8e12ebfa2385d2e31f870748229bf5b31b29759aebe605eb5978140da4e6db7989015ac285cb SHA512 acd5e6aa35dc2d9dcaeb2cab798db031ff7d25eac05318ce53e29fc76f746a1bfd1b2951ad2a3ffd552a7604558a24ab921548bc2e77cf05e2218c451bc31de9
-EBUILD inspircd-3.9.0.ebuild 3612 BLAKE2B 4cdef520df508d23db93e25aed8a732b58944ae680e6f926ba96eb32b39b925ce43a10a85e72eb30a827c6257bca57ac13758002406434592d71448f48882c2e SHA512 11e8cc3a56a200904317eca4e597a232d3e006a7f88764e65eb5d292fef74d9f52d45f77558f54453f99f8659b30f508a1e6bc9adc2c530eb82ef5f6bdf70e34
+EBUILD inspircd-3.9.0.ebuild 3610 BLAKE2B 1035e103115cdd21e2f14a389248ca6d18f852b39009efe0621bd88d1ae09bc5bf256ea7775d8144e8e8e8f1e86cd6a267edfec05f94f524a4c546fe32db9c75 SHA512 bbfc18047f737a6a07f4d57eefd63c8e811a89260f515db860d5dc77b55c12eb239364bac5f02705722742952feeb313cbfee16a875753ed4d27aad11807e849
 MISC metadata.xml 1877 BLAKE2B f9c983be016749a13bddfe989a9abc9397ff39b6a9d8ddcc9c50b91ede18e1443cc2e8e9049dc8bd6732348c4dc1e1127260218c053b72af46460f137e44a910 SHA512 01f8d325244ca9c0a6a908d1d1257c425fc2a7991ee35a9f3ce45688776eaf547e4847619ad7275b5144abcbc0048743160ae80a0722e575823522782b7da5fa
diff --git a/net-irc/inspircd/inspircd-3.9.0.ebuild b/net-irc/inspircd/inspircd-3.9.0.ebuild
index 3dfa1dea335f..024100c32747 100644
--- a/net-irc/inspircd/inspircd-3.9.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~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/irccloud-desktop-bin/Manifest b/net-irc/irccloud-desktop-bin/Manifest
index c09bd9b831d2..06cd313a0437 100644
--- a/net-irc/irccloud-desktop-bin/Manifest
+++ b/net-irc/irccloud-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST irccloud-desktop_0.15.0_linux_amd64.deb 56822648 BLAKE2B 9311a0b1c7aca956cbcd75be20dd11d6114c4a593d7f3fb3cbc06d9806d9fe8631d72af3e0f209a3ecb1211a8027cd9d55c0999366359fe49e219a3f6efb9429 SHA512 69d3a6edaae05a71100ca791eb0986e5b58070fd20ec23ae853e14d59f613f2f25470983de34f24222c7f67e609ae5e2a83b5dc0dbadb9c49e9165b3d5b550d1
-EBUILD irccloud-desktop-bin-0.15.0.ebuild 1193 BLAKE2B a0330168d512fcacb3e3896d9a28b6ed38399dfe4a32a3a8383c32a1579a49760324e352d4946dff21278d9a05c841b094f7fb42d3ecc98feb04cdd7be0a56ae SHA512 5e0c6bfb034b7b7ecb8494bd1f2f7ee1093f8504b70ce3339e90cb8f791abc69e85af0835b539339a74f409222687a0f1ccacf83b6db28caa5b73a1101411c2d
+DIST irccloud-desktop_0.16.0_linux_amd64.deb 57611554 BLAKE2B f96f9c146d4492e9fe4976f59e9965fc1ecc7b2976f9ffdb24a6a1db72f6c041b4623f41f34fbf18c5445a098b4d24fd4fe62d66fc28501d64403a539a7bd6de SHA512 7d03a4a121d90b6ce25e76cda0298a29e96f9b199e71030522a41cd0c0eb550be2ecdc080c0592dd835c18c00b3648000f3cbd193844e18ac8f46f1d15c0b74f
+EBUILD irccloud-desktop-bin-0.16.0.ebuild 1198 BLAKE2B 28edc946a277618ee853f502922250c7319bba1552ee0f58d58fdabe014d6746aa8a203f4bbb8128b4209fa76e95c93019f895f85a9733689a31a831875bae3c SHA512 64dfea7e963c6d3e071480c1d52bc0340c89adf125426a2f33d2be99142c40276bcf12d7c94ccf04465e905e5245df6423f1b8a25780739dd3744817f33effc4
 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild b/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.16.0.ebuild
index fd92a49e7005..5dca9e6f6551 100644
--- a/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild
+++ b/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-irc/ircii/Manifest b/net-irc/ircii/Manifest
index f927f0981d55..8aba1d3e770e 100644
--- a/net-irc/ircii/Manifest
+++ b/net-irc/ircii/Manifest
@@ -1,6 +1,4 @@
 AUX ircii-manpage-path.patch 514 BLAKE2B 09723e9e2d80654c9ca05535b8e14e833af7ed423bad9a32cc8b8200b3263129d85cc614db4a2f77d5778464fc28d2663675a909b7e2b16e570128cb7264cbdf SHA512 ef19be0ac1b5794da5d761131100b85d5d928f6a204fbce1c32b2deedf638cdaf8fe3a92cd06ac9ca0ddcb0b4f918b56ab298731201d54b94550287cddb4d693
-DIST ircii-20190117.tar.bz2 606327 BLAKE2B f7ee5c98f6106f07fec8feb0840aba87a052e5927c5e591f34ea28a9a017fb64c711983e472ae001465cbe29b6b9d88ab65d67c4bb303b9e01dde853aba66bf4 SHA512 08ca96cd62bae35245b40791c8588752b96136b53e5c9434d0f7976d03841fca80e8c83cf8608aad79c381820b06e00167447c6dc0c6294c6b3dfd91a9fdb6d4
 DIST ircii-20210314.tar.bz2 590626 BLAKE2B d9b785fd043f277ab7824b2161e9f8635f106802c502a905755fd7cfa1d34f8d7533e9bed7158f3ce0639787894c5f8f4ba4c96d628d3a50a34339f5a3d8466e SHA512 3dc3a4ddb000133907edb9b867ae7cb0b36488c875f5d4f56e70d7263cf042da6c429f60a8ed6cced89bca077aec42c9d992ea6b56b2ed8b4e91f125eeced310
-EBUILD ircii-20190117.ebuild 865 BLAKE2B ff4b1777b256435bd6124edf92ebf067fe59bc6f2cb08bda526a2575d5f0306e55a6f11fc7e1733d961e15afd4212c26bab3b2035ed67c3c786d9fe06e70d722 SHA512 42f910c9d2d8e201b528d73cf7b4d53e2cefdf7eaa0da0a46fb674df99a526cd6537dfeb7b5c06d235b7bd549f628b38e2c628563418f32e097ca293b58f98b1
-EBUILD ircii-20210314.ebuild 849 BLAKE2B b9cffa3ddc9c3d5dbf1de25cf6100858355d096d20ecd0a7cb42b6abdeec6066c5e7408e1682b4b921ffec743353e640fde4fc8ed60f4b9a6ad9321a85b53738 SHA512 64a8d416dfbf8c552f5f204250d8a69866a3f01584a37ce5e8f5995bf4e0e4e311d77eb64080ed3b06356a0f6037317b9577e589c49eedc9b604a350566a914b
+EBUILD ircii-20210314.ebuild 847 BLAKE2B 219b8acfba11060977c66f4ce1878b0a18326823c0d913391e1ca019e44fa21b024807b400ddcc59b695307e81a52c7ba059c883dcba75e763c6cc2fafca1d9b SHA512 b36f02acc4f739c856dc800ac5198de6b2dabab21f2c428cf3124f6dfc6c567d945e900d43315b960a26ea7473456dbf5f31b451d05cdd6e16ba6bd7e812f6a8
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/net-irc/ircii/ircii-20190117.ebuild b/net-irc/ircii/ircii-20190117.ebuild
deleted file mode 100644
index 677beaac500a..000000000000
--- a/net-irc/ircii/ircii-20190117.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="An IRC and ICB client that runs under most UNIX platforms"
-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"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="ipv6"
-
-DEPEND="sys-libs/ncurses:0=
-	virtual/libiconv"
-# This and irc-client both install /usr/bin/irc #247987
-RDEPEND="${DEPEND}
-	!net-irc/irc-client"
-
-PATCHES=( "${FILESDIR}/${PN}-manpage-path.patch" )
-
-src_configure() {
-	tc-export CC
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc ChangeLog INSTALL NEWS README \
-		doc/Copyright doc/crypto doc/VERSIONS doc/ctcp
-}
diff --git a/net-irc/ircii/ircii-20210314.ebuild b/net-irc/ircii/ircii-20210314.ebuild
index 53d9f0f1fea1..873dc09a5e9e 100644
--- a/net-irc/ircii/ircii-20210314.ebuild
+++ b/net-irc/ircii/ircii-20210314.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://eterna.com.au/ircii/"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:0=
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 4920d4719152..6ce6e1a88243 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,5 +1,7 @@
 AUX irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch 1498 BLAKE2B 79878990c10616a4bc54cc768cf87d2932aba7f75018f9887a75200a3ed38fa829958e3a5f0e137c6052dad1fce7a1d612f85d4c58bf6ed37c71f91f4a2b9099 SHA512 bfcdbfb1c06a13412594d5d14f4441ba06c3db3a4260aaa1c8bbfa1c68841ad1efc1c8af07f3fe4d12bb2e4c9fa7f067ace2b439745293082de6427a30242547
 DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2 SHA512 5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610
-EBUILD irssi-1.2.2-r1.ebuild 1596 BLAKE2B d251105311d238163eba7402149df75cbb8437f72a9c1318be5039d9f7fa6e83ae7d2de34e6b45cca584ce3edc9b1a5af81ec517f7c41171000194f64d221987 SHA512 b053f09ad42fa9c75b98e93c5afeb54da87196f1f3d8f03b7e3928aab142190905086908ffe6835ed68e20dcfa0f36e9d0ae668a5dcaea15007e5df89598a9ac
+DIST irssi-1.2.3.tar.xz 1145292 BLAKE2B 7b2b7cb8d1533a06ad3cd5e0b2e45bba636cf19d26c69e19fc7e9408313f80d80a26ff2bf5f21a8763d8adec722bb33f6b076a863e6a55e178a814a3e79c9db7 SHA512 826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc
+EBUILD irssi-1.2.2-r1.ebuild 1597 BLAKE2B 6acefb3074c21777b66c4997221ff499afe820c47c66c64c0f2260e71e226fef49b9af29b04a57211d61505cbbe8f6dede21101c3b82c0a4fdd1f94f509892bb SHA512 43b671b2369bfad8d7a2bbcf9e9829faf9b3b29d9ec2c0c4432dba7fb38802ff9388dcc283388f26d8b545358ccb06494a2c7e5080bac63e76c29be52a9c9c92
+EBUILD irssi-1.2.3.ebuild 1523 BLAKE2B 50bc261ab5e0058202cf8066831271ff0e89ebbbf8dfc1a3645dccc3bd0f97a488650a3d0d429e40f873822bea900cd0b7c58cc39bdf4868a116a55886b0535f SHA512 8a4e854c633ea56857a2be132f621893eb69c8889551b599e69205e579165b8686dc740bdd1b9fdfa850e824bc72ac5245d937b3c19fb92d2068f6861b976103
 EBUILD irssi-9999.ebuild 1452 BLAKE2B 36bdbe74877e969849b92cc653c21eb7d41d03b0b03ae3656b3d25b5bd63e37a7c65c47cb3ea7fad0f110a51f99384b66b9a4215a8940c2105e126054ed51dd6 SHA512 c9e57d39473c2f3a9fda1b331f8f8232c758e0fdb803b4472c68491e78b74432eea75577be9cfddfbd500643eb85a051cf986c00b472181f37bd1986c5cbcf64
 MISC metadata.xml 700 BLAKE2B 6dd761c206e402091a7847899f6d117a1110cbd12cc3263860470fdc3d2286f902d7949c1b36054508915eaf81622050a8ba734621781fa2bd1c167ff561a971 SHA512 bb8ce4cfafc1bb65ccc5fdfcd95d5aca47a958820eb55f3130967083256a495c4d8bf33e1bddf03394c4bd7b6afba70a838add6815e1e9ac86711ed405451601
diff --git a/net-irc/irssi/irssi-1.2.2-r1.ebuild b/net-irc/irssi/irssi-1.2.2-r1.ebuild
index f26fe2a1b73c..6347e3177724 100644
--- a/net-irc/irssi/irssi-1.2.2-r1.ebuild
+++ b/net-irc/irssi/irssi-1.2.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="otr +perl selinux socks5 +proxy libressl"
 
 COMMON_DEPEND="
diff --git a/net-irc/irssi/irssi-1.2.3.ebuild b/net-irc/irssi/irssi-1.2.3.ebuild
new file mode 100644
index 000000000000..d3b9d967d3b7
--- /dev/null
+++ b/net-irc/irssi/irssi-1.2.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="otr +perl selinux socks5 +proxy libressl"
+
+COMMON_DEPEND="
+	sys-libs/ncurses:0=
+	>=dev-libs/glib-2.6.0
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( >=dev-libs/libressl-2.7.4:= )
+	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
+		>=net-libs/libotr-4.1.0 )
+	perl? ( dev-lang/perl:= )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-irc )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	# Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
+	export ac_cv_lib_utf8proc_utf8proc_version=no
+
+	local myeconfargs=(
+		--with-perl-lib=vendor
+		--enable-true-color
+		$(use_with otr)
+		$(use_with proxy)
+		$(use_with perl)
+		$(use_with socks5 socks)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	use perl && perl_delete_localpod
+	rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die
+}
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index eeb71f028030..02a72be85d17 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,9 +1,6 @@
-AUX konversation-1.7.5-unused-kemoticons.patch 3192 BLAKE2B b1882f31639e17e2927ca7b7eecde12511a122ca6ebcc8fc2ab70cd38b28f973ba07e043aeed16dd029281b3c413515df707120c964105257960d23feee24e1f SHA512 3158d47aad3920715bd9dc010585e4a2e7488872a24cac8f69bff8ebafc4445d54611756ad05399d8bbd1b4be37fb28d8566577fbc040559fdad3ab18927e3df
-AUX konversation-1.7.6-no-kiconthemes.patch 13035 BLAKE2B a8f15af27cb86f8f8de3b4539de4bba891bf8434e8e1cc3941b11778b3ba35967afd05aa404d9f72888d9477321e45d0f34f7157c4236faf652f1026d8a55d4a SHA512 5a3fefb32f98a87b5c1d6272750c619318c28b650f0a334032b2454fb4aa77b24cc81b7b1161ad54f046b979edcb665e6fa4e5f1d303f9c1e39005efacef730e
-AUX konversation-1.7.7-no-solid.patch 1013 BLAKE2B 58cc622cce90ceded76e9b607b2a2f4d249fcbb4a722e8bc6f8e1a21345f25cc4244f77897e7a69b67c86d1533f926184bd89667d3705847c7d480bbd8f63510 SHA512 cd8e8bf8185785e26f4efc416419e858c8100a5673fd1440ef8c5f336099ae79e858016ec11fdeab18ccd6480f25f4a6e4a4f69c211456bb7e7a12fad465d17c
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
-DIST konversation-1.7.7.tar.xz 3357584 BLAKE2B 9f6817a1e01674f383879eeaafc65a50825aa7554fedcf7fbe7affc43da16f7198761ca12b510d9980df5a5f41819a5415043ec91de55f1cb4d86e62e8e23ea0 SHA512 99026007af7fa00b82240c1f0e46a8d3db6c3434948aff7d0b01c2f99bccdd227a2a705bd83bce1ca2e47be13866d5d0a981c8b4ff8dec472612d6ee40f9ed2c
 DIST konversation-20.12.3.tar.xz 4242136 BLAKE2B 2483b34dde69a73029d15e8d626c77ebc9f91aaca0dc7b83f4b92629bbf773873de52bf8fd1ead3d862fbb496f2dcc3823320d983ea0c0f2c0ba8ac831ce379f SHA512 022854edac9e2b834e9c6795cd02e9d9fe5ab54f4d3facaff9f60cac680e1b6df12ef3ac3281a07d4ce732f491fe2b49f47fd467751c9b87549e02df3ef27bae
-EBUILD konversation-1.7.7-r1.ebuild 2114 BLAKE2B 6fe3aff1c5e1d0c6791787d25b2443dc50a61c0f5e1c8b6b79f7bfc192cabd76dff6d38234c14eb66932bf5200990c522cac6e9bb8b12646f87cb51653450b63 SHA512 0a5f1f1c8b3a0130a6e7a09977a5b9b6c536cc41c858a2ae68e71707b7b4ec76f7c7558fbb0096bd5ee916ef4ed6630f74317c1a0a2449459cda429234b41348
-EBUILD konversation-20.12.3.ebuild 1905 BLAKE2B ca8c9ed95a0f9f2563cacb6d2119081c20ec311d12c1c30ac6fd546b9b1ee02296b752b998c42e8d2eaf6ef80f8d7050ed3d6a46d981ea967bb17b23033c1b92 SHA512 845bdfcd9d7ffc3741a5cfd1738ccfbb8e6fbabb0281d3227c9b5e15eefd710c3b72b844b21e5865adae8333c9ef74473891c4b19fc921f6ec62b33e06a9e8f6
+DIST konversation-21.04.0.tar.xz 4230300 BLAKE2B f5f1ece730b9b1f849e9dd990b94a4760dc660c643fbf5e26f7d6568cae2f5ab005ccb6e6d6dc64f0268531b3c1b79b312a9eef69aa4e99a11e7a784c7161e25 SHA512 1b0355d9ad2fdb5f62aced44c92d312115fe58153a1f52278aeb699f78e8b48eabf2f816190943f5fc583356885486ea7e04aefab1712f7627bb70d405d4ff47
+EBUILD konversation-20.12.3.ebuild 1902 BLAKE2B 65a9eb42c8b5922fbaa78935813bc9efb52d405141e9cd89fd47b80f51aae23e0b50a4240092c39a7d91011a82e258a6f705c342e44d11f0ed5583b9873e956b SHA512 8c8d3683660cce99b2902f66c866a78739e9d1e539c62f9f0c44d92422405f2a7fbd10d084c2f849ea6792cc5e96e780f232eb2881f790c6b61487de1442cdf4
+EBUILD konversation-21.04.0.ebuild 1894 BLAKE2B f4cef411a30ec8dce3a836d69ff72926ab105f78d991eaa09ee7fbc815abe97972210965a3d1047422657ef47ab44f185e8be583b8936dfe2bcab7795a02d5c7 SHA512 62f463191aa4a40d1f945c1636e1dabe1e47bdde86b60d41b24cfeaaf170c6d08361997a0e7c2ceff96d73f704504a37e571e3cf7c3d181cb47c4dcf42e2d4f8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch b/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
deleted file mode 100644
index d856a17215a9..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-unused-kemoticons.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 271da4bd1e584026fc24d93474ca6cf9e50fa6d7 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Mon, 16 Sep 2019 18:18:49 +0100
-Subject: Drop effectively unused kemoticons support
-
-Summary:
-Konversation only supported emoticons if config value EnableEmotIcons
-was true. This by default was false and there is no UI for configuring
-this, making it effectively unused.
-
-This appears to be deliberate from the code comments.
-
-This helps clear up some KEmoticon library usage for future KF6
-transitioning.
-
-UTF-8 emoticons work correctly.
-
-Test Plan: Compiles
-
-Differential Revision: https://phabricator.kde.org/D24000
----
- src/CMakeLists.txt           |  2 --
- src/config/konversation.kcfg |  8 --------
- src/viewer/ircview.cpp       |  3 ---
- 3 files changed, 13 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c2077b3..89616a6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -138,7 +138,6 @@ set(viewer_SRCS
-     viewer/topiclabel.cpp
-     viewer/awaylabel.cpp
-     viewer/editnotifydialog.cpp
--    viewer/emoticons.cpp
-     viewer/images.cpp
-     viewer/quickbutton.cpp
-     viewer/searchbar.cpp
-@@ -224,7 +223,6 @@ target_link_libraries(konversation
-     KF5::Bookmarks
-     KF5::ConfigWidgets
-     KF5::Crash
--    KF5::Emoticons
-     KF5::I18n
-     KF5::IdleTime
-     KF5::NotifyConfig
-diff --git a/src/config/konversation.kcfg b/src/config/konversation.kcfg
-index 1d59eaf..3f0b7a6 100644
---- a/src/config/konversation.kcfg
-+++ b/src/config/konversation.kcfg
-@@ -844,14 +844,6 @@
-       <label></label>
-       <whatsthis></whatsthis>
-     </entry>
--    <entry key="EnableEmotIcons" type="Bool">
--      <default>false</default>
--      <label>Enable emoticons</label>
--    </entry>
--    <entry key="EmotIconTheme" type="String">
--      <default>Default</default>
--      <label>Emoticons theme</label>
--    </entry>
-   </group>
-   <group name="PreferencesDialog">
-     <entry name="PreferencesDialogSize" key="Size" type="Size">
-diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
-index c129f61..15f78ca 100644
---- a/src/viewer/ircview.cpp
-+++ b/src/viewer/ircview.cpp
-@@ -20,7 +20,6 @@
- #include "application.h"
- #include "highlight.h"
- #include "sound.h"
--#include "emoticons.h"
- #include "notificationhandler.h"
- 
- #include <QDrag>
-@@ -1214,8 +1213,6 @@ QString IRCView::filter(const QString& line, const QString& defaultColor, const
-             QLatin1String("\">") + filteredLine + QLatin1String("</font>");
-     }
- 
--    filteredLine = Konversation::Emoticons::parseEmoticons(filteredLine);
--
-     return filteredLine;
- }
- 
--- 
-cgit v1.1
-
-From f1e6ec37b9a9ead194606795ed23a1ec70a784cc Mon Sep 17 00:00:00 2001
-From: Peter Simonsson <peter.simonsson@gmail.com>
-Date: Tue, 7 Apr 2020 16:37:53 +0200
-Subject: Remove KEmoticons from dependencies as it's not used
-
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5315dbd..19facd8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,7 +24,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-     CoreAddons
-     Crash
-     DocTools
--    Emoticons
-     I18n
-     IdleTime
-     NotifyConfig
--- 
-cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch b/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
deleted file mode 100644
index f631a9493483..000000000000
--- a/net-irc/konversation/files/konversation-1.7.6-no-kiconthemes.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-From 2104a776203d32b49512b303506f94085e0e4d89 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 19 Sep 2020 22:50:48 +0200
-Subject: [PATCH] Port away from KIconthemes
-
-Use appropriate QIcon/QStyle API instead
-
-Incorporates:
-
-commit 5cd6c690e005a040e5fd3ccfca7ae23593c6dfe6
-Author: Nicolas Fella <nicolas.fella@gmx.de>
-Date:   Sat Sep 19 22:50:48 2020 +0200
-Subject: Remove unneeded system tray icon update
-
-  The system tray icon is specified by name.
-  We don't need to do anything when the theme changes.
-
-commit d1bce09605c255f7b96fa677ece363b3053d085e
-Author: Peter Simonsson <peter.simonsson@gmail.com>
-Date:   Tue Oct 22 21:35:25 2019 +0200
-Subject: Don't use deprecated SmallIcon
-
----
- CMakeLists.txt                |  1 -
- src/CMakeLists.txt            |  1 -
- src/dcc/recipientdialog.cpp   |  5 ++---
- src/dcc/transferlistmodel.cpp | 25 ++++---------------------
- src/dcc/transferlistmodel.h   |  3 +--
- src/irc/channel.cpp           |  4 ++--
- src/irc/nicksonline.cpp       |  1 -
- src/irc/query.cpp             |  4 ++--
- src/mainwindow.cpp            |  2 --
- src/statusbar.cpp             |  4 ++--
- src/viewer/ircview.cpp        |  5 ++---
- src/viewer/ircviewbox.cpp     |  1 -
- src/viewer/topiclabel.cpp     |  6 ++----
- src/viewer/viewcontainer.cpp  |  4 +---
- 14 files changed, 18 insertions(+), 48 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f0cd4b4f..3a1f5274 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,7 +37,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-     DBusAddons
-     Notifications
-     WindowSystem
--    IconThemes
-     ItemViews
- )
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 04f28971..36de36b0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -238,7 +238,6 @@ target_link_libraries(konversation
-     KF5::CoreAddons
-     KF5::Notifications
-     KF5::WindowSystem
--    KF5::IconThemes
-     KF5::ItemViews
-     Phonon::phonon4qt5)
- 
-diff --git a/src/dcc/recipientdialog.cpp b/src/dcc/recipientdialog.cpp
-index 3e6eeae7..e81e91ea 100644
---- a/src/dcc/recipientdialog.cpp
-+++ b/src/dcc/recipientdialog.cpp
-@@ -28,7 +28,6 @@
- #include <KLineEdit>
- #include <KSharedConfig>
- #include <KWindowConfig>
--#include <KIconLoader>
- 
- namespace Konversation
- {
-@@ -64,12 +63,12 @@ namespace Konversation
-             dialogLayout->addWidget(buttonBox);
-             QPushButton* button = buttonBox->addButton(QDialogButtonBox::Ok);
-             button->setToolTip(i18n("Select nickname and close the window"));
--            button->setIcon(SmallIcon("dialog-ok"));
-+            button->setIcon(QIcon::fromTheme("dialog-ok"));
-             button->setShortcut(Qt::CTRL | Qt::Key_Return);
-             button->setDefault(true);
-             button = buttonBox->addButton(QDialogButtonBox::Cancel);
-             button->setToolTip(i18n("Close the window without changes"));
--            button->setIcon(SmallIcon("dialog-cancel"));
-+            button->setIcon(QIcon::fromTheme("dialog-cancel"));
- 
-             KWindowConfig::restoreWindowSize(windowHandle(), KConfigGroup(KSharedConfig::openConfig(), "DCCRecipientDialog"));
- 
-diff --git a/src/dcc/transferlistmodel.cpp b/src/dcc/transferlistmodel.cpp
-index cc1763f9..2a7e3b15 100644
---- a/src/dcc/transferlistmodel.cpp
-+++ b/src/dcc/transferlistmodel.cpp
-@@ -21,7 +21,6 @@
- #include <KCategorizedSortFilterProxyModel>
- #include <KLocalizedString>
- #include <KCategoryDrawer>
--#include <KIconLoader>
- 
- namespace Konversation
- {
-@@ -313,15 +312,11 @@ namespace Konversation
-                     {
-                         case TransferHeaderData::Status:
-                         {
--                            QVariant decoration(QVariant::Pixmap);
--                            decoration.setValue<QPixmap>(getStatusIcon(transfer->getStatus()));
--                            return decoration;
-+                            return getStatusIcon(transfer->getStatus());
-                         }
-                         case TransferHeaderData::TypeIcon:
-                         {
--                            QVariant decoration(QVariant::Pixmap);
--                            decoration.setValue<QPixmap>(getTypeIcon(transfer->getType()));
--                            return decoration;
-+                            return transfer->getType() == Transfer::Send ? QIcon::fromTheme("arrow-up") : QIcon::fromTheme("arrow-down");
-                         }
-                         default:
-                             return QVariant();
-@@ -384,19 +379,7 @@ namespace Konversation
-             }
-         }
- 
--        QPixmap TransferListModel::getTypeIcon(Transfer::Type type) const
--        {
--            if (type == Transfer::Send)
--            {
--                return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Small);
--            }
--            else
--            {
--                return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Small);
--            }
--        }
--
--        QPixmap TransferListModel::getStatusIcon(Transfer::Status status) const
-+        QIcon TransferListModel::getStatusIcon(Transfer::Status status) const
-         {
-             QString icon;
-             switch (status)
-@@ -422,7 +405,7 @@ namespace Konversation
-                 default:
-                 break;
-             }
--            return KIconLoader::global()->loadIcon(icon, KIconLoader::Small);
-+            return QIcon::fromTheme(icon);
-         }
- 
-         QString TransferListModel::getSpeedPrettyText (transferspeed_t speed)
-diff --git a/src/dcc/transferlistmodel.h b/src/dcc/transferlistmodel.h
-index 3a8a945c..b8bc0d25 100644
---- a/src/dcc/transferlistmodel.h
-+++ b/src/dcc/transferlistmodel.h
-@@ -164,8 +164,7 @@ namespace Konversation
-             inline QString getPositionPrettyText(KIO::fileoffset_t position,
-                                                  KIO::filesize_t filesize) const;
-             inline QString getSenderAddressPrettyText(Transfer *transfer) const;
--            inline QPixmap getStatusIcon(Transfer::Status status) const;
--            inline QPixmap getTypeIcon(Transfer::Type type) const;
-+            inline QIcon getStatusIcon(Transfer::Status status) const;
-             inline QString getStatusDescription(Transfer::Status status, Transfer::Type type, const QString& errorMessage = QString()) const;
- 
-             QList<TransferItemData> m_transferList;
-diff --git a/src/irc/channel.cpp b/src/irc/channel.cpp
-index 6488a0c1..595d0adc 100644
---- a/src/irc/channel.cpp
-+++ b/src/irc/channel.cpp
-@@ -38,7 +38,6 @@
- #include <KLineEdit>
- #include <KPasswordDialog>
- #include <KMessageBox>
--#include <KIconLoader>
- #include <KComboBox>
- 
- #define DELAYED_SORT_TRIGGER    10
-@@ -237,7 +236,8 @@ Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent)
-     awayLabel->hide();
-     cipherLabel = new QLabel(commandLineBox);
-     cipherLabel->hide();
--    cipherLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
-+    const int toolBarIconSize = cipherLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
-+    cipherLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
-     m_inputBar = new IRCInput(commandLineBox);
- 
-     commandLineLayout->addWidget(nicknameCombobox);
-diff --git a/src/irc/nicksonline.cpp b/src/irc/nicksonline.cpp
-index e23deab4..bb4cf00e 100644
---- a/src/irc/nicksonline.cpp
-+++ b/src/irc/nicksonline.cpp
-@@ -31,7 +31,6 @@
- #include <QToolTip>
- #include <QTreeWidget>
- 
--#include <KIconLoader>
- #include <KToolBar>
- 
- 
-diff --git a/src/irc/query.cpp b/src/irc/query.cpp
-index 8c1845e6..56310642 100644
---- a/src/irc/query.cpp
-+++ b/src/irc/query.cpp
-@@ -25,7 +25,6 @@
- 
- #include <QSplitter>
- 
--#include <KIconLoader>
- #include <KMessageBox>
- #include <KSqueezedTextLabel>
- 
-@@ -75,7 +74,8 @@ Query::Query(QWidget* parent, const QString& _name) : ChatWindow(parent)
-     blowfishLabel = new QLabel(inputBox);
-     inputBoxLayout->addWidget(blowfishLabel);
-     blowfishLabel->hide();
--    blowfishLabel->setPixmap(KIconLoader::global()->loadIcon(QStringLiteral("document-encrypt"), KIconLoader::Toolbar));
-+    const int toolBarIconSize = blowfishLabel->style()->pixelMetric(QStyle::PixelMetric::PM_ToolBarIconSize);
-+    blowfishLabel->setPixmap(QIcon::fromTheme(QStringLiteral("document-encrypt")).pixmap(toolBarIconSize));
-     m_inputBar=new IRCInput(inputBox);
-     inputBoxLayout->addWidget(m_inputBar);
- 
-diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
-index 40423d29..a876de30 100644
---- a/src/mainwindow.cpp
-+++ b/src/mainwindow.cpp
-@@ -49,7 +49,6 @@
- #include <KActionMenu>
- #include <KNotifyConfigWidget>
- #include <KGlobalAccel>
--#include <KIconLoader>
- 
- MainWindow::MainWindow() : KXmlGuiWindow(0)
- {
-@@ -743,7 +742,6 @@ void MainWindow::updateTrayIcon()
-             // set up system tray
-             m_trayIcon = new Konversation::TrayIcon(this);
-             connect(this, SIGNAL(endNotification()), m_trayIcon, SLOT(endNotification()));
--            connect(KIconLoader::global(), SIGNAL(iconChanged(int)), m_trayIcon, SLOT(updateAppearance()));
-             QMenu *trayMenu = qobject_cast<QMenu*>(m_trayIcon->contextMenu());
-             trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::Preferences))));
-             trayMenu->addAction(actionCollection()->action(QLatin1String(KStandardAction::name(KStandardAction::ConfigureNotifications))));
-diff --git a/src/statusbar.cpp b/src/statusbar.cpp
-index 07a22fc6..e0efb02f 100644
---- a/src/statusbar.cpp
-+++ b/src/statusbar.cpp
-@@ -19,7 +19,6 @@
- #include <KLocalizedString>
- #include <QStatusBar>
- #include <KSqueezedTextLabel>
--#include <KIconLoader>
- 
- namespace Konversation
- {
-@@ -52,7 +51,8 @@ namespace Konversation
- 
-         m_sslLabel = new SSLLabel(m_window->statusBar());
-         m_sslLabel->setObjectName(QStringLiteral("sslLabel"));
--        m_sslLabel->setPixmap(SmallIcon(QStringLiteral("security-high")));
-+        const int smallIconSize = m_sslLabel->style()->pixelMetric(QStyle::PixelMetric::PM_SmallIconSize);
-+        m_sslLabel->setPixmap(QIcon::fromTheme(QStringLiteral("security-high")).pixmap(smallIconSize));
-         m_sslLabel->hide();
-         m_sslLabel->setWhatsThis(i18n("All communication with the server is encrypted.  This makes it harder for someone to listen in on your communications."));
- 
-diff --git a/src/viewer/ircview.cpp b/src/viewer/ircview.cpp
-index 73f5305f..86bbc3ae 100644
---- a/src/viewer/ircview.cpp
-+++ b/src/viewer/ircview.cpp
-@@ -30,9 +30,7 @@
- #include <QTextDocumentFragment>
- #include <QMimeData>
- 
--#include <KIconLoader>
- #include <KStandardShortcut>
--#include <kio/pixmaploader.h>
- #include <KUrlMimeData>
- #include <QLocale>
- 
-@@ -2000,7 +1998,8 @@ void IRCView::mouseMoveEvent(QMouseEvent* ev)
- 
-         drag->setMimeData(mimeData);
- 
--        QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
-+        const QString iconName = KIO::iconNameForUrl(url);
-+        const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
-         drag->setPixmap(pixmap);
- 
-         drag->exec();
-diff --git a/src/viewer/ircviewbox.cpp b/src/viewer/ircviewbox.cpp
-index 463c9fd3..6c10d976 100644
---- a/src/viewer/ircviewbox.cpp
-+++ b/src/viewer/ircviewbox.cpp
-@@ -14,7 +14,6 @@
- #include "ircview.h"
- #include "searchbar.h"
- 
--#include <KIconLoader>
- #include <QPixmap>
- #include <QVBoxLayout>
- 
-diff --git a/src/viewer/topiclabel.cpp b/src/viewer/topiclabel.cpp
-index 6a8b4331..c96edc6e 100644
---- a/src/viewer/topiclabel.cpp
-+++ b/src/viewer/topiclabel.cpp
-@@ -20,9 +20,6 @@
- #include <QTextDocument>
- #include <QMimeData>
- 
--#include <KIconLoader>
--#include <kio/pixmaploader.h>
--
- namespace Konversation
- {
-     TopicLabel::TopicLabel(QWidget *parent, const char *name)
-@@ -181,7 +178,8 @@ namespace Konversation
- 
-             drag->setMimeData(mimeData);
- 
--            QPixmap pixmap = KIO::pixmapForUrl(url, 0, KIconLoader::Desktop, KIconLoader::SizeMedium);
-+            const QString iconName = KIO::iconNameForUrl(url);
-+            const QPixmap pixmap = QIcon::fromTheme(iconName).pixmap(32);
-             drag->setPixmap(pixmap);
- 
-             drag->exec();
-diff --git a/src/viewer/viewcontainer.cpp b/src/viewer/viewcontainer.cpp
-index 94d498ea..fd7be5bc 100644
---- a/src/viewer/viewcontainer.cpp
-+++ b/src/viewer/viewcontainer.cpp
-@@ -52,8 +52,6 @@
- #include <KToggleAction>
- #include <KSelectAction>
- #include <KWindowSystem>
--#include <KIconLoader>
--
- 
- using namespace Konversation;
- 
-@@ -241,7 +239,7 @@ void ViewContainer::setupTabWidget()
-     m_vbox->hide();
- 
-     QToolButton* closeBtn = new QToolButton(m_tabWidget);
--    closeBtn->setIcon(SmallIcon("tab-close"));
-+    closeBtn->setIcon(QIcon::fromTheme("tab-close"));
-     closeBtn->adjustSize();
-     m_tabWidget->setCornerWidget(closeBtn, Qt::BottomRightCorner);
-     connect(closeBtn, SIGNAL(clicked()), this, SLOT(closeCurrentView()));
--- 
-2.28.0
-
diff --git a/net-irc/konversation/files/konversation-1.7.7-no-solid.patch b/net-irc/konversation/files/konversation-1.7.7-no-solid.patch
deleted file mode 100644
index 53ea4a3d7a1d..000000000000
--- a/net-irc/konversation/files/konversation-1.7.7-no-solid.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3d8a425ef426019c49abea20baa58461900c731d Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Thu, 29 Oct 2020 13:15:22 +0100
-Subject: [PATCH] Remove unused explicit dep on and linkage of Solid
-
-(still pulled in via public dep of KIOFileWidgets, but not used by us)
----
- CMakeLists.txt     | 1 -
- src/CMakeLists.txt | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 72ec982d..bcd101e1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -30,7 +30,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-     NotifyConfig
-     KIO
-     Parts
--    Solid
-     Wallet
-     WidgetsAddons
-     GlobalAccel
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 460325f1..680053e2 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -244,7 +244,6 @@ target_link_libraries(konversation
-     KF5::KIOFileWidgets
-     KF5::KIOWidgets
-     KF5::Parts
--    KF5::Solid
-     KF5::Wallet
-     KF5::WidgetsAddons
-     KF5::GlobalAccel
--- 
-GitLab
-
diff --git a/net-irc/konversation/konversation-20.12.3.ebuild b/net-irc/konversation/konversation-20.12.3.ebuild
index 5e0ea6be4c39..8712bc63e0eb 100644
--- a/net-irc/konversation/konversation-20.12.3.ebuild
+++ b/net-irc/konversation/konversation-20.12.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="+crypt"
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-irc/konversation/konversation-1.7.7-r1.ebuild b/net-irc/konversation/konversation-21.04.0.ebuild
index d3f2f657db22..81b41083e5b3 100644
--- a/net-irc/konversation/konversation-1.7.7-r1.ebuild
+++ b/net-irc/konversation/konversation-21.04.0.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KDE_GEAR="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="User friendly IRC Client"
 HOMEPAGE="https://konversation.kde.org https://apps.kde.org/en/konversation"
 
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-
 LICENSE="GPL-2"
 SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+crypt"
 
 BDEPEND="sys-devel/gettext"
@@ -41,6 +38,7 @@ DEPEND="
 	>=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
@@ -58,13 +56,6 @@ RDEPEND="${DEPEND}
 	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
 "
 
-PATCHES=(
-	# git master
-	"${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch
-	"${FILESDIR}"/${PN}-1.7.6-no-kiconthemes.patch
-	"${FILESDIR}"/${P}-no-solid.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package crypt Qca-qt5)
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index 22f847eea10e..7afd8b757e9e 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,4 +1,6 @@
-DIST limnoria-20200124.tar.gz 1034653 BLAKE2B 895a0820efcd58429e457e0cb8dbcb864e56a3bce9fab9546cf622aabc7711a015432812c4193d2dabe7a85043c623ce427504c1c8e78530499c8db2c589bd8e SHA512 828c4927e2ce00c012d17f8a2b2d629370c34915e7e4f71de6df67259e643448c33a60d9cf742b2d827e21e17326a8fc20be875eac826edf64406eda906567a4
-EBUILD limnoria-20200124.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
+DIST limnoria-20210326.tar.gz 1046488 BLAKE2B fcbaab1ecebcd74438be4c2fce96c7e289aa01dcb67c324130d5c768727e159c87b5d96cc4ffefdf629287d59f02cc72ea17ba4a61e9157d7626ebceb9e072e8 SHA512 1d612a2ce42edec909255474f99b4785ff7eb7a7554ee5090e05db92cadb071821f6962659d8f1846f238a257d6b8d513881f27be44a7582d154bd0cf398f7db
+DIST limnoria-20210411.tar.gz 1084991 BLAKE2B 6bca9a2583748ae2b1c26670a762d0ee1307478b6d587e32c816c880d4d1ac6495f79d07bd8d7068867b1a9dd1bff51233e5636c0d0371e2ee1c19617a9a7872 SHA512 2c53d6ecd2457fae77076ad5ee0c4fa61c42970f8d43891b6d9adbabae80176ccab2789fc6a7129db3545a76f1850cf86de50aa3814b335d42f1220a2818c36c
+EBUILD limnoria-20210326.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
+EBUILD limnoria-20210411.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
 EBUILD limnoria-9999.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767
-MISC metadata.xml 434 BLAKE2B a46dc6d345d90a91c0862ef60b560fa43d88202da632e8a97c98ca2b1834cb5084b025d36b1d9318a8204599495c2469c0902f369ba05b74956fab5cc2cb8559 SHA512 97d2cf9271a8bdae86b93dbb651d2ac5f4f49ca475d647c3f6db5bdca4126435d0ec153d4fa3fc3fbbd11ec219174b36f1544cab23a5191a354bdd0c68ab1427
+MISC metadata.xml 537 BLAKE2B b5b3c724a256cfeb8c99426ebe011fab7aa09f099c92f5ab4684989a4553a6820816bebeb12e8fbe1801c54d9b279e47e9ca4f46f654f3575d5bc5f7badb1b53 SHA512 7583b486dbc023fc3dadd694ca8bc123296685b613e2eebd4f4f8de0105c68a58f0dc7c3997c3b1a5a93bb689758199e59f8e25fc136a310bea7568ce90cf5dd
diff --git a/net-irc/limnoria/limnoria-20200124.ebuild b/net-irc/limnoria/limnoria-20210326.ebuild
index 03b9171f694b..03b9171f694b 100644
--- a/net-irc/limnoria/limnoria-20200124.ebuild
+++ b/net-irc/limnoria/limnoria-20210326.ebuild
diff --git a/net-irc/limnoria/limnoria-20210411.ebuild b/net-irc/limnoria/limnoria-20210411.ebuild
new file mode 100644
index 000000000000..03b9171f694b
--- /dev/null
+++ b/net-irc/limnoria/limnoria-20210411.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+MY_PN="Limnoria"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git"
+	EGIT_BRANCH="testing"
+	inherit git-r3
+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"
+fi
+
+DESCRIPTION="Python based extensible IRC infobot and channel bot"
+HOMEPAGE="https://docs.limnoria.net"
+LICENSE="BSD GPL-2 GPL-2+"
+SLOT="0"
+IUSE="crypt ssl test"
+RESTRICT=" !test? ( test )"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	!net-irc/supybot
+	!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_test() {
+	pushd "${T}" > /dev/null || die
+	PLUGINS_DIR="${BUILD_DIR}"/lib/supybot/plugins
+	EXCLUDE_PLUGINS=()
+	# 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[@]}" \
+		|| die "Tests failed under ${EPYTHON}"
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/*
+}
+
+pkg_postinst() {
+	elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/"
+	elog ""
+	elog "Use supybot-wizard to create a configuration file."
+	elog "Run supybot </path/to/config> to use the bot."
+}
diff --git a/net-irc/limnoria/metadata.xml b/net-irc/limnoria/metadata.xml
index 6f7926539c95..42ecff18ea01 100644
--- a/net-irc/limnoria/metadata.xml
+++ b/net-irc/limnoria/metadata.xml
@@ -5,6 +5,10 @@
 		<email>np-hardass@gentoo.org</email>
 		<name>Adam Feldman</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>wraeth@gentoo.org</email>
+		<name>Sam Jorna</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<use>
 		<flag name="crypt">Enables user authentication with GPG</flag>
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index ca045587a6db..fa8d90745b35 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,4 +1,5 @@
 AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158
 DIST ngircd-26.1.tar.gz 562938 BLAKE2B a1a4ca8b6e12a02cb4ba2e07d777cf77051b5330464c91634cfac0b385157ab7c648e3b71151247bc8ee6cc847e84755fdca3d9b4a25205bbb57b8296995dd17 SHA512 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c
-EBUILD ngircd-26.1.ebuild 2190 BLAKE2B fe90ba70bb50f1fb59a3a596a075ff78c4bb3fe2b33f5e6d5d3fc01308d0d8b32ee81a079579107ca02f282dd6bd1d53fd8f928b2e245ac67b18f8fb74f9f481 SHA512 447b1298b91ba147bafd87b705f2f7d33c5fdc4e8ba747dcb703aaf2c7355caca83ec59b79124c2fae0d4682fbe89c5362466566f7460d42197f2290fd0e6694
+DIST ngircd-26.1.tar.gz.sig 310 BLAKE2B 108daa66aeccd51468aa0c6ab2de18c3ce476e812145902186ac4b3b8b29b0da32057c5a6f44133cfa4507310a9a76a001301ebe2d37ca809e1b7d8502aaa492 SHA512 e0b6b28c65f1363c0e8043378d52bccc0a634d7c17018edbc33130c9dbc4c2896f3b3a3ab758746707b37e3e527abbd61e5af8c1455d5fcc5b1b202758c82576
+EBUILD ngircd-26.1.ebuild 2284 BLAKE2B 86c9400a33199c8afa126f516b1a1f060cdb09b3026e55896f1cad5d08489924b6c09501b42eb16dbe4562598bdfd669a1ab88d6ae778b36be581b693ddfae2e SHA512 5ed1ffc9a714f11da86283ca92aad28bdb882dfeeba6be18d95b420c60b70a74a9d70840457506239974b745543452a20254271de100a1f67ac0d2f0213566b9
 MISC metadata.xml 650 BLAKE2B dd80efa442d59f04e26bb338e371ffa8380a4cdbb630db30e25adbaa930d9f0e4a486bbd05321b8185c23558ad4e29023153a69d1214294c345b46685eb7de86 SHA512 9b8879892c2edc6c7792c22a684f87ae559a43b034ee66f6242e73075012e1f53a33a63fc3ffa62c41f5fd620a4be6c1ffc57a1b62cf42ffa3c032cec4ff743b
diff --git a/net-irc/ngircd/ngircd-26.1.ebuild b/net-irc/ngircd/ngircd-26.1.ebuild
index a19285e647eb..2e0537871e32 100644
--- a/net-irc/ngircd/ngircd-26.1.ebuild
+++ b/net-irc/ngircd/ngircd-26.1.ebuild
@@ -3,20 +3,19 @@
 
 EAPI=7
 
-# Bug: https://github.com/ngircd/ngircd/issues/261
-WANT_AUTOMAKE=1.11.6
-inherit autotools
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/alexbarton.asc
+inherit 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 libressl pam +ssl strict-rfc tcpd test zlib"
 
-#RESTRICT="!test? ( test )"
 # Flaky test needs investigation (bug 719256)
 RESTRICT="test"
 
@@ -43,6 +42,7 @@ BDEPEND="
 		dev-tcltk/expect
 		net-misc/netkit-telnetd
 	)
+	verify-sig? ( app-crypt/openpgp-keys-alexbarton )
 "
 
 src_prepare() {
@@ -55,9 +55,9 @@ src_prepare() {
 			doc/sample-ngircd.conf.tmpl || die
 	fi
 
-	# Once https://github.com/ngircd/ngircd/pull/270 is in a release (ngircd 26), we can remove
-	# the eautomake/autotools machinery.
-	eautomake
+	# Note that if we need to use automake, we need a certain version (for now):
+	# https://github.com/ngircd/ngircd/issues/261
+	# eautomake
 }
 
 src_configure() {
diff --git a/net-irc/ninja/Manifest b/net-irc/ninja/Manifest
index 4dd072ac2652..39c34b58e0fc 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 619 BLAKE2B 5722cfb042c512a1f94b8d8bb94997b36bee7889a0fb8199870ec436b2502f5737ae0ceb5d900df83a30cbf73603496df21789e4fb70ef44459c6154919d105e SHA512 ca03c2a87e5a1dfe608194201d0bd9a7f88d2472736f89552f5b01fc34584f20d6f89a91518c2e855c7d8f06ce26d6884bf3d0c73944e3e03731146f2ec35c70
+EBUILD ninja-1.5.9_pre14-r1.ebuild 762 BLAKE2B a7803537f5cab687e8ca13c530bb8613f362b9fd7f71a04bf8df2e60f233f6ec817804e7af10c422ed03539a11f39b5e0ec1986e0f4d430b18e887f241f1223c SHA512 da1af4261ef926d126fed6c35ca87444cb0e80c1a6b27d1411b1b2d564f753177251ccf4bc11640341be3909ca8b9aa293ab785b88388c4f6d419506a7861093
 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-r1.ebuild
index ab35441f4f58..d4712c50f4b8 100644
--- a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
+++ b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-S=${WORKDIR}/${P/_*/}
+inherit toolchain-funcs
 
 DESCRIPTION="Ninja IRC Client"
 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"
 KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
@@ -15,17 +17,26 @@ IUSE="ncurses ipv6 ssl"
 
 RESTRICT="test"
 
-DEPEND="ncurses? ( sys-libs/ncurses )
-	ssl?  ( dev-libs/openssl )"
+DEPEND="
+	ncurses? ( sys-libs/ncurses:= )
+	ssl?  ( dev-libs/openssl:= )
+"
 RDEPEND="${DEPEND}"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_configure() {
+	tc-export CC
+
 	econf $(use_enable ipv6)
+
+	# Generated post-configure
+	sed -i -e "s:/usr/lib:/usr/$(get_libdir):" Makefile || die
 }
 
 src_install() {
 	default
-	mv "${ED}"/usr/bin/ninja{,_irc} || die #436804
+
+	# bug #436804
+	mv "${ED}"/usr/bin/ninja{,_irc} || die
 }
diff --git a/net-irc/onis/Manifest b/net-irc/onis/Manifest
index 60f73c925c56..0ca7677a5eeb 100644
--- a/net-irc/onis/Manifest
+++ b/net-irc/onis/Manifest
@@ -1,4 +1,4 @@
 AUX 0.6.0-nochdir.patch 257 BLAKE2B b9a74801aea7f18198874c2134800f7c57c5ae10a470d7029098d31381d894a20a5781878ccbddf5a0ee00c67320c7f5fd1dad47cdc416a49e07616c82eeb24c SHA512 cdc0599fbb6d0155adbb9d7123e01bc001051e325585ab6342d1aa2271d2f86d7d124ca4a8a62063d78edbb37394afe63853fc13c790a9f0263744aa39fcdbc5
 DIST onis-0.8.2.tar.bz2 100135 BLAKE2B bf88427a330acee02b71f30cc2f60cd84c6805fb350b23e9e92a99d9f35bc771d181499ff8498a7d882c6662f466e714889fa13c8d54f900b378c0a7152756b5 SHA512 f0b7f49fc65c77953956d4ba8c699d9f30967586514f79047282be2a0ea19e69224989937e4abc9a868c556776e579f68d58e541ad81b071b6575579ea29f928
-EBUILD onis-0.8.2-r1.ebuild 924 BLAKE2B c2ce2995401e12335d4e277ca6981f20d60c42a4be1dd503ddb05a10c0548aa9794f6bcad13a6ecdc43a2ac294bdfdc5aa89bc347f07a7b3279a54cfc3365c19 SHA512 5838dab7e82821b32cb438526cc76fb00209518403c281b2d6beb4bb7f4717e5387228287b067a699335f5fa5ac9618ee8ec20f5f7a730c974a5a89051e1be78
+EBUILD onis-0.8.2-r1.ebuild 908 BLAKE2B b0b32d667b7cf736064d695fd42cc7f5e6a5e9ba4cb688f1ce366fee7c82b4592a1b99f5fc70f8943f069d460b65a1c4d07f1ec2363957156ab38c6348007f59 SHA512 409a4f530fd262621df33a366be88ed2c8c30bf661a173a17d295e09d756ddf109c3c737dad97037337b6cfea61310a61124acb0e6c1c19e1475c706333d977c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/onis/onis-0.8.2-r1.ebuild b/net-irc/onis/onis-0.8.2-r1.ebuild
index 9b3ca1036075..7c1eb8e3d90d 100644
--- a/net-irc/onis/onis-0.8.2-r1.ebuild
+++ b/net-irc/onis/onis-0.8.2-r1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="onis not irc stats"
 HOMEPAGE="http://verplant.org/onis/"
 SRC_URI="http://verplant.org/${PN}/${P}.tar.bz2"
diff --git a/net-irc/oragono/Manifest b/net-irc/oragono/Manifest
index 92f2db332552..67ba4bf364f3 100644
--- a/net-irc/oragono/Manifest
+++ b/net-irc/oragono/Manifest
@@ -1,5 +1,5 @@
 AUX oragono.confd 104 BLAKE2B 8e1f9372d43f979a768b516f0b7c4e00540a1547592bae12b576e8b182b94eefadfda09208e14a7f3fe1c8480d447e487a1df86807041bca33a53b87f208822a SHA512 7b54c8ad9ed552fd91bda17605118599a8f3853156c0d8b9d1c64630b984095096c74dcd38000b2d13ab0e3015ee81e994ea5d90b20edbc6b5c174f6efbdb307
 AUX oragono.initd 228 BLAKE2B 5ccdbc0762223f0311ea80f104cb814bd1990720bc35befbb3b19d4e71226e773ea60a2a37ab249fa18f01ca680d6c2f5b86d8cf283a0eef8a08a28f438dd458 SHA512 428c1a350d3720434a727f1f68463519941e6e27f985be51417001bbfb55b7a68fc874977dec6d63bd1fb1dff496e88b9bccb2a6e079f34b726ce78d76a8f53b
-DIST oragono-2.5.1.tar.gz 3079990 BLAKE2B 0b2c0e330cac974e311ff711b28e7f5cc5548355bcafb14fc903a63e0442e513a890f4ce890c49316603ba1dc7214d8953b3fc62f2aa40fb34e787348900de81 SHA512 684b697a97fb0274e35f8ae491841e5f8c564f778ff19294ff2353e75416e7283295668bff5db57e4950cb991ead5215c501ba1a2c517a12bbbbe85efe983bea
-EBUILD oragono-2.5.1.ebuild 1526 BLAKE2B 3f4ae8e5e54dd75c22bf07b112693cc7b7f3bcea18c578e1bdabc5e8d4de8d61312318a794b82ee4e988da99224723d719d5347c4d53c4a3e2b10b768d82167c SHA512 57000d21064464c62072c2385cd62ab31b11c273d2070c8cd664b1d1a099c867308718cc2f9b3db04ed9b26a98e7e01ab935e2cd1af67963619b4441e36abd6d
+DIST oragono-2.6.1.tar.gz 3099750 BLAKE2B d07a699fd2330e270f623cd452fa5cd6833ad541f4be76bdea0fed85ca6947f35a93876f684cd611f40d1482192cd3fcc4d8ac22f5c08dce5098ca2ad6a913fd SHA512 ce7e28f71dbd99fd304cfbf343aa3a494ceef8b3680691982f1caa16b0c1162f354eceacc3deab6d8c1a9b9d6d5fa009953f2735ab87991801ec2e6958b8fb9b
+EBUILD oragono-2.6.1.ebuild 1526 BLAKE2B 3f4ae8e5e54dd75c22bf07b112693cc7b7f3bcea18c578e1bdabc5e8d4de8d61312318a794b82ee4e988da99224723d719d5347c4d53c4a3e2b10b768d82167c SHA512 57000d21064464c62072c2385cd62ab31b11c273d2070c8cd664b1d1a099c867308718cc2f9b3db04ed9b26a98e7e01ab935e2cd1af67963619b4441e36abd6d
 MISC metadata.xml 319 BLAKE2B d82fdd20f65f3c9c6d544701fd4542c7ea14a10869210f24a966e6c512127c132d9a8e58e116196999159cbcff6017b20ec5c5f4b918471a32cb91e81e84fdf2 SHA512 721af15195dda9a790c7cd38bd36792a0411bb45a34e5b0a2b5e9d3343a1c41d7aa583e8be8ea97a639cafafe70c8a5e0219d6b5f175e5eeb166d6afca2e464b
diff --git a/net-irc/oragono/oragono-2.5.1.ebuild b/net-irc/oragono/oragono-2.6.1.ebuild
index 2f2b1a51efdb..2f2b1a51efdb 100644
--- a/net-irc/oragono/oragono-2.5.1.ebuild
+++ b/net-irc/oragono/oragono-2.6.1.ebuild
diff --git a/net-irc/pisg/Manifest b/net-irc/pisg/Manifest
index e91693173271..98db24df4faf 100644
--- a/net-irc/pisg/Manifest
+++ b/net-irc/pisg/Manifest
@@ -1,3 +1,3 @@
 DIST pisg-0.73.tar.gz 236539 BLAKE2B 148d73419f958f9c0c7ec2db522f7c5c198bd22f7df25064fcf1771d9bbef4177556faae5edb60060a3167c9b8a01e533c48a742fb795c371c680f8bce5114af SHA512 290656fc556090fa8a263eaf123bad8e12b0ac50a2c1eb4619c50faf70fd3ee8afc7a8d97dbc4ff6338dd0fa9f73f7b19c60ca996b6612def95f1c494b3ef91e
-EBUILD pisg-0.73-r1.ebuild 944 BLAKE2B 20b069cd1345cb3379b2d2f2f97b40e7003fa0c9dd31c753a96b4878d79987e0b0a532de2723972045d7110037477eec62cdca3a9861b85dc0c0d812feb115d5 SHA512 f69cd3c303d560c94acd01141f955b4b966039dea6070af06401bae3ad7615553084739cfeb50a62dad131654e4e8b48eeaaae9f99aa098081dde2165aaf7afa
+EBUILD pisg-0.73-r1.ebuild 886 BLAKE2B 8a8831cfed353be9c8e87f3f9df34fc0a7fee29a5b07ecb0c207c711c3ddf9556f46336731f01c2a3a951d8d06ebd9df8799feacb9c8b614a1f55f3435c614b9 SHA512 b3ded4412cc2e267f248dcc0b81e503fe3e27c1bcbfdc0245d11ac88343ed1bfa419a50f6d69f15bffbaf31538d0e60879a3b24940150e3f7c28fa656b0672af
 MISC metadata.xml 241 BLAKE2B 7866f09039b1b4926d7e870b8292039c0ca87323de3966428a9d0846ffee64ed027510b9aad12007e12324956c3ae3fc915f1cf57dd02571e51447d580870165 SHA512 1fb73fbdd72b001e72b07c527a4b50a52fc0dd03645230521f018cf0f26cd3a31fef6d09099a8d5a991278404661e3654331999bb85b59d5fac94e78481d9493
diff --git a/net-irc/pisg/pisg-0.73-r1.ebuild b/net-irc/pisg/pisg-0.73-r1.ebuild
index 4a1954fff342..e440a36c0925 100644
--- a/net-irc/pisg/pisg-0.73-r1.ebuild
+++ b/net-irc/pisg/pisg-0.73-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit perl-module
 
@@ -13,22 +13,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-IUSE=""
-
 RDEPEND="dev-perl/Text-Iconv"
-DEPEND=">=sys-apps/sed-4"
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e 's!lang\.txt!/usr/share/pisg/lang.txt!' \
 		-e 's!layout/!/usr/share/pisg/layout/!' \
 		modules/Pisg.pm || die "sed failed"
 }
 
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
 	perl_set_version
 
@@ -43,7 +38,9 @@ src_install() {
 	dodoc docs/{FORMATS,pisg-doc.txt} \
 		docs/dev/API pisg.cfg README
 	doman docs/pisg.1
-	dohtml docs/pisg-doc.html
+
+	docinto html
+	dodoc docs/pisg-doc.html
 }
 
 pkg_postinst() {
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 82394e8102c3..9cf58526ac4d 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -9,5 +9,5 @@ AUX psybnc.conf 313 BLAKE2B c56022b42942b100479b6c539e9da85178db679b6596fc2b4162
 AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f0e686b504c2caf980c5a97864fac86a251431126c5a0338bb50a8eba9d3976156cf1eaf1b7681 SHA512 e58704dec299271d9a450eb243d0af1323aca58d555b61fc3aa899324a6bdc9aa82afc0597c190dc07c278f22c7cb448592a271e9ee6e4aa3552518ce6254753
 AUX psybnc.initd 898 BLAKE2B 7be60ef0dda81cb917e23e06e3fec88af952d71c2eef4255c316baf5a218e8bdc2d8d8bc4eb353ab7c19a697e97685441ec2a0c3503e4f22adf0d55c9a895e13 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd
 DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
-EBUILD psybnc-2.3.2.9-r3.ebuild 4673 BLAKE2B 7755b8b8b6eab39fb4720e304ff51622dad4dccac092488a181e6459efba499a81e50f8abd399834a6b361a3b2343ec4d40c112add1b67db234d2cce0a54fb83 SHA512 ab1d4a4e25085a63c35802da6930e8cf12f5bb09e0bd87bedc07a94535608ffec7b95672025bfc3d53a88de74f85fd2225c4e399f654de105e03a1933f16408c
+EBUILD psybnc-2.3.2.9-r4.ebuild 4625 BLAKE2B 2571a726868eb83cce5f8bc571c30337c0ed34b4901401cc7cb285a444532a01013e5d985b357f5be46f62c9360506a5c0149d64d01e801a1863083cf846f912 SHA512 e2517c73bf434eaa1a826f2665ebb9f3748d6da4eb7ffd52c10296ebb6354e8669d9c6e26c51cb6cc1a15e80a3175fbceab72cc558bb26e1e5d5e8d5ca64626d
 MISC metadata.xml 360 BLAKE2B c3cbefd59c47603f27e542da342a855416fd79da62af69f30721929a7e25055ed5f5d46a2b99259589a0d0584fe68a837a4abdf2f0722d0eb3a1d02215f387a7 SHA512 7bcf4c1c7acd11782e8c2f19a179ac753967d4b6609aaf15b3b41ce7a492312db6006ba229b0169976f013d440f46d65c39cfa8f6276ef195339ff858958c135
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
index 5a3deaeb55fe..eaa17997c338 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs user
+inherit toolchain-funcs
 
 MY_PV="$(ver_rs 3 -)"
 PSYBNC_HOME="/var/lib/psybnc"
@@ -19,16 +19,13 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="ipv6 ssl oidentd scripting multinetwork"
 
 DEPEND="
+	acct-group/psybnc
+	acct-user/psybnc
 	ssl? ( >=dev-libs/openssl-0.9.7d:= )
 	oidentd? ( >=net-misc/oidentd-2.0 )
 "
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	enewgroup psybnc
-	enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}" || die
diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest
index 566e17415b15..0c2aac8f9df1 100644
--- a/net-irc/telepathy-idle/Manifest
+++ b/net-irc/telepathy-idle/Manifest
@@ -1,8 +1,3 @@
-AUX telepathy-idle-0.2.0-fixes.patch 9363 BLAKE2B 6980114c9b030c1589f618fe67e88051bc414abe849fa6e08152625d1f66c00634cf572f4220fd9e31bb1706167869541e571fca04ca70e19c648dd094af263e SHA512 2c7b8f4069bc3907fea7c506af671a3d46ca56b55cbe6798589437751c598b549fcec4cf7cfdde93b2b7f5f3d858decf8218a7633f0e91cd3b2c883a301b746f
-DIST telepathy-idle-0.2.0-py3-1.patch 3849 BLAKE2B 48617c65e8c3af4aa40332eed66c1839b4a9db9c99a4e350fae89879dcbd67c133e0a05fd9a778a5e0ac737ddbf8f999f23095b9a2a3cdef233485b1c9422908 SHA512 41c90befc3bb2df84f35a2f53bbe29885f67a2ceb5dfbf906436655b9400368e74a1a4a6b408f669fa951ae9d50d89bc7e0e2285f50a6fecf1a1d719c307cb24
-DIST telepathy-idle-0.2.0-py3-2.patch 1441 BLAKE2B ea32a2c94216ff320f43c3bf8b537b197c0398507f812eecfab86359e43c53fc2724b2c0d0a0e0a7b342243b07cce38a86f802d9fbc777bba942df939f52a56b SHA512 c9f868f50c5300f4ed06953de935f44e2e87729a36a61d4c1e998d322c1dcdac2759200b66a04c965e9ef591475dfbd5997c83816c6fc2bfb178bfd4bcd260e8
-DIST telepathy-idle-0.2.0.tar.gz 566492 BLAKE2B d0e12bb23b96b7df5afb101ae2c62994777de616d5ea70a10fb2141e68066c7dfaae713340c7f8a2d8ce1f259f302729efa1927eaf7d2a9555120c58e89046f2 SHA512 f5e36afc3ab4b52eb865f2c1e6565b99011a7540fc1a7783d3bbd7bbf50bc671a2147df6bde646c82059a466cc1df9bdb10e2500db5b7bb06d57a989a75c261b
 DIST telepathy-idle-0.2.2.tar.gz 606406 BLAKE2B e5d4a19df08bbb59c18d0601357134a6edab085b2b04463b085651f35ee135f0d3f3f27fc35417dcf023913f7ead939161cb1a72cb51824a988aad6c0cb2a136 SHA512 c66cf7b70c84a9b7b1ada01712b8d3b683f15a4021bb2d0f6d868b4ab30e2fb12fd26dd8d5ba25b5050e055bf425295049e84a53198d6586f7cfd7c6bc02f826
-EBUILD telepathy-idle-0.2.0-r3.ebuild 1449 BLAKE2B 696cccb34138d2d7475b5be5e8e187cf9e8267f3ac078bf5a86e40e2f7495929f612a2965a255463f934545ee662479786c08f59b883a324009e5668dc847a83 SHA512 b5679d91d9fbbd893374f5d3e11025321a47a4c4f38c9c52bfa4fffc7a38c981cd37c8120609039695c97e2b39b36efac408953d39e8743db67be113a08983c8
-EBUILD telepathy-idle-0.2.2.ebuild 699 BLAKE2B ba3cd42b847399e940815e978860fdd6597c685fa235c5914ab6d5740977ef324a013b97ca034e55ebecb608f50db7c0e3f9a19418b3f045df1ad792cb630b74 SHA512 ff434016cc542aa7444bda61438d89d5544880a421250632cde3c4998c4646474d13e2b2b362451b301890e9a0e9354b191f39488ee4c0a6af94a0f69f632078
+EBUILD telepathy-idle-0.2.2.ebuild 696 BLAKE2B 9f3bf6c07854927da85f3efb93161f7cff730a7d0450d640c5ee9fe6ce82d5af6b6de28f6b9f51516ef592ec7a42080f5cc3b9990cef7d6da2cdb83ae31ade22 SHA512 50a014bd0d808d9de37180399b4d00ab04a1e89d21978e47dd5cf6ff0045fc2e595bbbd863978ff09626b61df738093431aeb6b04cef655152846e88ae32fa54
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch b/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch
deleted file mode 100644
index 07f14f9f4dde..000000000000
--- a/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-From bf6d596e40e5b9426a68dcd22aa62a697457c4f7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Sat, 13 Feb 2016 10:08:42 +0100
-Subject: [PATCH 1/6] ctcp: Don't bling the non-bling
-
-When stripping color codes, we currently remove any sequence of digits
-following ^C. As color codes use at most two digits, this means that we
-also remove any numbers at the start of the colored text - make sure we
-stop doing that and only remove digits that are actually part of a color
-code.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=94189
----
- src/idle-ctcp.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/idle-ctcp.c b/src/idle-ctcp.c
-index f282360..f28bf4b 100644
---- a/src/idle-ctcp.c
-+++ b/src/idle-ctcp.c
-@@ -98,13 +98,18 @@ gchar *idle_ctcp_kill_blingbling(const gchar *msg) {
- 			case '\x03': /* ^C */
- 				iter++;
- 
--				while (isdigit(*iter))
-+				/* Color codes are 1-2 digits */
-+                                if (isdigit(*iter))
-+					iter++;
-+                                if (isdigit(*iter))
- 					iter++;
- 
- 				if (*iter == ',') {
- 					iter++;
- 
--					while (isdigit(*iter))
-+	                                if (isdigit(*iter))
-+						iter++;
-+	                                if (isdigit(*iter))
- 						iter++;
- 				}
- 				break;
--- 
-2.23.0
-
-From 5a2510ddea8f165f0808a8841e1dca311c003e20 Mon Sep 17 00:00:00 2001
-From: Diane Trout <diane@ghic.org>
-Date: Sat, 4 Nov 2017 23:03:26 -0700
-Subject: [PATCH 2/6] Update self-signed certificate to 2048 bytes with SHA-256
- signature
-
-Valid for 10 years
----
- tests/twisted/tools/idletest.cert | 26 +++++++++++++++++--------
- tests/twisted/tools/idletest.key  | 32 ++++++++++++++++++++++++-------
- 2 files changed, 43 insertions(+), 15 deletions(-)
-
-diff --git a/tests/twisted/tools/idletest.cert b/tests/twisted/tools/idletest.cert
-index 655abc2..7ea6bcc 100644
---- a/tests/twisted/tools/idletest.cert
-+++ b/tests/twisted/tools/idletest.cert
-@@ -1,10 +1,20 @@
- -----BEGIN CERTIFICATE-----
--MIIBTzCB+gIBATANBgkqhkiG9w0BAQQFADAzMRIwEAYDVQQKEwl0ZWxlcGF0aHkx
--HTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTA5MDExNDE3NDc0N1oX
--DTA5MDExNDE3NDg0N1owMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYDVQQLExR0
--ZWxlcGF0aHkgZGV2ZWxvcGVyczBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC9z/pi
--zEMeL+bO3giJVGHGrOHLE7AfDorArwmA0u8Cgu06+J+SW+NJnkj8At4bioxREge6
--yeD6+cHCC9kzXrmXAgMBAAEwDQYJKoZIhvcNAQEEBQADQQBf1qg0gzSztx5pqqM8
--3wI5cEc7k13EzU6X2SkSCSxlMc4pF0hPdr0LuZJpeKBohIgKQ59+3Ny0LuUMEKYW
--ikGr
-+MIIDUDCCAjigAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMRIwEAYDVQQKEwl0ZWxl
-+cGF0aHkxHTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTE3MTEwNTAw
-+NTEwMFoXDTE4MTEwNTAwNTEwMFowMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYD
-+VQQLExR0ZWxlcGF0aHkgZGV2ZWxvcGVyczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-+ADCCAQoCggEBAL3wfZoTzmJqQyjw0tToAflpdmQMTNpzgXvH+uiuu4rWk7oGJsBN
-+HZfe4gkoYNLL8PwOGEQcIUN4Y0JU/mc9mSe44Vi0G0t/uJ/gI+CNtHzHjwtwCnYP
-+XsbCE69CsarvDVbsQHS6kWfgCYxMA0l+cydUfxuyIoFWjeM4hZs0JwdBGBTAtZkj
-+3xo+7Ee3xNBaaOtmoJO/QduAVA0UgiWU69m7Q+5aIuIl9PGOSL4MHqNXq/nwX5Ky
-+aFBpXdzmrVn8BophkBgOawp0e+Rhk5fCelyy54lIfpUxeOTP6EtAgsZYbZBPjsuz
-+8ewJbdnzcOCwTJpKQv9aHhkTKcK2PkN6tJMCAwEAAaNvMG0wDAYDVR0TAQH/BAIw
-+ADAdBgNVHQ4EFgQUuG8blqmQ1SEj/x5OhBc58XFv6vcwCwYDVR0PBAQDAgXgMBEG
-+CWCGSAGG+EIBAQQEAwIGQDAeBglghkgBhvhCAQ0EERYPeGNhIGNlcnRpZmljYXRl
-+MA0GCSqGSIb3DQEBCwUAA4IBAQBJCT/EPWqv/wUDn7jK4nRXXXwtIL7eYYTAvcJh
-+gxtrkkNB1LAp6mnb1WOw+Wbdpf2IgTqfAvpzCRL+kCM80Pqh365JlA5JflzhWxsJ
-+xtJQfNfiZhgXKN1rm5lT+U/WgGR6A1serbxUiRN2O6wB8nxtoc7sBJh18pcrwpam
-+vOGAolbePV8HPfyBRkCnSw1X6BdifEtxlRCfVWELSI6xQHX8OPTU+uGcvte5uAEi
-+7CRRJHlUoojyLOxlJ6IeXh7MjrDIi6tHDqVR9MlRRN3oXhvsN/TtsZUuuC7s280W
-+oapk/x7WNDSQsdsi0bmTLrJoZgHzaPRJPCwBFzbj/T1kCC0B
- -----END CERTIFICATE-----
-diff --git a/tests/twisted/tools/idletest.key b/tests/twisted/tools/idletest.key
-index 3a80dab..d579266 100644
---- a/tests/twisted/tools/idletest.key
-+++ b/tests/twisted/tools/idletest.key
-@@ -1,9 +1,27 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIIBOwIBAAJBAL3P+mLMQx4v5s7eCIlUYcas4csTsB8OisCvCYDS7wKC7Tr4n5Jb
--40meSPwC3huKjFESB7rJ4Pr5wcIL2TNeuZcCAwEAAQJBAJLaJc3qWsMwLFJAVjpp
--nnwnpUmIoeplRdRtl9yjVWeKrvD2gSh2Qz693dgJbDUGURJecJ+LSS4YMOS+8FLp
--KgECIQDhgvqh9KahKphn2/vvcCx3DKBZ7wh9lYIaaAay6IuAhwIhANd5cF48u0ID
--39kZCwfhpAKQDxvpqmbnRzB0hISjEpJxAiARfZIo24vM9jvJ2mMI6B9awGzzbLmw
--29aya50RZT3kowIhALrT2NJc5iB/K4AZbq8Ovh5auj8Bg3Zl4hvpa11154yBAiAO
--F+44Mb+YQi+r526cDv983vCuoU5EM0PbPvJxaWmwtQ==
-+MIIEpAIBAAKCAQEAvfB9mhPOYmpDKPDS1OgB+Wl2ZAxM2nOBe8f66K67itaTugYm
-+wE0dl97iCShg0svw/A4YRBwhQ3hjQlT+Zz2ZJ7jhWLQbS3+4n+Aj4I20fMePC3AK
-+dg9exsITr0Kxqu8NVuxAdLqRZ+AJjEwDSX5zJ1R/G7IigVaN4ziFmzQnB0EYFMC1
-+mSPfGj7sR7fE0Fpo62agk79B24BUDRSCJZTr2btD7loi4iX08Y5Ivgweo1er+fBf
-+krJoUGld3OatWfwGimGQGA5rCnR75GGTl8J6XLLniUh+lTF45M/oS0CCxlhtkE+O
-+y7Px7Alt2fNw4LBMmkpC/1oeGRMpwrY+Q3q0kwIDAQABAoIBAQC4gJyxh53KMait
-+Y0mZcQlB6nULeHtLFDpqL/cGAX3BvvBfGkyYLhCaDvKIrMVo3pxna5Wcy6pwLMhW
-+jdNWHBri4A9eKA3/h8Ci5IpVPbFeKEdGd/5hckrBTZLrgyCsh2vwzKtL+FL4kUMV
-+Gl1zDbb0NHsIP0CPXLGVT7lQ6xciTidcEcWUh25reGPMew+Xv/fuN2xVOFxwCe5Q
-+VdXR7yUFy7ihAyhEhK+TmF5eNRaqKA06KhbA6IME03RiiS/qxVRJgEfarXaibHiX
-+KYM612VvZ6GCbQaQBXYGpl2Gnzumro1E49+KgZ6SQlm+2iaDJn1P/vg3rzCUiR37
-+JvgNlap5AoGBAOQxtU5s+PbfdnW4SZu8+k0AtnwxwEvgwZUE5vdij/YApqIHfb2G
-+MnuqJ9gNaMBHRoEAM4FXfl6Fjnc2w2fpQxg9U5wFX8bA6EXiqJLgfEbNu5YKPB9e
-+BOTgNNrP6FbhwIM6mb0I47Fqzq17uS/GYYd3yRKdL34H9RPgzQms9Ov3AoGBANUV
-+doxGnqLoJWb/lLdk7+yRuCmTYwQmIBrAsdWK9mxrlvP5PTc1QRi11E1hcumViFdy
-+PBks7TUVmNqynRMaEw5W4VoLl2OrYrDkHxgP6clqwxYFYbldZohxueIdvNDCMLyu
-+5/efwEl/NgvnQwb+Z2UHHEP8E3xSl/LrkgCw3P1FAoGBAJlzj+/AOh+RoBCDsAQp
-+rcwwaYbU0fJ0ntj+Je8/+X09bNDS5syXPMWKZCbWxZVfmNrQ7tHQq2sWtvoV+oub
-+AgJ/4wStXH3EZa3xQNkcWpYmbTn1gf658+KRnxlx7FTYlOPqeU30d2FsaLWi2KJ2
-+7kjx1WZOC4zd/wGyD0+tXjp7AoGAcNM9gwb9hkqfS0s25mhWtY9u0OzOd+rsAt5X
-+CzfaRQwu0J3+8NWM01WrxRE9NDtOBudgtP/Z1crKtbnve6bJwkT0a6ZJkae0yO7x
-+G9+JLXIPPAC7ftfaq5J0Fyshx/OatL1z6+S1fvURm/nmvrRD8PVz3PeDJcfh1uku
-+1JjRWnUCgYAFnAsOddzyRMe52WbeoDbl/AFJZMBbLDb2fI9yGNzy2Y79V0Bvxi3k
-+iSp6vHXA2tiVysyeEgVWYOdPmblQ6GRivAW75sgyuma1A0GJqkmd1EPXwbFNod8K
-+Ax0XXK2/olLTWtSOs8Cxmopb+V1rpyuTwlhyHc9J4HGEEBeazlYg3A==
- -----END RSA PRIVATE KEY-----
--- 
-2.23.0
-
-From 0ce3a8fa2bd3f4e72358bb53ecd0acf8fe448483 Mon Sep 17 00:00:00 2001
-From: Diane Trout <diane@ghic.org>
-Date: Sat, 4 Nov 2017 23:32:32 -0700
-Subject: [PATCH 3/6] Avoid errors from Python caused by the deliberatly
- invalid Unicode
-
-Because stream.nick is Unicode when sendMessage combines the command,
-nick, and invalid utf8 python 2.7 ends up converting everything to
-Unicode. Since this test deliberately includes invalid Unicode, Python
-notices and throws an exception.
-
-In Python 3, network traffic is usually encoded as bytes. So I thought
-coercing the nick to bytes would be appropriate, and as bytes can contain
-anything including invalid Unicode, Python doesn't throw an exception.
----
- tests/twisted/messages/invalid-utf8.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/twisted/messages/invalid-utf8.py b/tests/twisted/messages/invalid-utf8.py
-index a48c2f4..725e3bd 100644
---- a/tests/twisted/messages/invalid-utf8.py
-+++ b/tests/twisted/messages/invalid-utf8.py
-@@ -33,7 +33,7 @@ def test_with_message(q, stream, parts):
- 
-     # Idle's default character set is UTF-8. We send it a message which is
-     # basically UTF-8, except that one of its code points is invalid.
--    stream.sendMessage('PRIVMSG', stream.nick, ':%s' % invalid_utf8,
-+    stream.sendMessage('PRIVMSG', bytes(stream.nick), ':%s' % invalid_utf8,
-         prefix='remoteuser')
- 
-     # Idle should signal that *something* was received. If it hasn't validated
--- 
-2.23.0
-
-From acf5fcf4d830ae0b5953d8ded8eba4c17726c6f3 Mon Sep 17 00:00:00 2001
-From: Diane Trout <diane@ghic.org>
-Date: Mon, 6 Nov 2017 21:46:00 -0800
-Subject: [PATCH 4/6] Returning FALSE from the timer function causes the
- timeout to be destroyed
-
-I asked one of the polari devs and was told that yes it is ok to set
-the timer id to zero in the timer function.
-
-With this patch make check works without changing any of the expected
-test results and without any coredumps
----
- src/idle-connection.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/idle-connection.c b/src/idle-connection.c
-index 6ab5fea..71c020f 100644
---- a/src/idle-connection.c
-+++ b/src/idle-connection.c
-@@ -600,6 +600,7 @@ _force_disconnect (gpointer data)
- 
- 	IDLE_DEBUG("gave up waiting, forcibly disconnecting");
- 	idle_server_connection_force_disconnect(priv->conn);
-+	priv->force_disconnect_id = 0;
- 	return FALSE;
- }
- 
--- 
-2.23.0
-
-From 5e5b677173ef64055b4a7073cb5a15066fc03f70 Mon Sep 17 00:00:00 2001
-From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
-Date: Fri, 14 Feb 2014 12:12:54 +0100
-Subject: [PATCH 5/6] idle-connection: make sure to always reset
- force_disconnect_id
-
-Recent GLib raises a critical when trying to remove an invalid source.
-
-(cherry picked from commit 12211654baa75db13a05b5c2b3293d1378fcf7a2)
----
- src/idle-connection.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/idle-connection.c b/src/idle-connection.c
-index 71c020f..8614d52 100644
---- a/src/idle-connection.c
-+++ b/src/idle-connection.c
-@@ -585,6 +585,7 @@ static gboolean _finish_shutdown_idle_func(gpointer data) {
- 	IdleConnectionPrivate *priv = self->priv;
- 	if (priv->force_disconnect_id != 0) {
- 		g_source_remove(priv->force_disconnect_id);
-+		priv->force_disconnect_id = 0;
- 	}
- 
- 	tp_base_connection_finish_shutdown(conn);
--- 
-2.23.0
-
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild
deleted file mode 100644
index 842f73c12425..000000000000
--- a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit python-single-r1
-
-DESCRIPTION="Full-featured IRC connection manager for Telepathy"
-HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-idle"
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz
-	https://src.fedoraproject.org/rpms/telepathy-idle/raw/93c37581c570200c3f646d0872a9c1327d3b3cb1/f/0001-tools-Fix-errors-running-glib-ginterface-gen-under-P.patch -> ${P}-py3-1.patch
-	https://src.fedoraproject.org/rpms/telepathy-idle/raw/93c37581c570200c3f646d0872a9c1327d3b3cb1/f/0002-tools-Remove-outdated-is-unicode-checks.patch -> ${P}-py3-2.patch"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-python/twisted-words )
-"
-RDEPEND="
-	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/glib-2.32:2
-	>=net-libs/telepathy-glib-0.21
-	sys-apps/dbus
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fixes.patch"
-	"${DISTDIR}"/${P}-py3-{1,2}.patch
-)
-
-src_prepare() {
-	default
-
-	# Failed in 0.1.16 and code has not moved since october
-	# Upstream is working on 1.0
-	sed -e 's:connect/server-quit-ignore.py::' \
-		-e 's:connect/server-quit-noclose.py::' \
-		-i tests/twisted/Makefile.{am,in} || die
-}
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
index 93299731defc..183663a926d6 100644
--- a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 04ae787e4772..f20e1c42e46c 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,9 +1,5 @@
 AUX weechat-3.0-cmake_lua_version.patch 272 BLAKE2B 3c88a0aad5d0ad9c5067062039fd147c9356923324089d74ebd5987e6f5a67bc1da785a12b863dffafc8e63af18b52b5ed6aba97cacec105b04f7b70ac0b3e5c SHA512 81a3143acfeb35ccd8e913efa0b881165459049bdbb3e7bf96b41c7f764fe37647349599d3bceadb966ae52f2156cba5170926ba7af7ed667f7664f8adb920aa
-DIST weechat-3.0.1.tar.xz 2215312 BLAKE2B 204c110259528c485a832a750a34c6b408e24c9b9c9797d41e2e2bfd5e33dcd4aa7c80c4478e8825155363048306a48bcbc61469813b9a82247c6cbffcc385a7 SHA512 d5b2949b668f622c08d60764aa230f8a4901d358facf83ab13428709854b173830aafe65fec86abacbea08ffe89e6e34131a5e4de37bbb5409454fa223f7885e
-DIST weechat-3.0.tar.xz 2215408 BLAKE2B ed43c16af2a9fea101b54714e21d5f28f2b18fed5734c5f6adde857500befd94089f6bd7be5e2ad2738fce4e1bd5b10ebef32d0d46039242efaa2dc7f664eb42 SHA512 d6a68f35dc7363b838af811ff0a0a8d9fff519a4231c66f963e896bdda8653a56608e46333dc866e7dee25c1eafd2f1bf99c443089dde5a268bba637a0dee8ca
 DIST weechat-3.1.tar.xz 2230316 BLAKE2B 95ce8c6107351676b64c368484baf2245bd17093c90552339d35d058a3caff7a0c4bb8e7692757bcf8c2d7617621961b5bc118806c5084cc212283d6982bd896 SHA512 1eb3f5a0e4d3f6777970fc60c816e7bc9be5e5cf91b9e072f6c77003f284c7bdbabfae7058cb5083915a2adf7f4c651a9afb8cc8ae17cac950e7f2ef9608ed78
-EBUILD weechat-3.0-r100.ebuild 4186 BLAKE2B a39dcccb10b695521bc7fbe5aa311608df46e274b3a372390a23f93d55dad7717fda9c7c8375ebdf6ce5a0b5d949b7a1ef3a97e23c6eca8be2bcee5ed92bdc3d SHA512 04f04f13668a40e6e0d9f9f3d7a1d00d067291812e9855bc51c552768626933acafbd81bc5287f6d4efc445c7d6649e4a53c991a4d086e8eadb151725e6e951a
-EBUILD weechat-3.0.1.ebuild 4189 BLAKE2B 86c80cf608e648b059e65f2cc562ee096609966752c3009791189227e744f1c4fe7dfad22efe9a31423f05893ef1cfa31153b30d354789db3da9aa41a13386e1 SHA512 68c4d25c1f800d4d804ff305cdba2ff4f6fc124b180aa5db349fa64a736469bd1899ec4bf7da507d87b774c1f8b3b231f5420a4f8b339f2cfa6f5f95aa1a2145
-EBUILD weechat-3.1.ebuild 4189 BLAKE2B 86c80cf608e648b059e65f2cc562ee096609966752c3009791189227e744f1c4fe7dfad22efe9a31423f05893ef1cfa31153b30d354789db3da9aa41a13386e1 SHA512 68c4d25c1f800d4d804ff305cdba2ff4f6fc124b180aa5db349fa64a736469bd1899ec4bf7da507d87b774c1f8b3b231f5420a4f8b339f2cfa6f5f95aa1a2145
-EBUILD weechat-9999.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea
+EBUILD weechat-3.1.ebuild 4237 BLAKE2B cdb17a439e33b21358dbd508d0d88a18ff69bd4fb5095d81d47b46bf95565292ad8fe0f0cbcdc8ff77656137cc9670fe9daaaeb1438b635d028c5aedcaa0ed4d SHA512 fb17f287d2e9beb5e729f455d9bb01dc5e3a958646c6f423e4740a47279d63074ff03671f2f23412986d79f60092c05f355100b7018747ec108637ff054a519f
+EBUILD weechat-9999.ebuild 4240 BLAKE2B 294104218725588965c2b480020d323b13d39e6788f90741e1bc926c7303239de67d983833f1043077aa85f367a522d292c1d5c52ee5eec3aee08971d6534fb1 SHA512 9dfdd91bf01be335f58a76026d6f0458bd745c08263023d2ec4e89d899b01a8fecad35947a2e719437b0f699546ee2d41db99f2f49660fbab5a41f7ac0b050c5
 MISC metadata.xml 934 BLAKE2B a848491f3855ff1d5911c1e5d2f875cacb1bf1f6df9fa31a3ba9fce80012d33f21992faf6a4748a2f134fd532cf99d58909fa1b0da06d6d7d09982438032324f SHA512 eec6d712307496df84f6294158fddfbe0865dfdbaeedef08231bfeaf0ce9a1b25fc7c163add36c1cdfc24fffdfbbf90063771693bf0d829c82b5886eb6899197
diff --git a/net-irc/weechat/weechat-3.0-r100.ebuild b/net-irc/weechat/weechat-3.0-r100.ebuild
deleted file mode 100644
index f647e79421f6..000000000000
--- a/net-irc/weechat/weechat-3.0-r100.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-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
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +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 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:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
-	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.0-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=/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_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-3.0.1.ebuild b/net-irc/weechat/weechat-3.0.1.ebuild
deleted file mode 100644
index f8abf272affc..000000000000
--- a/net-irc/weechat/weechat-3.0.1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} )
-PYTHON_COMPAT=( python3_{7..9} )
-
-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
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +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 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:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
-	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.0-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=/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_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-3.1.ebuild b/net-irc/weechat/weechat-3.1.ebuild
index f8abf272affc..6d32016aec5a 100644
--- a/net-irc/weechat/weechat-3.1.ebuild
+++ b/net-irc/weechat/weechat-3.1.ebuild
@@ -13,21 +13,21 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
 HOMEPAGE="https://weechat.org/"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 
 NETWORKS="+irc"
 PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +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 test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -49,6 +49,7 @@ RDEPEND="
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	selinux? ( sec-policy/selinux-irc )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
 "
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 9612d0567f73..86f3f2d17ba4 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.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
@@ -20,14 +20,14 @@ DESCRIPTION="Portable and multi-interface IRC client"
 HOMEPAGE="https://weechat.org/"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 
 NETWORKS="+irc"
 PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +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 test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+IUSE="doc man nls selinux test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -49,6 +49,7 @@ RDEPEND="
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	selinux? ( sec-policy/selinux-irc )
 	spell? ( app-text/aspell )
 	tcl? ( >=dev-lang/tcl-8.4.15:0= )
 "
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /net-irc
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)