gentoo resync : 14.05.2020

32 files changed, 363 insertions, 228 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 365a8d58858a..825105dc1d25 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 737d09317758..6afb5c253ef1 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,9 +1,10 @@
+AUX anope-2.0.6-example.conf-pid-path.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
+AUX anope-2.0.7-example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519fb3038bb71e45960cf000afa837a8a8a3f71458390bab1323ae85fc601f143725a45d3a0a7b9c9aca8b530805c459d70b39c SHA512 13f0eb0dfc5f18a4621e2812aad418cab1f5a0cb70ff2f915bd4df2ac896b441f24e64014e218d473c5be92d4be7a5f83e4804e92610c2ef35e46ded229bd6a4
+AUX anope-2.0.7-musl-libintl.patch 566 BLAKE2B 7deb854a68c259c9055a086fbb33a63d00544bacd1a9dd2bdd6793d93a8885be195336aa66054933a6bc9cfd1dabb5ff8eaea2529f4fd4841ff51364931fd320 SHA512 11e69a97bc0cca89719584e849577868c045a75ab531bc43c61140b29f640cf761f9f73165ebb70079d0d9e1dfeb335222c8954bf2b037f6b80b9f33da69bf87
 AUX anope-conf.d-v2 344 BLAKE2B 8817bba9938aa03abf79e61b86ddde537c6ec68b6584074e1f9bc50fe8334c5d0135ca17551390618f60b26d93f0209789b9337879dbecdcb4fced3d2bb88b3b SHA512 ae1851ccaa128404f3a721c92571ae3c4e0efd18c318485594f87da565b2de505ee9ace580b5d1c4ce4a7b53a4eba8338874195ca3a2cbc415ab6facdb3c9d7a
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
-AUX example.conf-user.patch 391 BLAKE2B 781e413ef79a7ca601710957b519fb3038bb71e45960cf000afa837a8a8a3f71458390bab1323ae85fc601f143725a45d3a0a7b9c9aca8b530805c459d70b39c SHA512 13f0eb0dfc5f18a4621e2812aad418cab1f5a0cb70ff2f915bd4df2ac896b441f24e64014e218d473c5be92d4be7a5f83e4804e92610c2ef35e46ded229bd6a4
-AUX pid-patch.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
 DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
 DIST anope-2.0.7-source.tar.gz 1817484 BLAKE2B 13a4628db8cb885d4636ab1897aab322f7846740e4a3fccd02a417d84a8eb3c942aebf5e0a51f8ca1108f455b44b4e280e7386b42e03f640c9b0e68943252814 SHA512 22a9f3e0d9fe7f68304062829a19b693a3414f94c90f8da601ab98995cbff7310dc22ca40749d50d6722dfb4649817d2f4b1dbe4afa3254b28980f03a491de65
-EBUILD anope-2.0.6.ebuild 4979 BLAKE2B 171b9a4e79cc20788f2d60aca8d20c308bea3d8d08241365d02180c57344402efd9a8ef7a5abea257af5fe2fc494526bbf885cfe8d394441aa38454d4b2aafa5 SHA512 cd4a6e963604249d1ebcb6fd7faa28bd588253285bb39afa9ba8d6144782a59fcd5ac19761419cc28620d08dadd5009e5ab1bf9c6eabe9f1112cfdba2bdf62ad
-EBUILD anope-2.0.7.ebuild 4284 BLAKE2B b632b76b133bfaea5d75bb84e1a8027b42743dd3cba955f645ae98f0c23243f56379a6704b3f69b268f19119fec3c5e4198a466038c32c31f6152c8ffe24a712 SHA512 8c1b0cbf7ffe5aed6646db95a9dde91948e224e78465854aa3e106e4bdb49cff5aec76161af284a33b78a0ff1c18e749302334e91757c2081b7c275f58031abe
+EBUILD anope-2.0.6.ebuild 5003 BLAKE2B d6d518195763f6673b6472daf36cf8e9ee792a04026b4289741b573cf6b3be669bb03e6a4be436ea5fb5ce4f66ad350918cf7bd6f97ef83b49589ebf7e9b0145 SHA512 9987c769735d6e1521c67143698ceeb3fa3143a020fe34b85d81a254f7b3761908ee1c5200b9999f73f51d7cb686236ecba9002f4e290c8ecdca82592f95bd98
+EBUILD anope-2.0.7.ebuild 4300 BLAKE2B 518e5927adb3377a4a6dd880546ee43a0e9e3cb36e5d5cf7e24238662f0cb890c58021aa4a708d369e7a75a2d59809e48509ee98b06b46c1bb45633ae77bfc61 SHA512 8defbd4c92bafbb223e1077b9436b1f6ad372d888c1b141e932e13369c3c73c46a83c3c9fd523270f1d0c9fac6928764c381e44c41fa89d22385060824f11cf9
 MISC metadata.xml 1766 BLAKE2B 468c8eada20fc23455d92c612f3268876d812a7c7a87a593f896fe8fa7246dbb75441430a2e0cb4d6a1fa36b611553c0df43de2edda195a51b390c70712d7ab9 SHA512 b40ef7336a091b3211826a3b2b1e51c0586187b903b3aa34e4d9e3df0194ae3ce92964d490e77b5d679aaaa76eadf40af5b1d785d6540a23c2b832474f0a5a03
diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild
index 8bb47e7d54bc..1d78f2271b9f 100644
--- a/net-irc/anope/anope-2.0.6.ebuild
+++ b/net-irc/anope/anope-2.0.6.ebuild
@@ -38,7 +38,7 @@ DEPEND="${BDEPEND}
 	tre? ( dev-libs/tre )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/pid-patch.patch" )
+PATCHES=( "${FILESDIR}/anope-2.0.6-example.conf-pid-path.patch" )
 
 S="${WORKDIR}/${P}-source"
 
diff --git a/net-irc/anope/anope-2.0.7.ebuild b/net-irc/anope/anope-2.0.7.ebuild
index 7761a88223ae..c97d65e1d2af 100644
--- a/net-irc/anope/anope-2.0.7.ebuild
+++ b/net-irc/anope/anope-2.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
 REQUIRED_USE="
 	sql? ( || ( mysql sqlite ) )
@@ -33,8 +33,9 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/pid-patch.patch"
-	"${FILESDIR}/example.conf-user.patch"
+	"${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch"
+	"${FILESDIR}/${PN}-2.0.7-example.conf-user.patch"
+	"${FILESDIR}/${PN}-2.0.7-musl-libintl.patch"
 )
 
 S="${WORKDIR}/${P}-source"
@@ -65,8 +66,6 @@ src_prepare() {
 	# Any SQL implementation
 	if use sql ; then
 	   anope_enable_mod "m_sql_authentication.cpp"
-	   anope_enable_mod "m_sql.cpp"
-	   anope_enable_mod "m_sql_live.cpp"
 	fi
 
 	if use ldap ; then
diff --git a/net-irc/anope/files/pid-patch.patch b/net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch
index ddf661ba9803..ddf661ba9803 100644
--- a/net-irc/anope/files/pid-patch.patch
+++ b/net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch
diff --git a/net-irc/anope/files/example.conf-user.patch b/net-irc/anope/files/anope-2.0.7-example.conf-user.patch
index 7f7a3826cb10..7f7a3826cb10 100644
--- a/net-irc/anope/files/example.conf-user.patch
+++ b/net-irc/anope/files/anope-2.0.7-example.conf-user.patch
diff --git a/net-irc/anope/files/anope-2.0.7-musl-libintl.patch b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch
new file mode 100644
index 000000000000..f14e494e0c18
--- /dev/null
+++ b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch
@@ -0,0 +1,22 @@
+diff --git a/src/language.cpp b/src/language.cpp
+index 1915378..c1eeea5 100644
+--- a/src/language.cpp
++++ b/src/language.cpp
+@@ -75,7 +75,7 @@ const char *Language::Translate(const NickCore *nc, const char *string)
+ 
+ #if GETTEXT_FOUND
+ 
+-#ifdef __USE_GNU_GETTEXT
++#if defined(__GLIBC__)
+ extern "C" int _nl_msg_cat_cntr;
+ #endif
+ 
+@@ -87,7 +87,7 @@ const char *Language::Translate(const char *lang, const char *string)
+ 	if (!lang || !*lang)
+ 		lang = Config->DefLanguage.c_str();
+ 
+-#ifdef __USE_GNU_GETTEXT
++#if defined(__GLIBC__)
+ 	++_nl_msg_cat_cntr;
+ #endif
+ 
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index cc30a6a68a99..9dc613481b8b 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,4 +1,4 @@
 AUX epic5-2.0.1-openssl-1.1.patch 2817 BLAKE2B f3ed4fa602b174f41700fdf5fcddb8a20626637fb5e416b82fd1e1216a846987a3afcf3fffd73317a6e2090e49b0fe3b1777ee4e870f597ca981be078c4e3c0e SHA512 af1f822f1660bc7528beef26b991a69896d0e94005aacd412256a5f8789024bfba6eec169d2115c626a70c0e89cc6625999c7b939390742aef932f1020e4fdad
 DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25
-EBUILD epic5-2.0.1.ebuild 1568 BLAKE2B 11b7c3b075ac993b264ebb42b9f7e9140f55e4faf5bf689d85bf60bdc802c3da410cd2cbbaf9a0f84094c6389028fd10e67c9d9f6ab66cd0b6961592333ec922 SHA512 cb723bba04aa08981dbac37f84f35cca11701d2c2ab3205c630a0f263830e4c6564b5ce5f4978ce878756ab5b415f9f8318b1d4ed0c404007ce1fd8f36f2bfab
+EBUILD epic5-2.0.1.ebuild 1568 BLAKE2B 100df9db7341e429f863877e5f46f2de16bde3400d721fc8f657b8eb4c5de2d30cbc87877df31635823813a6710b76568123315903d367ce89e929b23df3fe97 SHA512 ff66e641e7f2ea0a24f41d5c97da58c172a2ae7362da77f4d07287cada4aff0b5946f15e333b1462b18d594728311db1ba3d191ea5c30967ee3822febb8ca717
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1.ebuild
index e10c5b555d32..d38b780348b7 100644
--- a/net-irc/epic5/epic5-2.0.1.ebuild
+++ b/net-irc/epic5/epic5-2.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit autotools ruby-single toolchain-funcs
 
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 0ff5c1d0b2f0..885aa51e6047 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -3,10 +3,10 @@ AUX inspircd-3.4.0-fix-path-builds.patch 12942 BLAKE2B 7fe7bc904331f2cff3a27268a
 AUX inspircd-3.5.0-fix-path-builds.patch 16773 BLAKE2B 0cd63c080579fab035e44c965c56be5c57a738dad8cb2e118e96889a5e7413d7bf7a0a322132e6e47965aacd815e2b4b65fd17335f3baeaadf4bc0891391f597 SHA512 e45dffd981aa129d8628cd5272de4dd252763c4932b8b7d852eeab6f8590a046c173479b72f199604976d33a343d8055ae34c0354209c683b1aa6f56750a1f39
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
-DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
+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.5.0.tar.gz 835283 BLAKE2B d070d8f299ea2460eb58062b345e9fdef04f1aa94cbedda15bc2ed9c32a7627af383a250359dc77ee6cf2c53dd1841c9a77ce0da236d0b9852c5e9d5a0964aae SHA512 64e7be4b013c418577362b33be73b8f7045f1071ccb2c4e83fdf1a96b98656a3541e20c005bc32532007da21d9ba963f534cd14d16c2e1cf8afcf34b22ffad8c
-EBUILD inspircd-2.0.28.ebuild 3142 BLAKE2B 6a7434a1bf5841638268931c4106c2ff684ba00a7c6887a5d665632bd97ac99f1a38210cd0217c4951ec7a4585397685a3effe3298f9902b020c872056964cf1 SHA512 b0c245ef1d277fd8b9d728a98cef25b30e593faa847b6d5032d606957f5c2b77157dd4878baa8c20bc48ade6a9d471b49b159d2f7d6f5759cd519b6d6fe2d4b8
+DIST inspircd-3.6.0.tar.gz 851768 BLAKE2B e1cbad4e5f00e769e804abc432dbac24ae4c988aac690d009dd87f28d75c4229a174c1703395cae42306b45ba167268c2032a3c2533fdde8154a67f53f2e18f8 SHA512 b1feaf983f30aa3192860d931f85bb2e5b5f10d3b7582b7e5faa8fc16a349c79506f5a7ba9e1f4f8b24d62639c0e0e88f2d97a3130473ee10eda93dd5c131630
+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.5.0-r1.ebuild 3622 BLAKE2B 4ed8b42b32fcdb354add43029533c45a5ae35300564d93699c5d114d167670593f6a23ae8bb212b8367ab611af7ca18c26ba547c410decf839d050aa7e401311 SHA512 2c940d423fd048d8857f07df0617071beb925bfc6d8684df41882ecb6d13f291d9435986f2c74a0fdd6c5b0fd49b910316a67b122e915f28b2ae66b2c2e062d7
+EBUILD inspircd-3.6.0.ebuild 3622 BLAKE2B 4ed8b42b32fcdb354add43029533c45a5ae35300564d93699c5d114d167670593f6a23ae8bb212b8367ab611af7ca18c26ba547c410decf839d050aa7e401311 SHA512 2c940d423fd048d8857f07df0617071beb925bfc6d8684df41882ecb6d13f291d9435986f2c74a0fdd6c5b0fd49b910316a67b122e915f28b2ae66b2c2e062d7
 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
diff --git a/net-irc/inspircd/inspircd-2.0.28.ebuild b/net-irc/inspircd/inspircd-2.0.29.ebuild
index 5e0f22ce4574..5e0f22ce4574 100644
--- a/net-irc/inspircd/inspircd-2.0.28.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.29.ebuild
diff --git a/net-irc/inspircd/inspircd-3.5.0-r1.ebuild b/net-irc/inspircd/inspircd-3.6.0.ebuild
index 92c0dfe18f1a..92c0dfe18f1a 100644
--- a/net-irc/inspircd/inspircd-3.5.0-r1.ebuild
+++ b/net-irc/inspircd/inspircd-3.6.0.ebuild
diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
index 02f60b7e39e0..98b7c87b9c16 100644
--- a/net-irc/irssi-xmpp/Manifest
+++ b/net-irc/irssi-xmpp/Manifest
@@ -1,4 +1,6 @@
 AUX irssi-xmpp-0.53-irssi-1.0.patch 1877 BLAKE2B 80956453f37de65bc39ca1e1a2c5fdea704f8389ed4d7e13f03635d00f18608d1ce828dfbd06b3b0004fbe43578cd9a0da624c6085d2e27d1e7c8c85c5cf7be6 SHA512 8fabc71b9b45eace69041c4b446f8227e92ce426980bb03f3251d7fac1d0cf96ef00a3f5f0a21b07590dabc97db605ac39f5d78131d945b95e466c3fd6a2cac7
 DIST irssi-xmpp-0.53.tar.gz 65649 BLAKE2B 69621ae0fadb3b3c1015b5ffa1f4b9e81cc3b92270c07582f5a4cefe83f9ed4e1735527900c6989127c8d70616b316ea42653ee57aa5a8b0e6e5c641cf064346 SHA512 09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be
+DIST irssi-xmpp-0.54.tar.gz 65618 BLAKE2B 5dd1f3a858cdb397351b93800fdd2050aa8e5764ac2e03008d629dee7d825b02bce4bfc627ab2d3249392efe43ceb1530a7ccefc3241c8ca101cc2963d28f872 SHA512 31ddd9e0147eec23d08b8bcbe242e831d612cb2d00f3b56776e9d0b87db9bd76d4bb147422cdf18c0567f0e0463ab828ab7a0ef80a2b35cfdc0a8be962b39f14
 EBUILD irssi-xmpp-0.53.ebuild 794 BLAKE2B 2d34c668b665062f5007b7935b321d68dc86a6db523032226d69882e0ac19d96cee9320213da09418313dfcefc82e66c49dbfe326578d2c9a4baa89e9bc66547 SHA512 3236a53cdb10bebaf15f5644f20fec2a1a47f2423d7c0d03163978d9c41a1a86a66a5bf6d611cb259db9345d825b6409b1631abd33aac24d5229147eb7bcc83a
+EBUILD irssi-xmpp-0.54.ebuild 705 BLAKE2B 4a2bb9ab0f057e4790dd0ea525db35be821395d19bbf46db9410f327e0654163ee6a59c9e964898c967becbd7b1f2502f8c411fbde977c28c5e9b9a1427f4ae2 SHA512 f614e1ae5d0392d38fc114aad5800ec53d008fc90c60844ac7c66b0de64a9ce49cba05ab0053373d1fcb27ef5bb639a7f10835f0138b1a6e2b7f9efbb6ccf733
 MISC metadata.xml 250 BLAKE2B c268b1356ec4037e979bc2cf251f27473ab234bc7f5925b1725445675e59ce59fbd8900ffe5c09acdba75194848c7f001c8b1e6187a11744601dee6e3bd3c273 SHA512 ef7d2ea71e78c9684960143c24b05c0be118fe34e7ff731d4aa37d15b7435d5483440d235a59c2e223674b74cf7a9103c9e70fa1513225cc71b31ec01ea057cb
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
new file mode 100644
index 000000000000..78831f468181
--- /dev/null
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.54.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
+HOMEPAGE="https://cybione.org/~irssi-xmpp/"
+SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	net-irc/irssi
+	net-libs/loudmouth
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "s/{MAKE} doc-install/{MAKE}/" \
+		-i Makefile || die #322355
+}
+
+src_compile() {
+	emake PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
+	dodoc README.md NEWS TODO docs/*
+}
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 4b7d35c701f3..15ac51a89228 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -7,6 +7,5 @@ AUX konversation-1.7.5-qt-5.15.patch 814 BLAKE2B 3c5ddf41f0dc05244b69546616e7df2
 AUX konversation-1.7.5-unused-kemoticons.patch 3192 BLAKE2B b1882f31639e17e2927ca7b7eecde12511a122ca6ebcc8fc2ab70cd38b28f973ba07e043aeed16dd029281b3c413515df707120c964105257960d23feee24e1f SHA512 3158d47aad3920715bd9dc010585e4a2e7488872a24cac8f69bff8ebafc4445d54611756ad05399d8bbd1b4be37fb28d8566577fbc040559fdad3ab18927e3df
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
-EBUILD konversation-1.7.5-r1.ebuild 2072 BLAKE2B 30748529d81e48df25598047d5dcb078e9ce44aafcd102d36ecac01c0f9b395ddceb19e6d47842d8ab396d87803447191d78b213fd8249212958c7b203ac2bc3 SHA512 7598b801ade04ed967942e24f653271e7a07b7ace7c16264bd4e285bfbe7f6bc83d449c255a27367d462216d5bceec74f0203a956043d8b3f757df6a53fca4b7
-EBUILD konversation-1.7.5-r2.ebuild 2272 BLAKE2B 3c87dc8a8f1102d8a3b3b13c757de4502b3d59d4d8fdd8841dcae85eda66f3cccaf052fb31831bb8bd41722ec667291ec48453bae560e09d5bbe4a3d0a93da4d SHA512 f5cbe6112c22fefe5a9af3a61e169ca2409b7da6eb1fd6fa3cb698246561e91d7cbc1d68585d4ab4d9057b222917cf2a1aa3e84141182ddb2712fb65430208ef
+EBUILD konversation-1.7.5-r2.ebuild 2270 BLAKE2B 32af7e63e381ecc1dced71e185fcde58c40b04a441df6f6cbc9b0d03502221f1dab4cc634f3dc1eabc9e57748655a4028dcc6e24a91a2aac39a926fa703a081d SHA512 07217bc16ffb0b54adff8ff8d8adda619a1b57ece9b6033caa4200afebbacf49f1e3c5a0ea0ffd5c1440d2f44dd2eeff70dd7e5e58e68596224d17bb8d576aa1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-1.7.5-r1.ebuild b/net-irc/konversation/konversation-1.7.5-r1.ebuild
deleted file mode 100644
index 7a85da037fc9..000000000000
--- a/net-irc/konversation/konversation-1.7.5-r1.ebuild
+++ /dev/null
@@ -1,79 +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.60.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/kemoticons-${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=(
-	"${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch
-	"${FILESDIR}"/${P}-missing-header.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.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild
index 22ed78f5a2d3..925f72f30810 100644
--- a/net-irc/konversation/konversation-1.7.5-r2.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
 
 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/ngircd/Manifest b/net-irc/ngircd/Manifest
index 8d495183b2fb..be2309afa2c8 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,6 +1,8 @@
+AUX ngircd-25-fix-gcc-10.patch 1762 BLAKE2B ad5085da2c8f0fbc01e4fc77c4dc20c461cd8a3aad4dff78ace70d8673b8607f4621d80dd6bd122549882be1a9c3f461812617ebf59bce877ab4e87b9414e5b4 SHA512 73b07fc2fe5475fc7eb999f93504e2cfbbd1a2720335ae4332fd43e2621824626eb0df606585d9424df9e05a21416126692859fd1dc9689883960c8708bf3adf
+AUX ngircd-25-make-env.patch 2331 BLAKE2B c65567046e00f3dfa3e5c14e06071bf14fd28257eb799850610b7fe55c4a4745b766d754670be99f635a81239328c27ea3218e878e6f921f1601233e34d08539 SHA512 e32b5e852953cdff7f565e3dc2f521edbf25a42afca62f3fa76d8f33f72e4de96bb4b7b190d036dd573fef04879ecc891d3342353f8f46361c08943f85196329
 AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158
-DIST ngircd-23.tar.gz 517686 BLAKE2B 1e1d7386a95f22917e6f69ec43bc48a8031543c48d6141a16d81fd935dab47ae89d8bbc91d9d71a26b0a1d2fd2040feb478e773fcc2a3049061fc0b21c8bad18 SHA512 714fbb4af12335e62c615fa1e8de9c7366c4c6da6af9b334019ba900dce072067f7b08199de8c96aad5dd4b9b786b57d536ba9dc92c62b37d2ae11960dbd01b1
 DIST ngircd-24.tar.gz 524968 BLAKE2B 8ec0518d54f43a4c42fbf9744d217eb2aae498fe4f0010bce6ad68164037c2e55dc2b9681babce8ca5f7e26bac60a91389c63dab397d349dd4bcbcce6c2e9839 SHA512 66d1b9576c03d0a70be17a235f2da50ee661646cd428d18a6c61975407671dd4a3a545069258536773b27d4fb63523527366bbbf4f35cb08111dc60842924395
-EBUILD ngircd-23-r1.ebuild 1650 BLAKE2B dec05ba13a17143191e093b2956bc013b8517e52a7949cd5a0e9b7f0810834ce46b57bf06ed549b89a98fa32b4e6945bbab05cc393437cdd9d7ced38c2d69126 SHA512 9bd2d786f35f5bc0cc48db592c6c9bf1d921bf24a55924b947d625f9043b7a8f6d97377266385aeb3d4a4f982a98c4c8e71c03ebd48a81302eec31fdbf97ef66
+DIST ngircd-25.tar.gz 527886 BLAKE2B ab75c9a904fae8da4c89e07bd66bb000bc9b614e27269be3ac6f55254c77abeb2d6f7d0afc6d05630f7c548ea13d842d4c0376123035f9417eda55565a69dcec SHA512 0c96e97da312fe86c50007a72db03f85b9f79df053806f50badd07c7ca8e8bddd99adb478eab8be9630330707d7aa578b5d0bd3017b59bf4515319a64c29ea6c
 EBUILD ngircd-24.ebuild 1685 BLAKE2B eb31abc6faf507e55bf9a88abe98fd83eb4dd9fee3e580e0b9f9fb187c47b29a2b7ab16e11f347769ad82e4f4f495eccf5622205215f91b3d920e833f6d7d8d8 SHA512 66d47dd1029301755ae43fbfcc5d25930a3965011884c5c965a9bd6983e187d79086b182958b9bb7942232e7705e419f8aaa11ed334aebbb76a9d8d55caec4df
-MISC metadata.xml 259 BLAKE2B db253a70057f68a5b270f8133fd92ece2932276797ea0c1edb3f00a453610b6d880c8cebf35ee7cdbcd533433521b70851a7a4c296806ac6f3f5407bc144f667 SHA512 2b92154346053dfc4dbd911664a5fc8b7a72eb3a12fe191cf010cceb362a8eb36e42cbf52cc0f0843d5ffe24fd6c0082bd11b2e7e4fa900f7660e828c1daa1d9
+EBUILD ngircd-25.ebuild 2269 BLAKE2B 8ebaf779409d513b2cdd22506b8ae26382b8183b881e7729211413fb2a7d70b5979a97addd8514cce0dfee9891316f0fd051dbce0ef64833913407c79ea6e4c3 SHA512 e83e0e3865fbdb8bdf766baeb6b58fef197a7fc25ae12b8d758357ae6ac25c17989d4b842315e62d4353fbf3f6340ac12fa5c731883ea2248108a4db78b915aa
+MISC metadata.xml 632 BLAKE2B c27dd54558ef8f4670a5c888fbe81fffd77c20eb8e487a45bd61cfe8703fb3c379217e3ee8a0304a1b27eddc3a9fea0826b1cacd8c464a20fbd0bce43a109074 SHA512 27891662b1e62cd3d19faf621a3e06efcc0b51ad092cde32cf7cbf5817b7e7840cb57e948389547ecfbe70a022419dbe23b46870117ccb9c26da6581da426eb9
diff --git a/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch b/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch
new file mode 100644
index 000000000000..33e0d444bd56
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch
@@ -0,0 +1,77 @@
+From f27827d7937375b5348107ca7427abf74c9eff3d Mon Sep 17 00:00:00 2001
+From: michi <michi+ngircd@dataswamp.org>
+Date: Tue, 14 Apr 2020 16:53:02 +0200
+Subject: [PATCH] Unbreak GCC 10 (-fno-common) build
+
+---
+ src/ngircd/conn.c   |  1 +
+ src/ngircd/conn.h   | 14 +++++++++++---
+ src/ngircd/ngircd.c |  1 +
+ src/portab/portab.h |  4 ++++
+ 4 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
+index f62e9675..e14e6c08 100644
+--- a/src/ngircd/conn.c
++++ b/src/ngircd/conn.c
+@@ -10,6 +10,7 @@
+  */
+ 
+ #define CONN_MODULE
++#define CONN_MODULE_GLOBAL_INIT
+ 
+ #include "portab.h"
+ 
+diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
+index c642541f..869477f0 100644
+--- a/src/ngircd/conn.h
++++ b/src/ngircd/conn.h
+@@ -105,9 +105,17 @@ typedef struct _Connection
+ #endif
+ } CONNECTION;
+ 
+-GLOBAL CONNECTION *My_Connections;
+-GLOBAL CONN_ID Pool_Size;
+-GLOBAL long WCounter;
++
++#ifdef CONN_MODULE_GLOBAL_INIT
++CONNECTION *My_Connections;
++CONN_ID Pool_Size;
++long WCounter;
++#else
++extern CONNECTION *My_Connections;
++extern CONN_ID Pool_Size;
++extern long WCounter;
++#endif
++
+ 
+ #define CONNECTION2ID(x) (long)(x - My_Connections)
+ 
+diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
+index 7166640b..41255ca0 100644
+--- a/src/ngircd/ngircd.c
++++ b/src/ngircd/ngircd.c
+@@ -9,6 +9,7 @@
+  * Please read the file COPYING, README and AUTHORS for more information.
+  */
+ 
++#define GLOBAL_INIT
+ #include "portab.h"
+ 
+ /**
+diff --git a/src/portab/portab.h b/src/portab/portab.h
+index 70d5ed3e..43f2f907 100644
+--- a/src/portab/portab.h
++++ b/src/portab/portab.h
+@@ -102,7 +102,11 @@ typedef unsigned char bool;
+ #endif
+ 
+ #undef GLOBAL
++#ifdef GLOBAL_INIT
+ #define GLOBAL
++#else
++#define GLOBAL extern
++#endif
+ 
+ /* SPLint */
+ 
diff --git a/net-irc/ngircd/files/ngircd-25-make-env.patch b/net-irc/ngircd/files/ngircd-25-make-env.patch
new file mode 100644
index 000000000000..e6494c720079
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd-25-make-env.patch
@@ -0,0 +1,75 @@
+--- a/Makefile.am	2016-09-18 18:01:30.000000000 -0000
++++ b/Makefile.am	2020-04-20 14:01:43.166312404 -0000
+@@ -25,13 +25,13 @@
+ 	rm -f config.log debian
+ 
+ testsuite:
+-	cd src/testsuite && make check
++	cd src/testsuite && ${MAKE} check
+ 
+ lint:
+-	cd src/ngircd && make lint
++	cd src/ngircd && ${MAKE} lint
+ 
+ srcdoc:
+-	cd doc && make srcdoc
++	cd doc && ${MAKE} srcdoc
+ 
+ have-xcodebuild:
+ 	@xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \
+@@ -66,7 +66,7 @@
+ 	 --out ../../$(distdir).mpkg
+ 	rm -f $(distdir).mpkg.zip
+ 	zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg
+-	make osxpkg-clean
++	${MAKE} osxpkg-clean
+ 
+ osxpkg-clean:
+ 	[ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest
+@@ -74,12 +74,12 @@
+ 
+ osxpkg-dest: have-xcodebuild osxpkg-clean clean
+ 	./configure --prefix=/opt/ngircd
+-	make xcode
+-	make -C contrib/MacOSX de.barton.ngircd.plist
++	${MAKE} xcode
++	${MAKE} -C contrib/MacOSX de.barton.ngircd.plist
+ 	mkdir -p ngircd.dest/opt/ngircd/sbin
+-	DESTDIR="$$PWD/ngircd.dest" make -C doc install
+-	DESTDIR="$$PWD/ngircd.dest" make -C contrib install
+-	DESTDIR="$$PWD/ngircd.dest" make -C man install
++	DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C doc install
++	DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C contrib install
++	DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C man install
+ 	cp contrib/MacOSX/build/Default/ngIRCd \
+ 	 ngircd.dest/opt/ngircd/sbin/ngircd
+ 	rm ngircd.dest/opt/ngircd/etc/ngircd.conf
+--- a/doc/Makefile.am	2016-01-16 13:23:40.000000000 -0000
++++ b/doc/Makefile.am	2020-04-20 14:05:45.316912143 -0000
+@@ -55,7 +55,7 @@
+ install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
+ 	$(MKDIR_P) -m 755 $(DESTDIR)$(sysconfdir)
+ 	@if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
+-	  make install-config; \
++	  ${MAKE} install-config; \
+ 	 fi
+ 	$(MKDIR_P) -m 755 $(DESTDIR)$(docdir)
+ 	for f in $(static_docs) $(toplevel_docs); do \
+@@ -75,7 +75,7 @@
+ uninstall-hook:
+ 	rm -rf $(DESTDIR)$(docdir)
+ 	@if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \
+-	  make uninstall-config; \
++	  ${MAKE} uninstall-config; \
+ 	 else \
+ 	  echo; \
+ 	  echo " ** NOTE: Not uninstalling changed configuration file:"; \
+@@ -87,7 +87,7 @@
+ 	rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf
+ 
+ srcdoc:
+-	make -C src srcdoc
++	${MAKE} -C src srcdoc
+ 
+ .PHONY: install-config uninstall-config srcdoc
+ 
diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml
index 7f0bfef99296..fe32ef1d9ca8 100644
--- a/net-irc/ngircd/metadata.xml
+++ b/net-irc/ngircd/metadata.xml
@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@cmpct.info</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ident">Enables support for <pkg>net-libs/libident</pkg></flag>
+		<flag name="irc-plus">Enables support for the IRC+ protocol (needs <pkg>virtual/libiconv</pkg>)</flag>
+		<flag name="strict-rfc">Strict RFC compliance; may harm compatibility</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/ngircd/ngircd-23-r1.ebuild b/net-irc/ngircd/ngircd-23-r1.ebuild
deleted file mode 100644
index 86154bf4dd49..000000000000
--- a/net-irc/ngircd/ngircd-23-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools-utils eutils user
-
-DESCRIPTION="An IRC server written from scratch"
-HOMEPAGE="http://ngircd.barton.de/"
-SRC_URI="http://ngircd.barton.de/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="debug gnutls iconv ident ipv6 libressl pam ssl tcpd zlib"
-
-RDEPEND="
-	iconv? ( virtual/libiconv )
-	ident? ( net-libs/libident )
-	pam? ( sys-libs/pam )
-	ssl? (
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0 )
-		)
-		gnutls? ( net-libs/gnutls )
-		libressl? ( dev-libs/libressl )
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-"
-
-RESTRICT="test"
-
-src_configure() {
-	if ! use prefix; then
-		sed -i \
-			-e "s:;ServerUID = 65534:ServerUID = ngircd:" \
-			-e "s:;ServerGID = 65534:ServerGID = nogroup:" \
-			doc/sample-ngircd.conf.tmpl || die
-	fi
-
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		--sysconfdir="${EPREFIX}"/etc/ngircd
-		$(use_enable debug sniffer)
-		$(use_enable debug)
-		$(use_enable ipv6)
-		$(use_with iconv)
-		$(use_with ident)
-		$(use_with pam)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with zlib)
-	)
-
-	if use ssl; then
-		myeconfargs+=(
-			$(use_with !gnutls openssl)
-			$(use_with gnutls)
-		)
-	else
-		myeconfargs+=(
-			--without-gnutls
-			--without-openssl
-		)
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd
-}
-
-pkg_postinst() {
-	if ! use prefix; then
-		enewuser ngircd
-		chown ngircd "${ROOT}"/etc/ngircd/ngircd.conf
-	fi
-}
diff --git a/net-irc/ngircd/ngircd-25.ebuild b/net-irc/ngircd/ngircd-25.ebuild
new file mode 100644
index 000000000000..da56e3240d4a
--- /dev/null
+++ b/net-irc/ngircd/ngircd-25.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Bug: https://github.com/ngircd/ngircd/issues/261
+WANT_AUTOMAKE=1.11.6
+inherit autotools
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="https://ngircd.barton.de/"
+SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~x64-macos"
+IUSE="debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test zlib"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/ngircd
+	acct-group/ngircd
+	irc-plus? ( virtual/libiconv )
+	ident? ( net-libs/libident )
+	pam? ( sys-libs/pam )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	zlib? ( sys-libs/zlib )
+"
+
+BDEPEND="sys-devel/automake:1.11"
+
+DEPEND="
+	${RDEPEND}
+	test? (
+		dev-tcltk/expect
+		net-misc/netkit-telnetd
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-25-fix-gcc-10.patch"
+	"${FILESDIR}/${PN}-25-make-env.patch"
+)
+
+# Flaky test needs investigation (bug 719256)
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	if ! use prefix; then
+		sed -i \
+			-e "s:;ServerUID = 65534:ServerUID = ngircd:" \
+			-e "s:;ServerGID = 65534:ServerGID = ngircd:" \
+			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
+}
+
+src_configure() {
+	local myconf=(
+		--sysconfdir="${EPREFIX}"/etc/"${PN}"
+		$(use_enable debug sniffer)
+		$(use_enable debug)
+		$(use_enable irc-plus ircplus)
+		$(use_enable ipv6)
+		$(use_enable strict-rfc)
+		$(use_with irc-plus iconv)
+		$(use_with ident)
+		$(use_with pam)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with zlib)
+	)
+
+	if use ssl; then
+		if use gnutls; then
+			myconf+=(
+				$( use_with gnutls )
+			)
+		else
+			myconf+=(
+				$( use_with !gnutls openssl )
+			)
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && use pam; then
+		elog "ngircd will use PAMOnly by default, please change this option."
+		elog "You may not be able to login until you change this."
+	fi
+}
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index 1cdadfa3d720..2d5a558aed9b 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1,6 +1,6 @@
 DIST quasselgrep-0_p20170411.tar.gz 29117 BLAKE2B e55ef14015d1139dd967d1855a2994d47f189cb02b0b89dc1130a8d0756b137ddd58366c3cb87927cb6400b715efafe042ec929978a71d527ad640129d50cb71 SHA512 b216c49e340cddfeb4fe28046c698a5517a873602a4303c7c6976d6d7f0bfffbb78f170a33126a16089e239a67e1624410f8e727b5ed6ab977f78745362db0e2
 DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27 SHA512 0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56
 EBUILD quasselgrep-0_p20170411.ebuild 896 BLAKE2B 138a77936b0a4c3111e4f7711f449ea421b7af520774fe065f49b7308eb443892df2e53f52f04da9477f06f3d3a02553e0be89547688e7a4240aec0a9b4b3305 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050
-EBUILD quasselgrep-0_p20190211.ebuild 903 BLAKE2B d7f3aa2a39c1068b47455d3e7b51c87e22cbd9d117c46e38129a21a10a491c21e7e0c2b046abc71b2688171fb2b85907f3804903cf0d35b26cdc19763e0e441f SHA512 419e9d8499a58fb61c252cfb7fcf0ec860f4d2fbb6f5518c3cb091a72dfc1d7317ce277df3f8a19911e246ab41ae05697d19fcad3c4beafaafccce13f41c240f
+EBUILD quasselgrep-0_p20190211.ebuild 893 BLAKE2B 65db422640071f6757ba7d562c7723fded623d2fe7ac67ae8392abf61921db8d39fbd6343feb224da9b62936cfa688e2e72b4dc4ab827baaece79b9b70074daa SHA512 704f8b1b61bc1111d2d510449094f8baa1132bc72b0efe3365a6fa5c7a31b61fb4ef5359ce095f93b16252bed0472881928fc2ca7b2f7e489d797c29407ac56b
 EBUILD quasselgrep-9999.ebuild 896 BLAKE2B 138a77936b0a4c3111e4f7711f449ea421b7af520774fe065f49b7308eb443892df2e53f52f04da9477f06f3d3a02553e0be89547688e7a4240aec0a9b4b3305 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050
 MISC metadata.xml 540 BLAKE2B 21eee2edee345166e7191d71bfa727b2154d34bf0d7f839b1e6eca4ce5b65380ce96e25a35bf614a64a0e29edf30a4c860ec1b4ca364ffdc1563515e0169278a SHA512 67258ac5217d9338c963a9970eb556497643eac6b743c033d964164127bad7411918b870d63885863ce09bbbd2fe5a0623a58eba1dc68d9432401e5dd971ceef
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
index 74bef9e7a4f7..ca0bbcdb471a 100644
--- a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
+++ b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE=( sqlite )
 
 inherit distutils-r1 eutils
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
index 7c8a4c339724..f8596ebb0dde 100644
--- a/net-irc/rbot/Manifest
+++ b/net-irc/rbot/Manifest
@@ -4,5 +4,5 @@ AUX rbot.conf2 1111 BLAKE2B 22cfbcb92f8d0df664a03b26db6027837463c5f8f543829b772d
 AUX rbot.init 1459 BLAKE2B 3b58ca09d2073ef01f94ae1980ed9203d4cadc1a9512842e1ce53709ddb1cfab15228b41656aca5e69999ca933bfe45c94ac18af214b0e890f04912a56830ba8 SHA512 57f5504829ed7524b70102833a5de168f7ea08e594a92ece6d7c0f2eab7de8c9dd14a6d199c5e63b6298209bdf5de4adcb06aded0c23d05c35f7e9774742ecea
 AUX rbot.init2 1345 BLAKE2B 137df6384fde1e3ee9501ce38b31470605bf308827213924033b291f8aa567e90cb8421be6865f4df269aa9b8cc3b20c4b729f3cc4aaaa90959dec39382752ea SHA512 b3d8b83eea4d429a47657f4f9b6cb0aed6c283aa4e7535307305f33bc84c53c0c82e2b76a7cf45ec192c7db68c71e70ee5b000ffbd6f0ff59039de8f69f88dff
 DIST rbot-0.9.15_p20160325.tar.gz 762685 BLAKE2B 68146d241bd57198e0a7a9e5ae033827116bbe31d3bdc05bf42aa644c5dd900254bbe7317461aa553ad92daac299439721a85cd8dd41033cf38b9e97b268e1ee SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160
-EBUILD rbot-0.9.15_p20160325-r1.ebuild 5323 BLAKE2B ae239e25cff54a5e0b109650833649da4537cd69cc4fb70d763f0a7b0d6a622a4f07093cf4f255c54c71d3443696084c167c1cc6d184a666c21680c1163828e1 SHA512 1b86e9bb9c9963f8e3f4eb719670138ce253048d30f9867922c5b62d5612071491d028e02b30881df21978479374c6776b0c4d040d044afce1e98e45ff2d2799
+EBUILD rbot-0.9.15_p20160325-r1.ebuild 5291 BLAKE2B 0dbbb3716bf4006e695205307fbbb7575150e39af3c307cead9e6e1703ea373632e1098fe2d4ecffb6e17563fe13e88545d2d64fcf65980b3ddc33d180bb650d SHA512 a2578990be0dbc2c18a9fb10f7f0c346236c818fca69ceec2c4deed3c4950083093402f651974aad0c256cf60ba30b3a34a7709c4cf5eac929ea199df89aabff
 MISC metadata.xml 2656 BLAKE2B 47090f64bb983dfca142443a0f35ae99fa57927781177255e375e414c61a7555507d0110259f3a9ace86e42fadb237bbb5aecc251371bee9ff8ddaf1d414ea36 SHA512 03c3fc8b4f700eb1039feb5f656f772a55c3b928658e494c542cf69d3325d08b2723e23cfb753afe5ea3bad240011e642a4923e9a84673cba1e06b24cfc60918
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
index 5b654a853d17..495f009bcfe2 100644
--- a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20160325-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=5
@@ -30,7 +30,7 @@ RDEPEND+="
 	sqlite? ( dev-ruby/sqlite3 )
 	toilet? ( app-misc/toilet )
 	fortune? ( games-misc/fortune-mod )
-	cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) )
+	cal? ( sys-apps/util-linux )
 	host? ( net-dns/bind-tools )"
 
 ruby_add_bdepend "
diff --git a/net-irc/redirbot/Manifest b/net-irc/redirbot/Manifest
deleted file mode 100644
index 00be89c6b015..000000000000
--- a/net-irc/redirbot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST redirbot-0.0.5.tar.gz 4549 BLAKE2B 6ff099fd2126bebaf48799a37475320faf627efaea4363476b783747c41dc13c28893cf035888c83260466b85b71a07f1d6d3ba5b80bd04f11fc309e8719c182 SHA512 7cbd7e8dc792527f26f20ec9953ddafd5fef8dbca457a00198c8bb3e34b660be7e0fadf25d755375e5a40acf64bf4191bf6725a077616a8bdbe120200ec198c7
-EBUILD redirbot-0.0.5-r1.ebuild 548 BLAKE2B 6add5e9aa4386e54f4647f7ad05cb96da0cbf3f6b7b72b582bc0d4e4cf7a2dd6afaf13d99bb7880c6145c35c030c1f144430e14129fefbe421a4df26f3202ca2 SHA512 49af367b7ef1c4c904b55043dfe693bf08481060ef0cb4c2f380c8b2ad5b9bd8ecddc2e595861099b7e7ad4022bb9c3235412d0d64e6fda2da7f7739c18a2314
-MISC metadata.xml 299 BLAKE2B c8606fcc742a743d235cdf6ebd2af8f45ca4dc25cdbe31f5d00f82655fe88651693a01356e2e847e643fbc0cadf2e7ae7de637cd1b83696677e9d497a48a6b04 SHA512 83d9c0efb67343154d8dcae73314507a11ed50d896c8c25e518b3ad1d445733bc46b6ae673794409eb604d25559fc43642bc482c417cb382c85753d8a68173b4
diff --git a/net-irc/redirbot/metadata.xml b/net-irc/redirbot/metadata.xml
deleted file mode 100644
index fa34a2abadd7..000000000000
--- a/net-irc/redirbot/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">redirbot</remote-id>
-    <remote-id type="github">yaccz/redirbot</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-irc/redirbot/redirbot-0.0.5-r1.ebuild b/net-irc/redirbot/redirbot-0.0.5-r1.ebuild
deleted file mode 100644
index f65c44bb6c62..000000000000
--- a/net-irc/redirbot/redirbot-0.0.5-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DOCS=( ChangeLog README.rst  )
-
-inherit distutils-r1
-
-DESCRIPTION="IRCBot, telling people they should contact you on different nickname"
-HOMEPAGE="https://github.com/yaccz/redirbot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index a52e8e525602..c0673368a9c7 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.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
 DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
 EBUILD znc-1.7.4.ebuild 5134 BLAKE2B 31bd284fc0ece9ee5f6790171a94193e36b19dc200a8adc79b5605e47a3936d4ea1fa4f77431762b65d876d6d6bd78320715e9d3cadd9c9a8c5899699d938265 SHA512 73cc767efc33a7cfca17967035d98d5e30de22cbb97566ee9d754d2db5137f425db8bdae458d22651d17b9efd056f48cb8016049b1055ba817774240f873dc8a
-EBUILD znc-1.7.5.ebuild 5139 BLAKE2B 14a8c7636d185678c767e17d6bd65b0e1c6ce0f07b2ab02ee6cbe397618785206bade9f440c82e19eae4d4f7c2da4c522ab2950ccc96adb686b5bac31cb2d52d SHA512 8501a3bb7f50675b069fba726e22c0a87f2333c813ae57ced1db9e7b3b433520ac81d57771ac9de4a5d88b3a9ed08d4f091211f57785149c0f033eccca964ed9
+EBUILD znc-1.7.5.ebuild 5143 BLAKE2B 5007171b6bc56fd4ef00e28d8f386b052be58a82518261f30a8d45b08415c149c44fd51dd69c93574610b4bb5e34c6e6b09559c34059812eab48497d5ced61ad SHA512 6eb198b56afe1f8783eb345cefc6adbb4cdc885f1e5eb863ad81186399ceca51dc88e7df15a9df2d8df9b655dccb5d508948cdab2d1b704d13a748788cd688f3
 EBUILD znc-9999.ebuild 5139 BLAKE2B 14a8c7636d185678c767e17d6bd65b0e1c6ce0f07b2ab02ee6cbe397618785206bade9f440c82e19eae4d4f7c2da4c522ab2950ccc96adb686b5bac31cb2d52d SHA512 8501a3bb7f50675b069fba726e22c0a87f2333c813ae57ced1db9e7b3b433520ac81d57771ac9de4a5d88b3a9ed08d4f091211f57785149c0f033eccca964ed9
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index 6820a1521d18..6f190e2ca05f 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -22,7 +22,7 @@ else
 		https://znc.in/releases/archive/${MY_P}.tar.gz
 		test? ( ${GTEST_URL} )
 	"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 	S=${WORKDIR}/${MY_P}
 fi