gentoo resync : 18.11.2018

11 files changed, 9 insertions, 952 deletions

diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index cfc537656d96..8f866804085b 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,17 +1,7 @@
-AUX unrealircd-4.0.12-without-privatelibdir.patch 3050 BLAKE2B 8574bbd006253c824ef3a693248404c01ea8f3f856d0cd7d110a76664f809b7ede56181595ff5e0fba60bf738573396e64308a8f31bf762ef28d23177726b4d7 SHA512 f9bba46daa399bbcebc4b89ed129b270c1eaad3a7e2c573d20567b055fffd8185a987a6f394b35cb0f9e95288aacb73c201e9162b940fccf170c51e04bc72be7
-AUX unrealircd.confd-r1 1221 BLAKE2B 65c29bce13d54a3d87c89ff4fe124172a8237640c9cde8a7566a8e88e5dfd51099bfc1991779bd2b0f9770f065782a52505c7ba2b45efb2d02bfacbf89d3a9b4 SHA512 add347151035f8bef7fa77d8b675563c5308e39a7e1f6ce9c044fa1e38c5d2e662327d90b91fe9bb7e23fed3337db9c497c7275688048cbd12116f98e43ba94d
-AUX unrealircd.confd-r2 1366 BLAKE2B 093a1f6fbdf2015d170c0244d9870ca415b4f0e5b57d2bcd14539d901c45de3f0d66de6ff57fb6aaa0f0128f998516616418e0636fe177e31bd6bc949b70c5fc SHA512 7282da5b2d07e139bd579ce0012dd4a02b02b88e8f12bdf83e6742f8d221ee78568c5652933a065642561fca5902b256b10c61d5add3e4c587d4b4ac089751a4
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
-AUX unrealircd.initd 1139 BLAKE2B 8d401a42efe11a464e6b3cf482e44fa86ce66b71dcd68eebf7d49b1ac35d97f07afe35e28ff5ff316e989f5f9b4234a8c4d32dedd917f02418c7fae02d89ee41 SHA512 694230ad52450642d212aa88ad0d2c999a166b23bbbe44c07fd2574b29bc541cc727a75b8aeec41ca67bdb3125f04271bef9161ebaff409d161a2f47f15839da
-AUX unrealircd.initd-r1 1180 BLAKE2B bcc078dbe9d5cde47c230ba0b0d17ac3584a97a3d3b79943da2691147416179ba5ad73180b703981759d1f451577ff2f5f4738004ac7de86d80125797bc49a35 SHA512 108bfe0a79e7d25ee9d24980c9082d3ddf75d095d122576974319b68f5bebdcb088961276038ddfdb30aadbdfd5f7e247f61444675964604430c4092e517004f
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
-DIST Unreal3.2.10.7.tar.gz 3539026 BLAKE2B a61fcd7cd4329c6b0991219a331482ca84aecfa37638762aa1c20166ab2ce0d4facb2a51b2010a9dd2fbc32278de91acaf8fd209ce5b8a2d4232dce154880904 SHA512 7d5fd4729fdde56c6b3e38a93bc365857b5b4faf58cb39e844b43e87872623abc7527025247eeda8c8535576e2b1b8ef14d482c964ce940cafb5de77cc9e1667
-DIST unrealircd-4.0.12.tar.gz 5521686 BLAKE2B d55973387f58cabd80156e1113491adec623a56d83e0043dcd89457b00cc6519ab37459eb2c0a10176b5d5bb1518a81fa288bdea43f0e4b9303f629103c5ea1d SHA512 3df18e07226673d76977771f91f0f6c2129955523f1330519e5cada7989c8987382d78770c95837d520737796cf4fa84f1de3eb0f08ef017c5c56f775cf45420
-DIST unrealircd-4.0.17.tar.gz 5325068 BLAKE2B d6d1c05234ee5921e65e0a7a4223152bd729878a5d8b40dfb4b1b2d066a891564b8cd66097e03a8a47f84878aeeadb7356ff222dd4d8efece69a9f1df5fe3542 SHA512 e02684ba7b61747f6d0edb8105c3d9cb1f383c79b9ff563b374fefe1ed5224c168d8f9e3e482a122acd7a2af12ee8595812e4c46654e651cde7115656fb3d36e
 DIST unrealircd-4.0.18.tar.gz 5317767 BLAKE2B cb71144ce0fce7f719b3081f2da9f85c997dbc372492dfa57354eb51aee122f0e42fdba9e0aca997cd118ed9c75fb6f197ca13e371931fe45709d6b64651336d SHA512 b9541ea83c24963187931938eadbba746175ec1d9449631e799df038bb062625e4b508c2d0d4e9e69a6401158cc23a855cbfbda3d28a4b971fbb249f074d26d3
-EBUILD unrealircd-3.2.10.7.ebuild 6581 BLAKE2B c7c638865b036386c16ffb257632389e31b277bc9406ee081e7aa149b303af8ff02efcc5cbedea60eb6b7c76b5dfededae083f415dd392c022039401840fb677 SHA512 8bfbea36317e3984c4768e03f236d5a3bfbe5cc73d8d74798e80633cb9b4946489a8197bc7bacb1649f2d8cbea702c5cd6acb96645e97e89197d697f78eced89
-EBUILD unrealircd-4.0.12.ebuild 7879 BLAKE2B 272c2e142cfa449d307d48a009551e22025236eaf7c8b3c045c4e1908110a11be5add1a646b1ec83e6057e35dc75e2be1b0e8b785c912841a60c7b6dd0f1af38 SHA512 c3b1cbb3276ae0e8a5601989b3c65d49f7628926616cb0806fc8b0cc9588a942ffd3b0740bd7380f784960ed36f9ee3e0a5674d60099ef4fc8aa0963428be2fc
-EBUILD unrealircd-4.0.17.ebuild 7805 BLAKE2B a05eb46b95c093eaa26167291cd5e17c9413248e9db470ebcfd26344ad01bbeaf7c842bd71c79f12d3e2c59f8cfe9815bb62effeec2ede8960a92d94b5c0df6a SHA512 b2a7c952d9a957a77d11cabd0f72fcc29c056fcc5fa4f4f1c35e5d29237da97838c0af95b563bf89fffc2247dd808db703dce2b3429b996dd04ef8a9df444369
-EBUILD unrealircd-4.0.18-r1.ebuild 5413 BLAKE2B ee2940e61d56907d1830e0bec218d69d7ee183820ae77f5953b3a00d0e05a87186e963d51d82570455b19c84423459312ca99622bfed717569eaea27a9b29dce SHA512 135f5c9e0db38345f85f0dbe3c73feaa29516b2f5fcb06fb89df37ffbf276dbca88765200e794cd1a24482646f242440e4c8ea26efe0d645b8f873b5bb0b3bb8
-EBUILD unrealircd-4.0.18.ebuild 5413 BLAKE2B b13e7cba8238465aebb69ce2533773062cdecc01e87878c3fb11f3cb572157ac0b5dfb75b810c5fb1bd6ef28e74b663f56b95f5c3fae731f5849c4ea078e4720 SHA512 6a86677f08ad11732f74636992483e2c3c606db63263cab962c432a625811676606f58988ddff903d7f5ae48dde8d6708ea1b621f82d21f1270467a673f14470
+DIST unrealircd-4.2.0.tar.gz 5340752 BLAKE2B 12d1ada1d439c6acd692a04dd4ed7ed03ea91c897f9522c0fec853239ba9a21098bddb78c6f5159ed59f1b88cf88f0ecaa774d70aba226b3ac749c935bc18ff5 SHA512 2ee7955c3c6c9af2b74cb68cfa94f8500dddf640f0222888b230f0f46dd0a52fba2c68d795eff00c59a3025affb2becb1dd67ebac037c7f75e77a3a728239750
+EBUILD unrealircd-4.0.18-r1.ebuild 5410 BLAKE2B f4623989c7f2c188b384b3ad01b80f02ef0e50f018411e466821526429f7736ff9907a8c1b32e3fe71e555f19237169c55b06821090bf7680709e933b17acbed SHA512 593840a6d2620a8bd2e80292fdb3d3bbc212312dec559fd6d04607f9c8b6106a79147a63f942271d1d33f11559394a8bd2fb3f424ae18bede975b09739967143
+EBUILD unrealircd-4.2.0.ebuild 5384 BLAKE2B cb13d4a19d26ccd74d0ff6451d3235e5e5df131e6135641c27bc7e25fe00750c1d812e3ad5cc07d44e4f491931d95eb7798a807f7ed24f68ea5b39dbd2796ece SHA512 4cbe063226f705742db9da0c4c4b8320e647586aa0941d7568b5f39447d1d50f878b915aef6abbd3b3639e95fc6dc0270f6bc5ec123dd193d8de3c300ab65ce8
 MISC metadata.xml 1133 BLAKE2B 28a4ad6235e9a0ec31202822149d2cdc68ddacc49130b14f960639eaed019654a0d90548201e7e312b33422762a23678f7e3e2c76cc9e004296c93309ebf3f29 SHA512 6066d46bce08535445ff400ded0a93ca6a0bb879771a512e05bc896a85ebaf98a0b80875f3cc4bac5eddb99c28bb7c855da0f577d603fb39d61e517ef69373a7
diff --git a/net-irc/unrealircd/files/unrealircd-4.0.12-without-privatelibdir.patch b/net-irc/unrealircd/files/unrealircd-4.0.12-without-privatelibdir.patch
deleted file mode 100644
index 03b7a7a0eb2c..000000000000
--- a/net-irc/unrealircd/files/unrealircd-4.0.12-without-privatelibdir.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 2b94733cbe0161b58084a2e7a26985e6d321e1c8 Mon Sep 17 00:00:00 2001
-From: Nathan Phillip Brink <binki@gentoo.org>
-Date: Thu, 6 Jul 2017 06:04:18 +0000
-Subject: [PATCH] Support --without-privatelibdir for packagers.
-
----
- configure.ac | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 78360df..aa49df5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -586,15 +586,19 @@ AC_ARG_WITH(pidfile, [AS_HELP_STRING([--with-pidfile=path],[Specify the path of
- 	[AC_DEFINE_UNQUOTED([PIDFILE], ["$HOME/unrealircd/data/unrealircd.pid"], [Define the path of the pid file])
- 		PIDFILE="$HOME/unrealircd/data/unrealircd.pid"])
- 
--LDFLAGS_PRIVATELIBS=""
--AC_ARG_WITH(privatelibdir, [AS_HELP_STRING([--with-privatelibdir=path],[Specify the directory where private libraries are stored])],
--	[AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$withval"], [Define the location of private libraries])
--		PRIVATELIBDIR="$withval"
--		LDFLAGS_PRIVATELIBS="-Wl,-rpath=$PRIVATELIBDIR"
--		LDFLAGS="$LDFLAGS $LDFLAGS_PRIVATELIBS"
--		export LDFLAGS],
--	[AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$HOME/unrealircd/lib"], [Define the location of private libraries])
--		PRIVATELIBDIR="$HOME/unrealircd/lib"
-+dnl Ensure that this “feature” can be disabled as it makes it harder to package unrealircd.
-+dnl Users have always been able to specify “./configure LDFLAGS=-Wl,-rpath,/path/to/blah”—binki
-+AC_ARG_WITH(privatelibdir, [AS_HELP_STRING([--with-privatelibdir=path],[Specify the directory where private libraries are stored. Disable when building a package for a distro])],
-+	[],
-+	[with_privatelibdir="yes"])
-+AS_IF([test "x$with_privatelibdir" = "xno"],
-+	[PRIVATELIBDIR=],
-+	[test "x$with_privatelibdir" = "xyes"],
-+	[PRIVATELIBDIR="$HOME/unrealircd/lib"],
-+	[PRIVATELIBDIR="$with_privatelibdir"])
-+AS_IF([test "x$PRIVATELIBDIR" = "x"],
-+	[LDFLAGS_PRIVATELIBS=""],
-+	[AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$PRIVATELIBDIR"], [Define the location of private libraries])
- 		LDFLAGS_PRIVATELIBS="-Wl,-rpath=$PRIVATELIBDIR"
- 		LDFLAGS="$LDFLAGS $LDFLAGS_PRIVATELIBS"
- 		export LDFLAGS])
--- 
-2.4.6
-
-From 6591e6bcee0858b7cddf6fcfee7dbe04ae511169 Mon Sep 17 00:00:00 2001
-From: Nathan Phillip Brink <binki@gentoo.org>
-Date: Thu, 6 Jul 2017 06:43:20 +0000
-Subject: [PATCH] Do not try to delete libcares when not using PRIVATELIBDIR.
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index aa49df5..874d58f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -786,7 +786,7 @@ dnl Use system c-ares when available, unless --without-system-cares.
- has_system_cares="no"
- AS_IF([test "x$with_system_cares" = "xyes"],[
- PKG_CHECK_MODULES([CARES], libcares >= 1.6.0,[has_system_cares=yes
--rm -f "$PRIVATELIBDIR/"libcares*],[has_system_cares=no])])
-+AS_IF([test "x$PRIVATELIBDIR" != "x"], [rm -f "$PRIVATELIBDIR/"libcares*])],[has_system_cares=no])])
- 
- AS_IF([test "$has_system_cares" = "no"], [
- dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!
--- 
-2.4.6
-
diff --git a/net-irc/unrealircd/files/unrealircd.confd-r1 b/net-irc/unrealircd/files/unrealircd.confd-r1
deleted file mode 100644
index 9b4f7b632c27..000000000000
--- a/net-irc/unrealircd/files/unrealircd.confd-r1
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# user to run unrealircd as
-UNREALIRCD_USER="unrealircd"
-
-# Which configuration file to load instead of unrealircd.conf. If you
-# want to run multiple instances of unrealircd, you must edit
-# files::pidfile to match UNREALIRCD_PIDFILE. You should also ensure
-# that files::tunefile is different for each unrealircd instance. See
-# http://unrealircd.org/docs.php#filesblock.
-#
-# To support multiple instances of unrealircd, you may create symlinks
-# in /etc/init.d pointing to /etc/init.d/unrealircd. It is recommended
-# that the scheme unrealircd.${instance_name} be used. For each
-# instance, you may make a copy of this file with the appropriate name
-# to override default options specific to that instance.
-UNREALIRCD_CONF="/etc/unrealircd/${SVCNAME}.conf"
-
-# The path where unrealircd is configured to create its pidfile.
-UNREALIRCD_PIDFILE="/var/run/unrealircd/${SVCNAME#unreal}.pid"
-
-# extra options to pass to unrealircd ...
-# You should not specify the -f option here; use
-# UNREALIRCD_CONF instead.
-#
-# [-h servername]
-# [-p portnumber]
-# [-x loglevel]
-# [-t] (to enable debug output)
-UNREALIRCD_OPTS=""
diff --git a/net-irc/unrealircd/files/unrealircd.confd-r2 b/net-irc/unrealircd/files/unrealircd.confd-r2
deleted file mode 100644
index ac7db3dbf000..000000000000
--- a/net-irc/unrealircd/files/unrealircd.confd-r2
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# user to run unrealircd as
-UNREALIRCD_USER="unrealircd"
-
-# Which configuration file to load instead of unrealircd.conf. If you
-# want to run multiple instances of unrealircd, you must edit
-# files::pidfile to match UNREALIRCD_PIDFILE. You should also ensure
-# that files::tunefile is different for each unrealircd instance. See
-# https://www.unrealircd.org/docs/Configuration#Files_block
-#
-# To support multiple instances of unrealircd, you may create symlinks
-# in /etc/init.d pointing to /etc/init.d/unrealircd. It is recommended
-# that the scheme unrealircd.${instance_name} be used. For each
-# instance, you may make a copy of this file with the appropriate name
-# to override default options specific to that instance.
-UNREALIRCD_CONF="/etc/unrealircd/${SVCNAME}.conf"
-
-# The path where unrealircd is configured to create its pidfile.
-UNREALIRCD_PIDFILE="/var/run/unrealircd/${SVCNAME#unreal}.pid"
-
-# extra options to pass to unrealircd ...
-# You should not specify the -f option here; use
-# UNREALIRCD_CONF instead.
-#
-# [-h servername]
-# [-p portnumber]
-# [-x loglevel]
-# [-t] (to enable debug output)
-UNREALIRCD_OPTS=""
-
-# Extra flags to pass to start-stop-daemon. When initially
-# debugging, removing --quiet may help.
-UNREALIRCD_SSD_OPTS="--quiet"
diff --git a/net-irc/unrealircd/files/unrealircd.initd b/net-irc/unrealircd/files/unrealircd.initd
deleted file mode 100644
index cc4cd50e49db..000000000000
--- a/net-irc/unrealircd/files/unrealircd.initd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-# Defaults
-: ${UNREALIRCD_USER:=unrealircd}
-: ${UNREALIRCD_CONF:=/etc/unrealircd/${SVCNAME}.conf}
-: ${UNREALIRCD_PIDFILE:=/var/run/unrealircd/${SVCNAME#unreal}.pid}
-
-depend() {
-	use dns net
-	provide ircd
-}
-
-start() {
-	UNREALIRCD_PIDFILEDIR=${UNREALIRCD_PIDFILE%/*}
-	if ! [ -d "${UNREALIRCD_PIDFILEDIR}" ]; then
-		ebegin "Creating ${UNREALIRCD_PIDFILEDIR} for ${SVCNAME}"
-		mkdir "${UNREALIRCD_PIDFILEDIR}" \
-			&& chown :unrealircd "${UNREALIRCD_PIDFILEDIR}" \
-			&& chmod 770 "${UNREALIRCD_PIDFILEDIR}"
-		eend $?
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --exec /usr/bin/unrealircd \
-		--user ${UNREALIRCD_USER} --pidfile "${UNREALIRCD_PIDFILE}" -- -f "${UNREALIRCD_CONF}" ${UNREALIRCD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile "${UNREALIRCD_PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --quiet --pidfile "${UNREALIRCD_PIDFILE}"
-	eend $?
-}
diff --git a/net-irc/unrealircd/files/unrealircd.initd-r1 b/net-irc/unrealircd/files/unrealircd.initd-r1
deleted file mode 100644
index 0c54752779fe..000000000000
--- a/net-irc/unrealircd/files/unrealircd.initd-r1
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-# Defaults
-: ${UNREALIRCD_USER:=unrealircd}
-: ${UNREALIRCD_CONF:=/etc/unrealircd/${SVCNAME}.conf}
-: ${UNREALIRCD_PIDFILE:=/run/unrealircd/${SVCNAME#unreal}.pid}
-
-depend() {
-	use dns net
-	provide ircd
-}
-
-start() {
-	UNREALIRCD_PIDFILEDIR=${UNREALIRCD_PIDFILE%/*}
-	if ! [ -d "${UNREALIRCD_PIDFILEDIR}" ]; then
-		ebegin "Creating ${UNREALIRCD_PIDFILEDIR} for ${SVCNAME}"
-		mkdir "${UNREALIRCD_PIDFILEDIR}" \
-			&& chown :unrealircd "${UNREALIRCD_PIDFILEDIR}" \
-			&& chmod 770 "${UNREALIRCD_PIDFILEDIR}"
-		eend $?
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start ${UNREALIRCD_SSD_OPTS} --exec /usr/bin/unrealircd \
-		--user ${UNREALIRCD_USER} --pidfile "${UNREALIRCD_PIDFILE}" -- -f "${UNREALIRCD_CONF}" ${UNREALIRCD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop ${UNREALIRCD_SSD_OPTS} --pidfile "${UNREALIRCD_PIDFILE}"
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP ${UNREALIRCD_SSD_OPTS} --pidfile "${UNREALIRCD_PIDFILE}"
-	eend $?
-}
diff --git a/net-irc/unrealircd/unrealircd-3.2.10.7.ebuild b/net-irc/unrealircd/unrealircd-3.2.10.7.ebuild
deleted file mode 100644
index e63246f588c2..000000000000
--- a/net-irc/unrealircd/unrealircd-3.2.10.7.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils ssl-cert versionator multilib user
-
-MY_P=Unreal${PV/_/-}
-
-DESCRIPTION="An advanced Internet Relay Chat daemon"
-HOMEPAGE="http://www.unrealircd.com/"
-SRC_URI="http://www.unrealircd.com/downloads/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux"
-IUSE="class-nofakelag curl ipv6 +extban-stacking +operoverride operoverride-verify +prefixaq
-	showlistmodes shunnotices ssl topicisnuhost +usermod zlib"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )
-	curl? ( net-misc/curl[adns] )
-	dev-libs/tre
-	>=net-dns/c-ares-1.7"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	virtual/pkgconfig"
-
-S=${WORKDIR}/Unreal${PV}
-
-pkg_setup() {
-	enewuser unrealircd
-}
-
-src_prepare() {
-	# QA check against bundled pkgs
-	rm extras/*.gz || die
-
-	sed -i \
-		-e "s:ircd\.pid:${EPREFIX}/var/run/unrealircd/ircd.pid:" \
-		-e "s:ircd\.log:${EPREFIX}/var/log/unrealircd/ircd.log:" \
-		-e "s:debug\.log:${EPREFIX}/var/log/unrealircd/debug.log:" \
-		-e "s:ircd\.tune:${EPREFIX}/var/lib/unrealircd/ircd.tune:" \
-		include/config.h \
-		|| die "sed failed"
-
-	if use class-nofakelag; then
-		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--with-listen=5 \
-		--with-dpath="${EPREFIX}"/etc/unrealircd \
-		--with-spath="${EPREFIX}"/usr/bin/unrealircd \
-		--with-nick-history=2000 \
-		--with-sendq=3000000 \
-		--with-bufferpool=18 \
-		--with-permissions=0600 \
-		--with-fd-setsize=1024 \
-		--with-system-cares \
-		--with-system-tre \
-		--enable-dynamic-linking \
-		$(use_enable curl libcurl "${EPREFIX}"/usr) \
-		$(use_enable ipv6 inet6) \
-		$(use_enable prefixaq) \
-		$(use_enable ssl ssl "${EPREFIX}"/usr) \
-		$(use_enable zlib ziplinks "${EPREFIX}"/usr) \
-		$(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/{lib,log}/unrealircd
-
-	newbin src/ircd unrealircd
-
-	exeinto /usr/$(get_libdir)/unrealircd/modules
-	doexe src/modules/*.so
-
-	dodir /etc/unrealircd
-	dosym /var/lib/unrealircd /etc/unrealircd/tmp
-
-	insinto /etc/unrealircd
-	doins {badwords.*,help,spamfilter,dccallow}.conf
-	newins doc/example.conf unrealircd.conf
-
-	insinto /etc/unrealircd/aliases
-	doins aliases/*.conf
-
-	local so_suffix=so
-	[[ ${CHOST} == -*mingw* ]] && so_suffix=dll
-	sed -i \
-		-e s:src/modules:"${EPREFIX}"/usr/$(get_libdir)/unrealircd/modules: \
-		-e '/loadmodule.*\.'${so_suffix}'/s;^//;;' \
-		-e s:ircd\\.log:"${EPREFIX}"/var/log/unrealircd/ircd.log: \
-		"${ED}"/etc/unrealircd/unrealircd.conf \
-		|| die
-
-	dodoc \
-		Changes Donation Unreal.nfo \
-		ircdcron/{ircd.cron,ircdchk} \
-		|| die "dodoc failed"
-	dohtml doc/*.html
-
-	newinitd "${FILESDIR}"/unrealircd.initd unrealircd
-	newconfd "${FILESDIR}"/unrealircd.confd-r1 unrealircd
-
-	# config should be read-only
-	fperms -R 0640 /etc/unrealircd{,/aliases}
-	fperms 0750 /etc/unrealircd{,/aliases}
-	# state is editable but not owned by unrealircd directly
-	fperms 0770 /var/{lib,log}/unrealircd
-	fowners -R root:unrealircd /{etc,var/{lib,log}}/unrealircd
-}
-
-pkg_preinst() {
-	# Must pre-create directories; otherwise their permissions are lost
-	# on installation.
-
-	# Usage: _unrealircd_dir_permissions <user> <group> <mode> <dir>[, <dir>…]
-	#
-	# Ensure that directories are created with the correct permissions
-	# before portage tries to merge them to the filesystem because,
-	# otherwise, those directories are installed world-readable.
-	#
-	# If this is a first-time install, create those directories with
-	# correct permissions before installing. Otherwise, update
-	# permissions—but only if we are replacing an unrealircd ebuild at
-	# least as old as net-irc/unrealircd-3.2.10. Portage handles normal
-	# file permissions correctly, so no need for recursive
-	# chmoding/chowning.
-	_unrealircd_dir_permissions() {
-		local user=${1} group=${2} mode=${3} dir v
-		shift 3
-		while dir=${1} && shift; do
-			if [[ ! -d "${EROOT}${dir}" ]]; then
-				ebegin "Creating ${EROOT}${dir} with correct permissions"
-				install -d -m "${mode}" -o "${user}" -g "${group}" "${EROOT}${dir}" || die
-				eend ${?}
-			elif ! [[ ${REPLACING_VERSIONS} ]] || for v in ${REPLACING_VERSIONS}; do
-					# If 3.2.10 ≤ ${REPLACING_VERSIONS}, then we update
-					# existing permissions.
-					version_is_at_least "${v}" 3.2.10 && break
-				done; then
-				ebegin "Correcting permissions of ${EROOT}${dir} left by ${CATEGORY}/${PN}-${v}"
-				chmod "${mode}" "${EROOT}${dir}" \
-					&& chown ${user}:${group} "${EROOT}${dir}" \
-					|| die "Unable to correct permissions of ${EROOT}${dir}"
-				eend ${?}
-			fi
-		done
-	}
-
-	# unrealircd only needs to be able to read files in /etc/unrealircd.
-	_unrealircd_dir_permissions root unrealircd 0750 etc/unrealircd{,/aliases}
-
-	# unrealircd needs to be able to create files in /var/lib/unrealircd
-	# and /var/log/unrealircd.
-	_unrealircd_dir_permissions root unrealircd 0770 var/{lib,log}/unrealircd
-}
-
-pkg_postinst() {
-	# Move docert call from scr_install() to install_cert in pkg_postinst for
-	# bug #201682
-	if use ssl ; then
-		if [[ ! -f "${EROOT}"/etc/unrealircd/server.cert.key ]]; then
-			install_cert /etc/unrealircd/server.cert
-			chown unrealircd "${EROOT}"/etc/unrealircd/server.cert.*
-			chmod 0640 "${EROOT}"/etc/unrealircd/server.cert.*
-			ln -snf server.cert.key "${EROOT}"/etc/unrealircd/server.key.pem
-		fi
-	fi
-
-	local unrealircd_conf="${EROOT}"/etc/unrealircd/unrealircd.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=(
-			$(unrealircd -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 find example cron scripts here:"
-	elog "   /usr/share/doc/${PF}/ircd.cron.gz"
-	elog "   /usr/share/doc/${PF}/ircdchk.gz"
-	elog
-	elog "You can also use /etc/init.d/unrealircd to start at boot"
-}
diff --git a/net-irc/unrealircd/unrealircd-4.0.12.ebuild b/net-irc/unrealircd/unrealircd-4.0.12.ebuild
deleted file mode 100644
index d5cab32b8f78..000000000000
--- a/net-irc/unrealircd/unrealircd-4.0.12.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-inherit autotools eutils ssl-cert versionator multilib user
-
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-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:=
-	curl? ( net-misc/curl[adns] )
-	dev-libs/libpcre2
-	dev-libs/tre
-	>=net-dns/c-ares-1.7"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-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
-
-	epatch "${FILESDIR}"/${P}-without-privatelibdir.patch
-	eautoreconf -I autoconf/m4
-
-	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
-
-	dodoc \
-		doc/{Changes.old,Changes.older,RELEASE-NOTES} \
-		doc/{Donation,translations.txt}
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r2 ${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_preinst() {
-	# Must pre-create directories; otherwise their permissions are lost
-	# on installation.
-
-	# Usage: _unrealircd_dir_permissions <user> <group> <mode> <dir>[, <dir>…]
-	#
-	# Ensure that directories are created with the correct permissions
-	# before portage tries to merge them to the filesystem because,
-	# otherwise, those directories are installed world-readable.
-	#
-	# If this is a first-time install, create those directories with
-	# correct permissions before installing. Otherwise, update
-	# permissions—but only if we are replacing an unrealircd ebuild at
-	# least as old as net-irc/unrealircd-3.2.10. Portage handles normal
-	# file permissions correctly, so no need for recursive
-	# chmoding/chowning.
-	_unrealircd_dir_permissions() {
-		local user=${1} group=${2} mode=${3} dir v
-		shift 3
-		while dir=${1} && shift; do
-			if [[ ! -d "${EROOT}${dir}" ]]; then
-				ebegin "Creating ""${EROOT}${dir}"" with correct permissions"
-				install -d -m "${mode}" -o "${user}" -g "${group}" "${EROOT}${dir}" || die
-				eend ${?}
-			elif ! [[ ${REPLACING_VERSIONS} ]] || for v in ${REPLACING_VERSIONS}; do
-					# If 3.2.10 ≤ ${REPLACING_VERSIONS}, then we update
-					# existing permissions.
-					version_is_at_least "${v}" 3.2.10 && break
-				done; then
-				ebegin "Correcting permissions of ""${EROOT}${dir}"" left by ${CATEGORY}/${PN}-${v}"
-				chmod "${mode}" "${EROOT}${dir}" \
-					&& chown ${user}:${group} "${EROOT}${dir}" \
-					|| die "Unable to correct permissions of ${EROOT}${dir}"
-				eend ${?}
-			fi
-		done
-	}
-
-	# unrealircd only needs to be able to read files in /etc/unrealircd.
-	_unrealircd_dir_permissions root unrealircd 0750 etc/${PN}{,/aliases}
-
-	# unrealircd needs to be able to create files in /var/lib/unrealircd
-	# and /var/log/unrealircd.
-	_unrealircd_dir_permissions root unrealircd 0770 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=(
-			$(${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
-
-	# Precreate ircd.tune and ircd.log with the correct ownership to
-	# protect people from themselves when they run unrealircd as root
-	# before trying the initscripts. #560790
-	local f
-	for f in "${EROOT}"var/{lib/${PN}/ircd.tune,log/${PN}/ircd.log}; do
-		[[ -e ${f} ]] && continue
-		ebegin "Precreating ${f} to set ownership"
-		(
-			umask 0037
-			# ircd.tune must be seeded with content instead of being empty.
-			if [[ ${f} == *ircd.tune ]]; then
-				echo 0 > "${f}"
-				echo 0 >> "${f}"
-			fi
-			touch "${f}"
-		)
-		chown unrealircd "${f}"
-		eend $?
-	done
-
-	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.0.17.ebuild b/net-irc/unrealircd/unrealircd-4.0.17.ebuild
deleted file mode 100644
index fd9b43877ffa..000000000000
--- a/net-irc/unrealircd/unrealircd-4.0.17.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-inherit ssl-cert versionator user
-
-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-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r2 ${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_preinst() {
-	# Must pre-create directories; otherwise their permissions are lost
-	# on installation.
-
-	# Usage: _unrealircd_dir_permissions <user> <group> <mode> <dir>[, <dir>…]
-	#
-	# Ensure that directories are created with the correct permissions
-	# before portage tries to merge them to the filesystem because,
-	# otherwise, those directories are installed world-readable.
-	#
-	# If this is a first-time install, create those directories with
-	# correct permissions before installing. Otherwise, update
-	# permissions—but only if we are replacing an unrealircd ebuild at
-	# least as old as net-irc/unrealircd-3.2.10. Portage handles normal
-	# file permissions correctly, so no need for recursive
-	# chmoding/chowning.
-	_unrealircd_dir_permissions() {
-		local user=${1} group=${2} mode=${3} dir v
-		shift 3
-		while dir=${1} && shift; do
-			if [[ ! -d "${EROOT}${dir}" ]]; then
-				ebegin "Creating ""${EROOT}${dir}"" with correct permissions"
-				install -d -m "${mode}" -o "${user}" -g "${group}" "${EROOT}${dir}" || die
-				eend ${?}
-			elif ! [[ ${REPLACING_VERSIONS} ]] || for v in ${REPLACING_VERSIONS}; do
-					# If 3.2.10 ≤ ${REPLACING_VERSIONS}, then we update
-					# existing permissions.
-					version_is_at_least "${v}" 3.2.10 && break
-				done; then
-				ebegin "Correcting permissions of ""${EROOT}${dir}"" left by ${CATEGORY}/${PN}-${v}"
-				chmod "${mode}" "${EROOT}${dir}" \
-					&& chown ${user}:${group} "${EROOT}${dir}" \
-					|| die "Unable to correct permissions of ${EROOT}${dir}"
-				eend ${?}
-			fi
-		done
-	}
-
-	# unrealircd only needs to be able to read files in /etc/unrealircd.
-	_unrealircd_dir_permissions root unrealircd 0750 etc/${PN}{,/aliases}
-
-	# unrealircd needs to be able to create files in /var/lib/unrealircd
-	# and /var/log/unrealircd.
-	_unrealircd_dir_permissions root unrealircd 0770 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=(
-			$(${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
-
-	# Precreate ircd.tune and ircd.log with the correct ownership to
-	# protect people from themselves when they run unrealircd as root
-	# before trying the initscripts. #560790
-	local f
-	for f in "${EROOT}"var/{lib/${PN}/ircd.tune,log/${PN}/ircd.log}; do
-		[[ -e ${f} ]] && continue
-		ebegin "Precreating ${f} to set ownership"
-		(
-			umask 0037
-			# ircd.tune must be seeded with content instead of being empty.
-			if [[ ${f} == *ircd.tune ]]; then
-				echo 0 > "${f}"
-				echo 0 >> "${f}"
-			fi
-			touch "${f}"
-		)
-		chown unrealircd "${f}"
-		eend $?
-	done
-
-	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.0.18-r1.ebuild b/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
index 5c496d96d303..db75758bc7c4 100644
--- a/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
+++ b/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.unrealircd.org/${PN}$(get_version_component_range 1)/${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux"
 IUSE="class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq
 	showlistmodes shunnotices topicisnuhost +usermod"
 
diff --git a/net-irc/unrealircd/unrealircd-4.0.18.ebuild b/net-irc/unrealircd/unrealircd-4.2.0.ebuild
index e2003270220a..59861f9667fc 100644
--- a/net-irc/unrealircd/unrealircd-4.0.18.ebuild
+++ b/net-irc/unrealircd/unrealircd-4.2.0.ebuild
@@ -4,11 +4,11 @@
 EAPI=6
 
 SSL_CERT_MANDATORY=1
-inherit ssl-cert user versionator
+inherit eapi7-ver ssl-cert user
 
 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"
+SRC_URI="https://www.unrealircd.org/${PN}$(ver_cut 1)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,7 +33,7 @@ DOCS=( doc/{Authors,Donation,RELEASE-NOTES{,.old},tao.of.irc,technical/,translat
 pkg_pretend() {
 	local v
 	for v in ${REPLACING_VERSIONS}; do
-		version_is_at_least 4 "${v}" && continue
+		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"
@@ -121,8 +121,8 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r2 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
 
 	# config should be read-only
 	fperms -R 0640 /etc/${PN}