gentoo resync : 25.11.2020

41 files changed, 1015 insertions, 441 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index c9e477974946..8644a1bb9243 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index d52055042450..2eeb2fb2fd21 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -4,5 +4,7 @@ AUX anope-2.0.7-musl-libintl.patch 566 BLAKE2B 7deb854a68c259c9055a086fbb33a63d0
 AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
 DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
+DIST anope-2.0.9.tar.gz 1808866 BLAKE2B db5755dbb88edb9fcc2f00c1dc324894f22b9e6bc97c9cf57b40d2296014341fe3ade8a8e1b64879b852aef6637e1bb89947deb7a41e009e25101a0a992515e7 SHA512 0ce2caa5ede2831215781a333d896f1169f90bbb515078912f32beaff1699b7957384974cca7c86f1d584d624cb43c76769299ce245ee1fb6836ce7f14ada3e0
 EBUILD anope-2.0.7.ebuild 4305 BLAKE2B 0bfc78a17737d333768066bb5182f2a426f62c5e4de7559226b76aa81a7d7bf6ed1e4ec7748832569d4725f6d0107d4dabfa8ce2110d263fcc4996c850683808 SHA512 d2134d165f68f718c1e60a0056a89dfb346c12e6c2ebb363cd688d50e792860c8292008b2e6020350cac769a3ac0cea51e22a5dffdcedf95a1e735b4857a038a
+EBUILD anope-2.0.9.ebuild 4210 BLAKE2B 8f554e429a39b4fb172f019ab40c358291f853643721c08e9b5f8f65404e1045e7ceafcfec4c255e06a98babfa93feccb09a4fae5302d850e2ef56d4745114ff SHA512 6cc30d1d3d2aab3dfaa0260e866ccb99adcff5807ad0f1a7e119e08b43bb515870c76c6382a17d93df788f4b688dffe8e30e2fd3dbbe16274e7b40829df276bf
 MISC metadata.xml 901 BLAKE2B 0051a2f196c30f3fddfaae55dc660140a77d8b636454230473107af38f9e54cc059fa012516b07b86d1667bcfaf6fdeec6005de95c48b1b832ebd22826c03210 SHA512 f8271f6ece0d7f9488f317d8f4f8bdc8813521d15a603ea81445e109792ed5720319529f5c5527a902ff323151f4a58fbf62a83110104ce270ae5d96ec154ef6
diff --git a/net-irc/anope/anope-2.0.9.ebuild b/net-irc/anope/anope-2.0.9.ebuild
new file mode 100644
index 000000000000..d7c7c0caf699
--- /dev/null
+++ b/net-irc/anope/anope-2.0.9.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Anope IRC Services"
+HOMEPAGE="https://anope.org/ https://github.com/anope/anope/"
+SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
+REQUIRED_USE="sql? ( || ( mysql sqlite ) )"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	acct-group/anope
+	acct-user/anope
+	mysql? ( dev-db/mysql-connector-c:0= )
+	ssl? ( dev-libs/openssl:0= )
+	gnutls? (
+		net-libs/gnutls:0=
+		dev-libs/libgcrypt:0=
+	)
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+	sqlite? ( dev-db/sqlite:3 )
+	tre? ( dev-libs/tre )
+	virtual/libintl
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch"
+	"${FILESDIR}/${PN}-2.0.7-example.conf-user.patch"
+)
+
+src_prepare() {
+	anope_enable_mod() {
+		local modulefile=${1}
+		ln -s "extra/${modulefile}" "modules/" || \
+			die "Failed to use ${modulefile}"
+	}
+
+	# These all require MySQL specifically
+	if use mysql ; then
+		anope_enable_mod "m_mysql.cpp"
+		anope_enable_mod "stats/irc2sql/irc2sql.cpp"
+		anope_enable_mod "stats/irc2sql/irc2sql.h"
+		anope_enable_mod "stats/irc2sql/tables.cpp"
+		anope_enable_mod "stats/irc2sql/utils.cpp"
+		anope_enable_mod "stats/m_chanstats.cpp"
+		anope_enable_mod "stats/cs_fantasy_top.cpp"
+		anope_enable_mod "stats/cs_fantasy_stats.cpp"
+		anope_enable_mod "m_sql_log.cpp"
+		anope_enable_mod "m_sql_oper.cpp"
+	fi
+
+	use sqlite && anope_enable_mod "m_sqlite.cpp"
+
+	# Any SQL implementation
+	if use sql ; then
+		anope_enable_mod "m_sql_authentication.cpp"
+	fi
+
+	if use ldap ; then
+		anope_enable_mod "m_ldap.cpp"
+		anope_enable_mod "m_ldap_authentication.cpp"
+		anope_enable_mod "m_ldap_oper.cpp"
+	fi
+
+	use gnutls && anope_enable_mod "m_ssl_gnutls.cpp"
+	use pcre && anope_enable_mod "m_regex_pcre.cpp"
+	use ssl && anope_enable_mod "m_ssl_openssl.cpp"
+	use tre && anope_enable_mod "m_regex_tre.cpp"
+
+	# Unconditional modules
+	anope_enable_mod "m_regex_posix.cpp"
+
+	# Avoid a silly sandbox error - tries to delete /usr/lib/modules
+	sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die
+
+	# Copy anope.conf for fixup to comply w/ prefix
+	cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die
+
+	# Look in the right place for modules
+	sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \
+		"${T}/anope-conf.d-v2" || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBIN_DIR="libexec/anope"
+		-DDB_DIR="../var/lib/anope"
+		-DDOC_DIR="share/doc/${PF}"
+		-DLIB_DIR="$(get_libdir)/anope"
+		-DLOCALE_DIR="share/locale"
+		-DCONF_DIR="/etc/anope"
+		-DLOGS_DIR="../var/log/anope/"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}/anope-init.d" "${PN}"
+	newconfd "${T}/anope-conf.d-v2" "${PN}"
+
+	dosym ../libexec/anope/services /usr/bin/services
+	dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp
+
+	keepdir /var/log/anope /var/lib/anope/backups
+	fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
+
+	dodoc -r docs/* data/example.conf
+
+	insinto /etc/anope
+	newins data/example.conf services.conf
+
+	fowners anope:anope /var/log/anope
+	fowners anope:anope /var/lib/anope/backups/
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# Only tell them about this on a fresh install.
+		elog
+		ewarn "Anope won't run out of the box, you still have to configure it to match your IRCd's configuration."
+		ewarn "Edit /etc/anope/services.conf to configure Anope."
+		elog
+	else
+		# We're replacing some versions. Find out which.
+		local ver
+		for ver in "${REPLACING_VERSIONS}" ; do
+			if ver_test ${ver} -lt 2.0.7 ; then
+				# In this version, we introduced correct FHS structure
+				# We need the users to make some changes to their services.conf
+				ewarn "Please modify your services.conf to include the following directive:"
+				ewarn "in options{}, please include user=\"anope\" and group=\"anope\""
+				ewarn "This is needed because Anope now starts as root and drops down."
+				ewarn "Reference: https://wiki.anope.org/index.php/2.0/Configuration#Services_Process_Options"
+			fi
+		done
+	fi
+}
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index 57740db3f4f1..0d0b3c41e3fb 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -1,4 +1,4 @@
 DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d9d168d0ebd7de927a478b42a591631f2c193f3816b2a1b39cf79607326b073bcbeefe4291e0fb95f6 SHA512 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
-EBUILD ii-1.8.ebuild 697 BLAKE2B 5bf58333b62042b53070269898b63c9fd99b0aab09f12d0bf723a4d76a9945e8efa812025992fdb6f7e1c4a070ea6c58c4a9257276dc1624c109e891ba8e971a SHA512 3b304b910445d37a829c1f01ae370faf0e3f78bdd04b92ee4d3a0018a48d82d63801f1b92854dc2588f531f15a0d6829d79900d95d03b743ecc1aeba556cff37
+EBUILD ii-1.8.ebuild 696 BLAKE2B 4b7433bde11c0c3894c715062fed65800ee132ff607f70ae378e677ca67b024c986a6ebeeaba61e06ae8a463825bef9cc98436e1a251cfe62c0395f90beec4d3 SHA512 db7a7af35ea085f1126c228d6ec4278f0e14a64660b989be6eead6a26098b1f1a1720b2a96374a2a55eb3cfc041deea479af057b62095cbd5485f729cad0fcb7
 EBUILD ii-9999.ebuild 653 BLAKE2B bcefb912baa5b9f4484e9ae25db6561e141a7ce10d80cb673d655cfaaa637d90ec087a82943df8040115a9b7b2984bbbbd6a937df8ac89118c7cf8501441ebe4 SHA512 877ad3c2c18a1cf6a3b5c2bb82241ac52fb4a1aaa42e78b3b0167023f3a2c5171fc6a753e1fed7ecac8cac02f9821233c3e97db17391bf87763ba82be8156d84
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ii/ii-1.8.ebuild b/net-irc/ii/ii-1.8.ebuild
index c079034f9bfb..2bb1b227445e 100644
--- a/net-irc/ii/ii-1.8.ebuild
+++ b/net-irc/ii/ii-1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux"
 
 src_prepare() {
 	default
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 3d09f504e7fa..a519c123abe1 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -5,8 +5,8 @@ AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-2.0.29.tar.gz 736116 BLAKE2B bd634b81e5a21f4d5e12a4057c4dfb65a241b696be373d24a047594d1d175028dcabff2f28defcf4c340859cfc50637afec755f399c24366e1134c7d69c843f2 SHA512 83da7b089dca8035ffa4f30a2e757661150bb9337aa8124958daa317b44a98fb15fdcb872f8512737b5a39f1b641616eb27c4398d4c8d8fcd40d1f8872bd2052
 DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
-DIST inspircd-3.7.0.tar.gz 855041 BLAKE2B 8b65c6d29ecf448503201d6d3d9b5416775f7ea97dd3e3acb947cbfcecd4a137f5c4dfd5902f8de43c03b5c5d799acc4a833631982f9815053beec07366a7ccb SHA512 d683d54a046f9bf17ae1a7bb1e2ce94000455c0249478250fd7263f8ede12048ce3982b990bb47461a1c7d9ea5fc20836b3dd255924e72d187eb3a6d591fd51d
+DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86 SHA512 be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa
 EBUILD inspircd-2.0.29.ebuild 3142 BLAKE2B 6a7434a1bf5841638268931c4106c2ff684ba00a7c6887a5d665632bd97ac99f1a38210cd0217c4951ec7a4585397685a3effe3298f9902b020c872056964cf1 SHA512 b0c245ef1d277fd8b9d728a98cef25b30e593faa847b6d5032d606957f5c2b77157dd4878baa8c20bc48ade6a9d471b49b159d2f7d6f5759cd519b6d6fe2d4b8
 EBUILD inspircd-3.4.0-r1.ebuild 3620 BLAKE2B b7e49e080ce8d5a7b418ec12462ebf53af247c494d9c299027d952eede5e9cce243f53ccbd90e000aac7e2a4c490fd6f54228a92943a0093a033e918f169afba SHA512 e0809008918e85cf50af088e13d1c09953fb88416bcb9d63f009ef339ab420329cb7a4eea9189bde9bad1eb51fe3ef7c97d49ce53d2b471e09962ccddafedf76
-EBUILD inspircd-3.7.0.ebuild 3622 BLAKE2B 6418faafa0282e095add6dfa6f5ba4601cf3df33d50e3a9e957cfde7a475edee1cc40c9ccecd0f3bb2f21e0b5efde1645efdde1b57dddb73c776e5ad06a723b5 SHA512 0595ddf6fce1510bf5800490d357da72027d242454a484c3d03ff5f478220e43fdebf3329486d63bb54dd13fe47d742ed8d86fcea4ee6ec18ac25d6ff6fa1c97
+EBUILD inspircd-3.8.1.ebuild 3620 BLAKE2B 66d60ac155d62c825f6518eb62bbe5e753f0e9e2a2e9e23edc4d233587752149985a1e113508ce1525f7f45d05c742e3d220193e04bf296c1f54e7938f1782f8 SHA512 8a964f1149da171be11c16a397b3343f68f6229697ef7c64f75b069d2022a73eddb278ff89024bbadf5cd135afc599644184d44b6e52ff87451dc6651f6ae26f
 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
diff --git a/net-irc/inspircd/inspircd-3.7.0.ebuild b/net-irc/inspircd/inspircd-3.8.1.ebuild
index 60448a5f4f90..0e5b3d405075 100644
--- a/net-irc/inspircd/inspircd-3.7.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.8.1.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/irssi/Manifest b/net-irc/irssi/Manifest
index 03d570462023..74790f461b79 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1,5 @@
+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.ebuild 1520 BLAKE2B 499004bc99e0a16269facfb2933882c8aa1fdfd912b55c5b263173ae5aa7cdfea148ed08b842d4a1c6d5eb538fa87328e55e6fbfb1575d34145866f0043eabed SHA512 255691b426cbe5d24a5d0abad6209ad4572320d474289ece4a2627ffe777808aff231784e37f314ad88ea78367b539f382a64076443225e70fbe60b906507e22
+EBUILD irssi-1.2.2-r1.ebuild 1599 BLAKE2B ad998fd40d2c5a84acaadaf8341bc9327f917ff681c7561fa532d4db2cf03d060458e40e88e5d6afdbd5d0461cb07dbb24d1d118db568bb2e12165b3ee9b9e4c SHA512 c8121b847a5a9ca7ae04f27c7c0af94e4ff9236fa0098b6abc9f97a3da391e9582d55eda6cf1ce5a4f850900cccd9de8c086c8b30a21adc9a416ac9478cbb443
 EBUILD irssi-9999.ebuild 1452 BLAKE2B 36bdbe74877e969849b92cc653c21eb7d41d03b0b03ae3656b3d25b5bd63e37a7c65c47cb3ea7fad0f110a51f99384b66b9a4215a8940c2105e126054ed51dd6 SHA512 c9e57d39473c2f3a9fda1b331f8f8232c758e0fdb803b4472c68491e78b74432eea75577be9cfddfbd500643eb85a051cf986c00b472181f37bd1986c5cbcf64
 MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
diff --git a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
new file mode 100644
index 000000000000..63d26958b7bf
--- /dev/null
+++ b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch
@@ -0,0 +1,38 @@
+From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001
+From: ailin-nemui <ailin-nemui@users.noreply.github.com>
+Date: Thu, 23 Apr 2020 21:45:15 +0200
+Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated
+
+A change in GLib 2.63 broke some assumptions in Irssi that the null-byte
+NUL / U+0000 is a valid Unicode character. This would occur when the
+user types Ctrl+Space. As a result, the input loop never manages to
+process the NUL-byte (and any other user input that follows, ever).
+
+This patch adds a manual check that properly advances the input loop if
+GLib returns -2 (incomplete character) despite the length being positive
+and a NUL is in first position.
+
+Fixes #1180
+https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967
+https://gitlab.gnome.org/GNOME/glib/-/issues/2093
+---
+ src/fe-text/term-terminfo.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c
+index 5235f72d2..78496a64f 100644
+--- a/src/fe-text/term-terminfo.c
++++ b/src/fe-text/term-terminfo.c
+@@ -672,7 +672,11 @@ void term_stop(void)
+ 
+ static int input_utf8(const unsigned char *buffer, int size, unichar *result)
+ {
+-	unichar c = g_utf8_get_char_validated((char *)buffer, size);
++	unichar c = g_utf8_get_char_validated((char *) buffer, size);
++
++	/* GLib >= 2.63 do not accept Unicode NUL anymore */
++	if (c == (unichar) -2 && *buffer == 0 && size > 0)
++		c = 0;
+ 
+ 	switch (c) {
+ 	case (unichar)-1:
diff --git a/net-irc/irssi/irssi-1.2.2.ebuild b/net-irc/irssi/irssi-1.2.2-r1.ebuild
index 7874c1eee7d0..1da518b1943d 100644
--- a/net-irc/irssi/irssi-1.2.2.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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="otr +perl selinux socks5 +proxy libressl"
 
 COMMON_DEPEND="
@@ -41,6 +41,10 @@ RESTRICT="test"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-glib-2.63_NUL_unicode_fix.patch" #746704
+)
+
 src_configure() {
 	# Disable automagic dependency on dev-libs/libutf8proc (bug #677804)
 	export ac_cv_lib_utf8proc_utf8proc_version=no
diff --git a/net-irc/irssistats/Manifest b/net-irc/irssistats/Manifest
index fccb337644f0..98918655be54 100644
--- a/net-irc/irssistats/Manifest
+++ b/net-irc/irssistats/Manifest
@@ -1,3 +1,4 @@
+AUX irssistats-0.75-Makefile.patch 625 BLAKE2B b7d3a4e3efa900c3691748c3ef88d648538625fe9b8695856ff640b49314f63d7c1e4c54eca510585bcc55a956de61bc82dd47f077edf3880be5a06fbb419893 SHA512 800469eb250fb5b1e0727eb2774da4247fc96f9fedb133644be43af9ee1572547e2e1c61e222c0c1717ba757a7abf997d3e06b1f5f7f7f52194156057ed59128
 DIST irssistats-0.75.tar.gz 54434 BLAKE2B 1bd35158bea9f24b8013834a876cbc3a3f285cea1802e6699f6e10af33dde1a648ec717b031819a999c0beb2cac394130da7a31b5bc877d32abb0a706142d972 SHA512 d7ac167d64c850f3803e6192f1fbf98e13cf296902b92bc3c5847f5f97a678938e7bff41b3195d2845c5ddb92f0557fea1b3a82b61d18b6a307b94ceae1c62f6
-EBUILD irssistats-0.75-r1.ebuild 557 BLAKE2B ec2010783da6b4ef64c71b43d62a0d968af4e0f6f3570482029480eb7a6f11f5e6b3e6d4d350a31b36ed65bb445e1bf11d569d8f9970775268add5c5c8146175 SHA512 8cf88ee36409fbb5f5709cf0bdc352d5b11680ef93d0b13205657d5ba1b3a577d9550a89b4e5303319f4ac403ac22fe8e2062fde019fc5437a8a89c6d93fc19d
+EBUILD irssistats-0.75-r1.ebuild 630 BLAKE2B afa01c457249a1e30a6f6f488143e5dc5e201a8485f13a054a9b26768bbc19f12216f3ac37f1fc234ed83790893b7cfa0d0707a799aa9e5a3bc8e3de8c1e5dbf SHA512 94f56e1aa38381404cec72ec585027b9ae025362ab9b08a78bd0531f58b7bebb7607dc648783036cc1b3436e40e3342c715b20c3bf01ca8ea415d44473774363
 MISC metadata.xml 247 BLAKE2B ad7649194ba47fd592d8a94cedd1132e472d7173de56a4e5d1b7af591a4063e27b4a196bef97c2aff4e5026ba2b22562c9d156bc93b1820b926151c205a696e6 SHA512 6b67bcfd1c47571c43f484d58c9132df98bb173dc939307124e0bacf8178a281d404b903954a5d23761a54b07123b0c0a83f999fa3cd578dcac141a5a6df661c
diff --git a/net-irc/irssistats/files/irssistats-0.75-Makefile.patch b/net-irc/irssistats/files/irssistats-0.75-Makefile.patch
new file mode 100644
index 000000000000..ac91c7deb512
--- /dev/null
+++ b/net-irc/irssistats/files/irssistats-0.75-Makefile.patch
@@ -0,0 +1,26 @@
+--- a/Makefile	2020-10-30 22:07:33.519994135 -0000
++++ b/Makefile	2020-10-30 22:26:46.042808724 -0000
+@@ -1,17 +1,18 @@
+-PRE = /usr/local
++CC = gcc
++CFLAGS ?= -O2 -Wall
++PRE = /usr
+ BIN = $(PRE)/bin
+ DAT = $(PRE)/share/irssistats/data
+ DOC = $(PRE)/share/doc/irssistats
+ MAN = $(PRE)/share/man/man1
+-CFLAGS ?= -O2
+ 
+-irssistats:irssistats.c
+-	gcc $(CFLAGS) -o irssistats irssistats.c
++irssistats: irssistats.c
++	$(CC) $(CFLAGS) -o irssistats irssistats.c $(LDFLAGS)
+ 
+ clean:
+ 	rm -f irssistats
+ 
+-install:irssistats
++install: irssistats
+ 	mkdir -p $(BIN) $(DAT) $(DOC) $(MAN)
+ 	cp -f irssistats $(BIN)
+ 	cp -f data/* $(DAT)
diff --git a/net-irc/irssistats/irssistats-0.75-r1.ebuild b/net-irc/irssistats/irssistats-0.75-r1.ebuild
index 3f7fd1cb742d..0a674f4d68c6 100644
--- a/net-irc/irssistats/irssistats-0.75-r1.ebuild
+++ b/net-irc/irssistats/irssistats-0.75-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,8 +16,13 @@ KEYWORDS="amd64 ppc sparc x86"
 
 DEPEND="net-irc/irssi"
 
+src_prepare() {
+	default
+	eapply "${FILESDIR}/${P}-Makefile.patch"
+}
+
 src_compile() {
-	$(tc-getCC) -o irssistats ${CFLAGS} ${LDFLAGS} irssistats.c
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index c429412ec45e..ae39ece81a9d 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,14 +1,7 @@
-AUX konversation-1.7.5-QElapsedTimer.patch 2292 BLAKE2B 88cdfd06b20f75aa85a61792ac797a4315b7d7d0b1df8056a1967b50fcf827ab073ed8961e5be462b829b1b56c3ff9325a52d6a6d09429011fde55b732295215 SHA512 75408a7efb8b6e3d1e5e17b2c11111b487da92939680555f284d066e0507237b81bda34aa24cc73e519319853189edf38f6cbf74e8f2a76a02df3261e5084c52
-AUX konversation-1.7.5-fix-regex-for-cap-ack.patch 1040 BLAKE2B fb0e34812623079fcfaff022734f340b02bf1ee81cdf1819f034e203584fae922db1a8b7401942ea64df0c9dbdedb641c58d9c3688c9b7b47ca43b7ef64cf4de SHA512 e8f945919f21bbcb7ce9575fbb8b17e14b4c72fa736865bd7ed48c6806aa0be2778f63b9fbc05aa4580467587cba26b52ff7fea6e816208dd5048439dd8c9bbd
-AUX konversation-1.7.5-kf5bookmarks-5.69.patch 1491 BLAKE2B 4041825268ca0968cb4c21b3e2b2503600ebb0d1af3c91623091abf75875962b57c75de5f2936b1dc39c457d928df0990aec2db3472336cc51e9ad243727c7e1 SHA512 cb71fed6944c7b5299fb535bb650f607feb1417b3e648246162110ce89dbc3d65c65d2d077ea471762bd3941a725c02f54fdfd78927c88f3854ea80adae2263c
-AUX konversation-1.7.5-kf5windowsystem-5.63.patch 1074 BLAKE2B cd24488b5892d75fd81492e736c077fa8b109293c15fa8ba90ac7fe9c9928903f14f9de706784f6203b944a2aa87b45c6d79269b97e7fb22b5be82012c8b32d5 SHA512 55bfff05b0ac8d992312b821e507abdf397e23ff127544a2cd3c76654bcb575ff72fad82d44a852479ca2c9463c5ed08aa945e0bbf7ca735c2798c9aafd1aabd
-AUX konversation-1.7.5-missing-header.patch 574 BLAKE2B a2a88b4d071685301fcf071f676eac814ab21ce4dcdcd9af7ced5ea2e595d0335f73a36011393fa7c54ae26d60486d9b4319d2e197bee79adda79c6158b1a0d5 SHA512 b9b1b2e4b231d2a4beb63a6e757467ec0d32bfc9005dd990d7649cc6ac9c34d106b0b15bc3918490ef4ded81699e5d84161b3a1d8541aa6232ba485124b65386
-AUX konversation-1.7.5-qt-5.15.patch 814 BLAKE2B 3c5ddf41f0dc05244b69546616e7df2b98e2b51125954f7c5c9a75aaae750ee45a8a3fc3175dea6e0c171c4ee06d43002fdbcd6d08fc8e1bd9e316c25774ca4c SHA512 056a3d6c17b04734e446b623b88dfa9fd4a90133c251b427460f5c6f3f85a52ad46abe92b055e8a5eb86f433f67e4645f9999d6124d3343466b741d99c11b076
 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.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
-DIST konversation-1.7.6.tar.xz 3354800 BLAKE2B cad571f5d55e030de0d8610417d7c2473f9d3f0b81cfc2c8f730324d73ef0eee17e2f11a6d5714ff541170fa3eab6f4eaa3ecde117a65e9af143e13c1e8afd66 SHA512 69c4b67a186f4242c74e2027d1faca6be7a30719287b960888751a5522da5abe24c6ada076bb097233cf0254c5cff12cc70c9a7a85875f80c0eb1637c6de6613
-EBUILD konversation-1.7.5-r2.ebuild 2270 BLAKE2B 32af7e63e381ecc1dced71e185fcde58c40b04a441df6f6cbc9b0d03502221f1dab4cc634f3dc1eabc9e57748655a4028dcc6e24a91a2aac39a926fa703a081d SHA512 07217bc16ffb0b54adff8ff8d8adda619a1b57ece9b6033caa4200afebbacf49f1e3c5a0ea0ffd5c1440d2f44dd2eeff70dd7e5e58e68596224d17bb8d576aa1
-EBUILD konversation-1.7.6.ebuild 2011 BLAKE2B 423b14d9e78ca566f3b990c37d66bd345ef9cfe13deaaf217d5702e61b0916a8eb9d9ea92f4da1086d489491c5f07e99c34a8eaa9e78b99870e25fdb52880633 SHA512 70eb988b22b44f297e9f1895020612a0a1c7b77cc0776abca0925e4e5a2000a6f1e1e07c8e58184621b0092ebbab6ca30efabe824ece6c2dfaaef5b2fe27abc8
+DIST konversation-1.7.7.tar.xz 3357584 BLAKE2B 9f6817a1e01674f383879eeaafc65a50825aa7554fedcf7fbe7affc43da16f7198761ca12b510d9980df5a5f41819a5415043ec91de55f1cb4d86e62e8e23ea0 SHA512 99026007af7fa00b82240c1f0e46a8d3db6c3434948aff7d0b01c2f99bccdd227a2a705bd83bce1ca2e47be13866d5d0a981c8b4ff8dec472612d6ee40f9ed2c
+EBUILD konversation-1.7.7-r1.ebuild 2114 BLAKE2B 6fe3aff1c5e1d0c6791787d25b2443dc50a61c0f5e1c8b6b79f7bfc192cabd76dff6d38234c14eb66932bf5200990c522cac6e9bb8b12646f87cb51653450b63 SHA512 0a5f1f1c8b3a0130a6e7a09977a5b9b6c536cc41c858a2ae68e71707b7b4ec76f7c7558fbb0096bd5ee916ef4ed6630f74317c1a0a2449459cda429234b41348
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch b/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
deleted file mode 100644
index 74fd23e58d3c..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-QElapsedTimer.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 0efede7857a86f729bec0fdfd1789f7faf23d957 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Thu, 28 Nov 2019 17:41:33 +0100
-Subject: Port to QElapsedTimer; remove unused default constructor
-
-Tested by printing out the value of age(), works like before.
----
- src/irc/ircqueue.cpp |  8 ++++++++
- src/irc/ircqueue.h   | 18 +++++++-----------
- 2 files changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/src/irc/ircqueue.cpp b/src/irc/ircqueue.cpp
-index 1101623..3cc33a5 100644
---- a/src/irc/ircqueue.cpp
-+++ b/src/irc/ircqueue.cpp
-@@ -19,6 +19,14 @@
- 
- #include "server.h"
- 
-+IRCMessage::IRCMessage(const QString &str)
-+    : s(str) //, codec(QTextCodec::codecForName("utf8"))
-+{
-+    t.start();
-+}
-+
-+////
-+
- int IRCQueue::EmptyingRate::nextInterval(int, int elapsed)
- {
-     if (!isValid())
-diff --git a/src/irc/ircqueue.h b/src/irc/ircqueue.h
-index 3f7f0c8..7a91776 100644
---- a/src/irc/ircqueue.h
-+++ b/src/irc/ircqueue.h
-@@ -19,6 +19,7 @@
- #include <QObject>
- #include <QList>
- #include <QTime>
-+#include <QElapsedTimer>
- 
- class QTimer;
- class Server;
-@@ -34,29 +35,24 @@ class Server;
-  */
- struct IRCMessage
- {
--    IRCMessage() : t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8"))
--    {} ///< this constructor required for QValueList, do not use
--
-     /**
-         Make a new IRCMessage with timestamp of QTime::currentTime().
- 
-         Note the constructor takes a QString, not a const QString& or a QString *. If you want to modify the
-         contained text, put it back with setText.
-     */
--    IRCMessage(QString i) : s(i), t(QTime::currentTime()) //, codec(QTextCodec::codecForName("utf8"))
--    {}
-+    IRCMessage(const QString &str);
- 
--    QString text() { return s; }
--    int age() { return t.elapsed(); }
--    QTime time() { return t; }
--    void setText(QString text) { s=text; }
-+    QString text() const { return s; }
-+    int age() const { return t.elapsed(); } // in milliseconds
-+    void setText(const QString &text) { s=text; }
- private:
-     QString s;
--    QTime t;
-+    QElapsedTimer t;
- 
-     //FIXME wire this up
-     //QTextCodec* codec;
--    //operator const char * () const { return codec->fromUnicode(text()); }
-+    //operator QByteArray () const { return codec->fromUnicode(text()); }
- 
- };
- 
--- 
-cgit v1.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
deleted file mode 100644
index f351dd00134f..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6d896b4efc93c18246ce4db7c788929b0ce75559 Mon Sep 17 00:00:00 2001
-From: Peter Simonsson <peter.simonsson@gmail.com>
-Date: Sun, 23 Sep 2018 08:29:43 +0200
-Subject: Fix regex for cap ack
-
-Seems to have worked despite being broken
----
- src/irc/inputfilter.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
-index fbd268b..45d4f88 100644
---- a/src/irc/inputfilter.cpp
-+++ b/src/irc/inputfilter.cpp
-@@ -795,7 +795,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma
- 
-                 foreach(const QString& capability, capabilities)
-                 {
--                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9"), Qt::CaseInsensitive));
-+                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9]"), Qt::CaseInsensitive));
-                     QString modifierString = capability.left(nameStart);
-                     QString name = capability.mid(nameStart);
- 
--- 
-cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch b/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
deleted file mode 100644
index 2c36f69aa99c..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 57df81cd8a11c4dbe170f9d81abd5b35b4887e0b Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Fri, 17 Apr 2020 13:14:26 +0200
-Subject: Adapt the code to KBookmarkMenu-5.69 changes
-
-Test Plan:
-Bookmarks menu still works, and the bookmark actions still show in the
-shortcuts editor dialog.
-
-Reviewers: #konversation, psn
-
-Reviewed By: #konversation, psn
-
-Subscribers: #konversation
-
-Differential Revision: https://phabricator.kde.org/D28911
----
- src/bookmarkhandler.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/bookmarkhandler.cpp b/src/bookmarkhandler.cpp
-index 5a70591..74b51ff 100644
---- a/src/bookmarkhandler.cpp
-+++ b/src/bookmarkhandler.cpp
-@@ -21,7 +21,10 @@ Copyright (C) 2002 Carsten Pfeiffer <pfeiffer@kde.org>
- #include "connectionmanager.h"
- #include "viewer/viewcontainer.h"
- 
-+#include <KActionCollection>
-+#include <kbookmarks_version.h>
- #include <KBookmarkMenu>
-+#include <QMenu>
- #include <QStandardPaths>
- 
- 
-@@ -41,7 +44,12 @@ m_mainWindow(mainWindow)
-     manager->setEditorOptions(i18n("Konversation Bookmarks Editor"), false);
-     manager->setUpdate( true );
- 
-+#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0)
-     m_bookmarkMenu = new KBookmarkMenu(manager, this, menu, m_mainWindow->actionCollection());
-+#else
-+    m_bookmarkMenu = new KBookmarkMenu(manager, this, menu);
-+    m_mainWindow->actionCollection()->addActions(menu->actions());
-+#endif
- }
- 
- KonviBookmarkHandler::~KonviBookmarkHandler()
--- 
-cgit v1.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
deleted file mode 100644
index cf93b3b66def..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4295aba5c02533040723d140e062aebd231b3f18 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Thu, 28 Nov 2019 12:56:34 +0100
-Subject: Port away from deprecated KWindowSystem API (with ifdefs)
-
----
- src/application.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/application.cpp b/src/application.cpp
-index 4667c24..538624b 100644
---- a/src/application.cpp
-+++ b/src/application.cpp
-@@ -50,6 +50,7 @@
- #include <KTextEdit>
- #include <KSharedConfig>
- #include <KStartupInfo>
-+#include <kwindowsystem_version.h>
- 
- using namespace Konversation;
- 
-@@ -1392,7 +1393,12 @@ void Application::handleActivate(const QStringList& arguments)
- 
-     newInstance(m_commandLineParser);
- 
-+#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 62, 0)
-     KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
-+#else
-+    mainWindow->setAttribute(Qt::WA_NativeWindow, true);
-+    KStartupInfo::setNewStartupId(mainWindow->windowHandle(), KStartupInfo::startupId());
-+#endif
-     mainWindow->show();
-     mainWindow->raise();
- }
--- 
-cgit v1.1
-
diff --git a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
deleted file mode 100644
index 1ff14b81ec58..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sun, 21 Jul 2019 09:14:32 +0200
-Subject: Fix build with Qt 5.13
-
----
- src/irc/outputfilter.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
-index f9e6253..45d11fb 100644
---- a/src/irc/outputfilter.cpp
-+++ b/src/irc/outputfilter.cpp
-@@ -32,6 +32,7 @@
- 
- #include <QStringList>
- #include <QFile>
-+#include <QMetaMethod>
- #include <QRegExp>
- #include <QTextCodec>
- #include <QByteArray>
--- 
-cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch b/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
deleted file mode 100644
index a17c0a432314..000000000000
--- a/net-irc/konversation/files/konversation-1.7.5-qt-5.15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f88c73cf278da9907496eab0777903f942c50cb9 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 21 Apr 2020 10:34:49 +0200
-Subject: [PATCH] Fix build with Qt 5.15 (missing header)
-
-Test Plan: Build succeeds with Qt 5.15.0_beta4
-
-Reviewers: #konversation, psn
-
-Reviewed By: #konversation, psn
-
-Differential Revision: https://phabricator.kde.org/D29038
----
- src/viewer/viewtree.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/viewer/viewtree.cpp b/src/viewer/viewtree.cpp
-index eeee8fb4..04ec4e54 100644
---- a/src/viewer/viewtree.cpp
-+++ b/src/viewer/viewtree.cpp
-@@ -21,6 +21,7 @@
- #include <QFontDatabase>
- #include <QGuiApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QItemSelectionModel>
- #include <QStyleHints>
- #include <QToolTip>
--- 
-2.26.1
-
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
new file mode 100644
index 000000000000..53ea4a3d7a1d
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.7-no-solid.patch
@@ -0,0 +1,38 @@
+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-1.7.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild
deleted file mode 100644
index 925f72f30810..000000000000
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.63.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org
-https://kde.org/applications/internet/org.kde.konversation"
-SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="+crypt"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5=
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/phonon[qt5(+)]
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-"
-RDEPEND="${DEPEND}
-	crypt? ( app-crypt/qca:2[ssl] )
-"
-
-PATCHES=(
-	# 1.7 branch
-	"${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch
-	"${FILESDIR}"/${P}-missing-header.patch
-	"${FILESDIR}"/${P}-QElapsedTimer.patch
-	"${FILESDIR}"/${P}-kf5windowsystem-5.63.patch
-	# git master
-	"${FILESDIR}"/${P}-kf5bookmarks-5.69.patch
-	"${FILESDIR}"/${P}-unused-kemoticons.patch
-	"${FILESDIR}"/${P}-qt-5.15.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package crypt Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# Bug 616162
-	insinto /etc/xdg
-	doins "${FILESDIR}"/konversationrc
-}
diff --git a/net-irc/konversation/konversation-1.7.6.ebuild b/net-irc/konversation/konversation-1.7.7-r1.ebuild
index f088c5bfd39d..d3f2f657db22 100644
--- a/net-irc/konversation/konversation-1.7.6.ebuild
+++ b/net-irc/konversation/konversation-1.7.7-r1.ebuild
@@ -4,17 +4,20 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="User friendly IRC Client"
-HOMEPAGE="https://konversation.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
+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"
@@ -51,14 +54,15 @@ DEPEND="
 	crypt? ( >=app-crypt/qca-2.3.0:2 )
 "
 RDEPEND="${DEPEND}
+	>=dev-qt/qtsvg-${QTMIN}:5
 	crypt? ( >=app-crypt/qca-2.3.0:2[ssl] )
 "
 
 PATCHES=(
 	# git master
-	"${FILESDIR}"/${PN}-1.7.5-kf5bookmarks-5.69.patch
 	"${FILESDIR}"/${PN}-1.7.5-unused-kemoticons.patch
-	"${FILESDIR}"/${P}-no-kiconthemes.patch
+	"${FILESDIR}"/${PN}-1.7.6-no-kiconthemes.patch
+	"${FILESDIR}"/${P}-no-solid.patch
 )
 
 src_configure() {
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 4bc285a9a479..4f78854f52ee 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,4 +1,4 @@
 DIST kvirc-5.2_pre20200605155236.tar.gz 6170072 BLAKE2B 2652bcae16263615ccbf494d8265a1ecf997525dbfa70d4ace0c3f6ae58231ce575dfe444a60e2751bb7741445bf44297fafb260c05bad6d637f8dc89eb254b4 SHA512 84499fe13337f114587ff267d5e85e39ef61d99e88c84cfc9f0341a5db2e17b50d644bf8483de420c3629f073d6e3eeb81e25de357a723f54e39f154cb4b7da1
-EBUILD kvirc-5.2_pre20200605155236.ebuild 4528 BLAKE2B 874a2c26cc792f36ccb6eb35d5dd8fd9fbd93e67540242ca4b378179327bfe6a3e3a7a6db077589148ddbb0911746b3a3a503899211abedfff7c5198d5357a02 SHA512 51ffa855b9e97f4824f216c2ce3ecc119a189a146b9bda5e9aa364f72227b91a1c0ce13f742eba42ec4ee59800527719b09059495d9b26e96e3a127dae09b721
-EBUILD kvirc-9999.ebuild 4467 BLAKE2B 981e92e8fe2d3395d7c1f147859408de5de19bb7ed1457594cd4aab1eea32c02dd72808fb06762de8798f03fbce8f1b982af84c97bc50ee81ed24a56f47594e7 SHA512 6f30e5285cba65fd3ce42f4f931b78e0f4367274b7960079ca43ede98e4ac990c2d97069ff4108ed6f6946f2c08f53245fec078a3513ae7bb1c1a152a86c8f9b
+EBUILD kvirc-5.2_pre20200605155236.ebuild 4451 BLAKE2B 6fa7d8cb1ad91525c819aa5b9fb8c495a124f7b598c134d8dc3ecd26df42dbb8019ff4988cad1a0e532a8763bf639fd60d69f035f3bc2d0e6dc0c28bb097d90b SHA512 3ed8a83b9e7075122ac8e39203d44ffa7a3c021c407ab3bc644300c11d584f40c57aba0bb7551de9ce0214c9b4f5fb16d6db56ee0701aba90433acd9ba65541e
+EBUILD kvirc-9999.ebuild 4390 BLAKE2B fbb7f3850e6af42c3beab17543f5d0b63826e1e6650544ef8e5d154341423eac034ae8cda6f942b0c3a9b073ec7bf2d83109a45d5a0776a48f2c1aa230810ceb SHA512 b73b39e628c44121ae749605088463fe9bf114fcac54d13be3a44ff6c489f8ffd6f4416a50bc5c69e7c0b3df63b4e534cec8666caecdea0c80be415c3577ab71
 MISC metadata.xml 643 BLAKE2B 820a98f07a4cfb58e857d5c7b863ed7adc174497a7ea05e66245a2c40c328ee0bdb644b98ba1d923834ccf05f23f8128abfe462d433fe2136078225b152a633f SHA512 3dd50caac7ff50679cabad216d4ec28b60351febc419f5d32f60b785043eba6f2f379c06e5af28af26355845ebcfe8439bca9d141bc3b9d0401fb0ee0a0c704c
diff --git a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild
index 50ee9d0c832f..f73ede8d1ee5 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20200605155236.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
 
 inherit cmake flag-o-matic python-single-r1 xdg-utils
 
@@ -67,8 +67,8 @@ DEPEND="dev-qt/qtcore:5
 	python? ( ${PYTHON_DEPS} )
 	spell? ( app-text/enchant:0= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
 	)
 	theora? (
 		media-libs/libogg
@@ -141,11 +141,9 @@ src_configure() {
 		-DWANT_QTSVG=OFF
 	)
 	if use python; then
-		local PYTHON_INCLUDEDIR PYTHON_LIBPATH
-		python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
 		mycmakeargs+=(
-			-DPython3_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
-			-DPython3_LIBRARY="${PYTHON_LIBPATH}"
+			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
+			-DPython3_LIBRARY="$(python_get_library_path)"
 		)
 	fi
 
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index c7a673bfd4ad..5e4569dadd03 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_7,3_8,3_9})
 
 inherit cmake flag-o-matic python-single-r1 xdg-utils
 
@@ -67,8 +67,8 @@ DEPEND="dev-qt/qtcore:5
 	python? ( ${PYTHON_DEPS} )
 	spell? ( app-text/enchant:0= )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
 	)
 	theora? (
 		media-libs/libogg
@@ -141,11 +141,9 @@ src_configure() {
 		-DWANT_QTSVG=OFF
 	)
 	if use python; then
-		local PYTHON_INCLUDEDIR PYTHON_LIBPATH
-		python_export PYTHON_INCLUDEDIR PYTHON_LIBPATH
 		mycmakeargs+=(
-			-DPython3_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
-			-DPython3_LIBRARY="${PYTHON_LIBPATH}"
+			-DPython3_INCLUDE_DIR="$(python_get_includedir)"
+			-DPython3_LIBRARY="$(python_get_library_path)"
 		)
 	fi
 
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index a84553811ed6..846445543190 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,5 +1,3 @@
-DIST polari-3.34.1.tar.xz 1270300 BLAKE2B 37a7a5bd5e1850b03100d8465aeddb4f558ec94ae334a5b3f16b54b591404102bc505c3254fe353aaf8174031b8b7eb67b5f85468367eeded44400d704889d92 SHA512 99cdf95b248322e69f0fee99110598c0c1d9ceb8e7377db8eb319645090c5b56ca09e1c55e1ef2e98ae546e01b796aabe31c9362f69907d641a20cc8a588aa4d
 DIST polari-3.36.3.tar.xz 1030640 BLAKE2B 72cee290c21cd0a1f96d25e02993dadba14247bb3b38d2ce62ebbe8670a9c7498e7dd123bef2ab3ffaea78019109697186cee409dd78a554afbbc5b5c4db56b5 SHA512 dcf8018ffdaffe2867ab7c3bbc1c874090df0ff5435ec16746780ae081dc61a0b7ec0e58d706b6e7eb8957b1f3fe9c24b586db831ab8b0565fa05c1bf3adae38
-EBUILD polari-3.34.1.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a
 EBUILD polari-3.36.3.ebuild 1064 BLAKE2B b424c2334847d4156c39f7b65927007981ede1066a8682da0645e78c6c02f1062653e66bc177a273c63cba152b21aa3e53d1d221d0a898a6457e7a60b20d88ae SHA512 56ce22cb2d90b93099cfb8170962d0acbbf5bde9b670adebeea74ed631d1184c9a67d2c9b211c95173246fbcb31abe9a1adaf32d8e05211af53f6d294dd3e44a
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-irc/polari/polari-3.34.1.ebuild b/net-irc/polari/polari-3.34.1.ebuild
deleted file mode 100644
index dad3791fcd02..000000000000
--- a/net-irc/polari/polari-3.34.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="An IRC client for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.21.6:3[introspection]
-	net-libs/telepathy-glib[introspection]
-	>=dev-libs/gobject-introspection-1.50:=
-	>=dev-libs/gjs-1.57.3
-
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=app-text/gspell-1.4.0[introspection]
-	x11-libs/pango[introspection]
-	app-crypt/libsecret[introspection]
-	net-libs/libsoup:2.4[introspection]
-	net-im/telepathy-logger[introspection]
-"
-RDEPEND="${DEPEND}
-	>=net-irc/telepathy-idle-0.2
-"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? ( dev-lang/spidermonkey:60 )
-"
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/net-irc/rhapsody/Manifest b/net-irc/rhapsody/Manifest
index 97caeb102ae1..8a0cbba18504 100644
--- a/net-irc/rhapsody/Manifest
+++ b/net-irc/rhapsody/Manifest
@@ -1,5 +1,5 @@
 AUX rhapsody-0.28b-tinfo.patch 5392 BLAKE2B 412ed32dd0e3719af1a16d44da17303301055139b65c7ff7984982a0b5eaaa258d98a63d6c11a0961595104c0389db6e65e62d6f4f0c90860bed0ea316873454 SHA512 4fbfbc54004bb5402868309a2df1911f993fce9fc18a799eda10ee7417802a10069f2379737eb85d721030afaa5c80886827a1bbe67864f69f8fb7ea51eb24f0
 AUX rhapsody-0.28b-uclibc.patch 382 BLAKE2B 9bd47da75b9fa0771025cd8993bba7e66b213abc66a13b0a06ea5426fee8caf9d30955ef4e5074caa02844702b2bcbacb9ffe2a3c59b67f9eb1e6c96bcf5aadf SHA512 6bb29efcca48fbab3e53f0d71f21ae558b3aff14c1ced6188fb3f1ae4f627ffa723d70ca65c4f05fe85943224f784dcb968340f1d0ebe2677fd26e1d25a49525
 DIST rhapsody_0.28b.tgz 110062 BLAKE2B 58f4a37efc11f019eac815e43fefb55b39da298682588519671b449f25be3fa89e807f92b55f1f62ef04321ff0ba5adc40f625c5c1c75aa2824138419e06f671 SHA512 1ff9f29d281421b7fe3dcdccbd8b2559572cc6e7167ff9e0f1a46dcff07486115de245055b3d72107f40f40a484d9aef94c7ed21b55a7bdf80094198d69dec6d
-EBUILD rhapsody-0.28b.ebuild 795 BLAKE2B 775f24ea0090c980e5ceff109acf9e37ce748e6c877186959cebcf24b8c07bd146b62527f90e1adbf02c0650f26aa3195277a4691f6ce6562035a4c45025b6e8 SHA512 84bb81e002c125beb031604b97d6b9d40dc3e7c89edad800651a4c444bda778d9e5e5f88639ce9ea78ba5e9d48d2ee62e7671be9911795b361214c92b14ffece
+EBUILD rhapsody-0.28b.ebuild 804 BLAKE2B c2409516e3be942e416ecbfb3a6831ce18b02309683af91d3d3b173ffb112c219c70b8bd9a4724ebe7f7cd30a039772e54d2f15e5e1c01ed09b693a9727471fd SHA512 5a748cc9482c62cd9df7602fd5f57b4657dca75600260d827e9f67f2461aefb62dfadda26e0ea2c779e5ce2841274bc57402f1782e51894b82fd19e19f74826f
 MISC metadata.xml 245 BLAKE2B f059db0d75f6addf564b9ba45029962f855144c1f7ea684dda39b60bb47e8b298b0827add3cea31e0c1d12da4f5d2e5f6819022a2afa6631351e876f62a0e0d3 SHA512 513af093eab23f31409638d76341a397635e358dde908edc462bc80ed46a95e37f7c1a7c8d9d30c7935c214e2e8ea4d071603b294ba133e7092f4bc71bdfe192
diff --git a/net-irc/rhapsody/rhapsody-0.28b.ebuild b/net-irc/rhapsody/rhapsody-0.28b.ebuild
index 52d276a3bb78..921c22d2b274 100644
--- a/net-irc/rhapsody/rhapsody-0.28b.ebuild
+++ b/net-irc/rhapsody/rhapsody-0.28b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" LOCALFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" LOCALFLAGS="${CFLAGS} -fcommon"
 }
 
 src_install() {
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 99d41c29d00b..19421e96c639 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -3,6 +3,10 @@ AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af0070
 AUX unrealircd.service 177 BLAKE2B 9a58ce4e7785a66beac53afa2ecd276dd6f8e9927de8dfc3e9eab968008ad681a8b9f353bff4951bba8023d5c04affda6b58fde5db8232d0f1f9ae3e470424f0 SHA512 99163776104f2f27a585332004221fac16a9fbf9c8930b0603b5f33aca4c5ac13bdded4d5917143796b3893a19d2f709b0c4d4d635d85bd681f643b3b59131f5
 DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
 DIST unrealircd-5.0.6.tar.gz 4975195 BLAKE2B 3ba459e0ec932e9f240825ba9f1fa40e300fe7958f999de86d5653f2e6e4940be8b8da9c885c97bd738abefef601d61da6c4e6c7199c7052d29a74fcf5048828 SHA512 7532e9ab2e039f21796ae813881aec9d34b502ab64efc4323c938232c8901ce882dbcce497ad93df270e4b5fa2e9633c0971f2a6b3213ad458756aea92aa1612
+DIST unrealircd-5.0.7.tar.gz 4995220 BLAKE2B a2996f62b3fe943f9af2cd570866101a501d24f7966378d8e651cf84b9b9d0981fad441b785c6293f4a0668a914cdf191dec52cc6b1e86aac2a51640ca32dbfe SHA512 0b851af26da2ea5d3a04d2ef324d7bd3d3fc820f24d7dfd7e975d6bf1f3954884eb98dc348d291a118d98a214922d3ca1132800381e6f025264856aa06498779
 EBUILD unrealircd-4.2.4.1.ebuild 5452 BLAKE2B 356dfc371b2c8757cd710ba93401f4a34e069b545cc77573b9942ac1672e0a4367be3fb1a47fdf9ef7cdee3a1ba40bc57d0ae0366c16262665a03cdc63fae242 SHA512 b875c731c0712ab570b1d18fe0ca30abe5ed235d24a3beafa169f98d94cc6f52130d935d21ba732bbf74b368adfd9754283e61688339b1a2599523fd3e3d3d98
 EBUILD unrealircd-5.0.6.ebuild 5087 BLAKE2B 82341a54c9c04c7a1e91a53d14979520ce02b0b3824fe7e3bc124a4bff054a43e1124c5b9205c776ff7961a10ab88461c4fc11e28008a19dc32996bc92edc7e3 SHA512 c97b8b352b8f927ab9ada81f75903a0bb47f3882da8630a3bfd55cfc4a66b4e518418bbffef2b011535a47795d2d9024cf6619d446be55bcb146c1ea7ca66625
+EBUILD unrealircd-5.0.7-r1.ebuild 5174 BLAKE2B 94854576a6ae38be7c2568babd85dc37bd1dab4f5934aab626c3969da56c4f22434b305297d9ab774b19b05835a1cd59e322472ee542c9371d3a0f57bafb550a SHA512 e8808c6bf41df9161fb33877cc759c4b25fd234d549e3d6d09fb6f04933966f4101ca39921b7ab721ff1e2ff6643f46abdd47ffeed5229506fa70a14fa785635
+EBUILD unrealircd-5.0.7-r2.ebuild 5145 BLAKE2B dc8ae03291fc7c0074ea0c145144a202e855f0c59f0eb75a2ab6657c19b7e9c06cad6aed431719588510451603486e51d4a12943482b07ec015466c5d568e4fb SHA512 7bc2414949d06f35cc14dec06d18b46747c68851319be26e2d33e24811f2828cd81c58f69410c67d1975b2a7edd49e94df653c85ca3b14b04d78faa6dfcd99ec
+EBUILD unrealircd-5.0.7.ebuild 5171 BLAKE2B 2dfd5fbbcee70f11ebd9bd36b9a74b068d06512c042f7abae6d22302c7f16daf440896000b315c5183834dd6da08f6e50a9a1fe424ea8dbede5990c246a27279 SHA512 e614737149ea7a6ad3128ced1716d841c0f0996a6eb7ed9d644afdb7cd0b837344bdf89d1f9f22eb152f34815844721cd5be74da1dd48478599455e8de99a696
 MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild b/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild
new file mode 100644
index 000000000000..4807b6d11438
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.7-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert systemd
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.7:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm -r extras || die
+
+	# building third-party modules (which we don't do) cause a sandbox violation
+	# bug 704444
+	echo "" > src/buildmod || die
+
+	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
+
+	if use class-nofakelag; then
+		sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# Default value for privatelibdir adds a build path to -Wl,-rpath.
+	econf \
+		--with-bindir="${EPREFIX}"/usr/bin \
+		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
+		--with-confdir="${EPREFIX}"/etc/${PN} \
+		--with-datadir="${EPREFIX}"/var/lib/${PN} \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--without-privatelibdir \
+		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-maxconnections=1024 \
+		--with-nick-history=2000 \
+		--with-permissions=0640 \
+		--with-system-argon2 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+
+	(
+		cd src/modules || die
+		for subdir in $(find . -type d -print); do
+			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+				doexe "${subdir}"/*.so
+			fi
+		done
+	)
+
+	insinto /etc/${PN}
+	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+	# is redundant with app-misc/ca-certificates and examples will all
+	# be in docs anyway.
+	doins -r doc/conf/{aliases,help}
+	doins doc/conf/*.conf
+	newins doc/conf/examples/example.conf ${PN}.conf
+	keepdir /etc/${PN}/tls
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	fperms 0750 /etc/${PN}/tls
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/log/${PN}
+	fperms 0770 /var/lib/${PN}{,/tmp}
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+
+	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+	# that to look for ca-certificates-provided file instead. %s is
+	# CONFDIR. #618066
+	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+
+	insinto $(systemd_get_systemunitdir)
+	doins "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/tls/server.cert
+				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
+			)
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can also configure ${PN} start at boot with rc-update(1)."
+	elog "It is recommended to run unrealircd as an unprivileged user."
+	elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/unrealircd/unrealircd-5.0.7-r2.ebuild b/net-irc/unrealircd/unrealircd-5.0.7-r2.ebuild
new file mode 100644
index 000000000000..df06523b4325
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.7-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert systemd
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.7:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm -r extras || die
+
+	# building third-party modules (which we don't do) cause a sandbox violation
+	# bug 704444
+	echo "" > src/buildmod || die
+
+	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
+
+	if use class-nofakelag; then
+		sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# Default value for privatelibdir adds a build path to -Wl,-rpath.
+	econf \
+		--with-bindir="${EPREFIX}"/usr/bin \
+		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
+		--with-confdir="${EPREFIX}"/etc/${PN} \
+		--with-datadir="${EPREFIX}"/var/lib/${PN} \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--without-privatelibdir \
+		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-maxconnections=1024 \
+		--with-nick-history=2000 \
+		--with-permissions=0640 \
+		--with-system-argon2 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+
+	(
+		cd src/modules || die
+		for subdir in $(find . -type d -print); do
+			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+				doexe "${subdir}"/*.so
+			fi
+		done
+	)
+
+	insinto /etc/${PN}
+	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+	# is redundant with app-misc/ca-certificates and examples will all
+	# be in docs anyway.
+	doins -r doc/conf/{aliases,help}
+	doins doc/conf/*.conf
+	newins doc/conf/examples/example.conf ${PN}.conf
+	keepdir /etc/${PN}/tls
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	fperms 0750 /etc/${PN}/tls
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/log/${PN}
+	fperms 0770 /var/lib/${PN}{,/tmp}
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+
+	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+	# that to look for ca-certificates-provided file instead. %s is
+	# CONFDIR. #618066
+	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/tls/server.cert
+				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
+			)
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can also configure ${PN} start at boot with rc-update(1)."
+	elog "It is recommended to run unrealircd as an unprivileged user."
+	elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/unrealircd/unrealircd-5.0.7.ebuild b/net-irc/unrealircd/unrealircd-5.0.7.ebuild
new file mode 100644
index 000000000000..438a6541a211
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-5.0.7.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert systemd
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
+
+RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
+	>=app-crypt/argon2-20171227-r1:=
+	dev-libs/libpcre2
+	>=net-dns/c-ares-1.7:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm -r extras || die
+
+	# building third-party modules (which we don't do) cause a sandbox violation
+	# bug 704444
+	echo "" > src/buildmod || die
+
+	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
+
+	if use class-nofakelag; then
+		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# Default value for privatelibdir adds a build path to -Wl,-rpath.
+	econf \
+		--with-bindir="${EPREFIX}"/usr/bin \
+		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
+		--with-confdir="${EPREFIX}"/etc/${PN} \
+		--with-datadir="${EPREFIX}"/var/lib/${PN} \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--without-privatelibdir \
+		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-maxconnections=1024 \
+		--with-nick-history=2000 \
+		--with-permissions=0640 \
+		--with-system-argon2 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+
+	(
+		cd src/modules || die
+		for subdir in $(find . -type d -print); do
+			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+				doexe "${subdir}"/*.so
+			fi
+		done
+	)
+
+	insinto /etc/${PN}
+	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+	# is redundant with app-misc/ca-certificates and examples will all
+	# be in docs anyway.
+	doins -r doc/conf/{aliases,help}
+	doins doc/conf/*.conf
+	newins doc/conf/examples/example.conf ${PN}.conf
+	keepdir /etc/${PN}/tls
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	fperms 0750 /etc/${PN}/tls
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/log/${PN}
+	fperms 0770 /var/lib/${PN}{,/tmp}
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+
+	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+	# that to look for ca-certificates-provided file instead. %s is
+	# CONFDIR. #618066
+	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
+
+	insinto $(systemd_get_systemunitdir)
+	doins "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
+		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/tls/server.cert
+				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
+				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
+			)
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can also configure ${PN} start at boot with rc-update(1)."
+	elog "It is recommended to run unrealircd as an unprivileged user."
+	elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 38f53267eaf3..407ac0c0a846 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,4 +1,6 @@
 DIST weechat-2.9.tar.xz 2206584 BLAKE2B 8089cd846ca192ec666a50e8071ed57e1c2518b2d5ea98733b8e3fa6c8c684e8ed14253d787b3f9995a8f481a7413444c3ba262dcb6c100283192bcafb502627 SHA512 c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e
+DIST weechat-3.0.tar.xz 2215408 BLAKE2B ed43c16af2a9fea101b54714e21d5f28f2b18fed5734c5f6adde857500befd94089f6bd7be5e2ad2738fce4e1bd5b10ebef32d0d46039242efaa2dc7f664eb42 SHA512 d6a68f35dc7363b838af811ff0a0a8d9fff519a4231c66f963e896bdda8653a56608e46333dc866e7dee25c1eafd2f1bf99c443089dde5a268bba637a0dee8ca
 EBUILD weechat-2.9.ebuild 3868 BLAKE2B 7cb10514f4000d737a0748dd1c885deb877813fe4e7953c1547aa1b973e9eeb97c3ceacf0c4e1a5e5de94a762647aec4779badcab7b0ef7d83f30ef46d898cec SHA512 e5b27cf8d34ba432cc5d55e31cea0beb96076964e991efdbd842f20c82fc1667c04d107735e8295865351aaf7e453e3d08492701148736fb64fb9b4c39f19678
-EBUILD weechat-9999.ebuild 3866 BLAKE2B df87311a9cb02d04260f21e5626a2f380cbe3193e5064c5cdd4a09bf8b5704f1503498848bace98166a63d583ae3e419ac2867526a9aca797f6ca87333690acb SHA512 12b5f285dd4051152541be8f1b4440f55f4e678fbdc1f46686e4ca0941e9b8b0fb074740189246f5e1e1f9631078475b20284aaf27e16edca80ce727fdf616ad
+EBUILD weechat-3.0.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
+EBUILD weechat-9999.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/weechat-3.0.ebuild b/net-irc/weechat/weechat-3.0.ebuild
new file mode 100644
index 000000000000..b33c433ae6d2
--- /dev/null
+++ b/net-irc/weechat/weechat-3.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake 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="
+	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? ( dev-lang/lua:0 )
+	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 )
+"
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+RESTRICT="!test? ( test )"
+
+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-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index de9e048a74ce..b33c433ae6d2 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit cmake python-single-r1 xdg-utils
 
@@ -12,7 +12,7 @@ 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 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -27,7 +27,11 @@ PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spe
 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="python? ( ${PYTHON_REQUIRED_USE} )"
+
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+"
 
 RDEPEND="
 	dev-libs/libgcrypt:0=
@@ -42,10 +46,11 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:*[embed] )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	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 )
 "
@@ -59,8 +64,7 @@ BDEPEND="
 
 DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
 
-# tests need to be fixed to not use system plugins if weechat is already installed
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -137,6 +141,15 @@ src_configure() {
 	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
diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
index daca1bdc69e3..6db381ba7e55 100644
--- a/net-irc/znc-palaver/Manifest
+++ b/net-irc/znc-palaver/Manifest
@@ -1,5 +1,5 @@
 AUX znc-palaver-1.2.1-python310.patch 2084 BLAKE2B c764435ddcbe2ae6a00b4c937e030b5bb9f8c5f612d97dab6c655c4658523b66dcd8b0bf99a00dbcaffca704e61e191b2bcce43abbd79952b1f156e47bff2564 SHA512 171307c0cc374fe88bb59f5c344d14fc85088edc34b8ff2d85efb731efdeff8159a6ac640e36aec308b1bb3a39d8991323f956937482636aec46ffd6ee379f56
 AUX znc-palaver-1.2.1-xunit2.patch 803 BLAKE2B c56e25f2961257f2a02e6f50d22542c484285460c51cba2b7e7ae9b115a182d79a2f1f2785f5bbc64381bf33062c0d2ffcad2569670e139f8360c769470fe136 SHA512 d37c7ef8e50852096ac152a984a67802ff65002ce94ae0d3e8fed76ebed8aa3b79f04cbc6587b316522cbb1d12f69e82693892e5f273600c5ce72553d03dc032
 DIST znc-palaver-1.2.1.tar.gz 13302 BLAKE2B 0a46e4dd93f06a2b1705d619b0960a246ebf326fe4ca1afdc152a90274984421478ff52bd942a09dffe58349477d622b2839b2e1af0cb11b5bc8c7a329d3b3a4 SHA512 0cfa4dfcebca79ed0aaa9b44c7395318782237a8752e26810686276587004ab95342f5983e6c9a74950da062c34e634d8a4bf502977289e59686eef069dca84a
-EBUILD znc-palaver-1.2.1.ebuild 1128 BLAKE2B dd573e514eab21e07ad7943481645f631569850efc145660b8b12d8c81bdd3217f7634cdacdb11bd35a4c644a652a862921cb6f5607ba2091065f3f8fec6ed74 SHA512 b25a09298ca4bcfcc7a2ea3478842df9b4d40e94adf164220408d98e293ce2bf417ce949d09175f40af84a963f13b6a8db6e8fcfba48c87d6d12bc3d523da480
+EBUILD znc-palaver-1.2.1.ebuild 1126 BLAKE2B abc8dc995066f847a3ecf047d21f34caa480d9b4562c186f9e6f3b27ce8129c850807e1256227ca94a33145e0085a49d7f1282cd7ed31f16e35fa6907a2cbce7 SHA512 d1952a0088ad6e6aab174269f59634dafed25001172f8314a0a8ba25d2d432a6230c0c6a4c154cbb34e773c175bb1e1c4cf4fab412fd19144dbfd53f6cede56f
 MISC metadata.xml 572 BLAKE2B fad08970b057379dcfe02d6450cbe7a67f4d5f9470bf575c0eb2de733e7ac63fe2d620f8df5e923b23335ccadac1569da7ee2783d08d1e33c466b05dea36c6ac SHA512 6eca6cd820299e817e07720dc21c9843af259467fce8a79a6f76cca3bc0ed7b3ab03757c91ffe15429780f8f54a372d9e54111d9f7d18672337b71314a05229c
diff --git a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
index 45c850d4f1f7..37383594fb1e 100644
--- a/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
+++ b/net-irc/znc-palaver/znc-palaver-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cocodelabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 90d3bfc50941..8482d1ede15d 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -6,6 +6,6 @@ DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac8760
 DIST znc-1.8.1.tar.gz 2161359 BLAKE2B 5b9026156a62748659ae0496f9d799e7d1e0815358fa59f7538ca9d750b8f418fe8a57362b5b5bba40cfb00c2adc5fdc3eee0b56ebde50565c97d158296b827e SHA512 87713ca05621806a399abc23f45671746578f6487561666704bb2ed1cd1863159a42ef4344eea95c9e7dc13d131b669eeabedda37e919d0bad6a05103ad80a16
 DIST znc-1.8.2.tar.gz 2101215 BLAKE2B 7f0e5840fe57cc6b6549115b0fcf02e6afd3be0bf52e79da0a39bcc1463d983cbeb504bad30f3d2f7582f0295c7210d3c1eec40ec87bcc3546ba2d21a67cca9e SHA512 e821647b50698c3a82fad039e69943e030bf644d8f8e82afa87c6c11da44761bceecddd510a7a956a1b487b1cca6ee46e8ac8818ea03127f0f1ff8f5d1a1a7f9
 EBUILD znc-1.8.1.ebuild 4711 BLAKE2B 8b8182c6627e7aa58d56b5575d1e8e615adc5beff9639b04e5cea2821b20bea48f3449adffab0deed76b073ff3cf97b4d9f10abe1577a50d969c57beef9b6e86 SHA512 6acb23f885ebcdcd38fee1f8df5e43a4cb66b32f9c644c2848c75c0f84e10b017ea0acf7a8f49d9e78a810dbe1cf4f73d7696df9caeb79ae83cef71d59c9fe1a
-EBUILD znc-1.8.2.ebuild 4839 BLAKE2B 247882a7d030319ec78132621619a5a25158c0acb3a7762b935ee215c2fd42670fa59d1fe64ab8fa824f9967c1ae92b695cf1c234ff7444696b15b5163b4fa5c SHA512 5c97f2b6c1dbaa34865a27ba6117d11b2e49113d2764b4006dc1e8a2a4bfe7e4c3de384b193434fa4e9e6366854f1c0c4c877f44506d3cd11c16ba42abcce8fe
+EBUILD znc-1.8.2.ebuild 4835 BLAKE2B 4ccaaac4bcba6d93e508f0ede98496840d43e7b1af3b2ce596d484f73547b8c6a48a17b37a3919e22519bc2e81495f59a93e4bf0792490dffd9ad61c001484a9 SHA512 bfc3693f19d53007b522195ce6b73173981c1bd15c904e0f551c97aadfe6e71c47a42fa2f05a2c25c6cf5a39247420e534a8e92631802060aaa8c22188578a61
 EBUILD znc-9999.ebuild 4848 BLAKE2B 2227d552a5e2dde5096765721782ae24b89ecd7cf8632c8b0bb4c97779df5efe1ec94f197d443f5a4bbdaef8b70d97e39783ab89f80b0c427d7b2464b87d7ebd SHA512 0e8818db7492c151377bdefbf64cc47b3f36458ddf12bd89fa7f51225f4447991467c1b0d44eb3fece2a3ccae5fee48a9f2e9be5cf56711e21053f1461b11513
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/znc-1.8.2.ebuild b/net-irc/znc/znc-1.8.2.ebuild
index 975978dcf4e3..313155eaeb29 100644
--- a/net-irc/znc/znc-1.8.2.ebuild
+++ b/net-irc/znc/znc-1.8.2.ebuild
@@ -22,7 +22,7 @@ else
 		https://znc.in/releases/archive/${MY_P}.tar.gz
 		test? ( ${GTEST_URL} )
 	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 x86"
 	# "If you upgrade your ZNC version you must recompile all your modules."
 	# - https://wiki.znc.in/Compiling_modules
 	SLOT="0/${PV}"