gentoo resync : 04.05.2019

11 files changed, 22 insertions, 208 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index a2e22ff5a385..a8bb33bdf433 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 4594adfc57bf..955a9ab9dfae 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -5,7 +5,7 @@ AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c35
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
 DIST quassel-0.13.1.tar.bz2 4289663 BLAKE2B 1d5252efe3febd26e7d04f6533f551316d58b5e4a7c143cc81dd0cf6a3602e28a57de4c73c86fb668e43bf8d01049456d1f5cf37a73f683b9c8b6dd9d78ee4bd SHA512 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
-EBUILD quassel-0.12.5-r2.ebuild 4943 BLAKE2B 5f996b57334d498c9311e1df249fe6f6ca5703ff1b6d5cfc5d64cd82e08298a098b03f23f763f0580c8e328cea3fe49599f390476c8bf372e71d526f8ce90a32 SHA512 cda2554d2e63d4f600b82293e04dbd8e2d90be8ded0749ee95cd98c9b0363a33147b05fd05acb7b3e872742d54e9eca04daf1eed5a44d4285db815c401714255
-EBUILD quassel-0.13.1.ebuild 5038 BLAKE2B bb4556e19689d78fb9e0acb8f2bee4a7bc31a7cab5859b968c6aa026707f2974ee1f102459c619b416d914fcecc9648f2e35ea7628e5bb7dbc8e2d4229f1f767 SHA512 3f5c285bd7e5fe9b6b2d613cb12118f6a153a550f09a4da37091881ee68a8f8bbef36543bf972b44052a3fc51488085b58ff6e9124031f16267436c48585fa9b
-EBUILD quassel-9999.ebuild 5043 BLAKE2B 5d6a0efe97940221762488df12448639fe4928e2401c583c1333c6df237d2e3ef0de84ba576e3bdc1d69e7725c34da6b1f7be91d3de09d12ed3a7b028a671434 SHA512 158bab31c9cc60aafc6e800b76a4b5deee011f0218e068a5a65214337a6af3166d14befdffe217af255b7ad29125cc76fafb0e19be4c5aeb62d2c90945a49ae7
+EBUILD quassel-0.12.5-r2.ebuild 4945 BLAKE2B 5a54a1aa6826752cf7d9af83ccd572eb5cd3252ed44a7ddeb3a30facdfba46282fe04a652ad20e38f91b251f1eafc2afcce05d8e56e28b7afa283ffe877cca05 SHA512 a49a8b12edc8cf8296189efc30278d59e1494a5097d1759854cc33a456e0158a17b3bb9d90860ac33818b2e2f2183c777f37a3b5768a4aea2bdbba0675a82390
+EBUILD quassel-0.13.1.ebuild 5039 BLAKE2B ef87d0973516d221ea4e5e37ffc9af247217ee835b6e2009c31912ceb862c18dd69e833bb08c04fe9596fdf7548f50815060cdf6a45e84c34feadb4377128b4a SHA512 d86140e4fe5ef1a432110fb829f271119a7abdc0a8eb5a5b2ae16d84edab5215b30f014d240be90daff7dfd8bbe9460c6eddffc4747f524102e16c4d042b20c7
+EBUILD quassel-9999.ebuild 5045 BLAKE2B 755dde3d5253499249e4e7e7ce2d40689247f9002b74a882ae247889934a48a47ed80173776efd7d7d61f5e048cba7ffef8c272ad6fb671afc720de3655bdb0a SHA512 2326f3a6bc0ca9de6b7eeaaf7150a69c7cbd842074d8fe0f43f7b4f9ab3213dba63657b85cf2d19565e15c16840d35cb4629e60250e227b01e5c927bcb3960ac
 MISC metadata.xml 1960 BLAKE2B a7e329fb44a58cf74d1964b426cc75b7697160478d62d2c4216d93defb62fd6d9e018ab29689b7a8652571db62a2a2a00f22dda6fb697feb9a381c37cc4a6ac6 SHA512 17931d04330ce51f30dd77579ebed36c04050d150db1faa793fd65307f3808ee2cdfb807a40e3881ebd879c75a583434367e46963a90c99c1a1724659946a8ca
diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild b/net-irc/quassel/quassel-0.12.5-r2.ebuild
index a0296d1e259e..5db277fc20a5 100644
--- a/net-irc/quassel/quassel-0.12.5-r2.ebuild
+++ b/net-irc/quassel/quassel-0.12.5-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils gnome2-utils pax-utils systemd user versionator
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+	SRC_URI="https://quassel-irc.org/pub/${P}.tar.bz2"
 	KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="http://quassel-irc.org/"
+HOMEPAGE="https://quassel-irc.org/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="crypt dbus debug kde monolithic phonon postgres +server
diff --git a/net-irc/quassel/quassel-0.13.1.ebuild b/net-irc/quassel/quassel-0.13.1.ebuild
index debc76490244..890c2b6a296e 100644
--- a/net-irc/quassel/quassel-0.13.1.ebuild
+++ b/net-irc/quassel/quassel-0.13.1.ebuild
@@ -7,8 +7,8 @@ inherit cmake-utils gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != *9999* ]]; then
 	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+	SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
+	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
 	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="http://quassel-irc.org/"
+HOMEPAGE="https://quassel-irc.org/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index e80faf93513f..ced820424d5c 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != *9999* ]]; then
 	MY_P=${PN}-${PV/_/-}
-	SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
+	SRC_URI="https://quassel-irc.org/pub/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
 	S="${WORKDIR}/${MY_P}"
 else
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
-HOMEPAGE="http://quassel-irc.org/"
+HOMEPAGE="https://quassel-irc.org/"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
diff --git a/net-irc/scrollz/Manifest b/net-irc/scrollz/Manifest
index 99a0ca9c9dbf..7f8db88e5de9 100644
--- a/net-irc/scrollz/Manifest
+++ b/net-irc/scrollz/Manifest
@@ -3,5 +3,5 @@ AUX scrollz-2.2-make-install.patch 714 BLAKE2B 10941de185355132346e2049b6dae60cd
 DIST ScrollZ-2.2.1.tar.gz 940738 BLAKE2B eaac2b2d990dade73f036a71534f624bf9b6fb6be04d6c19ad8d458f6a2aa035cbd97af305925db42586091ada6eb6ea3415b97819b57a68fa0dda07718122ee SHA512 38eac6a2ecf8789b2d5e042a6ff59463aecf65646c3b07ca1980f60dc47f153dd5f6e42f5a0c1edbef7d1b6743a368f9f4b25be57406353b8e34919e82c7bc21
 DIST ScrollZ-2.3.tar.gz 981707 BLAKE2B ee7c1955dbd2515204d805052d091274c3c7e08257a798c357c5a195c12d7ebc85a160cd40ddf1b2aa87a1b628bebf630c3b7428bde1f230bf9b372f74cc74d2 SHA512 cb3dc2f462452c605c688805ed5128e0197eb4daae895c03f00631c4e9a0994f89a9c55b7e0591588f3f313dab66fcbeb1683b42ef75c3b714185b40703b1979
 EBUILD scrollz-2.2.1.ebuild 1235 BLAKE2B 2f9103f10c2370f0f4af98fc37b4bc96bb64f48804be8cbbd87d2423ff6e689cb9796b2370ad512ecda2deaa124736e2e8aad6bb9b9f16ad82688a281bd5eb15 SHA512 bbc8404ce6b6175eb36a13c4bb35993ab79078c8cf3bd88b97ecc9dcce04837ccecc81a545bda1b0a36e4fbc4cd7c4aaae7570d60744ad1996421d684353dd41
-EBUILD scrollz-2.3.ebuild 1144 BLAKE2B 7f3670aa0c41174da5563e1d56c8fcb2f20c2f9007072e85e741f1865873e880b9a917f72b65c2d1abfc5be3a55318d483f70d4d7c6c7037583ff00121b2e5fb SHA512 520daa4397dbe0c17ac497a72244d1e8176b242946446e4811cc978f7a3ba7f67a2be27d944d0587a120b3bae1a51a00ca974ccf478fa5f666d0be836fb57dca
+EBUILD scrollz-2.3.ebuild 1143 BLAKE2B 93c63fdb523e9a614de3d729396493183110f3e9345cc482d29327b0814898e98fd29bbfc2d3b78ec3ed069a9bc3e4f3263142604e3c8caf85b70c206e3707ee SHA512 2015d7bea3f1c008f2906ddfe4e68436f93809ee3f5ff1081d55089b8644c17b4360dfadb975079f684331a7aa99c6719055c2fd4402e1c293f6379340b5808e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/scrollz/scrollz-2.3.ebuild b/net-irc/scrollz/scrollz-2.3.ebuild
index 91c290474e36..a7a4b03e80b7 100644
--- a/net-irc/scrollz/scrollz-2.3.ebuild
+++ b/net-irc/scrollz/scrollz-2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.scrollz.info/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 IUSE="gmp gnutls ipv6 socks5 ssl"
 REQUIRED_USE="gnutls? ( ssl )"
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 0d82b620da3d..4c5e54467ac6 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,9 +1,7 @@
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
-DIST unrealircd-4.0.18.tar.gz 5317767 BLAKE2B cb71144ce0fce7f719b3081f2da9f85c997dbc372492dfa57354eb51aee122f0e42fdba9e0aca997cd118ed9c75fb6f197ca13e371931fe45709d6b64651336d SHA512 b9541ea83c24963187931938eadbba746175ec1d9449631e799df038bb062625e4b508c2d0d4e9e69a6401158cc23a855cbfbda3d28a4b971fbb249f074d26d3
-DIST unrealircd-4.2.0.tar.gz 5340752 BLAKE2B 12d1ada1d439c6acd692a04dd4ed7ed03ea91c897f9522c0fec853239ba9a21098bddb78c6f5159ed59f1b88cf88f0ecaa774d70aba226b3ac749c935bc18ff5 SHA512 2ee7955c3c6c9af2b74cb68cfa94f8500dddf640f0222888b230f0f46dd0a52fba2c68d795eff00c59a3025affb2becb1dd67ebac037c7f75e77a3a728239750
 DIST unrealircd-4.2.2.tar.gz 6060272 BLAKE2B f45cae6aa85b478e7f667e379b557314fa509c17f150941f84ee80fb328b01de099235b69d3e2710afef01578f5898ba12f21245d6ce5370e7aa7ffdfa49d1f0 SHA512 961947e2286e10cd6032320d57cf3a99d4354f46ae28ad3142d11a0d423f7a0be915f8c09e8fe7b5816829752e4a03776907bb491366f418afc319fd8efb14ad
-EBUILD unrealircd-4.0.18-r1.ebuild 5410 BLAKE2B f4623989c7f2c188b384b3ad01b80f02ef0e50f018411e466821526429f7736ff9907a8c1b32e3fe71e555f19237169c55b06821090bf7680709e933b17acbed SHA512 593840a6d2620a8bd2e80292fdb3d3bbc212312dec559fd6d04607f9c8b6106a79147a63f942271d1d33f11559394a8bd2fb3f424ae18bede975b09739967143
-EBUILD unrealircd-4.2.0.ebuild 5443 BLAKE2B 1a9915411b588b0fab288845a4ac090b531230e0a97d0bc1a1cf7f448ebc2c3a6dd6d2c6f5466e1d12097b96816b2e02b1055c37a88dea9e912f5b726813a512 SHA512 c4cad1fd924400324d65cb56e7f0779ee3f642394e2264094a97c08c5ead678ca917855a00c4d1ae805e8ca995c976b726cfe7b898aef69fccf8cba7ec1af99d
+DIST unrealircd-4.2.3.tar.gz 6086716 BLAKE2B 26eae482b8b5ce599a3672981c5cf32725f0cf7d9dae16cf48c73dfcabbd4b897d8308be0eb1a6b7b44c657dfb66c42115e67c29eefc791da5fc01fc53e22323 SHA512 d71550d71d24f808141d235248600476167b82de089173f0c1814638df636bf999c931827e5952f0233932b2d5412bf2e26573c62cc8a0720f91bd8723867b0a
 EBUILD unrealircd-4.2.2.ebuild 5474 BLAKE2B 9bd2f057b44d155f1347ebd4953f4d047ebee669bd1db35b08065826b31812f17595da7ef1414517e6c313363365fa32b8d6cf81117ef1922cf28c2b2b427c21 SHA512 6486c17f73c3e9c42bad4e587047ba15145f755c5721e4d6699b704877aa940e82f9e672761dcadf4ed411cd01c2dfdcfb5d715a1ff24dcd5c8af15c009f5a8b
-MISC metadata.xml 1133 BLAKE2B 28a4ad6235e9a0ec31202822149d2cdc68ddacc49130b14f960639eaed019654a0d90548201e7e312b33422762a23678f7e3e2c76cc9e004296c93309ebf3f29 SHA512 6066d46bce08535445ff400ded0a93ca6a0bb879771a512e05bc896a85ebaf98a0b80875f3cc4bac5eddb99c28bb7c855da0f577d603fb39d61e517ef69373a7
+EBUILD unrealircd-4.2.3-r1.ebuild 5463 BLAKE2B e2bd7d6874e2c981f4d7e515c27c938a862aacb26df6ee07a4bacbc217b68e76d348bf382ae42a27726a72cf23b6f7880e997e13961159672307d0bed622b48d SHA512 05f628e511835eb4fa103f4de297abae3bc97b712c8a0f644391167836022d4f12915a49d163c6c23063b11dfe9d0df770fd7c3d4b4fffb07472e50c3b007271
+MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index da34a4fb08f4..71258eb2874c 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -13,6 +13,5 @@
 		<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>
-		<flag name="topicisnuhost">Enable displaying nick!user@host as topic setter</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild b/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
deleted file mode 100644
index db75758bc7c4..000000000000
--- a/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-inherit ssl-cert user versionator
-
-DESCRIPTION="An advanced Internet Relay Chat daemon"
-HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/${PN}$(get_version_component_range 1)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux"
-IUSE="class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq
-	showlistmodes shunnotices topicisnuhost +usermod"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/libpcre2
-	dev-libs/tre
-	>=net-dns/c-ares-1.7:=
-	sys-libs/zlib
-	curl? ( net-misc/curl[adns] )
-"
-DEPEND="${RDEPEND}
-	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
-		version_is_at_least 4 "${v}" && 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
-}
-
-pkg_setup() {
-	enewuser unrealircd
-}
-
-src_prepare() {
-	# QA check against bundled pkgs
-	rm -r extras || die
-
-	if use class-nofakelag; then
-		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
-}
-
-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-nick-history=2000 \
-		--with-sendq=3000000 \
-		--with-permissions=0640 \
-		--with-fd-setsize=1024 \
-		--with-system-cares \
-		--with-system-pcre2 \
-		--with-system-tre \
-		--enable-dynamic-linking \
-		--enable-ssl="${EPREFIX}"/usr \
-		$(use_enable curl libcurl "${EPREFIX}"/usr) \
-		$(use_enable prefixaq) \
-		$(use_with showlistmodes) \
-		$(use_with topicisnuhost) \
-		$(use_with shunnotices) \
-		$(use_with !operoverride no-operoverride) \
-		$(use_with operoverride-verify) \
-		$(use_with !usermod disableusermod) \
-		$(use_with !extban-stacking disable-extendedban-stacking)
-}
-
-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}/ssl
-
-	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}/ssl
-	# 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}
-}
-
-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
-			ewarn "The location ${PN} looks for SSL certificates has changed"
-			ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
-			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
-			)
-		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-4.2.0.ebuild b/net-irc/unrealircd/unrealircd-4.2.3-r1.ebuild
index 9f2dfabd3812..1cca46256153 100644
--- a/net-irc/unrealircd/unrealircd-4.2.0.ebuild
+++ b/net-irc/unrealircd/unrealircd-4.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,14 +14,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
 IUSE="class-nofakelag curl +extban-stacking libressl +operoverride operoverride-verify
-	+prefixaq showlistmodes shunnotices topicisnuhost +usermod"
+	+prefixaq showlistmodes shunnotices +usermod"
 
 RDEPEND="
+	>=app-crypt/argon2-20171227-r1:=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )
 	dev-libs/libpcre2
-	dev-libs/tre
 	>=net-dns/c-ares-1.7:=
+	net-libs/libnsl:=
 	sys-libs/zlib
 	curl? ( net-misc/curl[adns] )
 "
@@ -75,19 +76,19 @@ src_configure() {
 		--without-privatelibdir \
 		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
 		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-maxconnections=1024 \
 		--with-nick-history=2000 \
 		--with-sendq=3000000 \
 		--with-permissions=0640 \
-		--with-fd-setsize=1024 \
+		--with-system-argon2 \
 		--with-system-cares \
 		--with-system-pcre2 \
-		--with-system-tre \
+		--without-tre \
 		--enable-dynamic-linking \
 		--enable-ssl="${EPREFIX}"/usr \
 		$(use_enable curl libcurl "${EPREFIX}"/usr) \
 		$(use_enable prefixaq) \
 		$(use_with showlistmodes) \
-		$(use_with topicisnuhost) \
 		$(use_with shunnotices) \
 		$(use_with !operoverride no-operoverride) \
 		$(use_with operoverride-verify) \