gentoo resync : 13.03.2018

22 files changed, 259 insertions, 459 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index de9f744a5925..53ab80a427f1 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 4170e391c247..abd425e93592 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -6,4 +6,4 @@ AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f
 AUX pid-patch.diff 450 BLAKE2B 0cf9f4f2f237d0769ecc77e3103419f5ac0f2c8b58ebdd55b7dce4134a71a2f6280e8571d92de2a6ec458df2fb292963cbc18f54d63faf3693740f1bd9f04948 SHA512 eae4208a3014a6e4d787b19395606f96d9d9d382dc25985e63a40f0e488b6596112acffbe554ac7226daa8b87d090be6fd11d0bf22f1edd41e5dcd21f62df6ed
 DIST anope-1.8.7.tar.gz 1586164 BLAKE2B 1efc6c9e719bca6698760d4181e2b96fa9aef5999a27af1c9452aea8ae39a5be7009efc14e5e7ad22426b95eb35952724b737d9de911830f3f69f822ebcc914f SHA512 3fb67f73b8f4dbdfbb9b4ac41a20e3b5c46d54cf5abb303f4a25d3a5863ef860ba5bdffc67439e5f1435675f80f86b2c283932c1a05edde2ae49612947fbd074
 EBUILD anope-1.8.7-r2.ebuild 3425 BLAKE2B 91d045a802046c607c5dd34f09d25e4ec20c52993c1c69587663883bc910e53a352cddba29cd6aeeb8586f614a4c6b900d7ca21aff5f792d670d9241acbfabc1 SHA512 f2c22af87982e0e0a89214a4d5a138671a269d67cc648497f75f410bba10dbebebad9f7394a12a63355c75d1f782d05e8a2c5aa3910605f32c20029dc2ca4b1b
-MISC metadata.xml 389 BLAKE2B 3083c014efa65840e7e6f378dabd662d3bbcbc47cb89773379e46c8cab32c4e5a3099369abcb49a40c2973e847c91f8a6d172ab636065debd03b31ca96a1a02f SHA512 b9f3206326176db34ed69ae52cdf8305b3c09df969310f0d388bcfe5579d5c8c0ac8ecb3f95117881fbbfc6183ca0304930b8b96c06763b259eec826ad63e551
+MISC metadata.xml 269 BLAKE2B 8394b29778013bb47c9f09e92fc75e7913477eff8f29436fdbf0251472651edbc7856a6f41a0ed204f45877ae35df2e5379fa676c868ffe8bfc3b705fe1f6006 SHA512 6a40d97233c3ed6f0bba926eeecc4930ca63d113bd9a9554a98caf236a2d3970f6ceea2a2d1a8e42839494566e8caa657e95dd248a88f555cac60f2a19febae2
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index a107dd71b69b..52f9787ecc7e 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<longdescription>Anope IRC Services</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">anope</remote-id>
diff --git a/net-irc/ircservices/Manifest b/net-irc/ircservices/Manifest
index a946b8a3a23b..21f062212bdf 100644
--- a/net-irc/ircservices/Manifest
+++ b/net-irc/ircservices/Manifest
@@ -9,4 +9,4 @@ AUX ircservices.confd 487 BLAKE2B 611c82daabcd1c5ef532f21e07c60b9dcd72f427a5a8a7
 AUX ircservices.initd 759 BLAKE2B d7f9c8cfc0e13e382c26f3f820db2dba699bf9b85cdc01ff83df5ea64bf960901dfab5e8a6024f8e40dc985ef1273f303af6c41081c5f76877f326faac386ce5 SHA512 cee224e3ba727ef9141e8fda744b4dd488c4603db44c12c5e405d8de2d39f6e6e5e0829b4353a651c5ca9bb23e5ca00188178e7ed6e20d69e2767ef38eb40243
 DIST ircservices-5.1.24.tar.gz 1516612 BLAKE2B df341d84ad958dfc3e1228d346d91ba50be765836d9a167b5c3c9efaba6d005921f07a92b1431b960a0e19e488cb84f96014fb9853376bf3cddfffac4977556b SHA512 1c1a0ec6d0e0a11071532e07792a15b1910fe108f09e991ca27e0196cfeec72e057a067fa69396b8647aca4ed8097c857eb8e714d8bee2ca6a0c5e27593fb06d
 EBUILD ircservices-5.1.24.ebuild 3145 BLAKE2B 14666ee3bdf2824364303e4e6162c6b3c689fd0eb451c6883ef6d82b487b421a89f59e65c365d00dd33ccda245ffa27e9136f8fb247538fcf46313d9e6c9a25a SHA512 8dab875a6c4d7ae2a8bac6a8fab348b5d4e7ce320325c6765950198f533d5a5010bb34af1a7fe739b77f248fb553466dcefa3093ad63446eb67fe87367b47a0b
-MISC metadata.xml 259 BLAKE2B c8a1cbbd154cfc531c8bcc2129a0fb2660e317c163c026e782782e51eba9d5b189fe0308cfa8efd836ac126a8cc90adeccbbaca155d83c543fccb79b34392efd SHA512 35da36c4a432db521f3a3747f4e047d807d3943ee80e9b5f4dc5ab4d341c52d24f4f1f0d622c77e405b5ad96a63904f5662dab4cb191d85388061fdd70737b4d
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/net-irc/ircservices/metadata.xml b/net-irc/ircservices/metadata.xml
index db6fa3b9dde5..097975e3adc2 100644
--- a/net-irc/ircservices/metadata.xml
+++ b/net-irc/ircservices/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 86cfe401d23d..5f7a51fd9d48 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -10,4 +10,4 @@ AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f
 AUX psybnc.initd 898 BLAKE2B 7be60ef0dda81cb917e23e06e3fec88af952d71c2eef4255c316baf5a218e8bdc2d8d8bc4eb353ab7c19a697e97685441ec2a0c3503e4f22adf0d55c9a895e13 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd
 DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
 EBUILD psybnc-2.3.2.9-r2.ebuild 4582 BLAKE2B 620329b195a3d03503fb72a38f78e9e125d091c3d7143a0a29fa3b3ddb006ac0b77bd68f6e3545b51a5d36f1185d53577648b7a0f0415148dbc767966fb549d5 SHA512 f4c18d8ec6bb989006fa6d81c9cff3a5cc7aa91ec5894b22e16d11948e02c24b5238d9d706f474f31a17d5020eb2621ad2f4a6af70799cbace0fb3ac96854374
-MISC metadata.xml 554 BLAKE2B d8787edf04bcaa03c49ab1ebdc0c508c040212d599a22710437826b6e018290998099c9d5bf8c1714da615104d5f90bb58cdd1e2c4038cc3dd97d2333ff843ff SHA512 cbf3d7b05da1d5f3700e37b5f2b860a295eca80c2917afd08e5ca10df677f8e8860b4a78da43a43efe7e7f37d3b638ca78c82133e45d9f64767fd97540824f23
+MISC metadata.xml 434 BLAKE2B 7e478f33125a86a9298854d4f3196e74cdf7b7138139048d4d20bcb9a15b88ef988776fabacdbf247dbf08c99a5756007283e6e6ba20ec38529dc34c106a4abd SHA512 79ea36967c0e1d45d332e64c054e45114689f66d5c290bb1eb9c901244fb2f9a3629564d67581589cfee2e8764b9887bde66f07cc2d74e7abfaeb290ceac2286
diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml
index fc7667fe9321..99886fc47cc4 100644
--- a/net-irc/psybnc/metadata.xml
+++ b/net-irc/psybnc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
 	<use>
 		<flag name="oidentd">Adds support for oidentd</flag>
 		<flag name="scripting">Adds scripting support</flag>
diff --git a/net-irc/ultimate/Manifest b/net-irc/ultimate/Manifest
deleted file mode 100644
index b8233ce26daf..000000000000
--- a/net-irc/ultimate/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX ultimate-3.0.2-config.patch.in 1390 BLAKE2B 51bc80e7f2edd6a327de46fefc07b323e8f1ffdf1131852588a96137306b729b521373ab941c487d51e12b753be01d814e711afee09aa4f3798d8c83993ac776 SHA512 73cbec361c5bd78481edbfdda84cd923d8c6fd39c5f952f66e52c80846184e61a5694714472956632efcbaf68470f4f2b52a9db9e55a3993e3cebddd787129b3
-AUX ultimate-3.0.2-entropy-path.patch 1578 BLAKE2B fb3714e9aeffd518c2e51df07a3ba364319d34bf2bfed19aaacac8f4b087faba0f4d0cb91426cea814f824ad2ad3ed9bff3ec2b26bdb283ba0f8610aa4fc45bf SHA512 430fceae45bae19eb0224461664c02a9e1a49ec26a40ff7032d7446e36bc1d9101a3aa70a1ad1a054fc38d25a775417ec55581057dfedc59ff5ba4046281b7ee
-AUX ultimate-3.0.2-make-failfast.patch 1693 BLAKE2B a1fd35eec8cdd0fd5ee2f7dfab0ad87c1b99e9091a3195fe99ab37f9160b897b7c109e0dc805e094e7e307e596f8f67d79a752b782892c5372d0e47f7a2ffbd7 SHA512 8d5a40bdbb83504cf0d7ef56a4b31f4bbe205b6dbe9d86337dd2374fc216915f601bdeba5ba13c7eb9d8381c541d408606b4cc236a849f58210b0ded76668672
-AUX ultimate-3.0.2-open-mode.patch 2758 BLAKE2B 51be6e0610f929053f743e423c1f99d42f89f49347aee1a19d01d4ea4ee6b9e9e21f89f1944e90b5b3ca109bbb70d81fcf16c2026a5b14f69c524785701c13d6 SHA512 f1ffc168f8f3b51779cb45397428e7c010829960f7b466ca3027a49b9a5c6519c9eff52e750c31c642e86e3d59939f4419dc9394d9970198073ffb7ed0ad68ab
-AUX ultimate-3.0.2-system-zlib-r1.patch 1640 BLAKE2B b1710d089b9b8b5bf8ca2166698d2d9a731b531109c760221742f2c97b340ba112c222c240749dd3b5de94307d575342948726ba2c3199b3d033ccd9b424152b SHA512 f1f3c4f26449b648a81899803524fde4e14092e0b1aa9bf7a85e12a048e2b7fe64ef8a8ec33e13c60129f4875fdb4621c441f29804a917d4a137bb2e51a6a95d
-AUX ultimateircd.conf 166 BLAKE2B 142f00d45c9e988519766c02b1a42d8afe340e52f8bfbc54aa17105ad87bbbb5e06467412c4682d3aefe2def2c62dbb033df2a51766d2690c785fc733aa482ca SHA512 380c7975e7c41001af68f549adf6f7557e833408e0ff6867492304cbb86b6b12d17d6ec56d1a3c5929cade97f71c12ca88efed38c0e4940b9ad236114a55b0d4
-AUX ultimateircd.conf.2 171 BLAKE2B 3d37b8397d0f280e2cdd20e03a2e3687e12a1c4c6901f9986ea75742bc0f8752c32bd2cf983b5fd25602e5448d29205b884e6426fe1ef0afdabfb143e4e8b4d4 SHA512 5a84ce6a81621113bfd12a7f356bf4d10619281e70398ff7de52b4279cf96001554e48b74deac40062c186babc4db9ea96aa9f52bb8927755169e457e0daec73
-AUX ultimateircd.rc 400 BLAKE2B 0e6c6e77ed5b3dc42aecb84bd123ff9f120c25a3187ee26c1779f1e22ac019c94508f98ddaecab7cca37c6ad9e5e04fa39c7656d89372b13b6c1cc98f328cf59 SHA512 1bf0612679ac161e0c68fd68d45b91949154a7c5cef67cabd0e3e6f4ca6ca6eb97a3e162dde04309c017da6f68be954675e0036d33ba8daa13eb93ecfb46f58c
-AUX ultimateircd.rc.2 426 BLAKE2B c35006d8fb9867466e9f7defd92194f7d85ec35cc1ba3e9f5857d1e75f30fc6a25c31d93932f22610c4dca2336b1bcb93eacba95df71315a9b6a796f4e91d55a SHA512 09753fae82165dfa5faeaf98ee3378d4b15f7e9db9d807726fa275691891ff45c9e258dcb2a547371d2bb959b7ea10e5aeecc0848a502ab956a6b7bfea4411de
-DIST Ultimate3.0.2.tar.bz2 615944 BLAKE2B 30c4185b2111718f3d32d034201bb0caa19887104459275c19533ef703a5708d7c5ae0c0bbdce6a43d2b146276b981904ae7a89f31e70553a20cb19570c8a0cb SHA512 ed79f7f63faaa08fc901cfe58df430a051a6e0cc15b7484851f659fe2b5f23bb4b0235d8cc131284d9b6373d2da1b5d1376908d59dd0fc73496ac2d4561170ed
-EBUILD ultimate-3.0.2-r2.ebuild 2452 BLAKE2B 0bc9397f6d6cc4f4531d9561ecb8b62c2386a5cf2f45a3cca0703210cbe9f114f82a3d388837db7a300b30e00c9e6b689123abc7ba1b7475ebc657abf13a4a56 SHA512 307e30025cccefba97694c02ee71d0e27aefae4d7f2ce2c9573a726ba7916c11c70d07a3744578265e6d2d0ee4e35cf8783cdff1d39465a082e52f3830c79aae
-MISC metadata.xml 221 BLAKE2B f75d0175c2fdbeffa58ec59c4472cf3ded0d73e434210a81d4043598e96a7bc221f4440d3cdf823d272d0b4e82a336b2e01af40c706349241ad8661dd9986e04 SHA512 be16352d6b60adffe0c7459102ad6289db9380e31f7b5d2b4475d19496e7c91af4181b3a4d717a2473b754412d5a4eab3c62a9538c96fe272d6816c2b53252f3
diff --git a/net-irc/ultimate/files/ultimate-3.0.2-config.patch.in b/net-irc/ultimate/files/ultimate-3.0.2-config.patch.in
deleted file mode 100644
index 5cb512fe896c..000000000000
--- a/net-irc/ultimate/files/ultimate-3.0.2-config.patch.in
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur Ultimate3.0.0.rc2.orig/include/config.h Ultimate3.0.0.rc2/include/config.h
---- Ultimate3.0.0.rc2.orig/include/config.h	2005-01-30 15:01:45.677952244 +0100
-+++ Ultimate3.0.0.rc2/include/config.h	2005-01-30 15:02:43.353895511 +0100
-@@ -127,13 +127,13 @@
- #endif
- 
- /* dirs */
--#define DPATH		IRCD_PREFIX                                                     
-+#define DPATH		IRCD_PREFIX
- #define BINPATH		IRCD_PREFIX "/bin/"
--#define ETCPATH		IRCD_PREFIX "/etc"
--#define LOGPATH		IRCD_PREFIX "/logs"
-+#define ETCPATH		"@GENTOO_PORTAGE_EPREFIX@/etc/ultimateircd"
-+#define LOGPATH		"@GENTOO_PORTAGE_EPREFIX@/var/log/ultimateircd"
- 
- /* files */
--#define SPATH		BINPATH "/ircd"			/* ircd executable */
-+#define SPATH		BINPATH "/ultimateircd"			/* ircd executable */
- 
- #define CPATH		ETCPATH "/ircd.conf"		/* ircd.conf file */
- #define DCONF		ETCPATH "/ircd.ini"		/* Dynamic Configuration File */
-@@ -144,7 +144,7 @@
- #define	SMPATH		ETCPATH "/ircd.smotd"		/* Short Message Of The Day */
- #define OMPATH		ETCPATH "/ircd.opermotd"	/* Operator Message Of The Day */
- #define RPATH		ETCPATH "/ircd.rules"		/* Rules File */
--#define	PPATH		ETCPATH "/ircd.pid"		/* IRCd PID */
-+#define	PPATH		"@GENTOO_PORTAGE_EPREFIX@/var/run/ultimateircd/ircd.pid"		/* IRCd PID */
- #define IRCDSSL_CPATH 	ETCPATH "/ircd.crt"		/* Client SSL */
- #define IRCDSSL_KPATH 	ETCPATH "/ircd.key"		/* Client SSL */
- 
diff --git a/net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch b/net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch
deleted file mode 100644
index d99f29030723..000000000000
--- a/net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Subject: Store and retrieve entropy from a file in a directory
-	writable/readable by ultimateircd.
-Date: 2011/04/28
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -32,7 +32,7 @@
- LEX		= @LEX@
- LEXLIB		= @LEXLIB@
- CCDV	= @CCDV@
--CFLAGS		= @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\"
-+CFLAGS		= @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\" -DLOCALSTATEDIR='"$(localstatedir)"'
- LDFLAGS   	= @LDFLAGS@
- MKDEP		= @MKDEP@ -DIRCD_PREFIX=\"@prefix@\"
- MV		= @MV@
---- a/src/dh.c
-+++ b/src/dh.c
-@@ -214,10 +214,10 @@
-   printf ("Done.\n");
-   fclose (fp);
- 
--  fp = fopen (".ircd.entropy", "w");
-+  fp = fopen (LOCALSTATEDIR "/.ircd.entropy", "w");
-   if (!fp)
-   {
--    printf ("Could not open .ircd.entropy for writing: %s\n",
-+    printf ("Could not open " LOCALSTATEDIR "/.ircd.entropy for writing: %s\n",
-             strerror (errno));
-     return 0;
-   }
-@@ -225,7 +225,7 @@
-   fwrite (randbuf, RAND_BYTES * 4, 1, fp);
-   fclose (fp);
- 
--  RAND_load_file (".ircd.entropy", -1);
-+  RAND_load_file (LOCALSTATEDIR "/.ircd.entropy", -1);
- 
-   return 1;
- }
-@@ -236,7 +236,7 @@
-   int ret;
-   time_t now;
- 
--  ret = RAND_load_file (".ircd.entropy", -1);
-+  ret = RAND_load_file (LOCALSTATEDIR "/.ircd.entropy", -1);
-   if (ret <= 0)
-   {
-     if (!make_entropy ())
-@@ -250,7 +250,7 @@
-   /* this is probably not too good, but it saves just writing
-      the whole state back to disk with no changes. */
-   RAND_seed (&now, 4);
--  RAND_write_file (".ircd.entropy");
-+  RAND_write_file (LOCALSTATEDIR "/.ircd.entropy");
- 
-   return 0;
- }
diff --git a/net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch b/net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch
deleted file mode 100644
index fa13f814de6e..000000000000
--- a/net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Subject: Cause build failures to be fail-fast instead of going undetected.
-Date: 2011/04/27
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -43,7 +43,7 @@
- 	@for i in $(SUBDIRS); do \
- 		echo "Building $$i";\
- 		cd $$i;\
--		${MAKE} build; cd ..;\
-+		${MAKE} build || exit 1; cd ..;\
- 	done
- 	@echo ' '
- 	@echo '================================================================='
-@@ -62,7 +62,7 @@
- 	@for i in $(SUBDIRS); do \
- 		echo "Building $$i [profile]";\
- 		cd $$i;\
--		${MAKEPROFILE} build; cd ..;\
-+		${MAKEPROFILE} build || exit 1; cd ..;\
- 	done
- 
- clean:
-@@ -70,7 +70,7 @@
- 	@for i in $(SUBDIRS); do \
- 		echo "Cleaning $$i";\
- 		cd $$i;\
--		${MAKE} clean; cd ..;\
-+		${MAKE} clean || exit 1; cd ..;\
- 	done
- 	-@if [ -f include/setup.h ] ; then \
- 	echo "To really restart installation, make distclean" ; \
-@@ -83,28 +83,28 @@
- 	@for i in $(SUBDIRS); do \
- 		echo "Cleaning $$i";\
- 		cd $$i;\
--		${MAKE} distclean; cd ..;\
-+		${MAKE} distclean || exit 1; cd ..;\
- 	done
- 
- depend:
- 	@for i in $(SUBDIRS); do \
- 		echo "depend ==> $$i";\
- 		cd $$i;\
--		${MAKE} depend; cd ..;\
-+		${MAKE} depend || exit 1; cd ..;\
- 	done
- 
- install: all
- 	@for i in $(SUBDIRS); do \
- 		echo "install ==> $$i";\
- 		cd $$i;\
--		${MAKE} install; \
-+		${MAKE} install || exit 1; \
- 		cd ..; \
- 	done
- 
- 	@for i in $(SUBDIRS2); do \
- 		echo "install ==> $$i";\
- 		cd $$i;\
--		${MAKE} install; \
-+		${MAKE} install || exit 1; \
- 		cd ../../; \
- 	done
- 
---- a/tools/Makefile.in
-+++ b/tools/Makefile.in
-@@ -68,6 +68,7 @@
- 
- build: all
- 
-+depend:
- 
- mkpasswd: $(mkpasswd_OBJECTS)
- 	$(CCDV)$(CC) ${CFLAGS} ${LDFLAGS} -o mkpasswd $(mkpasswd_OBJECTS) $(IRCDLIBS)
diff --git a/net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch b/net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch
deleted file mode 100644
index 30ec6c96e5d7..000000000000
--- a/net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Subject: Provide the required third argument to open() when O_CREAT is
-	in the second argument.
-Date: 2011/04/28
-
---- a/src/s_serv.c
-+++ b/src/s_serv.c
-@@ -4603,7 +4603,7 @@
- 
- #else /*  LOCKFILE - MDP */
- 
--  if ((out = open (filename, O_RDWR | O_APPEND | O_CREAT)) == -1)
-+  if ((out = open (filename, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
-   {
-     sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
-                 me.name, parv[0], filename);
-@@ -7397,7 +7397,7 @@
-     syslog (LOG_INFO, "ADDCNLINE from %s for [%s] - Opening %s\n",
-             get_client_name (source_p, FALSE), parv[3], configfile);
- #endif
--    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
-+    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
-     {
-       sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
-                   me.name, parv[0], configfile);
-@@ -7770,7 +7770,7 @@
-     syslog (LOG_INFO, "ADDOPER from %s for [%s] - Opening %s\n",
-             get_client_name (source_p, FALSE), parv[3], configfile);
- #endif
--    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
-+    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
-     {
-       sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
-                   me.name, parv[0], configfile);
-@@ -8090,7 +8090,7 @@
-     syslog (LOG_INFO, "ADDQLINE from %s for [%s] - Opening %s\n",
-             get_client_name (source_p, FALSE), parv[1], configfile);
- #endif
--    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
-+    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
-     {
-       sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
-                   me.name, parv[0], configfile);
-@@ -8379,7 +8379,7 @@
-     syslog (LOG_INFO, "ADDHLINE from %s for [%s] - Opening %s\n",
-             get_client_name (source_p, FALSE), parv[1], configfile);
- #endif
--    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
-+    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
-     {
-       sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
-                   me.name, parv[0], configfile);
-@@ -8663,7 +8663,7 @@
-     syslog (LOG_INFO, "ADDULINE from %s for [%s] - Opening %s\n",
-             get_client_name (source_p, FALSE), parv[1], configfile);
- #endif
--    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT)) == -1)
-+    if ((out = open (configfile, O_RDWR | O_APPEND | O_CREAT, 0600)) == -1)
-     {
-       sendto_one (source_p, ":%s NOTICE %s :Problem opening %s ",
-                   me.name, parv[0], configfile);
-
-Diff finished.  Thu Apr 28 00:15:19 2011
diff --git a/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch b/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch
deleted file mode 100644
index acbb71c73d42..000000000000
--- a/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Subject: Don't  compile against internal  zlib. Missing ./configure.ac
-	changes  because ./configure.ac wasn't  shipped with  the dist
-	tarball.
-Date: 2011/04/27
-Subject: Use @ZLIB_LIBS@ and @ZLIB_CFLAGS@ instead of $(ZLIB_LIBS) and
-	friends because we don't get AC_SUBST() declared as Makefile
-	variables for free. https://bugs.gentoo.org/371889
-Date: 2011/06/16
-
---- a/autoconf/configure.in
-+++ b/autoconf/configure.in
-@@ -702,6 +702,8 @@
- wi_ARG_DISABLE_CCDV
- wi_PROG_CCDV
- 
-+PKG_CHECK_MODULES([ZLIB], [zlib])
-+
- AC_SUBST(SSL_INCLUDES)
- AC_SUBST(SSL_LIBS)
- AC_SUBST(ENCRYPT_SRC)
-@@ -716,7 +718,7 @@
- AC_SUBST(SEDOBJ)
- AC_SUBST(CCDV)
- 
--AC_OUTPUT(Makefile data/Makefile data/networks/Makefile src/Makefile tools/Makefile tools/ircdcron/Makefile tools/ssl-cert/Makefile zlib/Makefile)
-+AC_OUTPUT(Makefile data/Makefile data/networks/Makefile src/Makefile tools/Makefile tools/ircdcron/Makefile tools/ssl-cert/Makefile)
- 
- echo
- echo =================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -28,3 +28,3 @@
- SHELL=/bin/sh
--SUBDIRS=zlib src tools data @SUBDIR_MESSAGES@
-+SUBDIRS = src tools data @SUBDIR_MESSAGES@
- SUBDIRS2=data/networks tools/ircdcron tools/ssl-cert
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -53,9 +53,9 @@
- SSL_LIBS	= @SSL_LIBS@
- SSL_INCLUDES	= @SSL_INCLUDES@
- 
--IRCDLIBS	= ../zlib/libz.a @LIBS@ $(SSL_LIBS)
-+IRCDLIBS	= @ZLIB_LIBS@ @LIBS@ $(SSL_LIBS)
- 
--INCLUDES	= -I../include -I../zlib $(SSL_INCLUDES)
-+INCLUDES	= -I../include @ZLIB_CFLAGS@ $(SSL_INCLUDES)
- CPPFLAGS	= ${INCLUDES} @CPPFLAGS@
- 
- default:	all
-
diff --git a/net-irc/ultimate/files/ultimateircd.conf b/net-irc/ultimate/files/ultimateircd.conf
deleted file mode 100644
index 9955829f28d7..000000000000
--- a/net-irc/ultimate/files/ultimateircd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# user to run ultimate-ircd as
-ULTIMATEIRCD_USER="nobody"
diff --git a/net-irc/ultimate/files/ultimateircd.conf.2 b/net-irc/ultimate/files/ultimateircd.conf.2
deleted file mode 100644
index 8d2d2af3ab37..000000000000
--- a/net-irc/ultimate/files/ultimateircd.conf.2
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# user to run ultimateircd as
-ULTIMATEIRCD_USER="ultimateircd"
diff --git a/net-irc/ultimate/files/ultimateircd.rc b/net-irc/ultimate/files/ultimateircd.rc
deleted file mode 100644
index 8563d44ea412..000000000000
--- a/net-irc/ultimate/files/ultimateircd.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use dns net
-}
-
-start() {
-	ebegin "Starting ultimate-ircd"
-	start-stop-daemon --start --quiet --exec /usr/bin/ultimate-ircd \
-		--chuid ${ULTIMATEIRCD_USER} &>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Shutting down ultimate-ircd"
-	killall ultimate-ircd
-	eend $?
-}
diff --git a/net-irc/ultimate/files/ultimateircd.rc.2 b/net-irc/ultimate/files/ultimateircd.rc.2
deleted file mode 100644
index 327e5f3a5392..000000000000
--- a/net-irc/ultimate/files/ultimateircd.rc.2
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use dns net
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
- 	start-stop-daemon --start --quiet --exec /usr/bin/ultimateircd \
-		--chuid ${ULTIMATEIRCD_USER}
-	eend $?
-}
-
-stop() {
-	ebegin "Shutting down ${SVCNAME}"
-	start-stop-daemon --stop --pidfile /var/run/ultimateircd/ircd.pid
-	eend $?
-}
diff --git a/net-irc/ultimate/metadata.xml b/net-irc/ultimate/metadata.xml
deleted file mode 100644
index 1f6e4b59748b..000000000000
--- a/net-irc/ultimate/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="sourceforge">ultimate</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-irc/ultimate/ultimate-3.0.2-r2.ebuild b/net-irc/ultimate/ultimate-3.0.2-r2.ebuild
deleted file mode 100644
index f2f46b267897..000000000000
--- a/net-irc/ultimate/ultimate-3.0.2-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AT_M4DIR=autoconf
-inherit autotools eutils fixheadtails prefix ssl-cert user
-
-MY_P=Ultimate${PV/_/.}
-
-DESCRIPTION="An IRCd server based on DALnet's DreamForge IRCd"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.shadow-realm.org/"
-
-KEYWORDS="~amd64 ~ppc ~sparc x86 ~amd64-linux"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="ssl"
-
-RDEPEND="sys-libs/zlib
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm -rf zlib || die
-
-	cp "${FILESDIR}"/${P}-config.patch.in "${T}"/${P}-config.patch || die
-	eprefixify "${T}"/${P}-config.patch
-	epatch "${T}"/${P}-config.patch
-
-	epatch "${FILESDIR}"/${P}-system-zlib-r1.patch
-	epatch "${FILESDIR}"/${P}-make-failfast.patch
-	epatch "${FILESDIR}"/${P}-open-mode.patch
-	epatch "${FILESDIR}"/${P}-entropy-path.patch
-
-	mv autoconf/configure.in ./ || die
-	ht_fix_file configure.in
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/ultimateircd \
-		--localstatedir="${EPREFIX}"/var/lib/ultimateircd \
-		--disable-ccdv \
-		$(use_enable ssl openssl)
-}
-
-src_compile() {
-	# Must rerun the depend stage because we removed the zlib/ dir to
-	# which the stale dependencies still refer.
-	emake depend
-	emake
-}
-
-src_install() {
-	dodir /etc/ultimateircd
-	keepdir /var/{lib,log,run}/ultimateircd
-
-	einstall \
-		sysconfdir="${ED}"/etc/ultimateircd \
-		localstatedir="${ED}"/var/lib/ultimateircd \
-		networksubdir='$(sysconfdir)/networks'
-
-	rm -rf "${ED}"/usr/{{ircd,kill,rehash},bin/{ircdchk,ssl-{cert,search}.sh}} "${ED}"/var/lib/ultimateircd/logs || die
-	dosym /var/log/ultimateircd /var/lib/ultimateircd/logs
-
-	mv "${ED}"/usr/bin/ircd "${ED}"/usr/bin/ultimateircd || die
-	mv "${ED}"/usr/bin/mkpasswd "${ED}"/usr/bin/ultimateircd-mkpasswd || die
-
-	newinitd "${FILESDIR}"/ultimateircd.rc.2 ultimateircd
-	newconfd "${FILESDIR}"/ultimateircd.conf.2 ultimateircd
-}
-
-pkg_preinst() {
-	if ! use prefix; then
-		enewuser ultimateircd
-		fowners ultimateircd /var/{lib,log,run}/ultimateircd
-		fowners -R ultimateircd /etc/ultimateircd
-	fi
-
-	fperms -R go-rwx /etc/ultimateircd
-	fperms 0700 /var/{lib,log,run}/ultimateircd
-}
-
-pkg_postinst() {
-	if use ssl && [[ ! -e ${EROOT}etc/ultimateircd/ircd.crt ]]; then
-		install_cert /etc/ultimateircd/ircd
-		use prefix || chown ultimateircd "${EROOT}"etc/ultimateircd/ircd.{key,crt,pem}
-	fi
-}
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index ec2285cbb7f2..7a371e539df1 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -5,6 +5,8 @@ AUX unrealircd.initd 1139 BLAKE2B 8d401a42efe11a464e6b3cf482e44fa86ce66b71dcd68e
 AUX unrealircd.initd-r1 1180 BLAKE2B bcc078dbe9d5cde47c230ba0b0d17ac3584a97a3d3b79943da2691147416179ba5ad73180b703981759d1f451577ff2f5f4738004ac7de86d80125797bc49a35 SHA512 108bfe0a79e7d25ee9d24980c9082d3ddf75d095d122576974319b68f5bebdcb088961276038ddfdb30aadbdfd5f7e247f61444675964604430c4092e517004f
 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
 EBUILD unrealircd-3.2.10.7.ebuild 6581 BLAKE2B c7c638865b036386c16ffb257632389e31b277bc9406ee081e7aa149b303af8ff02efcc5cbedea60eb6b7c76b5dfededae083f415dd392c022039401840fb677 SHA512 8bfbea36317e3984c4768e03f236d5a3bfbe5cc73d8d74798e80633cb9b4946489a8197bc7bacb1649f2d8cbea702c5cd6acb96645e97e89197d697f78eced89
 EBUILD unrealircd-4.0.12.ebuild 7879 BLAKE2B 272c2e142cfa449d307d48a009551e22025236eaf7c8b3c045c4e1908110a11be5add1a646b1ec83e6057e35dc75e2be1b0e8b785c912841a60c7b6dd0f1af38 SHA512 c3b1cbb3276ae0e8a5601989b3c65d49f7628926616cb0806fc8b0cc9588a942ffd3b0740bd7380f784960ed36f9ee3e0a5674d60099ef4fc8aa0963428be2fc
-MISC metadata.xml 1051 BLAKE2B 79f6147708fb297f019fcc89646182be03a8b4c62c7d32a3ac0f708821920e52428a6e4c7d85f99546db8d2eb1467f4379c9d9ac87572afa839aa5fb41e8a4a6 SHA512 9d346cf7e9e896039a95a24bc2504a8f12eb0a573b8c4a3dd83707ac890acca1262c1b7b6c7ea617f685741b1126974e57a8490785a8a40e8d32e1aa61ea3a48
+EBUILD unrealircd-4.0.17.ebuild 7805 BLAKE2B a05eb46b95c093eaa26167291cd5e17c9413248e9db470ebcfd26344ad01bbeaf7c842bd71c79f12d3e2c59f8cfe9815bb62effeec2ede8960a92d94b5c0df6a SHA512 b2a7c952d9a957a77d11cabd0f72fcc29c056fcc5fa4f4f1c35e5d29237da97838c0af95b563bf89fffc2247dd808db703dce2b3429b996dd04ef8a9df444369
+MISC metadata.xml 1133 BLAKE2B 28a4ad6235e9a0ec31202822149d2cdc68ddacc49130b14f960639eaed019654a0d90548201e7e312b33422762a23678f7e3e2c76cc9e004296c93309ebf3f29 SHA512 6066d46bce08535445ff400ded0a93ca6a0bb879771a512e05bc896a85ebaf98a0b80875f3cc4bac5eddb99c28bb7c855da0f577d603fb39d61e517ef69373a7
diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index 3917e0ce39f0..da34a4fb08f4 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</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>
diff --git a/net-irc/unrealircd/unrealircd-4.0.17.ebuild b/net-irc/unrealircd/unrealircd-4.0.17.ebuild
new file mode 100644
index 000000000000..fd9b43877ffa
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-4.0.17.ebuild
@@ -0,0 +1,250 @@
+# 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."
+}