gentoo (valentine's day) resync : 14.02.2021

10 files changed, 213 insertions, 56 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 67e3f18c2de4..530485f2009f 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index b3d5ac258773..d73287a5444d 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -3,7 +3,7 @@ AUX konversation-1.7.6-no-kiconthemes.patch 13035 BLAKE2B a8f15af27cb86f8f8de3b4
 AUX konversation-1.7.7-no-solid.patch 1013 BLAKE2B 58cc622cce90ceded76e9b607b2a2f4d249fcbb4a722e8bc6f8e1a21345f25cc4244f77897e7a69b67c86d1533f926184bd89667d3705847c7d480bbd8f63510 SHA512 cd8e8bf8185785e26f4efc416419e858c8100a5673fd1440ef8c5f336099ae79e858016ec11fdeab18ccd6480f25f4a6e4a4f69c211456bb7e7a12fad465d17c
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.7.tar.xz 3357584 BLAKE2B 9f6817a1e01674f383879eeaafc65a50825aa7554fedcf7fbe7affc43da16f7198761ca12b510d9980df5a5f41819a5415043ec91de55f1cb4d86e62e8e23ea0 SHA512 99026007af7fa00b82240c1f0e46a8d3db6c3434948aff7d0b01c2f99bccdd227a2a705bd83bce1ca2e47be13866d5d0a981c8b4ff8dec472612d6ee40f9ed2c
-DIST konversation-20.12.1.tar.xz 4220716 BLAKE2B 00a5ae17b51afa0ab08b9e50bc1ff3c775cc8d19830b8658c8b1c51f180812a76d9466ce125ea313ff89c5ef3df97f6f0e26617029e10b77740f09f47ad9e437 SHA512 f70a47a384c1e61ae304fb8642d54a393046583cdbe53413cabc6fa064f2db9c3b9092dfbafcd14b1b58480bd31917b12c65808a149d90ef40512cc6483b9dc7
+DIST konversation-20.12.2.tar.xz 4222016 BLAKE2B 9f53e2f805959a2decbac907a8614f09f33edd2c0be666ef775893ec1101f1a243435314f10f2099c42631883fec07eea0ca28336b03860c6487e00d4606f78a SHA512 b9410c2a6b39f50734a1daa1903441c282fdbe128d0b0cb0cff3611ffb6bdd49a58d0f1b66dd3b9d6232110ed1ff82677ba14e2877d431602cad4a55248fc341
 EBUILD konversation-1.7.7-r1.ebuild 2114 BLAKE2B 6fe3aff1c5e1d0c6791787d25b2443dc50a61c0f5e1c8b6b79f7bfc192cabd76dff6d38234c14eb66932bf5200990c522cac6e9bb8b12646f87cb51653450b63 SHA512 0a5f1f1c8b3a0130a6e7a09977a5b9b6c536cc41c858a2ae68e71707b7b4ec76f7c7558fbb0096bd5ee916ef4ed6630f74317c1a0a2449459cda429234b41348
-EBUILD konversation-20.12.1.ebuild 1905 BLAKE2B 2cbcaba86f34a8a02e9b164f3a0cd1c585f737f0486ee4e07ca55b0c24da85a121bbc5209f77a84f2573a0911293037dc44f4056f7ea328372f3f94a64f4e466 SHA512 b36f1dd77fa0ef505f2e10f7fb7eab33e1904ff5e57f7c864a67062551d0f469cb0c52fce932f5195a007a498b4dc29a6586ac6d673a502ef3f6ae998ad8572e
+EBUILD konversation-20.12.2.ebuild 1905 BLAKE2B ca8c9ed95a0f9f2563cacb6d2119081c20ec311d12c1c30ac6fd546b9b1ee02296b752b998c42e8d2eaf6ef80f8d7050ed3d6a46d981ea967bb17b23033c1b92 SHA512 845bdfcd9d7ffc3741a5cfd1738ccfbb8e6fbabb0281d3227c9b5e15eefd710c3b72b844b21e5865adae8333c9ef74473891c4b19fc921f6ec62b33e06a9e8f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-20.12.1.ebuild b/net-irc/konversation/konversation-20.12.2.ebuild
index 4e398d5c85b7..5e0ea6be4c39 100644
--- a/net-irc/konversation/konversation-20.12.1.ebuild
+++ b/net-irc/konversation/konversation-20.12.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 KDE_RELEASE_SERVICE="true"
 KFMIN=5.74.0
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="User friendly IRC Client"
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index 37b693fbf2d5..0ad85383e7e1 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,6 +1,6 @@
 AUX ngircd.init-r1.d 388 BLAKE2B 10b6d4eb2cd39fe4e3087461cdc15f2ee8f1002e826552e145903b69e16ce46169a2dde19e03af38228ed9ede0473a828aa8cd123ab4a2b043fde448bb180954 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158
 DIST ngircd-26.1.tar.gz 562938 BLAKE2B a1a4ca8b6e12a02cb4ba2e07d777cf77051b5330464c91634cfac0b385157ab7c648e3b71151247bc8ee6cc847e84755fdca3d9b4a25205bbb57b8296995dd17 SHA512 4a3ee379dd8d8655a71134c745f750359ceb0512e184db555f65f2bcab68087480365a35680a9ec75b1e6eb0fef23e1cbe0a0e13c3c58d211e5a520a8eeaa71c
 DIST ngircd-26.tar.gz 565579 BLAKE2B edd005179a79bbb51a1401f7d580ebf66cb5bf65d1427453c471a4e7e667d7fd6b320c292e9a7993c5fef6beeae88126fefb73284063451b080ecc0d3e6ca0f1 SHA512 2502baf83e3bfca3e6b83c22fe660fee24732ee875b32a7071a489a8babcc08124738142215b55d4f9bd4e94bec3f2a41889ab18324f772b1674b02883cbfb91
-EBUILD ngircd-26.1.ebuild 2190 BLAKE2B e21af4b0deefc9065650f78101138a0d1505506c891254147bb3639b32f0a454fe5308dae1def1e0e06f6dc37899288b44587a89a4b4688e4beaf9fd37127ca2 SHA512 59d69d2c1050bbdcc07121548a3862d4b6b9f0a0884759a0a8b51ea2e289b6a042d7bf1f3dba173992dc97a7de87ed6d169adefb127669e5442d3abafe332699
+EBUILD ngircd-26.1.ebuild 2187 BLAKE2B d8b5bccfadf17e8ddddae860e133ba010835d01d0ca825b41359440bf4f00cba3ceae1866ec8dfe29864248297e8293cb42c64b55ac34529208ce9d199eb8478 SHA512 da5c93fda515001e803f6e288aedfc938d5d07004aa1667d685c4e6a1b0c1d2824bc2440468aa52c23deb4c2e6440ef062ea26647e3f8855115c6029229f8153
 EBUILD ngircd-26.ebuild 2187 BLAKE2B de64499c0448af9ef9bf156ef4c5fa71ca6573a71baf3bd187ccd440ac27f0d6cfb5cefcf2f9357d57f57077e0b6951916fd946bbff2de01a76ca8e40d2760e9 SHA512 d5bd6005b284b90643fe3444c6cc1a9fec6ef0a5550f9747a803c413625ac17377c33c117d836ccdbcac5e49cd79bae5c897bc13409c00c82b22f5ad8dd2b807
 MISC metadata.xml 650 BLAKE2B dd80efa442d59f04e26bb338e371ffa8380a4cdbb630db30e25adbaa930d9f0e4a486bbd05321b8185c23558ad4e29023153a69d1214294c345b46685eb7de86 SHA512 9b8879892c2edc6c7792c22a684f87ae559a43b034ee66f6242e73075012e1f53a33a63fc3ffa62c41f5fd620a4be6c1ffc57a1b62cf42ffa3c032cec4ff743b
diff --git a/net-irc/ngircd/ngircd-26.1.ebuild b/net-irc/ngircd/ngircd-26.1.ebuild
index 3336bff7a932..4a9c13b03363 100644
--- a/net-irc/ngircd/ngircd-26.1.ebuild
+++ b/net-irc/ngircd/ngircd-26.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos"
 IUSE="debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test zlib"
 
 #RESTRICT="!test? ( test )"
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 19421e96c639..33d8d8bb69f3 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,12 +1,12 @@
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 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
+DIST unrealircd-5.0.8.tar.gz 5013231 BLAKE2B 57365a06b8108239ab10f6cff7d4553b08aa428acb5c635c4b9241c3f82459a5aac18c916a4534f3a8fc9ac1fd4c1d9418c7395233603e576eda40c56d81b110 SHA512 45fc0758a870dbb9c3ff55fc7029d1ecff9dcf65680f31ff331f012efbf9c9bffa60a6fe27b9bab69302d26b8293a1089cfaf1c550a3f2802a549f25e4644770
 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
+EBUILD unrealircd-5.0.8.ebuild 5145 BLAKE2B 90f498b72e65ebd231c0f65f9e98bb5684715db56ee4e79365987e211369aba68dcdd9c75fbca2344b354ac7240c81cb030066c6c6af0346858513c25be71796 SHA512 9c400a49c29b79b5f54dff15a93e3a29554be8ac63a7f14b6c834d13bc04ab5f955c438106263ae72f918aa5c4007087d75dcfbebe75f36aaeba9d15c1a399c1
+MISC metadata.xml 759 BLAKE2B 5194eba7f1cb19272370b3d6d54a316201e52cfe79fa3a4a250feae84cfc37c00ee5882a352a13516924dbb393422c8052146309a5e2af888b7e1385d25dc5cb SHA512 30291788f7a41dd006eff3b2edffb2814f4ea27a16eadfb5126bc24f9013fbe76fd175b1ae1720b2d9ecb627d11a4a744cfcdac14cd1dc1c20b56a426bc8997a
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index 71258eb2874c..a265e93f2b47 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -6,12 +6,9 @@
 	</maintainer>
 	<use>
 		<flag name="class-nofakelag">Enable an unsupported class::options flag called “nofakelag” allowing you to grant fakelag exemption to normal user (instead of just opers).</flag>
-		<flag name="extban-stacking">Enable extended channel bans (such as +b ~c: and +b ~n:) to contain other extended bans instead of just hostmasks.</flag>
 		<flag name="prefixaq">Enable chanadmin and chanowner prefixes</flag>
 		<flag name="showlistmodes">Display channel modes in /LIST (only configured at compiletime)</flag>
 		<flag name="operoverride-verify">Enable requiring opers to invite themselves to +s/+p channels</flag>
 		<flag name="operoverride">Enable OperOverride extension</flag>
-		<flag name="usermod">Enable /set* and /chg* commands</flag>
-		<flag name="shunnotices">Enable notifying a user when un-shunned</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/unrealircd/unrealircd-4.2.4.1.ebuild b/net-irc/unrealircd/unrealircd-5.0.8.ebuild
index 368e8f269796..48b03f3e0792 100644
--- a/net-irc/unrealircd/unrealircd-4.2.4.1.ebuild
+++ b/net-irc/unrealircd/unrealircd-5.0.8.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 SSL_CERT_MANDATORY=1
-inherit eapi7-ver ssl-cert
+inherit ssl-cert systemd
 
 DESCRIPTION="An advanced Internet Relay Chat daemon"
 HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/${PN}$(ver_cut 1)/${P}.tar.gz"
+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 +extban-stacking libressl +operoverride operoverride-verify
-	+prefixaq showlistmodes shunnotices +usermod"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
 
 RDEPEND="
 	acct-group/unrealircd
@@ -22,42 +21,29 @@ RDEPEND="
 	>=app-crypt/argon2-20171227-r1:=
 	dev-libs/libpcre2
 	>=net-dns/c-ares-1.7:=
-	net-libs/libnsl:=
-	sys-libs/zlib
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	curl? ( net-misc/curl[adns] )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( doc/{Authors,Donation,RELEASE-NOTES{,.old},tao.of.irc,technical/,translations.txt} )
-
-pkg_pretend() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		ver_test "${v}" -ge 4 && continue
-		ewarn "The configuration file format has changed since ${v}."
-		ewarn "Please be prepared to manually update them and visit:"
-		ewarn "https://www.unrealircd.org/docs/Upgrading_from_3.2.x"
-		break
-	done
-}
+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
+		sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
 	fi
 
-	# 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
-	sed -i -e 's:%s/ssl/curl-ca-bundle.crt:%s/../ssl/certs/ca-certificates.crt:' src/s_conf.c || die
-
 	eapply_user
 }
 
@@ -76,22 +62,17 @@ src_configure() {
 		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
 		--with-maxconnections=1024 \
 		--with-nick-history=2000 \
-		--with-sendq=3000000 \
 		--with-permissions=0640 \
 		--with-system-argon2 \
 		--with-system-cares \
 		--with-system-pcre2 \
-		--without-tre \
 		--enable-dynamic-linking \
 		--enable-ssl="${EPREFIX}"/usr \
 		$(use_enable curl libcurl "${EPREFIX}"/usr) \
 		$(use_enable prefixaq) \
 		$(use_with showlistmodes) \
-		$(use_with shunnotices) \
 		$(use_with !operoverride no-operoverride) \
-		$(use_with operoverride-verify) \
-		$(use_with !usermod disableusermod) \
-		$(use_with !extban-stacking disable-extendedban-stacking)
+		$(use_with operoverride-verify)
 }
 
 src_install() {
@@ -117,7 +98,7 @@ src_install() {
 	doins -r doc/conf/{aliases,help}
 	doins doc/conf/*.conf
 	newins doc/conf/examples/example.conf ${PN}.conf
-	keepdir /etc/${PN}/ssl
+	keepdir /etc/${PN}/tls
 
 	einstalldocs
 
@@ -127,32 +108,39 @@ src_install() {
 	# config should be read-only
 	fperms -R 0640 /etc/${PN}
 	fperms 0750 /etc/${PN}{,/aliases,/help}
-	fperms 0750 /etc/${PN}/ssl
+	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}/ssl/server.cert.key ]]; then
-		if [[ -f "${EROOT}"etc/${PN}/server.cert.key ]]; then
+	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} to ${EROOT}etc/${PN}/ssl."
+			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
 			ewarn "Please move your existing certificates."
 		else
 			(
 				umask 0037
-				install_cert /etc/${PN}/ssl/server.cert
-				chown unrealircd "${EROOT}"etc/${PN}/ssl/server.cert.*
-				ln -snf server.cert.key "${EROOT}"etc/${PN}/ssl/server.key.pem
+				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
+	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"
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 8593f4a155ec..443e9f70750b 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,8 +1,10 @@
 AUX weechat-3.0-cmake_lua_version.patch 272 BLAKE2B 3c88a0aad5d0ad9c5067062039fd147c9356923324089d74ebd5987e6f5a67bc1da785a12b863dffafc8e63af18b52b5ed6aba97cacec105b04f7b70ac0b3e5c SHA512 81a3143acfeb35ccd8e913efa0b881165459049bdbb3e7bf96b41c7f764fe37647349599d3bceadb966ae52f2156cba5170926ba7af7ed667f7664f8adb920aa
 DIST weechat-2.9.tar.xz 2206584 BLAKE2B 8089cd846ca192ec666a50e8071ed57e1c2518b2d5ea98733b8e3fa6c8c684e8ed14253d787b3f9995a8f481a7413444c3ba262dcb6c100283192bcafb502627 SHA512 c4a5723accb417c0496b5427ee58fbf5d3e842e6d79a7988f8680cd605534cfc9d30f6f4844afe45f5223458f28b8deff1284fff2fb5b7d04cb99a81cde4e13e
+DIST weechat-3.0.1.tar.xz 2215312 BLAKE2B 204c110259528c485a832a750a34c6b408e24c9b9c9797d41e2e2bfd5e33dcd4aa7c80c4478e8825155363048306a48bcbc61469813b9a82247c6cbffcc385a7 SHA512 d5b2949b668f622c08d60764aa230f8a4901d358facf83ab13428709854b173830aafe65fec86abacbea08ffe89e6e34131a5e4de37bbb5409454fa223f7885e
 DIST weechat-3.0.tar.xz 2215408 BLAKE2B ed43c16af2a9fea101b54714e21d5f28f2b18fed5734c5f6adde857500befd94089f6bd7be5e2ad2738fce4e1bd5b10ebef32d0d46039242efaa2dc7f664eb42 SHA512 d6a68f35dc7363b838af811ff0a0a8d9fff519a4231c66f963e896bdda8653a56608e46333dc866e7dee25c1eafd2f1bf99c443089dde5a268bba637a0dee8ca
 EBUILD weechat-2.9.ebuild 3864 BLAKE2B f5a7ffca93c5845c31fda18107cd9d2f49c74b9c3d318bf6002e117a1c59bb8ca0fe04f7e2956b51e7f3d953b7d7aeaec35ca19795fb5b3b4f9cf749d2c44e65 SHA512 825f3681db2792bc4d4112796f2ca524302ed32df718902fcd787e79bd0f162425e8940f316e090e1d6ec3ff0ecb3e5b4b232a4c2e4c971163d315752ed7ba50
 EBUILD weechat-3.0-r100.ebuild 4186 BLAKE2B a39dcccb10b695521bc7fbe5aa311608df46e274b3a372390a23f93d55dad7717fda9c7c8375ebdf6ce5a0b5d949b7a1ef3a97e23c6eca8be2bcee5ed92bdc3d SHA512 04f04f13668a40e6e0d9f9f3d7a1d00d067291812e9855bc51c552768626933acafbd81bc5287f6d4efc445c7d6649e4a53c991a4d086e8eadb151725e6e951a
+EBUILD weechat-3.0.1.ebuild 4189 BLAKE2B 86c80cf608e648b059e65f2cc562ee096609966752c3009791189227e744f1c4fe7dfad22efe9a31423f05893ef1cfa31153b30d354789db3da9aa41a13386e1 SHA512 68c4d25c1f800d4d804ff305cdba2ff4f6fc124b180aa5db349fa64a736469bd1899ec4bf7da507d87b774c1f8b3b231f5420a4f8b339f2cfa6f5f95aa1a2145
 EBUILD weechat-3.0.ebuild 4029 BLAKE2B 5ba766edfd551f4dde7d04c923aea4657d7107e3e32a85701c68ec7b81700c6842fd36f6bbf4c1ea629db7759faed1e7ade0181e24f3290cdebc6684d53a7bdb SHA512 9ed9379cebedc21a72e13740d3325175181ae72da664dfd7cecd9a12a082d3d823d9a30dbde9aa8338c19d9d9d15540a8d6c23345a327ca6bd04e715c3777239
 EBUILD weechat-9999.ebuild 4189 BLAKE2B dd2b47e18560aa368222ff5ced136c3d58f5a0d05e958560095eb004f00fdd509457ce920ebbea9bf4162edc15155d47515814fe97d6236afc8b554ee24cccf6 SHA512 b6ad28286bf87e8081b7dab73a752f16d77b742622da0ac3205332f0e516a11ac3b61e2766ef35ed9ba799948177d85aef0555d537daac97559108f58dff22ea
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/weechat-3.0.1.ebuild b/net-irc/weechat/weechat-3.0.1.ebuild
new file mode 100644
index 000000000000..f8abf272affc
--- /dev/null
+++ b/net-irc/weechat/weechat-3.0.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake lua-single python-single-r1 xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr it ja pl ru"
+IUSE="doc man nls test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( nls )
+"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:=
+	net-misc/curl[ssl]
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( ${LUA_DEPS} )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:*[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.7 dev-lang/ruby:2.6 dev-lang/ruby:2.5 ) )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR=/usr/$(get_libdir)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		cmake_src_test -V
+	else
+		eerror "en_US.UTF-8 locale is required to run ${PN}'s ${FUNCNAME}"
+		die "required locale missing"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}