reinit the tree, so we can have metadata

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-09 18:53:29 +0100
commit: 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree: ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-irc
336 files changed, 14471 insertions, 0 deletions
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
new file mode 100644
index 000000000000..67ab0a86cc1b
--- /dev/null
+++ b/net-irc/anope/Manifest
@@ -0,0 +1,11 @@
+AUX anope-1.8.7-ldflags-fix.patch 1715 SHA256 49c20cf2dc85d1a9b86b0876f27f5da37a26b2fbb2bd3666155d529d7129db6c SHA512 f92b8ff3d6c7d4cd9a56aa4cdcf98b9c1da93aa8a6a00e2e0a09e7a4facf937878b7abda32b698dbb19781863263e2eb21fbc8b5adfd4619898dacf34920fe23 WHIRLPOOL 1a0c0ec67ca7d722ec504d1874a366bff88675d381268e3349c1ec9a57f50de60723673ce1458809cb8d4a77daaed7858020ba4265ef25d7af844c50fd02a4a5
+AUX anope-1.8.7-libdir-gentoo.patch 2584 SHA256 e639064792827b2797f1ca21865146c880720d844f1aa3d4725484c5e2c7772c SHA512 50d80ac51e781b97b7db0ba9e8dbf20de1471c29d603ae14ba907d562de977be3242226d4e71edbec6a497856a87f41eb05bcc19e7a2854ff4dc37365c3a0089 WHIRLPOOL 398cea99a4d89949847e9ce353afd861952f73f42d7529ba843d3890871d4c5b493b0cc3cb60924bd07f946b396e4805baa0ac2d5e50a68db6054ae607041fab
+AUX anope-1.8.7-mariadb.patch 3452 SHA256 770a15ae09e1a56aa8f3775646e945822761136dda208b1772ebf0d6a2d5e246 SHA512 4f0172a0113601be01117585d75ecc59c5fc36a9dc21b49faba525b0af5145d1180b0bddfd3ca8685b4ed7ef4eaeb14921a6940979c0d8a3c66a57e0a77c388b WHIRLPOOL 4e44aae225c47b7b39c0e416b57d831bbcaa1371756ec5d7f47f1fdb945dc43958f3a35307333598992b064f2fe09c47871a1c2e71ed1918094a54e8cf1b4139
+AUX anope-conf.d 209 SHA256 f5ff17513ca5a6a5c23570f1fdb809bd99677df03985142ea3f4c6fd1e5f1f6f SHA512 9de9f1be029af784c57c6b02122de62900a9381259f30420fdcfba13b12c3500a298b71e09d83f143b3fe2696e4e428f98fc75b6db055ece18ff2f45d13031cc WHIRLPOOL 874ee9ac8f3b553772ec8d3f7d34f17cea03796ff5b99b0c900c3b86b8e37ce1a494c7ff135e7cd511c355f3955d9052fde871f067fa20c9592b10b5f6e01c32
+AUX anope-init.d 724 SHA256 45c4f5c987b2ff20e9592191af1b560c6afb1ddbf593b60ef141ad133c6dfd6b SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c WHIRLPOOL 02ec3b05ff745ffd19649ff218771596e4e1958e80b95d22572f86cbbcefaddd3a40df7bc975d1f9c2614fbf8e0513e7634ddb3d739bebf8b326362c98e00d0b
+AUX pid-patch.diff 450 SHA256 cd3f266cd236e6a5bb7d15b502631e8992289455f7e308d94ac14e3b13314dc5 SHA512 eae4208a3014a6e4d787b19395606f96d9d9d382dc25985e63a40f0e488b6596112acffbe554ac7226daa8b87d090be6fd11d0bf22f1edd41e5dcd21f62df6ed WHIRLPOOL ed3e030e1f3347114914570a2b361ed83f70714683ea8d02ab2325fc035793eb63f32aa2b8d334f89f2a076b321aff42d7094b7ece9c2e495a98e096ae347268
+DIST anope-1.8.7.tar.gz 1586164 SHA256 804516153936b1147a79960a283229191d29e1d9162c3ec70d86d099ee04447b SHA512 3fb67f73b8f4dbdfbb9b4ac41a20e3b5c46d54cf5abb303f4a25d3a5863ef860ba5bdffc67439e5f1435675f80f86b2c283932c1a05edde2ae49612947fbd074 WHIRLPOOL 347231e1a9be8bfd9f09a895af5ede179a24c1ac56cefbfb0fb343ea060497f2985e9cc2fd368857e58ea919751fde1c10bef1f02333f989928c7504314c0f13
+EBUILD anope-1.8.7-r2.ebuild 3425 SHA256 183750e2fdfe29f397919025fbeeda0b562aa9598d31a6227a50be492d289795 SHA512 f2c22af87982e0e0a89214a4d5a138671a269d67cc648497f75f410bba10dbebebad9f7394a12a63355c75d1f782d05e8a2c5aa3910605f32c20029dc2ca4b1b WHIRLPOOL 75ef7d57d29b067ca305e1eacdad7c9b1d320c83c8a9757ee61906be4a8818ff623ceaa42ea4f9c893d43b84dd598eaef48501343dd291cd1e78279bf68bbfa1
+MISC ChangeLog 2967 SHA256 f20928474ee1faf3572b92f42aff03ba5d3160f510bbe449b2a0a5e90a1cd78b SHA512 7cb386429587a0df2ff4f4917d3e8491f95e0c698d2555c12574f903d7805d0d6ba93b6ed1eaa6a3de71afc6c0928d51ea2a27dc6982f650aa39d534ca5d926e WHIRLPOOL e50d66b8b27ec7ecdcd4c96bab6d7c701dddb7177c72f34027cc26b9965bcd799e8b3020ffbb9b62d8d42b090c48dc04628230b784626e61ce5187cb8fbf040e
+MISC ChangeLog-2015 3924 SHA256 440e87d8f81a69252ca848e38b69c9d579ae2fd9179c55cb2231bcb2f4a28204 SHA512 6385df5090eeef98fe412dcdddd56d11fa954ef553cb3a309fd0b90b88c9d842d7b653eea40daff0eb3ff749669532be7339491ee677b2ed51449e1ccd61602d WHIRLPOOL 0988469734da8bb1022d03c4b44a82b5f2b9485e9808b62087997cd6e6eb33014ad3448923f5ce6900c2a35144760e8eba6ca64a0583dd0c02cc301dfa60298b
+MISC metadata.xml 389 SHA256 6500126e466eab19bf190668d43f8b4e4e15054e4d2915c7f4ed1366b8707f00 SHA512 b9f3206326176db34ed69ae52cdf8305b3c09df969310f0d388bcfe5579d5c8c0ac8ecb3f95117881fbbfc6183ca0304930b8b96c06763b259eec826ad63e551 WHIRLPOOL b8fd92bc01d8061db762bfaa7664e28f54d0622e4a7b86ae2cc6c25e3cc2659dc617e950b1a5358c3473d8b6f0206de65bb54fdea8d9074c48b39182760833d7
diff --git a/net-irc/anope/anope-1.8.7-r2.ebuild b/net-irc/anope/anope-1.8.7-r2.ebuild
new file mode 100644
index 000000000000..82224833f9bb
--- /dev/null
+++ b/net-irc/anope/anope-1.8.7-r2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils multilib versionator user
+
+DESCRIPTION="Anope IRC Services"
+HOMEPAGE="http://www.anope.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql"
+
+DEPEND="mysql? ( virtual/mysql )"
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+	local replaced_version
+	for replaced_version in ${REPLACING_VERSIONS} ; do
+		if ! version_is_at_least 1.8.7 ${replaced_version} && [[ -f ${ROOT}opt/anope/data/nick.db ]]; then
+			eerror "It looks like you have an older version of Anope installed."
+			eerror "To upgrade, shut down Anope and copy your databases to"
+			eerror "${ROOT}var/lib/anope and your configuration to ${ROOT}etc/anope"
+			eerror "You can do this by:"
+			eerror "# mkdir -p ${ROOT}var/lib/anope ${ROOT}etc/anope"
+			eerror "# chown anope:anope ${ROOT}var/lib/anope"
+			eerror "# mv ${ROOT}opt/anope/data/*.db ${ROOT}var/lib/anope"
+			eerror "# mv ${ROOT}opt/anope/data/services.conf ${ROOT}etc/anope"
+			die "Please move your anope database files from /opt/anope/data"
+		fi
+	done
+}
+
+pkg_setup() {
+	enewgroup anope
+	enewuser anope -1 -1 -1 anope
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/pid-patch.diff"
+	epatch "${FILESDIR}/${P}-ldflags-fix.patch"
+	epatch "${FILESDIR}/${P}-libdir-gentoo.patch"
+	epatch "${FILESDIR}"/${P}-mariadb.patch # bug 381119
+	eautoconf
+}
+
+src_configure() {
+	local myconf
+	if ! use mysql; then
+		myconf="${myconf} --without-mysql"
+	fi
+
+	econf \
+		${myconf} \
+		--with-bindir=/usr/bin/ \
+		--with-datadir=/var/lib/anope \
+		--with-libdir=/usr/$(get_libdir)/anope/ \
+		--with-rungroup=anope \
+		--with-permissions=077
+
+	sed -i -e "/^build:/s:$: language:g" "${S}"/Makefile || die "sed failed"
+}
+
+src_install() {
+	keepdir /var/log/anope /var/lib/anope/backups
+	fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
+
+	local baselibdir
+	baselibdir="${D}/usr/$(get_libdir)/anope"
+
+	dodir /usr/$(get_libdir)/anope/{lang,modules}
+	emake DATDEST="${baselibdir}" \
+		BINDEST="${D}/usr/bin" \
+		MODULE_PATH="${baselibdir}/modules" \
+		install
+
+	newinitd "${FILESDIR}/anope-init.d" anope
+	newconfd "${FILESDIR}/anope-conf.d" anope
+
+	dodoc Changes Changes.conf Changes.lang Changes.mysql docs/* data/example.conf
+	use mysql && dodoc data/tables.sql
+
+	insinto /etc/anope
+	newins data/example.conf services.conf
+}
+
+pkg_preinst() {
+	if has_version net-irc/anope ; then
+		local directory
+		directory="${ROOT}"var/lib/anope/pre-update
+		elog "Making a backup of your databases to ${directory}"
+		if [ ! -d "${directory}" ]; then
+			mkdir -p "${directory}" || die "failed to create backup directory"
+			chown anope:anope "${directory}"/../ || die "failed to chown data directory"
+		fi
+		# don't die otherwise merge will fail if there are no existing databases
+		cp "${ROOT}"/var/lib/anope/*.db "${directory}"
+	fi
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Anope won't run out of the box, you still have to configure it to match your IRCD's configuration."
+	ewarn "Edit /etc/anope/services.conf to configure Anope."
+
+	if use mysql; then
+		echo
+		ewarn "!!! ATTENTION !!!"
+		ewarn "Be sure to read Changes.mysql to update your MySQL"
+		ewarn "tables or anope will break after restart"
+		ewarn "!!! ATTENTION !!!"
+		echo
+		einfo "The mysql script for updating the tables is located in the"
+		einfo "/usr/share/doc/${PF} directory"
+	fi
+}
diff --git a/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch b/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch
new file mode 100644
index 000000000000..98500509693b
--- /dev/null
+++ b/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch
@@ -0,0 +1,47 @@
+diff -aurp a/src/core/Makefile b/src/core/Makefile
+--- a/src/core/Makefile	2010-10-10 19:55:31.396999906 +0000
++++ b/src/core/Makefile	2010-10-10 19:53:54.877001245 +0000
+@@ -24,7 +24,7 @@ distclean: spotless
+ 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+ 
+ .o.s:
+-	$(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
++	$(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+ 	@$(TOUCH) $*.s
+ 
+ subs:
+diff -aurp a/src/modules/Makefile b/src/modules/Makefile
+--- a/src/modules/Makefile	2010-10-10 19:55:32.486000023 +0000
++++ b/src/modules/Makefile	2010-10-10 19:54:07.240000026 +0000
+@@ -27,7 +27,7 @@ distclean: spotless
+ 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+ 
+ .o.s:
+-	$(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
++	$(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
+ 	@$(TOUCH) $*.s
+ 
+ subs:
+diff -aurp a/src/protocol/Makefile b/src/protocol/Makefile
+--- a/src/protocol/Makefile	2010-10-10 19:55:33.605002302 +0000
++++ b/src/protocol/Makefile	2010-10-10 19:54:19.271997806 +0000
+@@ -24,7 +24,7 @@ distclean: clean spotless
+ 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
+ 
+ .o.s:
+-	$(CC) ${SHARED} ../mod_version.o  $< -o $*.so ${PROFILE}
++	$(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o  $< -o $*.so ${PROFILE}
+ 	@$(TOUCH) $*.s
+ 
+ subs:
+--- a/src/tools/Makefile	2011-12-28 20:00:00.646427623 +0000
++++ b/src/tools/Makefile	2011-12-28 20:00:41.030430806 +0000
+@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}'
+    	   'RUNGROUP=${RUNGROUP}' 
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -I../include/ $< -o $*
++	$(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $*
+ 
+ all: ${OBJS}
+ 
diff --git a/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch b/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch
new file mode 100644
index 000000000000..7a86d0f517b9
--- /dev/null
+++ b/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch
@@ -0,0 +1,91 @@
+--- configure.in
++++ configure.in
+@@ -286,6 +286,15 @@
+ ])
+ 
+ AC_SUBST(DATDEST)
++
++AC_ARG_WITH(libdir, [ --with-libdir=libdir   Specify the location of the services lib folder], [
++ AC_DEFINE_UNQUOTED(LIB_DIR,"$withval","services lib dir")
++ AC_DEFINE_UNQUOTED(MODULE_PATH,"${withval}/modules/","Module dir")
++ DATDEST=$withval
++ MODULE_PATH=${withval}/modules/
++])
++
++AC_SUBST(LIB_PATH)
+ AC_SUBST(MODULE_PATH)
+ 
+ AC_CONFIG_FILES(		\
+--- src/Makefile
++++ src/Makefile
+@@ -115,10 +115,6 @@
+ 	ln $(BINDEST)/services $(BINDEST)/listnicks
+ 	ln $(BINDEST)/services $(BINDEST)/listchans
+ 	(cd ../lang ; $(MAKE) install)
+-	$(CP) ../data/* $(DATDEST)
+-	$(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
+-	test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
+-	test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
+ 	@if [ "$(MODULE_PATH)" ] ; then \
+ 		test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \
+ 		test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \
+--- include/sysconf.h.in
++++ include/sysconf.h.in
+@@ -96,6 +96,9 @@
+ /* "Module dir" */
+ #undef MODULE_PATH
+ 
++/* "Lib dir" */
++#undef LIB_DIR
++
+ /* "Has mysql/mysql.h" */
+ #undef MYSQL_HEADER_PREFIX
+ 
+--- include/config.h
++++ include/config.h
+@@ -22,10 +22,10 @@
+ /******* General configuration *******/
+ 
+ /* Name of configuration file (in Services directory) */
+-#define SERVICES_CONF	"services.conf"
++#define SERVICES_CONF	"/etc/anope/services.conf"
+ 
+ /* Name of log file (in Services directory) */
+-#define LOG_FILENAME	"services.log"
++#define LOG_FILENAME	"/var/log/anope/services.log"
+ 
+ /* Maximum amount of data from/to the network to buffer (bytes). */
+ #define NET_BUFSIZE	65536
+--- src/log.c
++++ src/log.c
+@@ -33,7 +33,7 @@
+ 
+     /* fix bug 577 */
+     strftime(timestamp, sizeof(timestamp), "%Y%m%d", tm);
+-    snprintf(name, count, "logs/%s.%s", log_filename, timestamp);
++    snprintf(name, count, "%s.%s", log_filename, timestamp);
+     curday = tm->tm_yday;
+ 
+     return 1;
+--- src/modules.c
++++ src/modules.c
+@@ -2846,7 +2846,7 @@
+ 
+ 
+ #ifndef _WIN32
+-    snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", services_dir);
++    snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", LIB_DIR);
+ #else
+     snprintf(dirbuf, BUFSIZE, "\\%s", "modules/runtime");
+ #endif
+--- src/language.c
++++ src/language.c
+@@ -71,7 +71,7 @@
+         alog("debug: Loading language %d from file `languages/%s'",
+              index, filename);
+     }
+-    snprintf(buf, sizeof(buf), "languages/%s", filename);
++    snprintf(buf, sizeof(buf), "%s/languages/%s", LIB_DIR, filename);
+ #ifndef _WIN32
+     if (!(f = fopen(buf, "r"))) {
+ #else
diff --git a/net-irc/anope/files/anope-1.8.7-mariadb.patch b/net-irc/anope/files/anope-1.8.7-mariadb.patch
new file mode 100644
index 000000000000..98a1b3634b6a
--- /dev/null
+++ b/net-irc/anope/files/anope-1.8.7-mariadb.patch
@@ -0,0 +1,109 @@
+Author: Adam
+Date: 2012-01-11
+Subject: Fix https://bugs.gentoo.org/381119 , where -I ordering causes
+	mariadb's services.h to be #include-ed improperly.
+
+diff --git a/src/Makefile b/src/Makefile
+index 739c918..a9a2ee2 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -25,7 +25,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
+ 	   'RDB=${RDB}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -I../include/ -c $<
++	$(CC) -I../include/ $(CFLAGS) -c $<
+ 
+ all: services
+ 
+diff --git a/src/core/Makefile b/src/core/Makefile
+index 4ec2754..32c049f 100644
+--- a/src/core/Makefile
++++ b/src/core/Makefile
+@@ -21,7 +21,7 @@ install:
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
++	$(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ .o.s:
+ 	$(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub
+index 9fbadf3..d93e6d5 100644
+--- a/src/core/Makefile.sub
++++ b/src/core/Makefile.sub
+@@ -16,7 +16,7 @@ module: $(OBJECTS) so
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
++	$(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ so:
+ 	$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
+diff --git a/src/modules/Makefile b/src/modules/Makefile
+index cafbe45..bde65b3 100644
+--- a/src/modules/Makefile
++++ b/src/modules/Makefile
+@@ -24,7 +24,7 @@ install:
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
++	$(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ .o.s:
+ 	$(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
+diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
+index 7697249..b7c244f 100644
+--- a/src/modules/Makefile.sub
++++ b/src/modules/Makefile.sub
+@@ -16,7 +16,7 @@ module: $(OBJECTS) so
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
++	$(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ so:
+ 	$(CC) ${SHARED} ../../mod_version.o  $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
+diff --git a/src/protocol/Makefile b/src/protocol/Makefile
+index ab837e4..d962d8b 100644
+--- a/src/protocol/Makefile
++++ b/src/protocol/Makefile
+@@ -21,7 +21,7 @@ install:
+ distclean: clean spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
++	$(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ .o.s:
+ 	$(CC) ${SHARED} ../mod_version.o  $< -o $*.so ${PROFILE}
+diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub
+index a2d6a41..d93e6d5 100644
+--- a/src/protocol/Makefile.sub
++++ b/src/protocol/Makefile.sub
+@@ -16,7 +16,7 @@ module: $(OBJECTS) so
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
++	$(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ so:
+ 	$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
+diff --git a/src/tools/Makefile b/src/tools/Makefile
+index 4dffbf0..87bd0ae 100644
+--- a/src/tools/Makefile
++++ b/src/tools/Makefile
+@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
+    	   'RUNGROUP=${RUNGROUP}' 
+ 
+ .c.o:
+-	$(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $*
++	$(CC) -I../include/ $(LDFLAGS) $(CFLAGS) $< -o $*
+ 
+ all: ${OBJS}
+ 
diff --git a/net-irc/anope/files/anope-conf.d b/net-irc/anope/files/anope-conf.d
new file mode 100644
index 000000000000..ddcae9856e0c
--- /dev/null
+++ b/net-irc/anope/files/anope-conf.d
@@ -0,0 +1,8 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# user to run ultimate-ircd as
+ANOPE_USER="anope"
+
+# Additional commandline parameters
+ANOPE_OPTS=""
diff --git a/net-irc/anope/files/anope-init.d b/net-irc/anope/files/anope-init.d
new file mode 100644
index 000000000000..2cca4925ef84
--- /dev/null
+++ b/net-irc/anope/files/anope-init.d
@@ -0,0 +1,37 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/run/anope/services.pid
+
+extra_started_commands="reload"
+
+depend() {
+	use ircd
+}
+
+start_pre() {
+	checkpath -o ${ANOPE_USER} -d "$(dirname $PIDFILE)"
+}
+
+start() {
+	ebegin "Starting Anope IRC Services"
+	start-stop-daemon --start --exec /usr/bin/services \
+		--user ${ANOPE_USER} --pidfile ${PIDFILE} \
+		-- ${ANOPE_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Anope IRC Services"
+	start-stop-daemon --stop --pidfile ${PIDFILE}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading Anope IRC Services"
+        start-stop-daemon --signal USR2 --exec /usr/bin/services \
+		--pidfile ${PIDFILE}
+	eend $?
+}
+
diff --git a/net-irc/anope/files/pid-patch.diff b/net-irc/anope/files/pid-patch.diff
new file mode 100644
index 000000000000..c92e1216be9c
--- /dev/null
+++ b/net-irc/anope/files/pid-patch.diff
@@ -0,0 +1,11 @@
+--- data/example.conf.orig	2008-12-14 20:37:22.000000000 +0000
++++ data/example.conf	2008-12-14 20:37:43.000000000 +0000
+@@ -285,7 +285,7 @@ HostServName	"HostServ"  "vHost Server"
+ # PIDFile <filename>  [REQUIRED]
+ #     Specifies the name of the file containing Services' process ID.
+ 
+-PIDFile     services.pid
++PIDFile     /var/run/anope/services.pid
+ 
+ # MOTDFile <filename>  [REQUIRED]
+ #     Specifies the name of the Message of the Day file.
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
new file mode 100644
index 000000000000..a107dd71b69b
--- /dev/null
+++ b/net-irc/anope/metadata.xml
@@ -0,0 +1,12 @@
+<?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>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
new file mode 100644
index 000000000000..0558cdfe0d6f
--- /dev/null
+++ b/net-irc/atheme-services/Manifest
@@ -0,0 +1,6 @@
+AUX atheme-services-7.2.9-configure-logdir.patch 833 SHA256 78a5b3d0aaf16256e7093cb6d3dbcad0891dd187cf25383c651f03a8cfa7c238 SHA512 43ca2af5aec6a1ea4b08564c62a21ae762fd01f2c177dbf8f7c6ebb238b9302b8310f2fe96ce2b20a7f7014c488a02177d1e583aa438ceff7576e4880ca2f62f WHIRLPOOL 703d2cbdc3153522b75a5c9dc05e5d9e7b849ff8e4c2fd7342a282e89d659cb3e6fa682d2944427c9d6248ca205bca14061a7451652d797deac5530996fcc7ab
+AUX atheme-services-7.2.9-fix-docdir.patch 326 SHA256 bd17c88e63fe973a9ce8170daae8285eb6186ada0fba7e41e01c422d286353fe SHA512 62830bc6836406eb780dd60bfd3ac1d013223358aab5fc4fa26906c15c4de71089c4bc2a941776434b086e90722ef611b1d5e21a0599f61ee24b00a60ef502c2 WHIRLPOOL bc3dc26d77cfad4b2be814fa448e2bae5be73d3b56130ca9a644cd6d9dbaaa54d4eef753034461d764486401f3fb0be7649995addb84f5ec438c80750688719e
+AUX atheme-services.initd 524 SHA256 7d2bc403e84f852cdb70cd624a893b717d5f0bb638f61b877168cf671f0f366c SHA512 3b90f60677088384c3f69b9dde40d18f4829d3435da0cdfbab003db3b68b6462ef31635b5fe4ed59d56745df9aa95a0690586b56d2f91e621aa2e708cb289cc1 WHIRLPOOL 402058a26650564d08f76de30dad98a21f0c7dac6ba99847946a2582a800c09ad20bc8258e4efa7d3002e88e0244053eb70f9f0284d8f9b5b6bf2d3076aa4ca5
+DIST atheme-services-7.2.9.tar.bz2 1179582 SHA256 a87a046aa73fc4a97a11d41cc08c60b835135ba20bb173ca888b40e0d6b54b27 SHA512 8852bcf4746ad3b8814e2e7ae8b435c538b442f26f6cf8479087d115c0c4d6877ea864f9e19ccaa9ae93ea8a116cfa53d1f22846fffb783f78bfad8e95fd26f7 WHIRLPOOL 2b5ceb38b196567eb64ac11d0866b209b5f0ed00f1ee4c387dde2214bb3ff540996822d9843d7b32c6f0d908b80ca4c5edab7d1ee96e89a0ed59ab9333baf84b
+EBUILD atheme-services-7.2.9-r1.ebuild 2184 SHA256 8fe12920cd077a4a66be70a4035bb987139a252d708a2dccb0e09088e8c2b0e9 SHA512 69706eccbd2a9c6d9acf4c307db1de6f91b8ad2b6f408a878451c7d7a8b4fad21107c24d1f16503f5a625a4b25ae803ae2d0a0297ac02c69e9a3c7105cb8bfe4 WHIRLPOOL 31696c8f3405b2b18ad895e97170ade4de7cb66c8886ba14d23279928dcb73d7650bc738ebb61e1396a16690ad06910202ea9d76d24129c5acf807748d6eaaa4
+MISC metadata.xml 721 SHA256 ecd9528e5c904de1e996a6afa536265b1f66f2751e7095e1ad9b76d2630da149 SHA512 bc64eb444e7f6166a81a832c005bd6acb582c9dda7471b057756ede11531290645ef6d9d4c664a87405200190ed4a51678403691e5863cc0af2a408741bd7d15 WHIRLPOOL 36381adf23a3762cb662e3fdedcfe9e71523122f5939da73983d14a01495430e94ec84e452ee33f49fd8aa95dd49f02294fbaa86d8b9226f770173f8fb32a94a
diff --git a/net-irc/atheme-services/atheme-services-7.2.9-r1.ebuild b/net-irc/atheme-services/atheme-services-7.2.9-r1.ebuild
new file mode 100644
index 000000000000..5fcdc6534d3a
--- /dev/null
+++ b/net-irc/atheme-services/atheme-services-7.2.9-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic perl-functions user
+
+DESCRIPTION="A portable and secure set of open-source and modular IRC services"
+HOMEPAGE="https://github.com/atheme/atheme"
+SRC_URI="https://github.com/atheme/atheme/releases/download/v${PV}/atheme-${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
+S="${WORKDIR}/atheme-${PV}"
+
+RDEPEND=">=dev-libs/libmowgli-2.1.0:2
+	cracklib? ( sys-libs/cracklib )
+	ldap? ( net-nds/openldap )
+	perl? ( dev-lang/perl )
+	pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-docdir.patch
+	"${FILESDIR}"/${P}-configure-logdir.patch)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
+}
+
+src_configure() {
+	# perl scriping module support is also broken in 7.0.0. Yay for QA failures.
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-fhs-paths \
+		--disable-warnings \
+		--enable-contrib \
+		$(use_enable largenet large-net) \
+		$(use_with cracklib) \
+		$(use_with ldap) \
+		$(use_enable nls) \
+		$(use_enable profile) \
+		$(use_with pcre) \
+		$(use_with perl) \
+		$(use_enable ssl)
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+
+	insinto /etc/${PN}
+	for conf in dist/*.example; do
+		# The .cron file isn't meant to live in /etc/${PN}, so only
+		# install a .example version.
+		[[ ${conf} == *cron* ]] && continue
+
+		local confdest=${conf##*/}
+		newins ${conf} ${confdest%.example}
+	done
+
+	fowners -R 0:${PN} /etc/${PN}
+	keepdir /var/{lib,log}/atheme
+	fowners ${PN}:${PN} /var/{lib,log}/atheme
+	fperms -R go-w,o-rx /etc/${PN}
+	fperms 750 /etc/${PN} /var/{lib,log}/atheme
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	mv "${ED}"/usr/bin/{,atheme-}dbverify || die
+
+	# contributed scripts and such:
+	docinto contrib
+	dodoc contrib/*.{c,pl,php,py,rb}
+
+	use perl && perl_domodule -r contrib/Atheme{,.pm}
+
+	rm "${ED%/}/usr/share/doc/${PF}/WINDOWS" || die
+
+	# Bug #454840 #520490
+	rm -rf "${ED%/}/var/run" || die
+}
diff --git a/net-irc/atheme-services/files/atheme-services-7.2.9-configure-logdir.patch b/net-irc/atheme-services/files/atheme-services-7.2.9-configure-logdir.patch
new file mode 100644
index 000000000000..d57af2d9f445
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services-7.2.9-configure-logdir.patch
@@ -0,0 +1,25 @@
+diff --git a/dist/atheme.conf.example b/dist/atheme.conf.example
+index ac3ed54dd..be1c2db50 100644
+--- a/dist/atheme.conf.example
++++ b/dist/atheme.conf.example
+@@ -1909,17 +1909,17 @@ ldap {
+  * This block logs all account and channel registrations and drops,
+  * and account and channel setting changes to var/account.log.
+  */
+-logfile "var/account.log" { register; set; };
++logfile "/var/log/atheme/account.log" { register; set; };
+ 
+ /*
+  * This block logs all command use to var/commands.log.
+  */
+-logfile "var/commands.log" { commands; };
++logfile "/var/log/atheme/commands.log" { commands; };
+ 
+ /*
+  * This block logs all security auditing information.
+  */
+-logfile "var/audit.log" { denycmd; };
++logfile "/var/log/atheme/audit.log" { denycmd; };
+ 
+ /*
+  * You can log to IRC channels, and even split it by category, too.
diff --git a/net-irc/atheme-services/files/atheme-services-7.2.9-fix-docdir.patch b/net-irc/atheme-services/files/atheme-services-7.2.9-fix-docdir.patch
new file mode 100644
index 000000000000..e7d4bb2695fc
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services-7.2.9-fix-docdir.patch
@@ -0,0 +1,13 @@
+diff --git a/extra.mk.in b/extra.mk.in
+index 39053e48a..e47b27246 100644
+--- a/extra.mk.in
++++ b/extra.mk.in
+@@ -82,7 +82,7 @@ libdir ?= @libdir@
+ CFLAGS ?= @CFLAGS@
+ INSTALL_LIB ?= @INSTALL_LIB@
+ RUNDIR ?= @RUNDIR@
+-DOCDIR ?= @DOCDIR@
++DOCDIR ?= @docdir@
+ localstatedir ?= @localstatedir@
+ docdir ?= @docdir@
+ GREP ?= @GREP@
diff --git a/net-irc/atheme-services/files/atheme-services.initd b/net-irc/atheme-services/files/atheme-services.initd
new file mode 100644
index 000000000000..46a868380aa3
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+command="/usr/bin/atheme-services"
+command_user="atheme-services"
+pidfile="/var/run/atheme/atheme.pid"
+
+name="Atheme IRC Services"
+
+depend() {
+	need net
+	use ircd
+	provide irc-services
+}
+
+start_pre() {
+	checkpath -d "/var/run/atheme" -o atheme-services
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-irc/atheme-services/metadata.xml b/net-irc/atheme-services/metadata.xml
new file mode 100644
index 000000000000..1056f0f4fb25
--- /dev/null
+++ b/net-irc/atheme-services/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="cracklib">Enable nickserv/cracklib module for enforcing strong account passwords</flag>
+		<flag name="largenet">Enable support/tweaks for large networks</flag>
+		<flag name="ldap">Enable ldap-backed authentication module</flag>
+		<flag name="perl">Install a perl module which wraps around the services' XML-RPC interface</flag>
+	</use>
+	<maintainer type="person">
+		<email>wadecline@hotmail.com</email>
+		<name>Wade Cline</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-irc/bip/Manifest b/net-irc/bip/Manifest
new file mode 100644
index 000000000000..2004b69443fe
--- /dev/null
+++ b/net-irc/bip/Manifest
@@ -0,0 +1,7 @@
+AUX bip-freenode.patch 671 SHA256 a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f SHA512 eadbe7867b24aa57e9bd2ffdde0eaac50b39bc0ad374a2ebce9d3a074c381156bd99be0d9826dafc00077bd33ae8f07ef0765b80a02fa5affbdd771747d10774 WHIRLPOOL f60ddf1434c3a2a06c2be31ff61af186edd14f51f03d2511a9ee01d6bdee0414f58dcd2b531e1ea1e2d4d755e1df57d01450312be939d5af5d29406d0991a09e
+AUX bip.vim 102 SHA256 cafaae5d0e428980bff54df06ecad5a1c9eb15fed93ee2f3f980568c8eb15a0c SHA512 6e612cc2963f846bf7fdb0061ce68104c2fbe1f806923ccd54c821467e67eccde88d93ff88e33da27d32fb5c02c872ecaea02b523a25430b76291b4c63fe0be8 WHIRLPOOL cb07d201d8e2ab7bee129ea27dee912afd49b212fa1dcd6b8b603090cc3bf48bc3000a975782d53f11d7143e50a5253214ee084bad77d3b2c979ab1fb00a0eca
+DIST bip-0.8.9.tar.gz 256711 SHA256 3c950f71ef91c8b686e6835f9b722aa7ccb88d3da4ec1af19617354fd3132461 SHA512 572adb6e0982d74a39b0380ef6af51ba7f55b880f78e110b93e09616e6345bb4a9a60475df644ec891cae368287d502ba00bbf734370ba50c57b29de6934c138 WHIRLPOOL ffad5a0a525a09e6d31537dd4238353ac820a874f18a9590f039419e9d2b7aff4f92a1882f02db450e9e88957adbc4bc4eb993fbff01f7327bcdd02d0b1b6e6d
+EBUILD bip-0.8.9.ebuild 1416 SHA256 597fb76d2831ea4668bcc2e3391370b364b196013bca6e0476ce33c0eceb5bf2 SHA512 8c1d77dbc6bfe45c39580691e0e1931cd607d5c2a7d782b91c9b5acb273b6847dc1fb03da84aecc75f355375e243a6a8bdb5f6fea3e2518e95fa49eb95ef0bb1 WHIRLPOOL 5a7b2ca5ae41b45ae81e00f6a11e01d9384fa8fa740e14ae19236bb9c27b629dbab4842506fd201bfaca29166674b3e95bdd93f5729d3f015738ee9fa361c3f9
+MISC ChangeLog 3492 SHA256 b5c64ebb15f97687bf253ee301388dd3ac1d88ef8cbea8e73eaa2d81c3ffa09f SHA512 4987a8451ece0997762d167008f6be93e29aec1260873800d16aaec3ce47b1183e357d8372d857fa7328dfeb67acc46ffe3360c531dadd79970eee6259dd4809 WHIRLPOOL 2638810fd57320f6c36ce04990561fc85ccf05a82bb33d5557800615f1a1e1e6665bd1986351b2d29fa762162e9460e95beb54e0de282274257053c8902c0a54
+MISC ChangeLog-2015 4428 SHA256 a9fb7ccf0ee8a14040ea78287e9d4aefdc66004f30dfeb552a54ad5d3acecae2 SHA512 85c203b164156f7b3aeb3115c77ed9da1d06c7cb1bf5e7efa7d1fd1df832e6a3ee19f233f7dc886bfc8519b2562d59969e90105b838f07338303810d811b53f2 WHIRLPOOL d9da90d1aec8c5fcfd07e411e68eec93dbeb3f6d378a9c341b93ccbdebafea9d1313ff4daea9d4f6e1f6d6b89c273b77b454971eacf30be23b897f38743780fb
+MISC metadata.xml 1019 SHA256 5e68c0de8283c6c3286d7f913c6a16b40b6f5805126857b192bfc9af77b025be SHA512 21018551f0940f152202d2a380e4757a7a4d7f301967cd03ee424120bac173d48a77cde2c14aa657316d0d47b89679eee66d33bec987d84b794b75a0d0d82042 WHIRLPOOL c378aa98eea344cdfb3c1ea46c5001d9aad20507eaaedd8c61ed24c030cacb9cbc15666217c2b482096a676a152ea96f07c03c48ceded0232032195e50d5a804
diff --git a/net-irc/bip/bip-0.8.9.ebuild b/net-irc/bip/bip-0.8.9.ebuild
new file mode 100644
index 000000000000..cc037d11faa5
--- /dev/null
+++ b/net-irc/bip/bip-0.8.9.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit eutils
+
+DESCRIPTION="Multiuser IRC proxy with SSL support"
+HOMEPAGE="http://bip.milkypond.org/"
+SRC_URI="ftp://ftp.duckcorp.org/bip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug freenode noctcp oidentd vim-syntax"
+
+COMMON_DEPEND="
+	dev-libs/openssl:0
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/yacc
+"
+RDEPEND="${COMMON_DEPEND}
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	oidentd? ( >=net-misc/oidentd-2.0 )
+"
+
+src_prepare() {
+	if use noctcp; then
+		sed -i -e '/irc_privmsg_check_ctcp(server, line);/s:^://:' src/irc.c || die
+	fi
+
+	if use freenode; then
+		epatch "${FILESDIR}/${PN}-freenode.patch" || die
+	fi
+
+	sed -i -e "s/-Werror//" Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable oidentd)
+}
+
+src_install() {
+	dobin src/bip src/bipmkpw
+
+	dodoc AUTHORS ChangeLog README NEWS TODO
+	newdoc samples/bip.conf bip.conf.sample
+	doman bip.1 bip.conf.5 bipmkpw.1
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins samples/bip.vim
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}"/bip.vim
+	fi
+}
+
+pkg_postinst() {
+	elog 'The default configuration file is "~/.bip/bip.conf"'
+	elog "You can find a sample configuration file in"
+	elog "/usr/share/doc/${PF}/bip.conf.sample"
+}
diff --git a/net-irc/bip/files/bip-freenode.patch b/net-irc/bip/files/bip-freenode.patch
new file mode 100644
index 000000000000..437da08f438d
--- /dev/null
+++ b/net-irc/bip/files/bip-freenode.patch
@@ -0,0 +1,18 @@
+Freenode's ircd-seven uses a custom banlist type for mutes (+q).
+This patch makes bip handle +q the same way as +q.
+Without it, a user wouldn't get the banlist replies for mutes.
+
+diff --git a/src/irc.c b/src/irc.c
+index 556bf97..a5cc039 100644
+--- a/src/irc.c
++++ b/src/irc.c
+@@ -944,7 +947,8 @@ static int irc_cli_mode(struct link_client *ic, struct line *line)
+ 
+ 	/* This is a wild guess and that sucks. */
+ 	if (!irc_line_elem_equals(line, 0, "MODE") ||
+-			strchr(irc_line_elem(line, 2), 'b') == NULL)
++			(strchr(irc_line_elem(line, 2), 'b') == NULL &&
++                        strchr(irc_line_elem(line, 2), 'q') == NULL))
+ 		return OK_COPY;
+ 
+ 	++ic->who_count;
diff --git a/net-irc/bip/files/bip.vim b/net-irc/bip/files/bip.vim
new file mode 100644
index 000000000000..437d7f083633
--- /dev/null
+++ b/net-irc/bip/files/bip.vim
@@ -0,0 +1,4 @@
+" Vim filetype detection file for bip config files
+"
+
+au BufNewFile,BufRead bip.conf set filetype=bip
diff --git a/net-irc/bip/metadata.xml b/net-irc/bip/metadata.xml
new file mode 100644
index 000000000000..e20cca0de70b
--- /dev/null
+++ b/net-irc/bip/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Bip is an IRC proxy, which means it keeps connected to your preferred
+		IRC servers, can store the logs for you, and even send them back to your IRC
+		client(s) upon connection. You may want to use bip to keep your logfiles (in a
+		unique format and on a unique computer) whatever your client is, when you
+		connect from multiple workstations, or when you simply want to have a playback
+		of what was said while you were away.
+	</longdescription>
+	<use>
+		<flag name="freenode">Enables freenode-specific functionality.
+			Currently that is only support for mute lists (MODE #channel +q).</flag>
+		<flag name="noctcp">Disable the automatic CTCP VERSION reply which is often
+			exploited by malicious people to cause a DoS (reconnect due to flooding).
+		</flag>
+		<flag name="oidentd">Enable oidentd support</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-irc/bnc/Manifest b/net-irc/bnc/Manifest
new file mode 100644
index 000000000000..310c95498c6a
--- /dev/null
+++ b/net-irc/bnc/Manifest
@@ -0,0 +1,7 @@
+AUX bnc-2.9.3-64bit.patch 402 SHA256 738ab7203502e4e02b2c0255945d2f83f379eb65557b2a39dda04864ba9b5d9e SHA512 e257416b88fa147ab532389893ecbf3ee5c47a3680bf8c3c54fb03408fb97b04ffd01222ce8e6c0a1257f9618c18dd95f3eb1799ae3a83922617a630b557604f WHIRLPOOL c87360dc11b28fea835ab842834c014a7739dec75cdc0978eb6035d42f9f82fa5a7a22aa60f3fe3e290f216a20d35bbcc42826ad057797b23c5f2afead4784cb
+AUX respect-cflags-ldflags.patch 2766 SHA256 3cbdc5566b08189fed9a5c1c69eb6ae4983be1124efbab683c1a992a30e91116 SHA512 2b865f67d1999cc7c5ab85c828b8d442906306df23f48fdff17ffb7e7f4f5279a5f0aed0acce3708b558b4cd2e7d7885a585b0cae06b2a78425430ee786362ed WHIRLPOOL 50101b24a32818cab48686606c6e7083c3513dc141b800ecbb9a2a2d8613596351387012a9ea412e8a212c0c3ffc1ad221d06da374ba55b63dd4fba49323b122
+DIST bnc2.9.4.tar.gz 76896 SHA256 af0e95c97feb1f2d231c570a658be8e42a91aafab6e6dfeb04b7e9fcc360b74b SHA512 131c25624c2a72494f900c6247e5569df48700223664487944ac42b0d892ea62f7d0e67a9ba4609cd936718365075c428e756074e349e1e041186c43cd16da23 WHIRLPOOL 5899dce7edb2bb3dfd4598579753acc8936889e5ef2c3d9cec61d25aa0f93f883c270aa929683ad8011f0d08cd098d0c5f90d4c37b8c00c09bc5e02f86b8af3b
+EBUILD bnc-2.9.4-r1.ebuild 969 SHA256 df9a930926b90e49c821baee2af2a5812fe1f7b903b420dc7f10ff10a0cf88b9 SHA512 72b8f54014329394dabd78e2dc791e38143eeb37e7212cabab3338b1ed3d02ecfa761b9bbdb68fa8ef09f792c643e0d216b32f34c5994bc245e762c4d12288fc WHIRLPOOL f4965bdec685c2490f2fd16ba4d1230736e15bd2c60a6e1784b6f9480021c951e0633afc0df81bb80c7c426f6c785804e9d7ae1b137656368bbff5a893cb5177
+MISC ChangeLog 3029 SHA256 c16e1d411ecacbd4272e866f645be372aff3a9ad9654dd350f95b573182b4084 SHA512 5ebe5a49066fc9ba601c098f8cc3ee27a454e4ac6033868b62bc8e2bf4387d388cbbc7caf3c8eb3cfe59813a1c5d9802fdc69cadaea20c767267e04cfe023498 WHIRLPOOL f7a0e931d870299dc9e1ec92299929b54f7c992613de83a7b0029da4721d2faad532382d9a278391a83a454aa6cd81f23ae9d36ab2fd79785669a63ecd8b1515
+MISC ChangeLog-2015 4547 SHA256 663b9ea7bfc5f668d96f751d394a3127baacb1d677bdd72afd2a378fd4e4e447 SHA512 fde1da22d3d1c42a089fb585560b2cd01dc92910602b201a80c47ec1a384ba4aa88d58db2069ff69f0a868812b2458362277da460e36805ead0bf23aa9059828 WHIRLPOOL a621a43caa11e9f8476e749616d85cd50a32f4027f7b71bcedba138c375272fc628d1dee98462a526c900bfeee2a03faa37a70bc68a1d488a366503bfff48364
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/bnc/bnc-2.9.4-r1.ebuild b/net-irc/bnc/bnc-2.9.4-r1.ebuild
new file mode 100644
index 000000000000..73bbb522e5cd
--- /dev/null
+++ b/net-irc/bnc/bnc-2.9.4-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/-/}"
+DESCRIPTION="BNC (BouNCe) is used as a gateway to an IRC Server"
+HOMEPAGE="http://gotbnc.com/"
+SRC_URI="http://gotbnc.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ppc ppc64 ~s390 sparc x86"
+IUSE="ssl"
+
+DEPEND="ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/respect-cflags-ldflags.patch"
+	"${FILESDIR}/${PN}-2.9.3-64bit.patch"
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:./mkpasswd:/usr/bin/bncmkpasswd:' bncsetup \
+		|| die 'failed to rename mkpasswd in bncsetup'
+}
+
+src_configure() {
+	econf $(use_with ssl)
+}
+
+src_install() {
+	default
+	mv "${D}"/usr/bin/{,bnc}mkpasswd \
+		|| die 'failed to rename the mkpasswd executable'
+	dodoc example.conf motd
+}
+
+pkg_postinst() {
+	einfo 'You can find an example motd/conf file here:'
+	einfo " /usr/share/doc/${PF}"
+}
diff --git a/net-irc/bnc/files/bnc-2.9.3-64bit.patch b/net-irc/bnc/files/bnc-2.9.3-64bit.patch
new file mode 100644
index 000000000000..0eb94a4817ce
--- /dev/null
+++ b/net-irc/bnc/files/bnc-2.9.3-64bit.patch
@@ -0,0 +1,20 @@
+--- bnc2.9.3-orig/server.c	2005-02-07 01:29:11.000000000 +0000
++++ bnc2.9.3/server.c	2005-09-22 18:10:18.000000000 +0100
+@@ -398,7 +398,7 @@
+ int send_queued(struct lsock *ls)
+ {
+ 	int res;
+-	int length;
++	size_t length;
+ 	char *msg;
+ 
+ 	while(sbuf_getlength(&ls->sendq) > 0)
+@@ -1114,7 +1114,7 @@
+ int dccsend(int fd, struct sbuf *sendq)
+ {
+ 	int res;
+-	int length;
++	size_t length;
+ 	char *msg;
+ 
+ 	
diff --git a/net-irc/bnc/files/respect-cflags-ldflags.patch b/net-irc/bnc/files/respect-cflags-ldflags.patch
new file mode 100644
index 000000000000..ce3c30ecf63d
--- /dev/null
+++ b/net-irc/bnc/files/respect-cflags-ldflags.patch
@@ -0,0 +1,90 @@
+From e5663f7b7bd506b7af2ee7ab2e68722ade1f2a03 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Sun, 28 Aug 2016 16:06:09 -0400
+Subject: [PATCH 1/1] autotools: fix --with-ssl option and respect
+ {C,CPP,LD}FLAGS.
+
+Patch the build system to support LDFLAGS. This is a new revision of
+an existing Gentoo patch that made the build system support CFLAGS,
+and incorporates binki's patch from our bugzilla to add CPPFLAGS
+support.
+
+The --with-ssl option is also fixed in configure.in (it was
+missing a dash).
+
+Gentoo-Bug: 338181
+---
+ Makefile.in  | 32 +++++++++++++++++++++-----------
+ configure.in |  2 +-
+ 2 files changed, 22 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b7c9733..f28a355 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,28 +1,38 @@
+ LIBS=@LIBS@
+-CFLAGS=-O3 -Wall -include config.h
++CFLAGS=@CFLAGS@ -Wall
++CPPFLAGS = -include config.h @CPPFLAGS@
+ CC=@CC@
+ 
+-ALL: bnc mkpasswd
++DESTDIR     =
++prefix      = @prefix@
++exec_prefix = @exec_prefix@
++bindir      = @bindir@
++
++all ALL: bnc mkpasswd
++
++install: bnc mkpasswd
++	install -m 755 -d $(DESTDIR)$(bindir)
++	install -m 755 bnc mkpasswd bncchk bncsetup $(DESTDIR)$(bindir)
+ 
+ mkpasswd:mkpasswd.c
+-	${CC} ${CFLAGS} -o mkpasswd mkpasswd.c ${LIBS} 
++	${CC} ${CFLAGS} -o mkpasswd mkpasswd.c ${LIBS} ${LDFLAGS}
+ bnc: bnc.o conf.o server.o cmds.o ctcp.o send.o sbuf.o Makefile
+-	${CC} -o bnc bnc.o conf.o server.o cmds.o ctcp.o sbuf.o send.o ${LIBS}
++	${CC} -o bnc bnc.o conf.o server.o cmds.o ctcp.o sbuf.o send.o ${LIBS} ${LDFLAGS}
+ 
+ bnc.o: config.h struct.h bnc.c Makefile
+-	${CC} ${CFLAGS} -c bnc.c
++	${CC} ${CPPFLAGS} ${CFLAGS} -c bnc.c
+ conf.o: config.h struct.h conf.c Makefile
+-	${CC} ${CFLAGS} -c conf.c
++	${CC} ${CPPFLAGS} ${CFLAGS} -c conf.c
+ cmds.o: config.h struct.h cmds.c Makefile
+-	${CC} ${CFLAGS} -c cmds.c
++	${CC} ${CPPFLAGS} ${CFLAGS} -c cmds.c
+ ctcp.o: config.h ctcp.c Makefile
+-	${CC} ${CFLAGS} -c ctcp.c
++	${CC} ${CPPFLAGS} ${CFLAGS} -c ctcp.c
+ server.o: config.h struct.h server.c Makefile
+-	${CC} ${CFLAGS} -c server.c
++	${CC} ${CPPFLAGS} ${CFLAGS} -c server.c
+ send.o: send.c send.h Makefile
+-	${CC} ${CFLAGS} -c send.c
++	${CC} ${CPPFLAGS} ${CFLAGS} -c send.c
+ sbuf.o: sbuf.c
+-	${CC} ${CFLAGS} -c sbuf.c
++	${CC} ${CPPFLAGS} ${CFLAGS} -c sbuf.c
+ 
+ clean:
+ 	rm -rf *.o *~ core bnc mkpasswd
+diff --git a/configure.in b/configure.in
+index be17af3..3552eb1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -35,7 +35,7 @@ AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt",)
+ dnl Check for SSL support.
+ AC_MSG_CHECKING(whether to enable SSL support)
+ AC_ARG_WITH(ssl,
+-[  -with-ssl              Enable SSL support],
++[  --with-ssl              Enable SSL support],
+ [ case "$withval" in
+     yes)
+       AC_MSG_RESULT(yes)
+-- 
+2.7.3
+
diff --git a/net-irc/bnc/metadata.xml b/net-irc/bnc/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/bnc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/cgiirc/Manifest b/net-irc/cgiirc/Manifest
new file mode 100644
index 000000000000..92f9c2abb0be
--- /dev/null
+++ b/net-irc/cgiirc/Manifest
@@ -0,0 +1,5 @@
+DIST cgiirc-0.5.10.tar.gz 133827 SHA256 654409c768026e9565e54a39e27064a4f86fc778042e1d46959f30d24fbfbce0 SHA512 57001051a31f8a1494e8b31b256b5f244ed7e1d23f38f27184374f1becf91e6ea3bd61621679e046ae0a11a2eb3e5909d9d284df2a896bf5aac38f5314c7ae55 WHIRLPOOL 4914adc50aad155ad50f0e466f3efb77d0e6bf03b81cb16562fb90b1814fd4d2d20fe7656e2438b692c4ee6699d7e86adebdecc6936d72ee360af9b4276573b3
+EBUILD cgiirc-0.5.10.ebuild 879 SHA256 b226d5a1a2ac9c9ae37f9b4a5befeca9d54e76dc7e1a17a9381c6eed1d630892 SHA512 c091d1d0ae8fac42a8109b6c45e82faa7c55b2c12f34db6fb09879fc44a3be74ce120e7766dbf393c7f9ccf86007bf46f03be009e6926bfb67619799b3ad88b3 WHIRLPOOL f1d16ca5ad123d2f591328d650930c116d4dcb94a127da09d1a718618f8f84b4903a9b9e06d4cbea163054e7d8e59061d8b0b622527dc629c3a1982db66c29f7
+MISC ChangeLog 2425 SHA256 5cb2e999e3239dcd35271c17ab01701ab4e52519c5e86268465e6cc8910d095b SHA512 38469c04ef2e26d92a8b353b85cfc9b3fe959af63ef62aeaad33ae36db28fa41b2da7a681f20ac4ee7c8bcfb5af10954ce3e5c078ea9e8f611b5d32c973b7fa6 WHIRLPOOL 0557f92663fb1a23d02aeeb3350e88caf7be6c596ac03ed57caee5eac2c24fc378314d52b2c0d5c25bbd1e2306f594ab250021f1ffe8776225b5120bab3e133a
+MISC ChangeLog-2015 1905 SHA256 df17033c9ad4eba964b59062897eeaebc2d3268aa49a8af68ff2e6b889023ae7 SHA512 c71fc29ad5c818be078447736b381a723147c2ee021c3a583060e9f31ed3fae588efde8d309e4b3735176ca61ecda13a50ddee180c0a9ec605fd3628d5342c8f WHIRLPOOL ac3643b12ed22177e72b2a4d8ffb1f81d7468ff325bbbe56e5e5dc05c108daa0225b72f5b514def401f8ce2feaf136d70e91b8ac998b79ee6d755974e92dd445
+MISC metadata.xml 250 SHA256 d9fcac0092614f226b371c1819fe3a264758bfd9fedc2874c35a7b3dd6d77291 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282 WHIRLPOOL 113cbaecb7ee19172633b0ee77ecfa10f6742848fd0f5f0797b95865f291e063ce3916719af48a81a72adfdaf40a4b18815e2434f0de91e2baa63822951470f0
diff --git a/net-irc/cgiirc/cgiirc-0.5.10.ebuild b/net-irc/cgiirc/cgiirc-0.5.10.ebuild
new file mode 100644
index 000000000000..33ab17fa90d5
--- /dev/null
+++ b/net-irc/cgiirc/cgiirc-0.5.10.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=5
+
+inherit webapp eutils
+
+DESCRIPTION="A perl/CGI program to use IRC from a web browser"
+HOMEPAGE="http://cgiirc.org/"
+SRC_URI="http://cgiirc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+	elog "Note that file locations have changed."
+	elog "CGI:IRC will be installed into cgi-bin/${P}"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	ecvs_clean
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="README cgiirc.config.full ipaccess.example"
+
+	dodoc docs/{CHANGES,TODO} ${docs}
+	dohtml docs/help.html
+	rm -rf docs/ ${docs}
+
+	insinto "${MY_CGIBINDIR}"/${P}
+	doins -r .
+	fperms +x "${MY_CGIBINDIR}"/${P}/irc.cgi
+
+	webapp_configfile "${MY_CGIBINDIR}"/${P}/cgiirc.config
+	webapp_src_install
+}
diff --git a/net-irc/cgiirc/metadata.xml b/net-irc/cgiirc/metadata.xml
new file mode 100644
index 000000000000..2b9b44f73497
--- /dev/null
+++ b/net-irc/cgiirc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-irc/dccserver/Manifest b/net-irc/dccserver/Manifest
new file mode 100644
index 000000000000..4fef56cce46a
--- /dev/null
+++ b/net-irc/dccserver/Manifest
@@ -0,0 +1,6 @@
+DIST dccserver-0.5.tar.gz 139083 SHA256 c757c84543585075c0cc46a338e97f11a3ad59e00322bf5b3a6aef27545cdd76 SHA512 0fb2584dc4bee930fa259862206ba875cf0c7a8257799c3fe85d470de6827eab0b304b0e07b8692268fd1a63a82249204c447df92bed0dd994c78ec295040494 WHIRLPOOL 347200d8fc58a30ddea11a946f92c8bdbb37172b5d9c2034d737d607d6440fa0e5f46315a116ffe4a3246f92d2743dbeac220c127497d2cdcf111cf3315070f4
+EBUILD dccserver-0.5-r1.ebuild 335 SHA256 bae9b2545df6c283732eb61a9e500de2a82cd1c29c8da7421f38a806b942eac4 SHA512 93241097228a6d691ea31b548217c05a86063d58297451808f87ab0e77e9dc1d716216991154d7efb967c2481d0cec1edfcdcc4ce49726d58f7fcaf07c4e2052 WHIRLPOOL eb21291992a28a7fc186b4e9f627db0b09a64fe08c18e6c7dd0e04a900beabcc30dae0cd3281ea6fe1a0d3b922bf5ee4da37ed06ab1af8a0d25627dca1074fd2
+EBUILD dccserver-0.5.ebuild 416 SHA256 68cc392dcea82e79454494d997be6a6c1e7d16d3dc273ee0e3a0291399e3b393 SHA512 7a8210e0fd3ba8d087cb27d82139bed7551cb263d0d2fc1dea1723c6fd0d6388e5e3712830f631934acfc0394a8dd838f64c646b9edb47fc56da161235a2a58a WHIRLPOOL 50648cf543097fd136ef9c71757efafa9b5d6ad292f5ed237ac5095aeb46ba74df65d272756a94e378a035660173cec155315f3581463e820f10f18dc89381aa
+MISC ChangeLog 2849 SHA256 dcc359037faf5bc25ad6cf253ad622ee9b1508371258f8b713a95b7df1073f8c SHA512 bf4aad0ccbef0b98bbb97e14dd7d387b1b4ee2ebb00470ecf04f07594f6136b62e3320ae7c93197989f77dfaea1afe1e268e2eddc661850227ee75664fcffad7 WHIRLPOOL f3d211f270325111544c1a507351c45f867d4e8bb8c4bf71f361b246e6abbbaf2daa18b74fcd613e42e40cfc144c98c26f2796978924f043048a2a332a7d5452
+MISC ChangeLog-2015 2214 SHA256 3b069a8dc0e089301ee64d591e9ad515ad3dbdfce089592100470315a82732be SHA512 95b7fc98805b80264d2a7bdb17be00a9a877a4edde663fb8fc097e3c9850023476c464502b8a14bf7bbf2943e06a958853854fc9b1fb1974c27fe687827642c2 WHIRLPOOL b25beacd26adb1ff8daa15f28583481caea32ae0015d001be781921f7e87e60bc7d012a8a108bcefaee120682b0add6f48933c684e5d131cfe474901e7965624
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/dccserver/dccserver-0.5-r1.ebuild b/net-irc/dccserver/dccserver-0.5-r1.ebuild
new file mode 100644
index 000000000000..80e2250e13b0
--- /dev/null
+++ b/net-irc/dccserver/dccserver-0.5-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="linux implementation of the mirc dccserver command"
+HOMEPAGE="http://www.nih.at/dccserver/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/net-irc/dccserver/dccserver-0.5.ebuild b/net-irc/dccserver/dccserver-0.5.ebuild
new file mode 100644
index 000000000000..87d638825bf9
--- /dev/null
+++ b/net-irc/dccserver/dccserver-0.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="linux implementation of the mirc dccserver command"
+SRC_URI="http://www.nih.at/dccserver/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+HOMEPAGE="http://www.nih.at/dccserver/"
+
+DEPEND=""
+
+src_install() {
+	einstall || die "einstall failed"
+	dodoc AUTHORS NEWS THANKS TODO
+}
diff --git a/net-irc/dccserver/metadata.xml b/net-irc/dccserver/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/dccserver/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/dircproxy/Manifest b/net-irc/dircproxy/Manifest
new file mode 100644
index 000000000000..d78ce37500f9
--- /dev/null
+++ b/net-irc/dircproxy/Manifest
@@ -0,0 +1,5 @@
+DIST dircproxy-1.2.0-RC1.tar.gz 811366 SHA256 40ad50ffd13681114f995519dc3f65f48cb5eac41e780ad14ce8ffd49463757f SHA512 edc4234a5249d06e7342250401c79f3f2190b38ca54f9e7fb4b93a093a7e383057043dc42039fb90f9a012f8cb4fe7a6587d35c045bb58d500ecdbcd16354c17 WHIRLPOOL a96d1e7c6999cb308beb4da11a9bf12a64ea29eb0508cc033cd583a928816752baaddb4d89ff70c772819b7db32daafea226b67aee41d720e560a9e5794de574
+EBUILD dircproxy-1.2.0_rc1.ebuild 525 SHA256 319ac1701d2c388bc087fc25c11a40b9edf197be0281aa6ef288a4f3564ceb70 SHA512 b6023b8f1d1d01b9a41314b8e15412ff127eed4dec443f2654e6b3282854e7024c18794ddf0115b55270b83066cb24c0ed471c594bfb5c1f98993eaba1be9de7 WHIRLPOOL 341c00af9a3925636c51934798df451826c7232d67fbe70bf9c092e3b6a429363dc691cf352285b9ab52fe62391246de0ee61a94d074dd8a4e50a142a7621fea
+MISC ChangeLog 2799 SHA256 5d55416ca95c146130584b6d36293cb95777dc88a653b1ee3e8da55b1c2218de SHA512 688a9d11719638dccfcbb7de5198bb6b84e8f41873da750b6a7b9feba805a3bc1b888f5d945d7cda958d3e7690a1041f09960b342e8caebd8e4826b0017ade53 WHIRLPOOL f95a12c76ce2e909456b371918793fd40f0ad38b55980f101b492d669cd8bb19b9005819b0baecebdd17b6963cfa7ceaefaa7e6abf1713d25c71eebe09937457
+MISC ChangeLog-2015 5234 SHA256 2b72fea2a052cc6e6de7ec95dad1779a6990e15917630b553163a34c69e6fef9 SHA512 f6ace6f451c2a53a65af4d1a3370809deca9582aca02cf4a68f7427f37068225a7562fa9f05261c962e09157c375db460fd71048999a622373820c9f583ad710 WHIRLPOOL 48a61b6e7e7bcec980069d5e984a95ead3b734a03fa74ec3c3dd72b5b003a890d8995cfd3297a76aa28e0ef2378c542029b1b2f2a2bd2c53a6e76f28a998fc30
+MISC metadata.xml 246 SHA256 373f9e691be72d5c32e6335f7450f913ffdfc430f0adf89671873b7740e23841 SHA512 19fa75dba696200d39cfe26b694bc230bab89ec6fc3c050418a0e8780388aee05251a13fa1b876130939378ec2de9d4d134b2f17e2f96f1c5b091067b3241961 WHIRLPOOL a26cbd43e33353b1e06a1f6a34d59f23f6b092ed86b7be61f8f0e8661126b0d4ae1b737b55f00f50883f6b313c8a60d67fcbd5b57449b5130c41eb66e779e7c6
diff --git a/net-irc/dircproxy/dircproxy-1.2.0_rc1.ebuild b/net-irc/dircproxy/dircproxy-1.2.0_rc1.ebuild
new file mode 100644
index 000000000000..e71fc34eac95
--- /dev/null
+++ b/net-irc/dircproxy/dircproxy-1.2.0_rc1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+MY_P="${P/_rc/-RC}"
+DESCRIPTION="an IRC proxy server"
+HOMEPAGE="https://code.google.com/p/dircproxy"
+SRC_URI="https://dircproxy.googlecode.com/files/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog FAQ NEWS HACKING README* TODO INSTALL
+}
diff --git a/net-irc/dircproxy/metadata.xml b/net-irc/dircproxy/metadata.xml
new file mode 100644
index 000000000000..4e7582a957f8
--- /dev/null
+++ b/net-irc/dircproxy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="google-code">dircproxy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
new file mode 100644
index 000000000000..607991063334
--- /dev/null
+++ b/net-irc/eggdrop/Manifest
@@ -0,0 +1,9 @@
+AUX eggdrop-1.6.21-fix-gcc5-remove-inline.patch 1551 SHA256 f8ae1d7973e17e3890aacc9fae0c9184af45623c0f3cc1e1bce797df6c81271c SHA512 66c4bc3a632736cdef4d6b641e9ff30ce4e479114067901c208e26379f21e563c515b381690b3204c2437ae8a71ea756103185fe8bb508f0b22d9a907c5622ff WHIRLPOOL 6a66c1e6b73e64ba0bc726ba277f85992ae6ea9dfd463c79b36f308d8489acd2f0a64688603d5a86dbe9bdeabbff67771a1f3c96788c3b566d524a5558625023
+AUX eggdrop-1.6.21-fix-memset.patch 323 SHA256 36eadc8f6f67ed946946536200e5fa66ec1dd9c6cbd790f6a0166dd130c0965c SHA512 91f422c7af4d3f5dd11d770eb6f6495f321fa8be2d51bbcb7b39756e8e3137a397175a997ea8fdcd74783b72bebcac052866f297c2ae70a4f649c5fb9b4b6c04 WHIRLPOOL 53e3e8230b422ec0819112aab6bd5feee5281c3186f2f1a28294b3afcace32007668dd028b2ac4b89aff29b3c65e31e75a23760ac0c3a0a86123afd8efc941e2
+AUX eggdrop-installer 2149 SHA256 5df6d951add6d42dac6d1b4238b72cb917af2e9647100a457124251ea75eb898 SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715 WHIRLPOOL cdf0ab7b7437d70fc84ef9b333b85935dee25e39887ea1ae4a11d2c267848ff0c0948c3da891a4ceaae95debec94aaceaad397fe64309555970e26c0d80a338f
+DIST eggdrop-1.6.21-patches-1.0.tar.bz2 322608 SHA256 78b3107b711ce2df1e7752eb60d517774f104ba1ba0623bb116b824ab8d069d7 SHA512 d7d5d740c68997101f360096612700919c890c4254708102e962427de5929ce98f0f2eb5ad8dc8a56de60e8b610d502edeae7de2ac762fe0981134da379b6e64 WHIRLPOOL 202294f941d064b89348b270823d6b5f6e61483d56d32bde699857efe03c9aafec3ad4a9b6d503ffd97eefe6c6d4912e95546bd12f028e95c52d0e31e2086a1d
+DIST eggdrop1.6.21.tar.bz2 999211 SHA256 75bd5573a609eac3940c0b6ca8251c3f38ea5d54b520e1cad93c650b4bc21754 SHA512 9fd9a86c1c4b59a47a5eed4e2306e829a01bac2ad29e990ca9c0ec630d5814fd649a9216dae9ce49f734e3ac1728beb4f479ca10af583bd513f43bbbea23a653 WHIRLPOOL fc8115d6c5f1ac2878bb3811f303fe797f7b813d74f2c5c0be5a703a7e29d652b791a0a5e98842792f2466443c8571c983cd89fd516f36136f62a394060b052d
+EBUILD eggdrop-1.6.21-r1.ebuild 2464 SHA256 b4e0495da485b27163b0304fa60d7c3b292d4cb4728e31c2ad6cdcc2aabbb06a SHA512 509f82d3d4ce3a1c9762f212d254e488d501f358172df9fc2982b1f8b1cd69436494d02815940059aaa2b3e9c25b6c2b2878666af74bb2684557a55c92b6364e WHIRLPOOL e800d37d04227c244994fd2c3bd4d51fb63fd79b5d83a2aba78c5f66cab2c9e89d8ef84129acbeca1c72f8d973e49fc772cd36a6707edc96532ef36c2a457ded
+MISC ChangeLog 3376 SHA256 87713a5a96bec258a469d09209955ca36837c570f3f3fcaf513bb5df2e9c1fee SHA512 b250d1299f3bfd717a10f699de9182bed915332b259783c7d71cff007f42b1fbf38b497a2c44d5b81b24131603d602138598be81998534624a63fd4147d1e1ad WHIRLPOOL 8a6e9118bdd8f6132e11e94586c6d28207974770cc726e9deeb4f4b55ce58d131e38babeda71ef1ae47576ef86df9593c90efe7de50175da19440acc525cc8c9
+MISC ChangeLog-2015 14465 SHA256 84ee79e75edb4638cb31d423259d800b8d64a222bfa70084b371e98a375d5c82 SHA512 ea51a43a6a64d26931d4b441ac1834f8be338f466089f90435454bbf2bb6db7a46ca2b23478ecabe4a01c3f086f699ed4856017c5032b67425ba39c7167f94c0 WHIRLPOOL 6e9009b64b1621de0735179077c97eec24f8195763449b1db67f13d2020856702aa9a04aead4946968351698e0acf1d3a76e0c0b4380687b3aa34b1fe135d0f8
+MISC metadata.xml 591 SHA256 f86303553c1a4171548919f3af9279581a7c2061f7315e392c5ca946348c5dfc SHA512 45c78eafa22ba72fa30290dd18da85c6bdd677d623ccced725b20690b5822dbc55888fe0d09364cf4e81f04fda50377368fed966f0251704db30932ea9defbe2 WHIRLPOOL 8e9c6faa86c1b14e149859bc03c261743ff39513be1a4d3c0e42fc4f405166aace69646d508270e3759fc02c40d71691a0b27e9a0dbeb5d7304f0490f275bfb1
diff --git a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
new file mode 100644
index 000000000000..b9e9aed74280
--- /dev/null
+++ b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_P="eggdrop${PV}"
+PATCHSET_V="1.0"
+
+DESCRIPTION="An IRC bot extensible with C or TCL"
+HOMEPAGE="http://www.eggheads.org/"
+SRC_URI="
+	ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~binki/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCHSET_V}.tar.bz2"
+
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug mysql postgres ssl static vanilla"
+
+REQUIRED_USE="vanilla? ( !mysql !postgres !ssl )"
+
+DEPEND="
+	dev-lang/tcl:0
+	sys-apps/gentoo-functions
+	!vanilla? (
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql:*[server] )
+		ssl? ( dev-libs/openssl:0= )
+	)"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare()  {
+	# fix bug 571004 and a QA warning
+	epatch "${FILESDIR}/${P}-fix-gcc5-remove-inline.patch" \
+		"${FILESDIR}/${P}-fix-memset.patch"
+	if use vanilla; then
+		rm -f "${WORKDIR}"/patch/[1-6]*.patch || die
+	fi
+
+	EPATCH_SUFFIX="patch" epatch
+
+	# fix bug #335230
+	sed -i \
+		-e '/\$(LD)/s/-o/$(CFLAGS) $(LDFLAGS) &/' \
+		src/mod/*.mod/Makefile* src/Makefile.in || die
+	default
+}
+
+src_configure() {
+	use mysql    || ( echo mysql ; echo mystats ) >>disabled_modules
+	use postgres || echo pgstats >>disabled_modules
+	use static   && ( echo rijndael ; echo twofish ) >>disabled_modules
+
+	econf $(use_with ssl)
+
+	emake config
+}
+
+src_compile() {
+	local target=""
+
+	if use static && use debug; then
+		target="sdebug"
+	elif use static; then
+		target="static"
+	elif use debug; then
+		target="debug"
+	fi
+
+	emake -j1 ${target} # fixes #533490
+}
+
+src_install() {
+	local a b
+	emake DEST="${D}"/opt/eggdrop install
+
+	for a in doc/*; do
+		[ -f ${a} ] && dodoc ${a}
+	done
+
+	for a in src/mod/*.mod; do
+		for b in README UPDATES INSTALL TODO CONTENTS; do
+			[[ -f ${a}/${b} ]] && newdoc ${a}/${b} ${b}.${a##*/}
+		done
+	done
+
+	dodoc text/motd.*
+
+	use vanilla || dodoc \
+		src/mod/botnetop.mod/botnetop.conf \
+		src/mod/gseen.mod/gseen.conf \
+		src/mod/mc_greet.mod/mc_greet.conf \
+		src/mod/stats.mod/stats.conf \
+		src/mod/away.mod/away.doc \
+		src/mod/rcon.mod/matchbot.tcl \
+		src/mod/mystats.mod/tools/mystats.{conf,sql} \
+		src/mod/pgstats.mod/tools/{pgstats.conf,setup.sql}
+
+	dodoc -r doc/html
+
+	dobin "${FILESDIR}"/eggdrop-installer
+	doman doc/man1/eggdrop.1
+}
+
+pkg_postinst() {
+	elog "Please run /usr/bin/eggdrop-installer to install your eggdrop bot."
+}
diff --git a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch
new file mode 100644
index 000000000000..f7bcd8b80bca
--- /dev/null
+++ b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch
@@ -0,0 +1,52 @@
+diff --git a/src/net.c b/src/net.c
+index 68c245c..e48fb76 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -564,7 +564,7 @@ int open_address_listen(IP addr, int *port)
+ /* Returns a socket number for a listening socket that will accept any
+  * connection -- port # is returned in port
+  */
+-inline int open_listen(int *port)
++int open_listen(int *port)
+ {
+   return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port);
+ }
+diff --git a/src/proto.h b/src/proto.h
+index 117347e..e80e30b 100644
+--- a/src/proto.h
++++ b/src/proto.h
+@@ -271,7 +271,7 @@ int getsock(int);
+ void killsock(int);
+ void killtclsock(int);
+ int answer(int, char *, unsigned long *, unsigned short *, int);
+-inline int open_listen(int *);
++int open_listen(int *);
+ int open_address_listen(IP addr, int *);
+ int open_telnet(char *, int);
+ int open_telnet_dcc(int, char *, char *);
+diff --git a/src/tclhash.c b/src/tclhash.c
+index 822f920..7281ceb 100644
+--- a/src/tclhash.c
++++ b/src/tclhash.c
+@@ -109,7 +109,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl)
+   nfree(tl);
+ }
+ 
+-inline void garbage_collect_tclhash(void)
++void garbage_collect_tclhash(void)
+ {
+   tcl_bind_list_t *tl, *tl_next, *tl_prev;
+   tcl_bind_mask_t *tm, *tm_next, *tm_prev;
+diff --git a/src/tclhash.h b/src/tclhash.h
+index 4069014..3bd85a7 100644
+--- a/src/tclhash.h
++++ b/src/tclhash.h
+@@ -75,7 +75,7 @@ typedef struct tcl_bind_list_b {
+ 
+ #ifndef MAKING_MODS
+ 
+-inline void garbage_collect_tclhash(void);
++void garbage_collect_tclhash(void);
+ 
+ void init_bind(void);
+ void kill_bind(void);
diff --git a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch
new file mode 100644
index 000000000000..f4d60f322dac
--- /dev/null
+++ b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch
@@ -0,0 +1,11 @@
+diff --git a/src/md5/md5c.c b/src/md5/md5c.c
+index 4dce058..cfdf97c 100644
+--- a/src/md5/md5c.c
++++ b/src/md5/md5c.c
+@@ -267,5 +267,5 @@ void MD5_Final(unsigned char *result, MD5_CTX *ctx)
+ 	result[14] = ctx->d >> 16;
+ 	result[15] = ctx->d >> 24;
+ 
+-	egg_memset(ctx, 0, sizeof(ctx));
++	egg_memset(ctx, 0, sizeof(*ctx));
+ }
diff --git a/net-irc/eggdrop/files/eggdrop-installer b/net-irc/eggdrop/files/eggdrop-installer
new file mode 100644
index 000000000000..3f18376269ea
--- /dev/null
+++ b/net-irc/eggdrop/files/eggdrop-installer
@@ -0,0 +1,83 @@
+#!/bin/bash
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+source /lib/gentoo/functions.sh || {
+	echo "${0}: Could not source /lib/gentoo/functions.sh!"
+	exit 1
+}
+
+# Checks to see if user is trying to install eggdrop as root.
+root_check() {
+	if [ "${HOME}" = "/root" ] || [ "$(whoami)" = "root" ]
+	then
+		ewarn "You should not be installing eggdrop as root."
+		ewarn
+		ewarn "Installing eggdrop as root leaves your computer vulnerable"
+		ewarn "to attack from other irc clients. Please use the eggdrop-installer"
+		ewarn "script as the user who you wish to run eggdrop with"
+		exit 1
+	fi
+}
+
+# Usage information
+usage() {
+	cat <<USAGE_END
+Usage: eggdrop-installer <bot-name>
+Install eggdrop for a specific user, creating the directories and files
+needed for eggdrop to run securely and safely.
+USAGE_END
+	exit 1
+}
+
+# Install eggdrop
+install_eggdrop() {
+	einfo "Installing Eggdrop"
+	einfo
+
+	root_check
+
+	if [ -d "${bot_dir}" ]
+	then
+		einfo "Already found a bot home directory for ${bot_name}"
+		exit 1
+	fi
+
+	einfo "Creating directories for your eggdrop..."
+	for dir in logs filesys/incoming text tmp scripts var
+	do
+		mkdir -p "${bot_dir}/${dir}"
+	done
+
+	einfo "Creating symlinks to required files for your bot to run..."
+	for file in help language modules eggdrop
+	do
+		ln -s "/opt/eggdrop/${file}" "${bot_dir}/${file}"
+	done
+
+	einfo "Copying motd, banner, scripts and config file..."
+	cp /opt/eggdrop/text/* "${bot_dir}/text"
+	cp /opt/eggdrop/scripts/* "${bot_dir}/scripts"
+	cp /opt/eggdrop/eggdrop.conf "${bot_dir}/eggdrop.conf"
+
+	einfo "Finished..."
+	einfo
+	einfo "Please edit your ${bot_dir}/eggdrop.conf!"
+	einfo
+	einfo "The bot needs to be run from the ${bot_dir} directory."
+	einfo "Run 'cd ${bot_dir} && ./eggdrop -m eggdrop.conf'"
+	einfo "to create the user file and then remove the -m command line option"
+	einfo "to start your eggdrop bot."
+	einfo
+	einfo "If you need any help please refer to the man page, or"
+	einfo "eggdrop website at http://www.egghelp.org/"
+}
+
+if [ -z "${1}" ]
+then
+	usage
+else
+	bot_name="${1}"
+	bot_dir="${HOME}/.eggdrop/${bot_name}"
+	install_eggdrop
+fi
diff --git a/net-irc/eggdrop/metadata.xml b/net-irc/eggdrop/metadata.xml
new file mode 100644
index 000000000000..ec93e5973015
--- /dev/null
+++ b/net-irc/eggdrop/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eggheads/eggdrop</remote-id>
+		<bugs-to>https://github.com/eggheads/eggdrop/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/eiwic/Manifest b/net-irc/eiwic/Manifest
new file mode 100644
index 000000000000..5f366530c702
--- /dev/null
+++ b/net-irc/eiwic/Manifest
@@ -0,0 +1,6 @@
+AUX eiwic-1.1.3-ldflags.patch 648 SHA256 2ed6b18abd4003df0b5fd698f53e7d31d3627ee6fecd6da757e30aee093c2345 SHA512 1baa5f4ef8481b7401379140a5c68faffd25ba94bfef827794209358214bf43374ef729ebfe40182f6dfae698785923f5f426546701c48be2df73aa9c91d16a6 WHIRLPOOL b82622a863edf7ff373946b366e837d3425fa7928bc3b81fccdf76127e3de1d210ccde5987b1dcdddfeb58910881514c0f6ca7f59df67be79509a875a8dd4bf2
+DIST eiwic-1.1.4.tar.gz 117593 SHA256 6a49a859e46548f8ed005ed3c6338c64cc6725a08c32e5bbd075f8eee1eec800 SHA512 f4c6ac9853df2d26803bd3acd0987f6f4445ef0020a2e02b695eb362043f985eec8440ea9875c282e4f070e89b3ce7357947b99f86461a3bddef8cb2a85f8ce1 WHIRLPOOL f5147847f2884734ffcf90f532d0dd49ed96430dd7e76d223543fde30b8779db51a31314ea699ff132b7c8f773482850babe2be375b020fb914dfa9bf4ec1774
+EBUILD eiwic-1.1.4.ebuild 953 SHA256 b3f672bd164a58aa9a0bdb7313c0675c4b5c987d6f130cfa45997630646d63ad SHA512 907f6985139257de574b1155180307ee07622282fd4a89c70f01de459fe2273c55553322eaae2dcb3f23969b45eb5159d5beac0dc232bc2d6ba83d754fe2ce15 WHIRLPOOL ea62ca1f3b133cd883642a0240a003d9c98355e7be0ce35eb4d174d6fa936cb3bdd06713b0ed0b787e2afea91502e9303b7aab1f05fb859b548d4b83bac7cf39
+MISC ChangeLog 2324 SHA256 de03dc6f123a107af99f3f594f1393c4acfca0507a5236291aae94f0f646a9e3 SHA512 346ce442480f7217e4a3af6d386f5006461fa7a9b4a051feb166ad7007d055f610937f09f0cfa4ae0e8f86e4965c04e979ed529a66e4f41ea625bca660eed5b2 WHIRLPOOL a2ef38e4e77e349e489dcf921366092ed1c67f6e66484f1f7b0c9dd10f03dc485a87f057a1c3b7c6428e967212fc738307dc3fdee274994d89a695f6a091d859
+MISC ChangeLog-2015 1488 SHA256 5a9686ccf12bedac44b9795ea77863fda92a00084c973596f643a08f6e6b36e2 SHA512 0bea7a63d2f727bcb6c7a67fc3b047d516ca0cfb75acbaabb0e65a4f9a06c6781daa5ff1d21866a130b9b95da761848a1b1e1491406da4e8b8f7f79e4ca0b51a WHIRLPOOL e2b4bf5c0ce8c71f036dad053dbd3e7a89ad135418b7de9541c5ad300b2e4c5df812b568820a984439b7c358d2896e0dcd8f4bd50435e43e795b7f8511f15c97
+MISC metadata.xml 553 SHA256 55ceb6d1e2d15f944638b834f944f7b6908197d0b90583b40f00ce7902225133 SHA512 536fb40b8189b0ecb230bb202f10e514396dca5c88b3f3f99a4f302343a3b046d9e1e39bc63905b3ae529f45ebb3db0a44d9b602186fe2dd545b42762e33d052 WHIRLPOOL 81118696372c89b6b3a50ffc10837d873bfa70515d15fc7b1c47bebaad56266461f685398c61988724c25908e0187577fbcf44266f1e066e5a62ba3c12ebc3cc
diff --git a/net-irc/eiwic/eiwic-1.1.4.ebuild b/net-irc/eiwic/eiwic-1.1.4.ebuild
new file mode 100644
index 000000000000..e8a0f598cfc9
--- /dev/null
+++ b/net-irc/eiwic/eiwic-1.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+WANT_AUTOMAKE=1.10
+inherit autotools eutils multilib
+
+DESCRIPTION="A modular IRC bot written in C"
+HOMEPAGE="https://github.com/lordi/Eiwic"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug doc ipv6"
+
+DOCS="AUTHORS ChangeLog README NEWS TODO sample.conf"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.3-ldflags.patch
+
+	sed -i \
+		-e "/^set MODULE_PATH/s:modules:/usr/$(get_libdir)/eiwic:" \
+		-e "/^load MODULE/s:$:.so:" \
+		sample.conf || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_lib_raptor_raptor_init=no #409417
+
+	econf \
+		$(use_enable debug vv-debug) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	default
+	use doc && dohtml doc/*
+}
+
+pkg_postinst() {
+	elog "You need a configuration file to run eiwic. A sample configuration"
+	elog "was installed to /usr/share/doc/${PF}"
+}
diff --git a/net-irc/eiwic/files/eiwic-1.1.3-ldflags.patch b/net-irc/eiwic/files/eiwic-1.1.3-ldflags.patch
new file mode 100644
index 000000000000..2870dc4f322b
--- /dev/null
+++ b/net-irc/eiwic/files/eiwic-1.1.3-ldflags.patch
@@ -0,0 +1,13 @@
+--- modules/Makefile.am
++++ modules/Makefile.am
+@@ -15,8 +15,8 @@
+ 		echo "$@ skipped."; \
+ 	else :;\
+ 	if test $(patsubst %.so,%.c, $@) -nt $@ -o ! -e $@; then \
+-		echo "@CC@ @CFLAGS@ $(DEFS) $(INCLUDES) `$(ADD_BUILD_FLAGS)` -shared -fPIC $(patsubst %.so,%.c, $@) -o $@"; \
+-		@CC@ @CFLAGS@ $(DEFS) $(INCLUDES) `$(ADD_BUILD_FLAGS)`  -shared -fPIC $(patsubst %.so,%.c, $@) -o $@; \
++		echo "@CC@ @CFLAGS@ $(LDFLAGS) $(DEFS) $(INCLUDES) `$(ADD_BUILD_FLAGS)` -shared -fPIC $(patsubst %.so,%.c, $@) -o $@"; \
++		@CC@ @CFLAGS@ $(LDFLAGS) $(DEFS) $(INCLUDES) `$(ADD_BUILD_FLAGS)`  -shared -fPIC $(patsubst %.so,%.c, $@) -o $@; \
+ 	else :; fi; \
+ 	fi
+ 
diff --git a/net-irc/eiwic/metadata.xml b/net-irc/eiwic/metadata.xml
new file mode 100644
index 000000000000..c5c6f524c9e9
--- /dev/null
+++ b/net-irc/eiwic/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		Eiwic is an IRC-bot written in pure C. It can be easily extended by own modules,
+		that can be loaded at runtime. It has an module API which is designed to make
+		the creation of own modules as easy as possible. Including "output routing",
+		TCP/IP socket interface and timer functions.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">lordi/Eiwic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/emech/Manifest b/net-irc/emech/Manifest
new file mode 100644
index 000000000000..2476bdd032fb
--- /dev/null
+++ b/net-irc/emech/Manifest
@@ -0,0 +1,5 @@
+DIST emech-3.0.3.tar.gz 228709 SHA256 e29c62f50206083a9ae8d1f38591c0188a4cb62d09c3aa0f3e71ee3cdf6fb6b2 SHA512 ffe478c0c1800c8afb7afca62dbe08fce6af25a5878ca5fb44bb1271a302d11b96263c51a3848996db8f33f1cdab60d86c26d571d6342fe1505d4dcff83803a3 WHIRLPOOL 82417748e1972e244941a59e508e48510fd7f331239d9114c8b9b814e005881c1659d3ae59ddd7e386eb6ea0a570622eac84c53128babeba49213669616fa141
+EBUILD emech-3.0.3-r1.ebuild 1744 SHA256 5aa727c6a6f5a67d4b27df4f8bce090245417ff8f31f70bdd97b03ef01857f1c SHA512 539b9210d9a03e16c3350d706fa6042fd3d16de8b57397b1c28ce39ef88f7d526d2c89da51ddb41085c915fc6a378a3bc7e705417aca88e177112563b6cd09a2 WHIRLPOOL 0c65445a3f640ada00c03b56f0b1e51fc915807fd9a482d860718b911873386d5f29a582ba8c1d637d525023fc422aaa276eaffb8f09dea76ab25cfc3a04f25d
+MISC ChangeLog 2455 SHA256 879d13767241f6dbb1aecaba4e8408f4c55aa061b055ee0cfd54d6c16b503267 SHA512 785d698e598fd6a40caec400ec6df335a4e2ccd997adc12ed9eabe91507831080c3c7044e0a3813f3b7c7c4760998e3729230976712e1602bb01a709f4a5d49c WHIRLPOOL 2c9b31413b9c21281744e59bd01a70a6ea7765aeace98197730b4dfc8b30b826c02d3c1cc695479b777e0593116c09980087dcb5d69dbc52c989b306ba182883
+MISC ChangeLog-2015 2334 SHA256 fed712be61ddbbea28ff765909b213bd5a1b09773ab0e5d879358ddc691d1802 SHA512 036dd0d53172e4c7311de9ce9cf5e0d6e3c3323489bf7351e2e02ef83ba1e41a13b387059698df7435cdb3d95014ca71cc1f4dae5bfecb133e3ce71a46784432 WHIRLPOOL f15f8e4f14883d9f233fccdd1a340647e22e3ff17d73dd039c2b3081b6ec5f8a0d31346dc4e1b1ed69a28c613000a14624b1ecf27a332f351a1e6111229f35db
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/emech/emech-3.0.3-r1.ebuild b/net-irc/emech/emech-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..151f2255cb31
--- /dev/null
+++ b/net-irc/emech/emech-3.0.3-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils readme.gentoo toolchain-funcs
+
+DESCRIPTION="UNIX compatible IRC bot programmed in the C language"
+HOMEPAGE="http://www.energymech.net/"
+SRC_URI="http://www.energymech.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE="debug session tcl"
+
+DOC_CONTENTS="You can find a compressed sample config file at /usr/share/doc/${PF}"
+
+src_prepare() {
+	sed -i \
+		-e 's: "help/":"/usr/share/energymech/help/":' \
+		-e 's: "messages/":"/usr/share/energymech/messages/":' \
+		src/config.h.in || die
+	# Respect CFLAGS and LDFLAGS
+	sed -i \
+		-e '/^LFLAGS/s/\$(PIPEFLAG)/\0 \$(OPTIMIZE) \$(LDFLAGS)/' \
+		-e '/^GDBFLAG/d' \
+		-e '/^PIPEFLAG/d' \
+		src/Makefile.in || die
+
+	epatch_user
+}
+
+myconf() {
+	echo ./configure $*
+	./configure $* || die "./configure failed"
+}
+
+src_configure() {
+	myconf \
+		--with-alias \
+		--with-botnet \
+		--with-bounce \
+		--with-ctcp \
+		--with-dccfile \
+		--with-dynamode \
+		--with-dyncmd \
+		--with-greet \
+		--with-ircd_ext \
+		--with-md5 \
+		--with-newbie \
+		--with-note \
+		--with-notify \
+		--with-rawdns \
+		--with-redirect \
+		--with-seen \
+		--with-stats \
+		--with-telnet \
+		--with-toybox \
+		--with-trivia \
+		--without-uptime \
+		--with-web \
+		--with-wingate \
+		--without-profiling \
+		$(use_with tcl) \
+		$(use_with session) \
+		$(use_with debug)
+}
+
+src_compile() {
+	emake -C src CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/energymech
+
+	insinto /usr/share/energymech
+	doins -r help
+
+	insinto /usr/share/energymech/messages
+	doins messages/*.txt
+
+	dodoc sample.* README* TODO VERSIONS CREDITS checkmech
+	readme.gentoo_create_doc
+}
diff --git a/net-irc/emech/metadata.xml b/net-irc/emech/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/emech/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/epic4/Manifest b/net-irc/epic4/Manifest
new file mode 100644
index 000000000000..02cbb8d67b51
--- /dev/null
+++ b/net-irc/epic4/Manifest
@@ -0,0 +1,10 @@
+AUX epic-defaultserver.patch 620 SHA256 54d016eb90d1b1aab13d399398ba69450876941f947f53e9b9341d32e24403ea SHA512 5f939cac74194e0e92e7ce48fe668244201ae24590be9e8c71bf6fe74adbbd7cdfad6b43b3ccd755cbf22c4362467e72d7a0e7877c0b0f04340f58a039b67e7d WHIRLPOOL c111c87c73c115c94253cb41d23a309751ad7de2f1c1cddbe11b50d7186c627831385b754fe982620d047de4d405d1c357ac5a6c1bd30945f740271167d2dba2
+AUX epic4-2.10.1-make-recursion.patch 275 SHA256 5a8792c5febb7bafc1b895189e47e9ba35e60bb71ba52b04b090a99008774234 SHA512 e5def43f987585aa66761260f507049f67eca75a3cbef3b6f0a7283d0412388cb810ce7692877a62582816bca9887ee2c87429b8246442774bcecd5e195e4d1b WHIRLPOOL badae6ee1bde6d02d8d4739d804d97c59190110315b1a9a69e0beec52c0f13537c62630304de9acb7f0ad44a993085c8dab40e100680d83e0ab38e162a085128
+AUX epic4-2.10.1-perl.patch 1405 SHA256 9c192f37c314c348f0965daa2e212cc5c0127285b998ee43766b72650aad675e SHA512 958e54d18199b412a7f03917d62169227e0ac3be73793698c518cf676375879227d6c754622e722729369197853a2c22f1e6f7de97841c01471dd7b020d42781 WHIRLPOOL d7bf18f8a364b6915791bde71be1de8ed75ed8f3d1188ae6fe52b17cf0e0554ee2535a25810ebef12e4880b80057bebfebd4c7478bcba02430d909ad112d6c59
+DIST epic4-2.10.1.tar.bz2 629722 SHA256 7eb6294c0a1a5aee8bc47f9c6904b2240bf7163e4e07d295296f6b2e214e9935 SHA512 382a0ad6d2778aba037ee1cf065ec7d2ea3827957010f9eea36072fbb8bf14cdba5baffa9a3ce7888305a2451ae61a4b5b5823336fc80b73997fe0d609918656 WHIRLPOOL 0d7ccf95886124ccc0cefe5674990fd778eaa84c836404ab1b74cde090e89e91b59950a3c7ce3eecd33e83a8abaa00bfbf7d192d16c69dd4bf94fcfca37c0c79
+DIST epic4-help-20050315.tar.gz 332502 SHA256 714afd07348731e6ac82e1f6548acc12e84539b3106ab27fa5d00ed5696256f7 SHA512 f59339d4f2c339cb4c3cbc0cce7db8fadbfe469884c16ab9add42e98eb318851e48ce8a04b4920d33c42afff8b39ec41186744eda0460af544c43fe14658e7e6 WHIRLPOOL c2d3783d99692c562490707f68e6b2f2c50c11ef3053e7574c8f049e01504f171f8d86e189e8849e30bb0f3097dc5c7ebb61db9f869b22345ebbfdcdb2daaf38
+DIST epic4-local.bz2 6530 SHA256 4509ac8e491ac0b75dc5ddcef845b02b3610804dd98de9b5b98d58630be322cd SHA512 2f4bb0aee284ddedd95dd97b17bd1756fcc700ec07b2814d84f3185e215134600fdd0fadf7ecb1d490ebb449f5e9530fcb207ebfaec27cfce1f9570e73103cc1 WHIRLPOOL 437ab54779f6579a77870b792bf1f763f94c2faf29ca3adfa0d465385dd67b8bf3fc315130761ba8a305c3c01f01e46fe3c1f708110b3ee5a79221a17fb32ab1
+EBUILD epic4-2.10.1.ebuild 2714 SHA256 d879eefe23cc7118a4effbd3047f7caebc1d925b413a1364d0bb47547fbfa26d SHA512 9f3b5eac97febf130e179170fa4377864c08319a42981aa6003ea24a83be3bbe920e64117c012c53dbdb686da766da4bffdb0fef1f303d0c1cfda3a902273e6f WHIRLPOOL dee4fbfe8024b24968397cf6ffadea94ae285c6e0dd98a442d1731bf88f2b2f780cd187abd0b495a700c3e5e0ad64de1e4a75908e035ddaf85c9287be1e67841
+MISC ChangeLog 2560 SHA256 e046d4a4ce0ae5b7bc29808b21187871ded5ed6a292d784e4b3baa4217d228b6 SHA512 0e921a9324ec9573107834b66a03565e78056325d0950ad3ea1466f7759a2a7f52f35c3b0f9f0e00f30f50e1c5e919473a14dee3f94637570f8b5d6841e9a564 WHIRLPOOL ebf1274f45807099b20989c7c5b9e024de40331498ce7a21ee59034cd3c700ce8c6273713905c439b93ee188e50d69ff8b0262b38aa5e8a033a0f6f7bd534c4d
+MISC ChangeLog-2015 13939 SHA256 f48ade7c97f0486ca31b3957648f1a34c0d2e20bfccd0e50338916229b7aa8ea SHA512 4984c59c13980cacda3e0fe19734e7ac85db8543b186e2ecd6d93410feb576d47edae237e2afa3ed8406a42b7b0c81cfafc55358312f026d7d2235e7977daa59 WHIRLPOOL 2b5c84cbefcdc61f52a2e5b58a0191fbff5f3a599c81c3255495a43fd8dc08743449666b935a3faa2252b3dcf1ca35dcb6c2123a14c7d37f4d41c2a291a01b5f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/epic4/epic4-2.10.1.ebuild b/net-irc/epic4/epic4-2.10.1.ebuild
new file mode 100644
index 000000000000..fa6e98d50759
--- /dev/null
+++ b/net-irc/epic4/epic4-2.10.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+HELP_V="20050315"
+
+DESCRIPTION="Epic4 IRC Client"
+HOMEPAGE="http://epicsol.org/"
+SRC_URI="
+	ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/${P}.tar.bz2
+	ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-${HELP_V}.tar.gz
+	mirror://gentoo/epic4-local.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 perl ssl"
+
+DEPEND="
+	>=sys-libs/ncurses-5.2
+	perl? ( dev-lang/perl )
+	ssl? ( >=dev-libs/openssl-0.9.5:0 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/epic-defaultserver.patch \
+		"${FILESDIR}"/${P}-make-recursion.patch \
+		"${FILESDIR}"/${P}-perl.patch
+
+	eautoconf
+
+	rm -f "${WORKDIR}"/help/Makefile || die
+	ecvs_clean
+}
+
+src_configure() {
+	replace-flags "-O?" "-O"
+
+	# copied from alt overlay
+	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_getpgrp_void=yes
+
+	econf \
+		--libexecdir="${EPREFIX}"/usr/libexec/${PN} \
+		$(use_with ipv6) \
+		$(use_with perl) \
+		$(use_with ssl)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	einstall \
+		sharedir="${ED}"/usr/share \
+		libexecdir="${ED}"/usr/libexec/${PN}
+
+	dodoc BUG_FORM README KNOWNBUGS VOTES
+
+	cd "${S}"/doc || die
+	docinto doc
+	dodoc \
+		*.txt colors EPIC* IRCII_VERSIONS local_vars missing new-load \
+		nicknames outputhelp SILLINESS TS4
+
+	insinto /usr/share/epic
+	doins -r "${WORKDIR}"/help
+}
+
+pkg_postinst() {
+	if [ ! -f "${EROOT}"/usr/share/epic/script/local ]; then
+		elog "/usr/share/epic/script/local does not exist, I will now"
+		elog "create it. If you do not like the look/feel of this file, or"
+		elog "if you'd prefer to use your own script, simply remove this"
+		elog "file.  If you want to prevent this file from being installed"
+		elog "in the future, simply create an empty file with this name."
+		cp "${WORKDIR}"/epic4-local "${EROOT}"/usr/share/epic/script/local
+		elog
+		elog "This provided local startup script adds a number of nifty"
+		elog "features to Epic including tab completion, a comprehensive set"
+		elog "of aliases, and channel-by-channel logging.  To prevent"
+		elog "unintentional conflicts with your own scripting, if either the"
+		elog "~/.ircrc or ~/.epicrc script files exist, then the local script"
+		elog "is *not* run.  If you like the script but want to make careful"
+		elog "additions (such as selecting your usual servers or setting your"
+		elog "nickname), simply copy /usr/share/epic/script/local to ~/.ircrc"
+		elog "and then add your additions to the copy."
+	fi
+
+	# Fix for bug 59075
+	chmod 755 "${EROOT}"/usr/share/epic/help
+}
diff --git a/net-irc/epic4/files/epic-defaultserver.patch b/net-irc/epic4/files/epic-defaultserver.patch
new file mode 100644
index 000000000000..1dbc2087cce9
--- /dev/null
+++ b/net-irc/epic4/files/epic-defaultserver.patch
@@ -0,0 +1,12 @@
+diff -Naur epic4-1.1.14.orig/include/config.h epic4-1.1.14/include/config.h
+--- epic4-1.1.14.orig/include/config.h	2003-10-28 05:53:57.000000000 +0000
++++ epic4-1.1.14/include/config.h	2004-01-03 13:49:53.083473288 +0000
+@@ -42,7 +42,7 @@
+  *  the client will NOT compile and work properly!  Use the default here if
+  *  you dont have other servers to use.
+  */
+-#define DEFAULT_SERVER "localhost irc.efnet.net irc.undernet.org irc.dal.net"
++#define DEFAULT_SERVER "localhost irc.freenode.net irc.efnet.net irc.undernet.org irc.dal.net"
+ 
+ /*
+  * The left and right brace characters ('{', '}') are special characters in
diff --git a/net-irc/epic4/files/epic4-2.10.1-make-recursion.patch b/net-irc/epic4/files/epic4-2.10.1-make-recursion.patch
new file mode 100644
index 000000000000..68d7e4c460b6
--- /dev/null
+++ b/net-irc/epic4/files/epic4-2.10.1-make-recursion.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -210,6 +210,6 @@
+ 	$(RM) Makefile source/Makefile include/sig.inc config.status config.cache config.log include/defs.h source/info.c.sh
+ 
+ depend:
+-	(cd source;make depend)
++	(cd source;$(MAKE) depend)
+ 
+ # This is the end of the file.
diff --git a/net-irc/epic4/files/epic4-2.10.1-perl.patch b/net-irc/epic4/files/epic4-2.10.1-perl.patch
new file mode 100644
index 000000000000..ce41d153abc6
--- /dev/null
+++ b/net-irc/epic4/files/epic4-2.10.1-perl.patch
@@ -0,0 +1,54 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Fix broken perl detection somewhat.
+
+--- a/configure.in
++++ b/configure.in
+@@ -636,25 +636,27 @@
+ dnl
+ 
+ AC_MSG_CHECKING(whether to support Perl)
+-AC_ARG_WITH(perl,
+-[  --with-perl[=PATH]       Compile with perl support.],
+-[ test -z "$withval" && withval=yes ],
+-)
+-test "xno" != "x$withval" && for base in $withval /usr/local /usr /
+-do
+-	FOUND=
+-	for ext in so a dll ; do
+-		test -r $base/lib/libperl.$ext && FOUND=1
+-		test -r $base/libperl.$ext && FOUND=1
+-	done
+-	test -n "$FOUND" || continue
+-	AC_MSG_RESULT(yes)
+-	LIBS="$LIBS `perl -MExtUtils::Embed -e ldopts`"
+-	PERLDOTOH="perl.o"
+-	AC_DEFINE(PERL)
+-	break
+-done
+-test -z "$PERLDOTOH" && AC_MSG_RESULT(no)
++AC_ARG_WITH([perl],
++	[AS_HELP_STRING([--with-perl[=PATH]], [Compile with perl support.])],
++	[],
++	[with_perl=maybe])
++AS_IF([test "xno" != "x$with_perl"],
++	[
++	PERL_LIBS="`perl -MExtUtils::Embed -e ldopts`"
++	AS_IF([test -n "$PERL_LIBS"],
++		[
++		AC_MSG_RESULT([yes])
++		LIBS="$LIBS $PERL_LIBS"
++		AC_DEFINE([PERL], [], [Define if perl support should be compiled])
++		PERLDOTOH="perl.o"
++		],
++		[
++		AC_MSG_RESULT([no])
++		AS_IF([test "x$with_perl" != "xmaybe"],
++			[AC_MSG_ERROR([You specified --with-perl, but I was unable to find libperl])])
++		])
++	])
++
+ withval=''
+ 
+ dnl ----------------------------------------------------------
+
+Diff finished.  Thu Jun 30 22:15:26 2011
diff --git a/net-irc/epic4/metadata.xml b/net-irc/epic4/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/epic4/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
new file mode 100644
index 000000000000..851ed076be5c
--- /dev/null
+++ b/net-irc/epic5/Manifest
@@ -0,0 +1,11 @@
+AUX epic5-1.1.10-ruby-automagic-as-needed.patch 4139 SHA256 d16b22cb98e5129f15ebdeea746716673af349a5ab0805b6c89c6359f384d44c SHA512 2aa7122a4192849eb3c99c567cc0ad3fb914c4ef17555aecdffeee2b3792f511c3cd43ba069163889705e7a64d04e0636aa0b77934f9605eacfa1ed8d53afa9d WHIRLPOOL f90fe7dbb92fe773f1362af5c1f0328ebfac2e862761f80c32ae54e938b1d05b0f67cc22d1b4a08f0b4956e99da196c9d9d25c437c60d9d892cde994f5a5cbd1
+AUX epic5-1.1.10-socks5-libsocks.patch 1191 SHA256 9358fee981a228211def2f8d236dec8ed5e3cab4f0b996260acaaecfae3bdccf SHA512 bc0a441ef90d454441789fb1a11c3183776544a675acdc33158357ebad6bbc2a89c8689dad89cefe69b59ff7b6de4e97add32d84a500e83d3469634253ef6b3f WHIRLPOOL 40c4d0e914d7123efd0f66de61a07673e1ae2f8146d17a7c8879f754ec04618f63f81956679ef5e5c414444084bedabe3506e04d76664154d2bd51d17c199094
+AUX epic5-1.1.10-tcl-automagic-as-needed.patch 3453 SHA256 60e469a150c04cd720e0eac23e5a589fc548e6b926434796a259cd4801fde7dc SHA512 845e2e2ff40ab0c5351bc995457060b19781b07285e7115013cf5dea7ba333f28b9c248dd66369fda8a6038ad4de4fb71fb1d77c5b51568667a491efaebd72df WHIRLPOOL bdd17f1d236c3ae170186a48af417dbe4639842132aa04aaf7e462b307de4895cd54b65f28cf0436207f610fb5731fbcb76371c18c699a28a425100e8e7b0d27
+AUX epic5-1.1.10-without-localdir.patch 1780 SHA256 487a5614ac4099264e7ef7568858a5d83568cebc8a64d490ecd0597455e99a35 SHA512 788683fe1448793a2d8a5e50dda3dfb0aef86c44cbec11ed0a92444967a1775050bdd3ac40c44989b6fce16a6e7db154aa26d4f4c6692538eca2e661d32af7a6 WHIRLPOOL f95418fde4ae9cc8585b49f8b314d958410dc13287ffa12fffd6720d8d76dd9febceba4ed3dc8ba123884b2f1da21db88d204df75ef8f89c93680241a60614b3
+AUX epic5-1.1.2-libarchive-automagic.patch 1707 SHA256 c04768c6c2fb5dbb5c879d1025cdd6a7d02e7fd3cfc25b081e58e301c2e58439 SHA512 6f438cc70982538e09d9a0eef7e2c42c331aa73c279157d4bd44b48c6aea26b08b9433927a51fef025acf22bfeec330c4c99946538eae5dca50360963e5f828c WHIRLPOOL eb60683cc0424e3948bed3227467c8d39f13d6bc1a8e19f907c59595f2620282343b1649301ce35c4a86c8b68170043846d742ccc69eff3a2378fa1d6bc7928d
+AUX epic5-1.1.2-perl-automagic-as-needed.patch 3123 SHA256 2bdb85285e83a2ab1f68eb9b43313e9e0695f7de045312dfae4ec7dcdbabd10a SHA512 bd58fa5b49b0b9c900612d1183d696e6683113420f79702df0706a3bd3885bc6215a178a11ca9dff8c9337314cf72488b85217d731b162dea95f4c8e22d50a6c WHIRLPOOL 34091febf2784d7cd4ef5deb6485fb17bf32bcedda17e6f899e29da876204d57a6492b8250d2a1631e46aaf1c9c2438b452c7cf3bac005cdb29931f7e70873b4
+DIST epic5-1.1.10.tar.bz2 851439 SHA256 a4f19214e8eb9a7aceaed62d924d96d8c9359b186ff230c01daff398dd62cdb5 SHA512 d0215570962253a0d5c60dacec86db1094575b0765db039247cf16b5957ba721576618ff73588610ba528782f4460fd4bbe5a1869e60e2c10d832d41ea3c6048 WHIRLPOOL 906b919e99a4bfed78bab153aae3964850be17de958382859547fc34ded75a546714c57c4b1857597fec210359f93a1f6da3b5375a689ac435be381b101ec64a
+EBUILD epic5-1.1.10-r1.ebuild 2218 SHA256 7eedefbdb33dd7249d724c4f46995f89479441c7139b4e257d1aec533cc8e17e SHA512 2e16408ba7ee0246f7b6ad7389675208cd6d25ff94dfb8454a467e6572e57c5e17a78c27d5b07cb174423ddc4253106e223b06f6a257060f119f4dc2c00a26f3 WHIRLPOOL 9ca7d7dce3a30b2c1f4cfe1e41c022782c8389b5d13acc8810099599e8010f57519b1f237566fa8b8ae68cb44bdffdb43909be3e8f80a25d7cb0b1da6fe28726
+MISC ChangeLog 3341 SHA256 a91ea9a8df0acdf0bccbab2ce89616902ca1e4d289d834c736357b0d01d3f12a SHA512 a9b4fd058e7ec3174ce18b43a403ac33bb2f9ef5911fad21a96844398610956765ecad0810932a415a01b31ba3d28082a1ddd37a76d3c4b36cd745d479392744 WHIRLPOOL 9fcabbbeffe20aae3c74b3fd3178615507226d0c2526a8d1d674026bde75accaebd9555eefc6e75b07ada6d77aa9a5a0eff8a2ceeb1976abfaa90da932df7c87
+MISC ChangeLog-2015 4923 SHA256 18ba4c6536ac45ec578e1e9a24c99d6fd1760f9442570d26242f8db20073f246 SHA512 81e4257df675ffb4259e015e7787113e37fa9b8d12372d5e8111e74c4a998bd40a7e2c4eb9e7d2c1ca09c2675781931c7cdddc8d92e05ffcf5b3273e6e1b9b55 WHIRLPOOL 30d9f7f8b70a11dcf14806577ef7b0234380322cbf07fb295e7f12efe7f20178042596acaeb6641e316f89fb29102b986100b99c0efad18b35d2abb4191deac6
+MISC metadata.xml 447 SHA256 399695aa12c4af43e1cf7f628ef4006ad50c65dcff5d71e6dff3d0e6c1f2df7e SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a WHIRLPOOL 1d23dab8c79720943244120973d7ba619ea0559bb131462cb94e8e056f24800af6607d36d7b8f5dc40260b0bee8fa647be76cab55583ccce9fac1e8de725bac7
diff --git a/net-irc/epic5/epic5-1.1.10-r1.ebuild b/net-irc/epic5/epic5-1.1.10-r1.ebuild
new file mode 100644
index 000000000000..b10edb0ea041
--- /dev/null
+++ b/net-irc/epic5/epic5-1.1.10-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+USE_RUBY="ruby20 ruby21 ruby22"
+RUBY_OPTIONAL=yes
+inherit autotools eutils multilib ruby-ng toolchain-funcs
+
+DESCRIPTION="Epic5 IRC Client"
+SRC_URI="ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${P}.tar.bz2"
+HOMEPAGE="http://epicsol.org/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="archive ipv6 perl tcl ruby socks5 valgrind"
+
+RDEPEND="
+	>=dev-libs/openssl-0.9.8e-r3:0
+	>=sys-libs/ncurses-5.6-r2
+	virtual/libiconv
+	archive? ( app-arch/libarchive )
+	perl? ( >=dev-lang/perl-5.8.8-r2 )
+	tcl? ( dev-lang/tcl:0 )
+	socks5? ( net-proxy/dante )
+	ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+REQUIRED_USE="ruby? ( ^^ ( $(ruby_get_use_targets) ) )
+	$(for t in $(ruby_get_use_targets); do echo "${t}? ( ruby )"; done)"
+
+S=${WORKDIR}/${P}
+
+pkg_setup() {
+	# bug #489608, bug #497080
+	use ruby && ruby-ng_pkg_setup
+}
+
+# Don't use ruby-ng's separated sources support:
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.1.2-libarchive-automagic.patch \
+		"${FILESDIR}"/${P}-ruby-automagic-as-needed.patch \
+		"${FILESDIR}"/${P}-tcl-automagic-as-needed.patch \
+		"${FILESDIR}"/${PN}-1.1.2-perl-automagic-as-needed.patch \
+		"${FILESDIR}"/${P}-without-localdir.patch \
+		"${FILESDIR}"/${P}-socks5-libsocks.patch
+	eautoconf
+}
+
+src_configure() {
+	# Because of our REQUIRED_USE constraints above, we know that
+	# ruby_get_use_implementations will only ever return one ruby
+	# implementation.
+	econf \
+		--libexecdir="${EPREFIX}"/usr/lib/misc \
+		$(use_with archive libarchive) \
+		$(use_with ipv6) \
+		$(use_with perl) \
+		$(use_with ruby ruby "$(ruby_implementation_command $(ruby_get_use_implementations))") \
+		$(use_with socks5) \
+		$(use_with tcl tcl "${EPREFIX}"/usr/$(get_libdir)/tclConfig.sh) \
+		$(use_with valgrind valgrind)
+}
+
+src_compile() {
+	# parallel build failure
+	emake -j1
+}
+
+src_install () {
+	default
+
+	dodoc BUG_FORM COPYRIGHT EPIC4-USERS-README README KNOWNBUGS VOTES
+
+	cd "${S}"/doc || die
+	docinto doc
+	dodoc \
+		*.txt colors EPIC* IRCII_VERSIONS missing \
+		nicknames outputhelp README.SSL SILLINESS TS4
+}
diff --git a/net-irc/epic5/files/epic5-1.1.10-ruby-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.10-ruby-automagic-as-needed.patch
new file mode 100644
index 000000000000..ba277ca8f60b
--- /dev/null
+++ b/net-irc/epic5/files/epic5-1.1.10-ruby-automagic-as-needed.patch
@@ -0,0 +1,134 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Fix up linking against libruby when using
+	LDFLAGS=-Wl,--as-needed. Also allow ruby to be a non-automagic
+	dependency.
+
+--- a/configure.in	Tue Mar 25 07:39:34 2014 +0000
++++ b/configure.in	Tue Mar 25 07:55:14 2014 +0000
+@@ -1168,34 +1168,28 @@
+ dnl
+ dnl Ruby support?
+ dnl
+-AC_ARG_WITH(ruby,
+-[  --with-ruby[=PATH_TO_RUBY_EXE]       Compile with ruby support.],
+-[ 
+-	rubyexe=$withval
+-],
+-	rubyexe=yes
+-)
+-
+-if test "x$rubyexe" = "xyes"; then
+-	for i in ruby ruby20 ruby19 ruby18 ruby2.0 ruby1.9.1 ruby1.9 ruby1.8; do
+-		$i -h 2>&1 >/dev/null && rubyexe=$i && break
+-	done
+-	if test "x$rubyexe" = "xyes"; then
+-		rubyexe=no
+-	fi
+-fi
++AC_ARG_WITH([ruby],
++       [AS_HELP_STRING([--with-ruby[=PATH_TO_RUBY_EXE]], [Compile with ruby support.])],
++       [], [with_ruby=maybe])
+ 
+-if test "x$rubyexe" = "xno"; then
++with_ruby_errormsg="--with-ruby was specified but I could not locate ruby. Please try specifying --with-ruby=/path/to/ruby or --without-ruby."
++AC_MSG_CHECKING([whether to support Ruby])
++if test "x$with_ruby" = "xno" ; then
+ 	AC_MSG_CHECKING(whether to support Ruby)
+ 	AC_MSG_RESULT(no)
+ else
+-	AC_CHECK_PROG(RUBYPROG, $rubyexe, "yes", "no")
+-	AC_MSG_CHECKING(whether to support Ruby)
+-	if test $RUBYPROG != "yes" ; then 
+-	    AC_MSG_RESULT(no)
++	AC_MSG_RESULT(yes)
++	AS_IF([test "x$with_ruby" = "xyes" -o "x$with_ruby" = "xmaybe"],
++		[rubyexe=ruby],
++		[rubyexe="$with_ruby"])
++	dnl Support --with-ruby being passed a full path instead of just an executable name.
++	AS_IF([test -x "$rubyexe"],
++		[RUBYPROG=yes],
++		[AC_CHECK_PROG([RUBYPROG], [$rubyexe], [yes], [no])])
++	if test "x$RUBYPROG" = xno ; then
++		AS_IF([test "x$with_ruby" != "xmaybe"],
++			[AC_MSG_ERROR([$with_ruby_errormsg])])
+ 	else
+-	    AC_MSG_RESULT(yes)
+-
+ 	    dnl ---- 
+ 	    dnl Look first for Ruby 1.9
+ 	    incdir=`$rubyexe -rrbconfig -e 'puts RbConfig::CONFIG[["rubyhdrdir"]]'`
+@@ -1208,15 +1205,15 @@
+ 
+ 	    rubylibs=`$rubyexe -rrbconfig -e 'puts RbConfig::CONFIG[["LIBRUBYARG"]]'`
+ 	    extralibs=`$rubyexe -rrbconfig -e 'puts RbConfig::CONFIG[["LIBS"]]'`
+-	    RUBYLDFLAGS="$rubylibs $extralibs"
++	    RUBYLIBS="$rubylibs $extralibs"
+ 	    RUBYDOTOH="ruby.o"
+ 
+ 	    AC_MSG_CHECKING(whether embedded ruby works the way I expect)
+ 	    have_embedded_ruby="no"
+ 	    old_CFLAGS="$CFLAGS"
+-	    old_LDFLAGS="$LDFLAGS"
++	    old_LIBS="$LIBS"
+ 	    CFLAGS="$CFLAGS $RUBYCFLAGS"
+-	    LDFLAGS="$LDFLAGS $RUBYLDFLAGS"
++	    LIBS="$LIBS $RUBYLIBS"
+ 	    AC_TRY_LINK([
+ #include <ruby.h>
+     VALUE epic_echo (VALUE module, VALUE string)
+@@ -1241,9 +1238,9 @@
+ 		AC_MSG_RESULT(no)
+ 		AC_MSG_CHECKING(whether ruby requires -pthread to link)
+ 		RUBYCFLAGS="$RUBYCFLAGS -pthread"
+-		RUBYLDFLAGS="$RUBYLDFLAGS -pthread"
+-		CFLAGS="$CFLAGS $RUBYCFLAGS"
+-		LDFLAGS="$LDFLAGS $RUBYLDFLAGS"
++		RUBYLIBS="$RUBYLIBS -pthread"
++		CFLAGS="$old_CFLAGS $RUBYCFLAGS"
++		LIBS="$old_LIBS $RUBYLIBS"
+ 
+ 	        AC_TRY_LINK([
+ #include <ruby.h>
+@@ -1268,17 +1265,19 @@
+ 	    fi
+ 
+ 	    CFLAGS="$old_CFLAGS"
+-	    LDFLAGS="$old_LDFLAGS"
++	    LIBS="$old_LIBS"
+ 	    if test $have_embedded_ruby = "yes" ; then
+ 		AC_MSG_RESULT(yes)
+ 		AC_DEFINE(HAVE_RUBY)
+ 		AC_DEFINE(RUBYCFLAGS)
+-		AC_DEFINE(RUBYLDFLAGS)
++		AC_DEFINE(RUBYLIBS)
+ 	    else
++		AS_IF([test "x$with_ruby" != "xmaybe"],
++			[AC_MSG_ERROR([$with_ruby_errormsg])])
+ 	        RUBYDOTOH=""
+ 		HAVE_RUBY=""
+ 		RUBYCFLAGS=""
+-		RUBYLDFLAGS=""
++		RUBYLIBS=""
+ 		AC_MSG_RESULT(no, sorry)
+ 	    fi
+ 	fi
+@@ -1376,7 +1375,7 @@
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(RUBYDOTOH)
+ AC_SUBST(RUBYCFLAGS)
+-AC_SUBST(RUBYLDFLAGS)
++AC_SUBST(RUBYLIBS)
+ AC_SUBST(TCLDOTOH)
+ AC_SUBST(TCLCFLAGS)
+ AC_SUBST(TCLLDFLAGS)
+--- a/source/Makefile.in	Tue Mar 25 07:39:34 2014 +0000
++++ b/source/Makefile.in	Tue Mar 25 07:55:14 2014 +0000
+@@ -38,7 +38,7 @@
+ epic5: $(OBJECTS)
+ 	sh info.c.sh
+ 	$(CC) $(CFLAGS) $(INCLUDES) -c info.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLDFLAGS@ @RUBYLDFLAGS@ $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLDFLAGS@ @RUBYLIBS@ $(LIBS)
+ 	$(RM) info.c info.o
+ clean::
+ 	$(RM) epic5 $(OBJECTS)
diff --git a/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
new file mode 100644
index 000000000000..c2555c059e79
--- /dev/null
+++ b/net-irc/epic5/files/epic5-1.1.10-socks5-libsocks.patch
@@ -0,0 +1,37 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Use -lsocks instead of -lsocks5 for `./configure --with-socks5`.
+
+Index: configure.in
+===================================================================
+RCS file: /home/cvs/repository/epic5/configure.in,v
+retrieving revision 1.101
+diff -u -b -B -u -r1.101 configure.in
+--- configure.in	9 Apr 2014 17:51:06 -0000	1.101
++++ configure.in	4 Sep 2014 00:18:00 -0000
+@@ -861,7 +861,7 @@
+ 
+ AC_MSG_CHECKING(whether to support SOCKS)
+ AC_ARG_WITH(socks,
+-[  --with-socks[=PATH]     Compile with SOCKS firewall traversal support.],
++[  --with-socks[=PATH]     Compile with SOCKS (libsocks without socks.h) firewall traversal support.],
+ [ case "$withval" in
+   no)
+ 	AC_MSG_RESULT(no)
+@@ -887,7 +887,7 @@
+ 
+ AC_MSG_CHECKING(whether to support SOCKS5)
+ AC_ARG_WITH(socks5,
+-[  --with-socks5[=PATH]    Compile with SOCKS5 firewall traversal support.],
++[  --with-socks5[=PATH]    Compile with SOCKS5 (libsocks with socks.h) firewall traversal support.],
+ [ case "$withval" in
+   no)
+ 	AC_MSG_RESULT(no)
+@@ -899,7 +899,7 @@
+ 	fi
+ 
+ 	AC_MSG_RESULT(yes)
+-	LIBS="$LIBS -lsocks5"
++	LIBS="$LIBS -lsocks"
+ 	AC_DEFINE(SOCKS)
+ 	AC_DEFINE(USE_SOCKS5)
+ 	;;
diff --git a/net-irc/epic5/files/epic5-1.1.10-tcl-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.10-tcl-automagic-as-needed.patch
new file mode 100644
index 000000000000..5b5b932b06bc
--- /dev/null
+++ b/net-irc/epic5/files/epic5-1.1.10-tcl-automagic-as-needed.patch
@@ -0,0 +1,116 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Make dependence on TCL not be automagic (so that --with-tcl
+	errors out if TCL can't be found and not specifying --with-tcl
+	does the normal automagic behavior).  Support
+	LDFLAGS=-Wl,--as-needed by using LIBS instead of LDFLAGS for
+	-ltcl as appropriate.
+
+--- a/configure.in
++++ b/configure.in
+@@ -1122,43 +1122,41 @@
+ dnl
+ dnl Tcl support?
+ dnl
+-AC_ARG_WITH(tcl,
+-[  --with-tcl[=PATH_TO_tclConfig.sh]      Compile with tcl support.],
+-[
+-	tclconfig=$withval
+-],
+-	tclconfig="yes"
+-)
+-
+-if test "x$tclconfig" = "xyes" ; then
+-	for i in /usr/lib $localdir/lib $localdir/lib/tcl8.4 ; do
+-		if test -r $i/tclConfig.sh ; then
+-			tclconfig=$i/tclConfig.sh
+-			break;
+-		fi
+-	done
+-fi
++AC_ARG_WITH([tcl], [AS_HELP_STRING([--with-tcl[=PATH_TO_tclConfig.sh]], [Compile with tcl support.])],
++	[], [with_tcl=maybe])
+ 
+ AC_MSG_CHECKING(whether to support TCL)
+-if test "x$tclconfig" = "xno"; then
++if test "x$with_tcl" = "xno"; then
+ 	AC_MSG_RESULT(no)
+ else
+-	if test ! -r $tclconfig ; then
++	with_tcl_errormsg="You specified --with-tcl=$with_tcl but I could not find TCL. Please specify --with-tcl=/path/to/tclConfig.sh or remove --with-tcl from ./configure's commandline."
++	if test "x$with_tcl" = "xmaybe" -o "x$with_tcl" = "xyes"; then
++		for i in /usr/lib /usr/local/lib /usr/local/lib/tcl8.4 ; do
++			if test -r "$i"/tclConfig.sh ; then
++				tclconfig="$i"/tclConfig.sh
++				break;
++			fi
++		done
++	else
++		tclconfig="$with_tcl"
++	fi
++	if test ! -r "$tclconfig" ; then
++		dnl Avoid being automagic unless if the user wants us to be.
++		AS_IF([test "x$with_tcl" != "xmaybe"],
++			[AC_MSG_ERROR([$with_tcl_errormsg])])
+ 		AC_MSG_RESULT(no)
+ 	else
+ 		AC_MSG_RESULT(yes)
+-		TCLCFLAGS=`(. $tclconfig && echo $TCL_INCLUDE_SPEC)`
+-		TCLLDFLAGS1=`(. $tclconfig && echo $TCL_LIB_SPEC)`
+-		TCLLDFLAGS2=`(. $tclconfig && echo $TCL_LIBS)`
+-		TCLLDFLAGS=$(eval echo "$TCLLDFLAGS1 $TCLLDFLAGS2")
++		TCLCFLAGS=`(. "$tclconfig" && echo $TCL_INCLUDE_SPEC)`
++		TCLLIBS=`(. "$tclconfig" && echo $TCL_LIB_SPEC $TCL_LIBS)`
+ 		TCLDOTOH="tcl.o"
+ 
+ 		AC_MSG_CHECKING(whether embedded tcl works the way I expect)
+ 		have_embedded_tcl="no"
+ 		old_CFLAGS="$CFLAGS"
+-		old_LDFLAGS="$LDFLAGS"
++		old_LIBS="$LIBS"
+ 		CFLAGS="$CFLAGS $TCLCFLAGS"
+-		LDFLAGS="$LDFLAGS $TCLLDFLAGS"
++		LIBS="$LIBS $TCLLIBS"
+ 		AC_TRY_LINK([
+ #include <tcl.h>
+ 	   Tcl_Interp *my_tcl;
+@@ -1175,14 +1173,16 @@
+ ], have_embedded_tcl="yes")
+ 
+ 		CFLAGS="$old_CFLAGS"
+-		LDFLAGS="$old_LDFLAGS"
++		LIBS="$old_LIBS"
+ 		if test $have_embedded_tcl = "yes" ; then
+ 		    AC_MSG_RESULT(yes)
+ 		    AC_DEFINE(HAVE_TCL)
+ 		    AC_DEFINE(TCLCFLAGS)
+-		    AC_DEFINE(TCLLDFLAGS)
++		    AC_DEFINE(TCLLIBS)
+ 		else
+-		    AC_MSG_RESULT(no, sorry)
++			AS_IF([test "$with_tcl" != "xmaybe"],
++				[AC_MSG_ERROR([$with_tcl_errormsg])])
++			AC_MSG_RESULT(no, sorry)
+ 		fi
+ 	fi
+ fi
+@@ -1383,7 +1383,7 @@
+ AC_SUBST(RUBYLIBS)
+ AC_SUBST(TCLDOTOH)
+ AC_SUBST(TCLCFLAGS)
+-AC_SUBST(TCLLDFLAGS)
++AC_SUBST(TCLLIBS)
+ AC_SUBST(PERLDOTOH)
+ AC_SUBST(PERLCFLAGS)
+ AC_SUBST(PERLLDFLAGS)
+
+--- a/source/Makefile.in
++++ b/source/Makefile.in
+@@ -38,7 +38,7 @@
+ epic5: $(OBJECTS)
+ 	sh info.c.sh
+ 	$(CC) $(CFLAGS) $(INCLUDES) -c info.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLDFLAGS@ @RUBYLIBS@ $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLIBS@ @RUBYLIBS@ $(LIBS)
+ 	$(RM) info.c info.o
+ clean::
+ 	$(RM) epic5 $(OBJECTS)
diff --git a/net-irc/epic5/files/epic5-1.1.10-without-localdir.patch b/net-irc/epic5/files/epic5-1.1.10-without-localdir.patch
new file mode 100644
index 000000000000..4caccad764a8
--- /dev/null
+++ b/net-irc/epic5/files/epic5-1.1.10-without-localdir.patch
@@ -0,0 +1,66 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Drop some automatic probing of /usr/local and /opt and etc., Gentoo users know to use CPPFLAGS/CFLAGS/LDFLAGS.
+Date: 2014-08-30
+
+--- a/configure.in
++++ b/configure.in
+@@ -33,58 +33,6 @@
+ AC_AIX
+ 
+ dnl ----------------------------------------------------------
+-AC_MSG_CHECKING([for an extra library directory])
+-AC_ARG_WITH([localdir],
+-[  --with-localdir=/usr/local An extra directory to look for stuff.],[
+-   if test "x$withval" = "x" ; then
+-      if test -d /usr/local/lib ; then
+-	withval="/usr/local"
+-      elif test -d /usr/pkg/lib ; then
+-	withval="/usr/pkg"
+-      elif test -d /opt/lib ; then
+-	withval="/opt"
+-      else
+-        with_extra_libdir="no"
+-      fi
+-   elif test -d "$withval" ; then
+-      with_extra_libdir="yes"
+-   else
+-      with_extra_libdir="no"
+-   fi
+-
+-   if test "x$withval" != "x" ; then
+-      LIBS="-L$withval/lib $LIBS"
+-      CFLAGS="-I$withval/include/ $CFLAGS"
+-      localdir=$withdir
+-      with_extra_libdir="yes"
+-   else
+-      with_extra_libdir="no"
+-   fi
+-],[
+-   if test "x$withval" = "x" ; then
+-      if test -d /usr/local/lib ; then
+-	withval="/usr/local"
+-      elif test -d /usr/pkg/lib ; then
+-	withval="/usr/pkg"
+-      elif test -d /opt/lib ; then
+-	withval="/opt"
+-      else
+-        with_extra_libdir="no"
+-      fi
+-   fi
+-
+-   if test "x$withval" != "x" ; then
+-      LIBS="-L$withval/lib $LIBS"
+-      CFLAGS="-I$withval/include/ $CFLAGS"
+-      localdir=$withdir
+-      with_extra_libdir="yes"
+-   else
+-      with_extra_libdir="no"
+-   fi
+-])
+-AC_MSG_RESULT([$with_extra_libdir, $withval])
+-
+-dnl ----------------------------------------------------------
+ dnl ----------------------------------------------------------
+ dnl
+ dnl System specific checks
+
diff --git a/net-irc/epic5/files/epic5-1.1.2-libarchive-automagic.patch b/net-irc/epic5/files/epic5-1.1.2-libarchive-automagic.patch
new file mode 100644
index 000000000000..522610f9fb57
--- /dev/null
+++ b/net-irc/epic5/files/epic5-1.1.2-libarchive-automagic.patch
@@ -0,0 +1,53 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Prevent libarchive check from being automagic.
+
+--- a/configure.in
++++ b/configure.in
+@@ -231,22 +231,28 @@
+ dnl XXX I don't understand why this is even necessary.
+-have_libarchive=""
+-orig_LIBS="$LIBS"
+-AC_CHECK_LIB(archive, archive_read_new, [LIBS="$LIBS -larchive"])
+-AC_MSG_CHECKING(whether libarchive works the way I expect)
+-AC_TRY_LINK([#include <archive.h>], [
+-	struct archive *x; 
+-	const char *s = "bogus.zip";
+-	x = archive_read_new();
+-	archive_read_support_format_all(x);
+-	archive_read_open_file(x, s, 10240);
+-], have_libarchive="yes")
+-if test "x$have_libarchive" = "x"; then
+-	LIBS="$orig_LIBS"
+-	AC_MSG_RESULT(no)
+-else
+-	AC_MSG_RESULT(yes)
+-	AC_DEFINE(HAVE_LIBARCHIVE)
+-fi
++AC_ARG_WITH([libarchive], [AS_HELP_STRING([--without-libarchive], [Disable libarchive support.])],
++	[], [with_libarchive=maybe])
++AS_IF([test "x$with_libarchive" != "xno"],
++	[
++	have_libarchive=""
++	orig_LIBS="$LIBS"
++	AC_CHECK_LIB(archive, archive_read_new, [LIBS="$LIBS -larchive"])
++	AC_MSG_CHECKING(whether libarchive works the way I expect)
++	AC_TRY_LINK([#include <archive.h>], [
++		struct archive *x; 
++		const char *s = "bogus.zip";
++		x = archive_read_new();
++		archive_read_support_format_all(x);
++		archive_read_open_file(x, s, 10240);
++	], have_libarchive="yes")
++	if test "x$have_libarchive" = "x"; then
++		LIBS="$orig_LIBS"
++		AC_MSG_RESULT(no)
++		AS_IF([test "x$with_libarchive" = "xyes"],
++			[AC_MSG_ERROR([--with-libarchive was specified but libarchive could not be found. Please do not specify --with-libarchive or install libarchive.])])
++	else
++		AC_MSG_RESULT(yes)
++		AC_DEFINE(HAVE_LIBARCHIVE)
++	fi])
+ 
+ dnl -----
+ AC_ARG_WITH(ssl,
+
diff --git a/net-irc/epic5/files/epic5-1.1.2-perl-automagic-as-needed.patch b/net-irc/epic5/files/epic5-1.1.2-perl-automagic-as-needed.patch
new file mode 100644
index 000000000000..e211fa14b275
--- /dev/null
+++ b/net-irc/epic5/files/epic5-1.1.2-perl-automagic-as-needed.patch
@@ -0,0 +1,114 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Fix perl being automagic and to be safe with
+	LDFLAGS=-Wl,--as-needed.
+
+--- a/configure.in
++++ b/configure.in
+@@ -1033,37 +1033,38 @@
+ dnl
+ dnl Perl support?
+ dnl
+-AC_ARG_WITH(perl,
+-[  --with-perl[=PATH_TO_PERL_EXE]       Compile with perl support.],
+-[ 
+-	perlexe=$withval
+-],
+-	perlexe=yes
+-)
+-
+-if test "x$perlexe" = "xyes"; then
+-	perlexe=perl
+-fi
+-
+-if test "x$perlexe" = "xno"; then
++AC_ARG_WITH([perl], [AS_HELP_STRING([--with-perl=[PATH_TO_PERL_EXE]], [Compile with perl support.])],
++	[], [with_perl=maybe])
++AS_IF([test "x$with_perl" = "xno"],
++	[
+ 	AC_MSG_CHECKING(whether to support Perl)
+ 	AC_MSG_RESULT(no)
+-else
+-	AC_CHECK_PROG(PERLPROG, $perlexe, "yes", "no")
+-	AC_MSG_CHECKING(whether to support Perl)
+-	if test $PERLPROG != "yes" ; then 
++	],
++	[
++	with_perl_errormsg="You specified --with-perl=$with_perl but I could not find a working perl. Please run ./configure with --without-perl or specify a path to a working perl executable."
++	AS_IF([test "x$with_perl" = "xyes" -o "x$with_perl" = "xmaybe"],
++		[perlexe=perl],
++		[perlexe="$with_perl"])
++	dnl Allow a full path to be specified in --with-perl
++	AS_IF([test -x "$perlexe"],
++		[PERLPROG=yes],
++		[AC_CHECK_PROG(PERLPROG, $perlexe, "yes", "no")])
++	AC_MSG_CHECKING([whether to support Perl])
++	if test $PERLPROG != "yes" ; then
++		AS_IF([test "x$with_perl" != "xmaybe"],
++			[AC_MSG_ERROR([$with_perl_errormsg])])
+ 		AC_MSG_RESULT(no)
+ 	else
+ 		AC_MSG_RESULT(yes)
+ 		PERLCFLAGS=`$perlexe -MExtUtils::Embed -e ccopts`
+-		PERLLDFLAGS=`$perlexe -MExtUtils::Embed -e ldopts`
++		PERLLIBS=`$perlexe -MExtUtils::Embed -e ldopts`
+ 
+ 		AC_MSG_CHECKING(whether embedded perl works the way I expect)
+ 		have_embedded_perl="no"
+ 		old_CFLAGS="$CFLAGS"
+-		old_LDFLAGS="$LDFLAGS"
++		old_LIBS="$LIBS"
+ 		CFLAGS="$CFLAGS $PERLCFLAGS"
+-		LDFLAGS="$LDFLAGS $PERLLDFLAGS"
++		LIBS="$LIBS $PERLLIBS"
+ 		AC_TRY_RUN([
+ #include <EXTERN.h>
+ #include <perl.h>
+@@ -1101,20 +1102,22 @@
+ have_embedded_perl="no",:)
+ 
+ 		CFLAGS="$old_CFLAGS"
+-		LDFLAGS="$old_LDFLAGS"
++		LIBS="$old_LIBS"
+ 		if test $have_embedded_perl = "yes" ; then
+ 			AC_MSG_RESULT(yes)
+ 			AC_DEFINE(HAVE_PERL)
+ 			AC_DEFINE(PERLCFLAGS)
+-			AC_DEFINE(PERLLDFLAGS)
++			AC_DEFINE(PERLLIBS)
+ 			PERLDOTOH="perl.o"
+ 		else
++			AS_IF([test "x$with_perl" != "xmaybe"],
++				[AC_MSG_ERROR([$with_perl_errormsg])])
+ 			PERLCFLAGS=""
+-			PERLLDFLAGS=""
++			PERLLIBS=""
+ 			AC_MSG_RESULT(no, sorry)
+ 			PERLCFLAGS=""
+-			PERLLDFLAGS=""
++			PERLLIBS=""
+ 		fi
+ 	fi
+-fi
++	])
+ 
+@@ -1392,7 +1395,7 @@
+ AC_SUBST(TCLLIBS)
+ AC_SUBST(PERLDOTOH)
+ AC_SUBST(PERLCFLAGS)
+-AC_SUBST(PERLLDFLAGS)
++AC_SUBST(PERLLIBS)
+ AC_SUBST(WSERV_BIN)
+ AC_SUBST(WSERV_INSTALL)
+ AC_SUBST(bindir)
+
+--- a/source/Makefile.in
++++ b/source/Makefile.in
+@@ -38,7 +38,7 @@
+ epic5: $(OBJECTS)
+ 	sh info.c.sh
+ 	$(CC) $(CFLAGS) $(INCLUDES) -c info.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLDFLAGS@ @TCLLIBS@ @RUBYLIBS@ $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o epic5 $(OBJECTS) info.o @PERLLIBS@ @TCLLIBS@ @RUBYLIBS@ $(LIBS)
+ 	$(RM) info.c info.o
+ clean::
+ 	$(RM) epic5 $(OBJECTS)
diff --git a/net-irc/epic5/metadata.xml b/net-irc/epic5/metadata.xml
new file mode 100644
index 000000000000..45acb5c4092f
--- /dev/null
+++ b/net-irc/epic5/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="archive">Use <pkg>app-arch/libarchive</pkg> to use zip and tar archives from scripts.</flag>
+    <flag name="valgrind">Compile against <pkg>dev-util/valgrind</pkg> headers to improve memory-leak checking when running epic5 under valgrind.</flag>
+  </use>
+</pkgmetadata>
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
new file mode 100644
index 000000000000..ccd5af6b201b
--- /dev/null
+++ b/net-irc/hexchat/Manifest
@@ -0,0 +1,10 @@
+AUX hexchat-2.12.2-configure.ac-remove-werror.patch 871 SHA256 7a76f946020d973176541df8a4862f954b6b029884586cf409154ff69e242ac0 SHA512 4dd945fc4957697f5c4932e7057a6bf9a39319e1189801a84819f8f6a31198c562127606961120538f0a7161362c535bf634c16d73f1913c76ee4466250e30b8 WHIRLPOOL a8a0fda05cfa82ca007491b6a72d167efa77e81c5084ca69cc989bf32140106d77efd5cabcad8eb38c013fd775c3afb94299350e20baf854ecccf8e1b586367e
+AUX hexchat-2.12.4-configure.ac.patch 9671 SHA256 593ebe79fafb6248a52904ce7cec63804aa26a880448b62737145886bb8dba7c SHA512 2fcac82d4074cc79f4e6c779664cae1a47287b78ba827187d8d669e6c522f7c3aeedabd4cac9172476971aa49e7ed6927078073b7b4828d5df6363bc0d8a2062 WHIRLPOOL 94b03832fd66d4a0adc173df2b5ec78f9b7e96cffa29d863f66500a61175b388b705e2e279fdc8af3ce341473f6862a7112935c4abfd3681c8c4a9efadce274e
+AUX hexchat-2.12.4-libressl.patch 1040 SHA256 b52baf0efa7c3861b1113eada525888c18e74709850b0711ff6c052521dac941 SHA512 a309ce5e0bb25aa6c88c62bb5a5e1758e49d431cd51ef8186f29ac3c09af544ff75fd043ef8d9217c2779fb1c76fa27d392d9f7e9165a5772e401345bddce1ca WHIRLPOOL 6115f9a8ca00e402a7de3337cd6dddbe0666d329b0ee8ca4d3a7f40d5cc252d1daf717edf0108122f2400f1310d1b4e8d74cae4f5fd6c907ae40d895b30a787b
+DIST hexchat-2.12.4.tar.xz 1451468 SHA256 fa35913158bbc7d0d99de79371b6df3e8d21802f1d2c7c92f0e5db694acf2c3a SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40 WHIRLPOOL f0e48900c9cf048ad6238338630788197865bf649d4d373a3905b7dffd0076cbdeffc6bd14602fdb5924f6da5bb422739cde7f05b844482735157bb0ba39e712
+EBUILD hexchat-2.12.4-r1.ebuild 3609 SHA256 e868dbc3866b42c08b78e4571b86e9f7208ac0291d54c71afd01db2384513587 SHA512 84c8fb88e9cfe25ac42f255c5fd1dd73d096ebb6e1f50ccd0bcff394b5c3f90791cf2d8841ae1ae2192422f0658d0825c01cee8a83a8583c590ddafaa6365c87 WHIRLPOOL 9ab5c092e9e7c47eb93440ee3f74e967465737cfd42afece5d3bba50751cb83bb32b5f5b952b5dd381598dac9474dc506c92790efc97e22d4e79ff9ca0056bcc
+EBUILD hexchat-2.12.4-r2.ebuild 3404 SHA256 f6fbf6b0bedb095a9863f123636205118b9f8202b06fdc605c8493ad244b7093 SHA512 92c224e7c90640a7eee2400454243c9e611b30f28bb215b73d3f7880f30db5798f1f7ccb4ddf701dfa11cc959abd542d55c22f9149ae5bab8a08d6f9cb84acdf WHIRLPOOL 679202a34d4bc4538ca16383abba6311e8c9ab46a1b75ea1b9b275894acf1b50c8579233370c25633271dcd2abe3252972f201bd03c53be6b92c65b2c1369c8d
+EBUILD hexchat-9999.ebuild 3469 SHA256 023ac8b913bbadfc7a270a809e765ac3ab5630744b84840b75e0f8e99e5b9f12 SHA512 bb51a41dbcf9a57a5d4d4e2a7c39810861c5771f156560fd63767912237efbd5871b2701c8174c27626696b4260e31f1f6c38e941f4390fc811f6a7e6b93f1ea WHIRLPOOL 8b5aa068b5deb72eae548f81d8be182bd122e629731b712b1ea307ebe6d8ad17335d8af9cc3e4792611cad337dfdbd55b67a494b444f1e3269e8411a987a7121
+MISC ChangeLog 7065 SHA256 f44baa4294aa8f828e05aa34bf54e679d02e05ab34e629abdef61d2d6c2be011 SHA512 b6b1628858abe6bf190f63e831faba135346479237c4530e2b40e626bd1025fcadf51a18027b06a432781f597e24efbfe03c448e50d9dcb20de1421a1bb05f3c WHIRLPOOL c83c926926e6045c67b99f1ab5be16a648585d3b8049ccb344ef695e01e6b5ee8f1501490844b6c8beadb615867ba8c372f648f8dacd0d16f651eab9a6b8acde
+MISC ChangeLog-2015 16206 SHA256 18f0b6e3cfb0e6ca5c04a0b4875f2307839e463da8631351e05d2b3ce4ac1ef5 SHA512 4f601eacf06925821de26451d9891f346c492526489386a05491a48c59170bad3751281ae04b2ff1dd0ea98e1abced03c5f47a6c3e4f7e5052e1394be61eecaf WHIRLPOOL 2e5741a3a2667eebea20be4f683867767e262415279a3cdbb0f1d2e6bbf3ad0d435897773d9d8850bfb36984fd4d38cdc15cb0e8d142338c72ab731d110729e9
+MISC metadata.xml 1389 SHA256 badcb7464a7d73a10ff8cd60a1b6d82435ec96efc94af5b8429e0d77e3a59245 SHA512 64ce08c2a4a3a786276bbadbb0a59be1e365bc72cacd42a18ee1e64ce546c4c55f4fb4f2c11dd3425a26c9654880f8b0254667456974270bc8c37d85d50f5c36 WHIRLPOOL 01e564fb956f83bce6923cd68280c3f9a05dbf572506f2269334668d198dd8640cb9535e3831e9fc3cfc1ae13020b629fbcff2e45475471eb698c3b56754d451
diff --git a/net-irc/hexchat/files/hexchat-2.12.2-configure.ac-remove-werror.patch b/net-irc/hexchat/files/hexchat-2.12.2-configure.ac-remove-werror.patch
new file mode 100644
index 000000000000..7798d81c740d
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.12.2-configure.ac-remove-werror.patch
@@ -0,0 +1,25 @@
+The option -Werror=missing-include-dirs causes the build to fail if
+non-exsistent directories are added via -I.  Removing the rest of the -Werror*
+flags to ensure no new bugs get created because a -Werror flag stopped the
+build.
+
+--- hexchat-2.12.2/configure.ac.old	2016-10-15 13:40:30.585210113 -0700
++++ hexchat-2.12.2/configure.ac	2016-10-15 13:40:44.937008119 -0700
+@@ -634,17 +634,10 @@ AX_APPEND_COMPILE_FLAGS([\
+ 	-Wno-unused-parameter \
+ 	-Wno-sign-compare \
+ 	-Wno-pointer-sign \
+ 	-Wno-missing-field-initializers \
+ 	-Wno-unused-result \
+-	-Werror=format-security \
+-	-Werror=init-self \
+-	-Werror=declaration-after-statement \
+-	-Werror=missing-include-dirs \
+-	-Werror=date-time \
+-	-Werror=implicit-function-declaration \
+-	-Werror=pointer-arith \
+ ])
+ 
+ AS_IF([test "$stack_protector" = "yes"], [
+ 	AX_APPEND_COMPILE_FLAGS([ \
+ 		-fstack-protector-strong \
diff --git a/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch b/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch
new file mode 100644
index 000000000000..c4288d2761d2
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.12.4-configure.ac.patch
@@ -0,0 +1,319 @@
+--- hexchat-2.12.4/data/pkgconfig/Makefile.am
++++ hexchat-2.12.4/data/pkgconfig/Makefile.am
+@@ -1,4 +1,7 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ pkgcfgdir = $(pkgconfigdir)
+ pkgcfg_DATA = hexchat-plugin.pc
+ 
+ EXTRA_DIST = hexchat-plugin.pc.in
+--- hexchat-2.12.4/data/Makefile.am
++++ hexchat-2.12.4/data/Makefile.am
+@@ -1,5 +1,8 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ SUBDIRS =
+ 
+ if DO_PLUGIN
+ SUBDIRS += pkgconfig
+ endif
+--- hexchat-2.12.4/data/misc/Makefile.am
++++ hexchat-2.12.4/data/misc/Makefile.am
+@@ -1,5 +1,7 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
+ 
+ appdatadir = $(datadir)/appdata
+ appdata_in_files =
+ 
+ if DO_GTK
+--- hexchat-2.12.4/data/icons/Makefile.am
++++ hexchat-2.12.4/data/icons/Makefile.am
+@@ -1,5 +1,8 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ icon_DATA = hexchat.png
+ icondir = $(datadir)/icons/hicolor/48x48/apps
+ 
+ hicolor_DATA = hexchat.svg
+ hicolordir = $(datadir)/icons/hicolor/scalable/apps
+--- hexchat-2.12.4/data/man/Makefile.am
++++ hexchat-2.12.4/data/man/Makefile.am
+@@ -1,3 +1,6 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ man_MANS = hexchat.1
+ 
+ EXTRA_DIST = hexchat.1.in
+--- hexchat-2.12.4/Makefile.am
++++ hexchat-2.12.4/Makefile.am
+@@ -1,6 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ SUBDIRS = po src plugins data
+ 
+--- hexchat-2.12.4/configure.ac
++++ hexchat-2.12.4/configure.ac
+@@ -621,23 +621,23 @@ AX_APPEND_COMPILE_FLAGS([\
+ 	-Werror=declaration-after-statement \
+ 	-Werror=missing-include-dirs \
+ 	-Werror=date-time \
+ 	-Werror=implicit-function-declaration \
+ 	-Werror=pointer-arith \
+-])
++], hexchat_def_CFLAGS)
+ 
+ AS_IF([test "$stack_protector" = "yes"], [
+ 	AX_APPEND_COMPILE_FLAGS([ \
+ 		-fstack-protector-strong \
+-	])
++	], [hexchat_def_CFLAGS])
+ ])
+ 
+ AX_APPEND_LINK_FLAGS([ \
+ 	-pie \
+ 	-Wl,-z,relro \
+ 	-Wl,-z,now \
+-])
++], [hexchat_def_LDFLAGS])
+ 
+ dnl *********************************************************************
+ dnl ** FUNCTIONS/LIBS/CFLAGS ********************************************
+ dnl *********************************************************************
+ 
+@@ -687,10 +687,12 @@ dnl freebsd needs this
+ LIBS="$LIBS $INTLLIBS"
+ 
+ GUI_LIBS="$GUI_LIBS $COMMON_LIBS"
+ 
+ dnl make these visible to all Makefiles
++AC_SUBST(hexchat_def_CFLAGS)
++AC_SUBST(hexchat_def_LDFLAGS)
+ AC_SUBST(GUI_LIBS)
+ AC_SUBST(GUI_CFLAGS)
+ AC_SUBST(COMMON_LIBS)
+ AC_SUBST(COMMON_CFLAGS)
+ AC_SUBST(PERL_CFLAGS)
+--- hexchat-2.12.4/src/common/Makefile.am
++++ hexchat-2.12.4/src/common/Makefile.am
+@@ -1,6 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
+ 
+ include $(top_srcdir)/m4/clang-analyze.am
+ 
+ noinst_LIBRARIES = libhexchatcommon.a
+ 
+@@ -62,11 +64,11 @@ noinst_PROGRAMS = make-te
+ 
+ libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \
+ 	history.c ignore.c inbound.c marshal.c modes.c network.c notify.c \
+ 	outbound.c plugin.c plugin-identd.c plugin-timer.c proto-irc.c server.c servlist.c \
+ 	$(ssl_c) text.c tree.c url.c userlist.c util.c
+-libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS)
++libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) $(hexchat_def_CFLAGS)
+ 
+ textenums.h: textevents.h
+ 
+ textevents.h: $(srcdir)/textevents.in make-te
+ 	$(AM_V_GEN) ./make-te < $< > $@ 2> textenums.h
+--- hexchat-2.12.4/src/common/dbus/Makefile.am
++++ hexchat-2.12.4/src/common/dbus/Makefile.am
+@@ -1,5 +1,8 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ noinst_LIBRARIES = libhexchatdbus.a
+ libhexchatdbus_a_SOURCES =			\
+ 	dbus-plugin.c				\
+ 	dbus-plugin.h				\
+ 	dbus-client.c				\
+--- hexchat-2.12.4/src/Makefile.am
++++ hexchat-2.12.4/src/Makefile.am
+@@ -1,6 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
+ 
+ EXTRA_DIST = version-script
+ 
+ if DO_TEXT
+ text_fe = fe-text
+--- hexchat-2.12.4/src/fe-text/Makefile.am
++++ hexchat-2.12.4/src/fe-text/Makefile.am
+@@ -1,5 +1,8 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ localedir = $(datadir)/locale
+ 
+ bin_PROGRAMS = hexchat-text
+ 
+ AM_CPPFLAGS = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
+--- hexchat-2.12.4/src/fe-gtk/Makefile.am
++++ hexchat-2.12.4/src/fe-gtk/Makefile.am
+@@ -1,5 +1,7 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
+ 
+ include $(top_srcdir)/m4/clang-analyze.am
+ 
+ localedir = $(datadir)/locale
+ 
+@@ -31,11 +33,11 @@ endif
+ if USE_LIBNOTIFY
+ notify_c = notifications/notification-libnotify.c
+ else
+ if HAVE_GTK_MAC
+ notify_c = notifications/notification-osx.m
+-hexchat_LDFLAGS = -framework Foundation
++hexchat_LDFLAGS = -framework Foundation @hexchat_def_LDFLAGS@
+ else
+ notify_c = notifications/notification-dummy.c
+ endif
+ endif
+ 
+--- hexchat-2.12.4/src/htm/Makefile.am
++++ hexchat-2.12.4/src/htm/Makefile.am
+@@ -1,5 +1,8 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ theme_SCRIPTS = thememan.exe thememan
+ themedir = $(bindir)
+ 
+ mdtool_verbose = $(mdtool_verbose_$(V))
+ mdtool_verbose_ = $(mdtool_verbose_$(AM_DEFAULT_VERBOSITY))
+--- hexchat-2.12.4/plugins/fishlim/Makefile.am
++++ hexchat-2.12.4/plugins/fishlim/Makefile.am
+@@ -1,10 +1,13 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ EXTRA_DIST = LICENSE fish.h irc.h keystore.h plugin_hexchat.h dh1080.h
+ 
+ libdir = $(hexchatlibdir)
+ 
+ lib_LTLIBRARIES = fishlim.la
+ fishlim_la_SOURCES = fish.c irc.c keystore.c plugin_hexchat.c dh1080.c
+-fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
++fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
+ fishlim_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
+ fishlim_la_CPPFLAGS = -I$(top_srcdir)/src/common
+-fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS)
++fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS) @hexchat_def_CFLAGS@
+--- hexchat-2.12.4/plugins/Makefile.am
++++ hexchat-2.12.4/plugins/Makefile.am
+@@ -1,5 +1,8 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ if DO_LUA
+ lua = lua
+ endif
+ 
+ if DO_PYTHON
+--- hexchat-2.12.4/plugins/lua/Makefile.am
++++ hexchat-2.12.4/plugins/lua/Makefile.am
+@@ -1,9 +1,12 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ libdir = $(hexchatlibdir)
+ 
+ lib_LTLIBRARIES = lua.la
+ lua_la_SOURCES = lua.c
+-lua_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
++lua_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
+ lua_la_LIBADD = $(LUA_LIBS) $(GLIB_LIBS)
+ lua_la_CPPFLAGS = -I$(top_srcdir)/src/common
+-lua_la_CFLAGS = $(GLIB_CFLAGS) $(LUA_CFLAGS)
++lua_la_CFLAGS = $(GLIB_CFLAGS) $(LUA_CFLAGS) @hexchat_def_CFLAGS@
+ 
+--- hexchat-2.12.4/plugins/sysinfo/Makefile.am
++++ hexchat-2.12.4/plugins/sysinfo/Makefile.am
+@@ -1,5 +1,8 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ libdir = $(hexchatlibdir)
+ 
+ sources = sysinfo.c format.c shared/df.c
+ 
+ if PLATFORM_OSX
+@@ -10,8 +13,8 @@ endif
+ 
+ EXTRA_DIST = osx unix win32 shared format.h sysinfo.h sysinfo-backend.h
+ 
+ lib_LTLIBRARIES = sysinfo.la
+ sysinfo_la_SOURCES = $(sources)
+-sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
++sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
+ sysinfo_la_LIBADD = $(LIBPCI_LIBS) $(GLIB_LIBS)
+ AM_CPPFLAGS = -I$(top_srcdir)/src/common -I$(srcdir)/shared $(LIBPCI_CFLAGS) $(GLIB_CFLAGS)
+--- hexchat-2.12.4/plugins/python/Makefile.am
++++ hexchat-2.12.4/plugins/python/Makefile.am
+@@ -1,9 +1,12 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ libdir = $(hexchatlibdir)
+ 
+ lib_LTLIBRARIES = python.la
+ python_la_SOURCES = python.c
+ python_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+-python_la_LIBADD = $(PYTHON_LIBS) $(GLIB_LIBS)
++python_la_LIBADD = $(PYTHON_LIBS) $(GLIB_LIBS) @hexchat_def_LDFLAGS@
+ python_la_CPPFLAGS = -I$(top_srcdir)/src/common $(PYTHON_CPPFLAGS)
+-python_la_CFLAGS = $(GLIB_CFLAGS)
++python_la_CFLAGS = $(GLIB_CFLAGS) @hexchat_def_CFLAGS@
+ 
+--- hexchat-2.12.4/plugins/checksum/Makefile.am
++++ hexchat-2.12.4/plugins/checksum/Makefile.am
+@@ -1,8 +1,11 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
++
+ libdir = $(hexchatlibdir)
+ 
+ lib_LTLIBRARIES = checksum.la
+ checksum_la_SOURCES = checksum.c
+-checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
++checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
+ checksum_la_LIBADD = $(GLIB_LIBS)
+ checksum_la_CPPFLAGS = -I$(top_srcdir)/src/common
+-checksum_la_CFLAGS = $(GLIB_CFLAGS)
++checksum_la_CFLAGS = $(GLIB_CFLAGS) @hexchat_def_CFLAGS@
+--- hexchat-2.12.4/plugins/perl/Makefile.am
++++ hexchat-2.12.4/plugins/perl/Makefile.am
+@@ -1,17 +1,19 @@
++AM_CFLAGS = @hexchat_def_CFLAGS@
++AM_LDFLAGS = @hexchat_def_LDFLAGS@
+ 
+ EXTRA_DIST=generate_header lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm lib/HexChat/List/Network.pm \
+ 	lib/HexChat/List/Network/Entry.pm lib/HexChat/List/Network/AutoJoin.pm lib/IRC.pm
+ 
+ libdir = $(hexchatlibdir)
+ 
+ lib_LTLIBRARIES = perl.la
+ perl_la_SOURCES = perl.c
+-perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module
++perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module @hexchat_def_LDFLAGS@
+ perl_la_LIBADD = $(GLIB_LIBS)
+ perl_la_CPPFLAGS = -I$(top_srcdir)/src/common
+-perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS)
++perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS) @hexchat_def_CFLAGS@
+ 
+ BUILT_SOURCES = hexchat.pm.h irc.pm.h
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+ hexchat.pm.h irc.pm.h: lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm \
diff --git a/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch b/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch
new file mode 100644
index 000000000000..3b3adc09dd55
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.12.4-libressl.patch
@@ -0,0 +1,29 @@
+# diff -pU5 hexchat-2.12.4/src/common/ssl.c.old hexchat-2.12.4/src/common/ssl.c
+--- hexchat-2.12.4/src/common/ssl.c
++++ hexchat-2.12.4/src/common/ssl.c
+@@ -174,11 +174,11 @@ _SSL_get_cert_info (struct cert_info *ce
+ 	key = X509_get_X509_PUBKEY(peer_cert);
+ 	if (!X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key))
+ 		return 1;
+ 
+ 	alg = OBJ_obj2nid (algor->algorithm);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
+ 	sign_alg = OBJ_obj2nid (peer_cert->sig_alg->algorithm);
+ #else
+ 	sign_alg = X509_get_signature_nid (peer_cert);
+ #endif
+ 	ASN1_TIME_snprintf (notBefore, sizeof (notBefore),
+@@ -304,11 +304,11 @@ _SSL_socket (SSL_CTX *ctx, int sd)
+ 		/* FATAL */
+ 		__SSL_critical_error ("SSL_new");
+ 
+ 	SSL_set_fd (ssl, sd);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
+ 	method = ctx->method;
+ #else
+ 	method = SSL_CTX_get_ssl_method (ctx);
+ #endif
+ 	if (method == SSLv23_client_method())
diff --git a/net-irc/hexchat/hexchat-2.12.4-r1.ebuild b/net-irc/hexchat/hexchat-2.12.4-r1.ebuild
new file mode 100644
index 000000000000..cf092fcf3545
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.12.4-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit autotools fdo-mime gnome2-utils mono-env python-single-r1
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
+	KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dbus? ( sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:2 )
+	libcanberra? ( media-libs/libcanberra )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	lua? ( dev-lang/lua:= )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/iso-codes )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	theme-manager? (
+		|| (
+			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
+			dev-lang/mono[-minimal]
+		)
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	spell? ( app-text/enchant )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/autoconf-archive
+	theme-manager? ( dev-util/monodevelop )"
+
+PATCHES=(
+	"${FILESDIR}/hexchat-2.12.2-configure.ac-remove-werror.patch"
+	"${FILESDIR}/hexchat-2.12.4-libressl.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-plugin \
+		$(use_enable nls) \
+		$(use_enable ssl openssl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
+		$(use_enable python python "${EPYTHON}") \
+		$(use_enable perl) \
+		$(use_enable plugin-checksum checksum) \
+		$(use_enable plugin-fishlim fishlim) \
+		$(use_enable plugin-sysinfo sysinfo) \
+		$(use_enable dbus) \
+		$(use_enable lua) \
+		$(use_enable libnotify) \
+		$(use_enable libcanberra) \
+		$(use_enable libproxy) \
+		$(use_enable spell isocodes) \
+		$(use_enable debug) \
+		$(use_with theme-manager)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		UPDATE_ICON_CACHE=true \
+		UPDATE_MIME_DATABASE=true \
+		UPDATE_DESKTOP_DATABASE=true \
+		install
+	dodoc readme.md
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		elog "Themes are available at:"
+		elog "  https://hexchat.github.io/themes.html"
+	fi
+
+	elog
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+	fi
+}
diff --git a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
new file mode 100644
index 000000000000..842eac30186a
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit autotools fdo-mime flag-o-matic gnome2-utils python-single-r1
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dbus? ( sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:2 )
+	libcanberra? ( media-libs/libcanberra )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	lua? ( dev-lang/lua:= )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/iso-codes )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	spell? ( app-text/enchant )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/autoconf-archive"
+
+PATCHES=(
+	"${FILESDIR}/hexchat-2.12.4-configure.ac.patch"
+	"${FILESDIR}/hexchat-2.12.4-libressl.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	append-cflags \
+		$(test-flags-CC -Wno-error=format-security) \
+		$(test-flags-CC -Wno-error=init-self) \
+		$(test-flags-CC -Wno-error=declaration-after-statement) \
+		$(test-flags-CC -Wno-error=missing-include-dirs) \
+		$(test-flags-CC -Wno-error=date-time) \
+		$(test-flags-CC -Wno-error=implicit-function-declaration) \
+		$(test-flags-CC -Wno-error=pointer-arith)
+
+	econf \
+		--enable-plugin \
+		$(use_enable nls) \
+		$(use_enable ssl openssl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
+		$(use_enable python python "${EPYTHON}") \
+		$(use_enable perl) \
+		$(use_enable plugin-checksum checksum) \
+		$(use_enable plugin-fishlim fishlim) \
+		$(use_enable plugin-sysinfo sysinfo) \
+		$(use_enable dbus) \
+		$(use_enable lua) \
+		$(use_enable libnotify) \
+		$(use_enable libcanberra) \
+		$(use_enable libproxy) \
+		$(use_enable spell isocodes) \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		UPDATE_ICON_CACHE=true \
+		UPDATE_MIME_DATABASE=true \
+		UPDATE_DESKTOP_DATABASE=true \
+		install
+	dodoc readme.md
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	fi
+
+	elog
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
new file mode 100644
index 000000000000..de60cb5fd53b
--- /dev/null
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit autotools fdo-mime gnome2-utils mono-env python-single-r1
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dbus? ( sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:2 )
+	libcanberra? ( media-libs/libcanberra )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	lua? ( dev-lang/lua:= )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/iso-codes )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	theme-manager? (
+		|| (
+			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
+			dev-lang/mono[-minimal]
+		)
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	spell? ( app-text/enchant )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	dev-util/intltool
+	theme-manager? ( dev-util/monodevelop )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-plugin \
+		$(use_enable nls) \
+		$(use_enable ssl openssl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
+		$(use_enable python python "${EPYTHON}") \
+		$(use_enable perl) \
+		$(use_enable plugin-checksum checksum) \
+		$(use_enable plugin-fishlim fishlim) \
+		$(use_enable plugin-sysinfo sysinfo) \
+		$(use_enable dbus) \
+		$(use_enable lua) \
+		$(use_enable libnotify) \
+		$(use_enable libcanberra) \
+		$(use_enable libproxy) \
+		$(use_enable spell isocodes) \
+		$(use_enable debug) \
+		$(use_with theme-manager)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		UPDATE_ICON_CACHE=true \
+		UPDATE_MIME_DATABASE=true \
+		UPDATE_DESKTOP_DATABASE=true \
+		install
+	dodoc readme.md
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+		elog "Themes are available at:"
+		elog "  https://hexchat.github.io/themes.html"
+	fi
+
+	elog
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	fi
+
+	if use theme-manager ; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+	fi
+}
diff --git a/net-irc/hexchat/metadata.xml b/net-irc/hexchat/metadata.xml
new file mode 100644
index 000000000000..b9355556df11
--- /dev/null
+++ b/net-irc/hexchat/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>anthonyryan1@gmail.com</email>
+		<name>Anthony Ryan</name>
+		<description>Proxied maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+		<description>Proxy maintainer for Nicholas and Anthony</description>
+	</maintainer>
+	<use>
+		<flag name="libcanberra">Enable sound event support using
+			<pkg>media-libs/libcanberra</pkg></flag>
+		<flag name="libproxy">Enable proxy support.</flag>
+		<flag name="plugin-checksum">Build Checksum plugin
+			(needs plugins)</flag>
+		<flag name="plugin-fishlim">Build FiSHLiM plugin (needs plugins
+			)</flag>
+		<flag name="plugin-sysinfo">Build SysInfo plugin (needs plugins)
+		</flag>
+		<flag name="theme-manager">Build the theme manager (mono)</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>tingping@tingping.se</email>
+			<name>TingPing</name>
+		</maintainer>
+		<bugs-to>https://github.com/hexchat/hexchat/issues</bugs-to>
+		<doc lang="en">http://hexchat.readthedocs.org/en/latest</doc>
+		<remote-id type="github">hexchat/hexchat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
new file mode 100644
index 000000000000..074be6e31656
--- /dev/null
+++ b/net-irc/ii/Manifest
@@ -0,0 +1,6 @@
+DIST ii-1.7.tar.gz 10174 SHA256 3a72ac6606d5560b625c062c71f135820e2214fed098e6d624fc40632dc7cc9c SHA512 1fa744bc9b4291b5c6c56e023d982aad59001137db6c7682284a2d63e649a32d558adbb85ae3407e312ae5436852b4278c2c522d4ef03f47cf54ea3a1f13ca90 WHIRLPOOL 6aa7c43f7d9beca03724f98e2110ba4d2430943905d9c0a8cd28a9f8aba8d673af7eaaaa0c1b84028397fb566201581d8731e3387bcede589dfefb1f518953bc
+EBUILD ii-1.7-r1.ebuild 740 SHA256 10a5c1f8653c1bf8d592526e40a75a64514716e9e56a6b3444e88350f82e06ef SHA512 a4ebf245df4485a7fc9ae75ebfa726b84d924640054a55f6fe79ee5f9224d06ff765033bd89bd4e248242b1afaab0a268f66547f78b9816b54b2cb1df5bb24df WHIRLPOOL 736a77bfa2405abae93c9bad3e66c37f93a0c7482cfe7069bda5ae267a47fd09c01b772a3c719a1e16de5a2f8a296dd60bbab9f6e0a79c59c30ed267a4e9b34c
+EBUILD ii-9999.ebuild 653 SHA256 31e45c00947db003023ff56773305c0120afae5d59a099a4f0dc2d432707a4fb SHA512 877ad3c2c18a1cf6a3b5c2bb82241ac52fb4a1aaa42e78b3b0167023f3a2c5171fc6a753e1fed7ecac8cac02f9821233c3e97db17391bf87763ba82be8156d84 WHIRLPOOL 304778688e44543554720d3da08635b9fe09632abaf85af36da9e48bc194dfc05357e76a7fdddc471df9473eab2e3f151cd1d9ccfca0648228b782be89eef254
+MISC ChangeLog 2474 SHA256 dc167d8399349101901ac94e171730d75f9aabb82bdc5e2d8d442190488ddd8c SHA512 2a3d20838c3286a78bca9d77c90440560c46bc093b68298cc23fc726cbd7e8e700539696011b29fdf55e7d4714f6b36cf41aa08690a4837324d512881505261d WHIRLPOOL 174410b9bbe5fd5510365fb1b30a7e39f24a0266552ba2051e07a0310f061011e2edb8c5c635b5c3ea59f453bb304e435396c926d1783c6e63bc53d34e80f05f
+MISC ChangeLog-2015 1405 SHA256 266829408a04e5aada1e5a94776b49b2460231c04d24223d1228de95e649c49c SHA512 07b8f62c47dda499a1650c645f8b99c3e4229791f8806958bcdc63b59305a65ca9df770a5b8120555624788b943a45d6b19095c9c3f101d1ad8fdac2d8cab70c WHIRLPOOL b519ea94aae65d877862c942c3bbb6e41f46072ffb8431b6095838b6f4b65109c8642ea7ed82538991aacee5e33f801a8ca6cee950a5823917a9b8369f78d1a2
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/ii/ii-1.7-r1.ebuild b/net-irc/ii/ii-1.7-r1.ebuild
new file mode 100644
index 000000000000..4a1fce5af761
--- /dev/null
+++ b/net-irc/ii/ii-1.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit fixheadtails toolchain-funcs
+
+DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
+HOMEPAGE="https://tools.suckless.org/ii/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+		-e '/^CC/d' \
+		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+		config.mk || die
+	sed -i \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+
+	ht_fix_file query.sh
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ii
+	newbin query.sh ii-query
+	dodoc CHANGES FAQ README
+	doman *.1
+}
diff --git a/net-irc/ii/ii-9999.ebuild b/net-irc/ii/ii-9999.ebuild
new file mode 100644
index 000000000000..0cb5a9d7e15b
--- /dev/null
+++ b/net-irc/ii/ii-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit git-r3 toolchain-funcs
+
+DESCRIPTION="A minimalist FIFO and filesystem-based IRC client"
+HOMEPAGE="https://tools.suckless.org/ii/"
+EGIT_REPO_URI="https://git.suckless.org/ii"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+		-e '/^CC/d' \
+		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+		config.mk || die
+	sed -i \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ii
+	dodoc CHANGES FAQ README
+	doman *.1
+}
diff --git a/net-irc/ii/metadata.xml b/net-irc/ii/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/ii/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
new file mode 100644
index 000000000000..97850cc38b9d
--- /dev/null
+++ b/net-irc/inspircd/Manifest
@@ -0,0 +1,13 @@
+AUX inspircd-2.0.23-fix-path-builds.patch 9669 SHA256 f3c510efcee02745928ecb93d7d1b8160028b09ff7e588ad9e4f2d44671b5897 SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9 WHIRLPOOL 6b66c86be324a40bd9cfb0960a1dc4ce4aba21451ef9bf76ee21acad6f4f19b3709b1bcc2bcb999dc48e68e7dbf1fa035cd8c839bb4883149ce2f76abab45d3b
+AUX inspircd-2.0.24-fix-path-builds.patch 9669 SHA256 f3c510efcee02745928ecb93d7d1b8160028b09ff7e588ad9e4f2d44671b5897 SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9 WHIRLPOOL 6b66c86be324a40bd9cfb0960a1dc4ce4aba21451ef9bf76ee21acad6f4f19b3709b1bcc2bcb999dc48e68e7dbf1fa035cd8c839bb4883149ce2f76abab45d3b
+AUX inspircd-r2.initd 1390 SHA256 526138484bbc54f852d818a82104d98bcf695e202253cf101b1aa16e6f20d7b6 SHA512 88dcc6c50ebf4d16b97c193ca42185d66e7184c1b5bfb10bf807aef773e868ceb814dbcb57e121cc69d55f541aa7aaff093bb0d91938887e5bacd126ba931700 WHIRLPOOL beaeb5028cded90f5b41416a482ecb3bab92a697c5dbb0a9261449041fe7204c627e282fced2bd6daaf6d5d6951d2a1006a68ffd9075138b326c6cfdeea9e5e0
+AUX inspircd-r3.confd 1224 SHA256 1c8044500edb9aba2b0c1ad3f80da6ad5d0f0dc3e10022750234dd9af21d93fc SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2 WHIRLPOOL 753571b0a002067a539d348a3a8c19fc6d579ab5072da465fabfd7e34889e79e078226598e897011ad7462f6a357692caac42ac880451a0dbbbbf7c616f7381e
+AUX inspircd-r3.initd 1189 SHA256 1aa5dd1f63954926b387e8ccbf3cd3b57f228bef92b2ec0dd3e8d32bbab8115a SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff WHIRLPOOL ca63106a92d369ae6da1c0384991a7a9fd8042a3565df8a24aa7705bf7871fe2638f79651c94fb10cd000f7e926ed3e998bb16febe6c9b20bb2afaf6e72cda61
+AUX inspircd.confd 1343 SHA256 e20d9cd598120a1a890f66326ca897e94f635a27f3ec922c86097181fb26eaa9 SHA512 23cd6b51f92c3054152bb268e87461e5b59960ffd2f8ce209223ba03a9de7d9e76336d104805904dcfdb59c65af318dbfab11417848b2433cb96a17f0af74903 WHIRLPOOL 155c54faf982ab8daa7af7c4d59af6d126b945104050ee3fb436458444cfffab4788be1216c1735322c8476dc205460fe8a0c910c2c0ae3b8ccd44015b1a7a0f
+DIST inspircd-2.0.23.tar.gz 731695 SHA256 522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb WHIRLPOOL 9ac288624835e8cf97cf3634df47c4310c6929691b4bfb39139cb0a6c45a7503e1c73addf7f6eaef03d77e52d53a78f8efd648ddb3b5ee9023c4bdee045ac4a1
+DIST inspircd-2.0.24.tar.gz 732354 SHA256 41f702cb84caa2db089a02f511a3da3e7fa3cdce7d2c5040b3c54c5da83c8b40 SHA512 766ed9b2786a36c6f3765405b5e02d831ea5ae1089c1b646ed0340b08147f9bb8d477ff94e16b0d9ed02dc109c6273f3772e1bed10bc45d1e9e9b409a37d2b6a WHIRLPOOL 3da7b2b694fd60755d3238d33090e9bc30abca3090e2552b6a9cb572c644cdc883236d39b91d1680e2500a26ef4829c98315e9975e27d5271046461569193d24
+EBUILD inspircd-2.0.23.ebuild 2881 SHA256 ffe177927dd10fa0d1cccdeb33b2f1c309e7f8197c727a7243f51091fc51839f SHA512 bfa28ed4e8cf27389745b8b0582d76c2265350b2e6f980a40b65a914e5429d9e1bc4c2d88094c36834d86b9dea3479e2be91a554be43f7d51ba9ac4841fd51cb WHIRLPOOL 0641ad04c9810d4cfcc9604373b657d33cc786464ce369c76a4d2beeace3c8fd9a0114871f143b5bee95221991273dd3f7ce04fc700f141e59788c31cad6de4f
+EBUILD inspircd-2.0.24-r1.ebuild 3371 SHA256 26ded22870e2eaa72e09c55ab3d73f16c1ef600c98d7f20eee9283b6a41a633c SHA512 e0518097ccb0a8803d235e14128126a50ede0dcfe94e07141c029667b419033286cb95a6a1927f191bc6e66def41685b34d814a5fc74b1bd582e3f583f3b90fa WHIRLPOOL 232eb16c3550333f25623c7dde2b29173f033b639d23f10192512e2455767a85505491716e07c3ccbc865e67f4bf01abfe9480f0c2161887ccf145906e8d33cd
+MISC ChangeLog 6094 SHA256 00deb9f9de921f47c8b5bfda6407b8ff4451e77be10c38756e6f4cfafb508ab7 SHA512 f030769a50776cf397de72392a9b0b7ee3d5eca652de6e5e49c3b3adeff5548a81bfadf2669d5b7500d7aaeb5a212ff9b8fc00ca0953160117d55531411604aa WHIRLPOOL ae3594eb96c7dd85d9b1ce71c6030fbd30ca3d28ae9d1019d27f207214a46d9e135a3c1096889a6b0d0a5029a23a97d9da5900b7640929b1ba4ec3388b9ccdc8
+MISC ChangeLog-2015 18544 SHA256 66c5b46384f59df6e7e616208d61887648d6edf6cfc5c87654daef4c806250f3 SHA512 6c9b73b1f2a139af04f360cf0d86073e307b1c60d050eaab2cdaa207ac9a25265a7bc62b449785cdec5f76b75df312b882e0ce1818765557fff359356a46808a WHIRLPOOL aaf4cf6acd747ea97c3e743a3e0fa09ad3ea00bf4217969e56e2662749751a74b0b354613ac217e5dd8cbdfd67e83aface9146bb2fee79de6e9b1f92d5d43f8a
+MISC metadata.xml 1674 SHA256 fbb8e313970e38b92c92cc36cdcd946ec38ae7b211983c78fab05ce9f013f1b5 SHA512 ae6a96d1093024c9796788dea7fb23c8d2bb51ddea56eeb041e2443db2730f7f38cdb5fde42911ba75dd0cdfc4eac2c9c424f87660361d65cac6766729a60d98 WHIRLPOOL c64b746318b4fdaf89babdce24f89096ce2a749d055631ed30eaa5d144a5ccec89ebd25299855aa18493f43c6695c9a3cbbc07addec22f74a40d98d7b5196adb
diff --git a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch
new file mode 100644
index 000000000000..debf62a15f5e
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch
@@ -0,0 +1,253 @@
+diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
+--- a/docs/conf/inspircd.conf.example	2015-05-10 00:24:10.000000000 -0500
++++ b/docs/conf/inspircd.conf.example	2015-07-27 05:22:26.107849785 -0500
+@@ -412,11 +412,11 @@
+ 
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-<include file="conf/examples/opers.conf.example">
++<include file="/etc/inspircd/opers.conf.example">
+ 
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-<include file="conf/examples/links.conf.example">
++<include file="/etc/inspircd/links.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -426,7 +426,8 @@
+ #   motd - displayed on connect and when a user executes /MOTD
+ #   rules - displayed when the user executes /RULES
+ # Modules can also define their own files
+-<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
++<files motd="/etc/inspircd/motd.txt.example"
++       rules="/etc/inspircd/rules.txt.example">
+ 
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -472,7 +473,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -953,7 +954,7 @@
+ # provide almost all the features of InspIRCd. :)                     #
+ #                                                                     #
+ # The default does nothing -- we include it for simplicity for you.   #
+-<include file="conf/examples/modules.conf.example">
++<include file="/etc/inspircd/modules.conf.example">
+ 
+ # Here are some pre-built modules.conf files that closely match the
+ # default configurations of some popular IRCd's. You still may want to
+@@ -965,10 +966,10 @@
+ # recommended that you make your own modules file based on modules.conf.example.
+ 
+ # Settings similar to UnrealIRCd defaults.
+-#<include file="conf/examples/modules/unrealircd.conf.example">
++#<include file="/etc/inspircd/modules/unrealircd.conf.example">
+ 
+ # Settings similar to Charybdis IRCd defaults.
+-#<include file="conf/examples/modules/charybdis.conf.example">
++#<include file="/etc/inspircd/modules/charybdis.conf.example">
+ 
+ 
+ #########################################################################
+diff -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
+--- a/docs/conf/modules.conf.example    2016-02-28 17:38:30.492335461 -0600
++++ b/docs/conf/modules.conf.example    2016-02-28 17:39:20.068559846 -0600
+@@ -315,7 +315,7 @@
+ # specify some censor tags. See also:                                 #
+ # http://wiki.inspircd.org/Modules/censor                             #
+ #
+-#<include file="conf/examples/censor.conf.example">
++#<include file="/etc/inspircd/censor.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
+@@ -778,7 +778,7 @@
+ # specify below the path to the filter.conf file, or define some      #
+ # <filter> tags.                                                      #
+ #                                                                     #
+-#<include file="conf/examples/filter.conf.example">
++#<include file="/etc/inspircd/filter.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Gecos ban: Implements extended ban 'r', which stops anyone matching
+@@ -834,7 +834,7 @@
+ #                                                                     #
+ # If you specify to use the m_helpop.so module, then specify below    #
+ # the path to the helpop.conf file.                                   #
+-#<include file="conf/examples/inspircd.helpop-full.example">
++#<include file="/etc/inspircd/inspircd.helpop-full.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Hide chans module: Allows users to hide their channels list from non-
+@@ -1284,7 +1284,7 @@
+ #                 Read the comment above <connect:allowmotdcolors> in #
+ #                 inspircd.conf.example for details.                  #
+ #                                                                     #
+-#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
++#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Override module: Adds support for oper override.
+diff -Nuar a/make/template/main.mk b/make/template/main.mk
+--- a/make/template/main.mk	2015-05-10 00:24:10.000000000 -0500
++++ b/make/template/main.mk	2015-07-27 05:22:26.107849785 -0500
+@@ -34,7 +34,7 @@
+ SYSTEM = @SYSTEM@
+ BUILDPATH = @BUILD_DIR@
+ SOCKETENGINE = @SOCKETENGINE@
+-CXXFLAGS = -pipe -fPIC -DPIC
++MYCXXFLAGS = -pipe -fPIC -DPIC
+ LDLIBS = -pthread -lstdc++
+ LDFLAGS = 
+ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
+@@ -51,9 +51,9 @@
+ INSTMODE_LIB = 0644
+ 
+ @IFEQ $(CC) icpc
+-  CXXFLAGS += -Wshadow
++  MYCXXFLAGS += -Wshadow
+ @ELSE
+-  CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
++  MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
+ @ENDIF
+ 
+ 
+@@ -75,46 +75,46 @@
+ 	INSTALL = ginstall
+ @ENDIF
+ @IFEQ $(SYSTEM) darwin
+-  CXXFLAGS += -DDARWIN -frtti
++  MYCXXFLAGS += -DDARWIN -frtti
+   LDLIBS += -ldl
+   CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
+   PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
+ @ENDIF
+ @IFEQ $(SYSTEM) interix
+-  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
++  MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
+ @ENDIF
+ 
+-@IFNDEF D
+-  D=0
++@IFNDEF DEBUGLEVEL
++  DEBUGLEVEL=0
+ @ENDIF
+ 
+ GCC6=@GCC6@
+ @IFEQ $(GCC6) true
+-  CXXFLAGS += -fno-delete-null-pointer-checks
++  MYCXXFLAGS += -fno-delete-null-pointer-checks
+ @ENDIF
+ 
+ DBGOK=0
+-@IFEQ $(D) 0
+-  CXXFLAGS += -O2
++@IFEQ $(DEBUGLEVEL) 0
++  MYCXXFLAGS += -O2
+ @IFEQ $(CC) g++
+-    CXXFLAGS += -g1
++    MYCXXFLAGS += -g1
+ @ENDIF
+   HEADER = std-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 1
+-  CXXFLAGS += -O0 -g3 -Werror
++@IFEQ $(DEBUGLEVEL) 1
++  MYCXXFLAGS += -O0 -g3 -Werror
+   HEADER = debug-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 2
+-  CXXFLAGS += -O2 -g3
++@IFEQ $(DEBUGLEVEL) 2
++  MYCXXFLAGS += -O2 -g3
+   HEADER = debug-header
+   DBGOK=1
+ @ENDIF
+ FOOTER = finishmessage
+ 
+-CXXFLAGS += -Iinclude
++MYCXXFLAGS += -Iinclude
+ 
+ @GNU_ONLY MAKEFLAGS += --no-print-directory
+ 
+@@ -134,10 +134,11 @@
+ @ENDIF
+ 
+ @IFDEF PURE_STATIC
+-  CXXFLAGS += -DPURE_STATIC
++  MYCXXFLAGS += -DPURE_STATIC
+ @ENDIF
+ 
+-@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
++MYCXXFLAGS += $(CXXFLAGS)
++@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+ @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
+ 
+ # Default target
+@@ -150,10 +151,10 @@
+     @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+ 
+-@IFDEF T
++@IFDEF TGT
+     HEADER =
+     FOOTER = target
+-    TARGET = $(T)
++    TARGET = $(TGT)
+ @ENDIF
+ 
+ @IFEQ $(DBGOK) 0
+@@ -228,8 +229,8 @@
+ 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
+ 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
+ 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
+-	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
+-	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
+ 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
+ 	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
+ @IFNDEF PURE_STATIC
+@@ -237,9 +238,9 @@
+ @ENDIF
+ 	-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+ 	-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
+ 	@echo ""
+ 	@echo "*************************************"
+ 	@echo "*        INSTALL COMPLETE!          *"
+@@ -252,7 +253,7 @@
+ 	@echo '  Data:' $(DATPATH)
+ 	@echo 'To start the ircd, run:' $(BASE)/inspircd start
+ 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+-	@echo 'Examples are available at:' $(CONPATH)/examples/
++	@echo 'Examples are available at:' $(CONPATH)
+ 
+ @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
+ @BSD_ONLY RCS_FILES = src/version.sh
+diff -Nuar a/make/unit-cc.pl b/make/unit-cc.pl
+--- a/make/unit-cc.pl	2015-05-10 00:24:10.000000000 -0500
++++ b/make/unit-cc.pl	2015-07-27 05:22:26.107849785 -0500
+@@ -113,7 +113,7 @@
+ 	my $libs = '';
+ 	my $binary = $ENV{RUNCC};
+ 	if ($do_compile) {
+-		$flags = $ENV{CXXFLAGS};
++		$flags = $ENV{MYCXXFLAGS};
+ 		$flags =~ s/ -pedantic// if nopedantic($file);
+ 		$flags .= ' ' . getcompilerflags($file);
+ 
diff --git a/net-irc/inspircd/files/inspircd-2.0.24-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.24-fix-path-builds.patch
new file mode 100644
index 000000000000..debf62a15f5e
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.24-fix-path-builds.patch
@@ -0,0 +1,253 @@
+diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
+--- a/docs/conf/inspircd.conf.example	2015-05-10 00:24:10.000000000 -0500
++++ b/docs/conf/inspircd.conf.example	2015-07-27 05:22:26.107849785 -0500
+@@ -412,11 +412,11 @@
+ 
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-<include file="conf/examples/opers.conf.example">
++<include file="/etc/inspircd/opers.conf.example">
+ 
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-<include file="conf/examples/links.conf.example">
++<include file="/etc/inspircd/links.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -426,7 +426,8 @@
+ #   motd - displayed on connect and when a user executes /MOTD
+ #   rules - displayed when the user executes /RULES
+ # Modules can also define their own files
+-<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
++<files motd="/etc/inspircd/motd.txt.example"
++       rules="/etc/inspircd/rules.txt.example">
+ 
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -472,7 +473,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -953,7 +954,7 @@
+ # provide almost all the features of InspIRCd. :)                     #
+ #                                                                     #
+ # The default does nothing -- we include it for simplicity for you.   #
+-<include file="conf/examples/modules.conf.example">
++<include file="/etc/inspircd/modules.conf.example">
+ 
+ # Here are some pre-built modules.conf files that closely match the
+ # default configurations of some popular IRCd's. You still may want to
+@@ -965,10 +966,10 @@
+ # recommended that you make your own modules file based on modules.conf.example.
+ 
+ # Settings similar to UnrealIRCd defaults.
+-#<include file="conf/examples/modules/unrealircd.conf.example">
++#<include file="/etc/inspircd/modules/unrealircd.conf.example">
+ 
+ # Settings similar to Charybdis IRCd defaults.
+-#<include file="conf/examples/modules/charybdis.conf.example">
++#<include file="/etc/inspircd/modules/charybdis.conf.example">
+ 
+ 
+ #########################################################################
+diff -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
+--- a/docs/conf/modules.conf.example    2016-02-28 17:38:30.492335461 -0600
++++ b/docs/conf/modules.conf.example    2016-02-28 17:39:20.068559846 -0600
+@@ -315,7 +315,7 @@
+ # specify some censor tags. See also:                                 #
+ # http://wiki.inspircd.org/Modules/censor                             #
+ #
+-#<include file="conf/examples/censor.conf.example">
++#<include file="/etc/inspircd/censor.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
+@@ -778,7 +778,7 @@
+ # specify below the path to the filter.conf file, or define some      #
+ # <filter> tags.                                                      #
+ #                                                                     #
+-#<include file="conf/examples/filter.conf.example">
++#<include file="/etc/inspircd/filter.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Gecos ban: Implements extended ban 'r', which stops anyone matching
+@@ -834,7 +834,7 @@
+ #                                                                     #
+ # If you specify to use the m_helpop.so module, then specify below    #
+ # the path to the helpop.conf file.                                   #
+-#<include file="conf/examples/inspircd.helpop-full.example">
++#<include file="/etc/inspircd/inspircd.helpop-full.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Hide chans module: Allows users to hide their channels list from non-
+@@ -1284,7 +1284,7 @@
+ #                 Read the comment above <connect:allowmotdcolors> in #
+ #                 inspircd.conf.example for details.                  #
+ #                                                                     #
+-#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
++#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Override module: Adds support for oper override.
+diff -Nuar a/make/template/main.mk b/make/template/main.mk
+--- a/make/template/main.mk	2015-05-10 00:24:10.000000000 -0500
++++ b/make/template/main.mk	2015-07-27 05:22:26.107849785 -0500
+@@ -34,7 +34,7 @@
+ SYSTEM = @SYSTEM@
+ BUILDPATH = @BUILD_DIR@
+ SOCKETENGINE = @SOCKETENGINE@
+-CXXFLAGS = -pipe -fPIC -DPIC
++MYCXXFLAGS = -pipe -fPIC -DPIC
+ LDLIBS = -pthread -lstdc++
+ LDFLAGS = 
+ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
+@@ -51,9 +51,9 @@
+ INSTMODE_LIB = 0644
+ 
+ @IFEQ $(CC) icpc
+-  CXXFLAGS += -Wshadow
++  MYCXXFLAGS += -Wshadow
+ @ELSE
+-  CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
++  MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
+ @ENDIF
+ 
+ 
+@@ -75,46 +75,46 @@
+ 	INSTALL = ginstall
+ @ENDIF
+ @IFEQ $(SYSTEM) darwin
+-  CXXFLAGS += -DDARWIN -frtti
++  MYCXXFLAGS += -DDARWIN -frtti
+   LDLIBS += -ldl
+   CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
+   PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
+ @ENDIF
+ @IFEQ $(SYSTEM) interix
+-  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
++  MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
+ @ENDIF
+ 
+-@IFNDEF D
+-  D=0
++@IFNDEF DEBUGLEVEL
++  DEBUGLEVEL=0
+ @ENDIF
+ 
+ GCC6=@GCC6@
+ @IFEQ $(GCC6) true
+-  CXXFLAGS += -fno-delete-null-pointer-checks
++  MYCXXFLAGS += -fno-delete-null-pointer-checks
+ @ENDIF
+ 
+ DBGOK=0
+-@IFEQ $(D) 0
+-  CXXFLAGS += -O2
++@IFEQ $(DEBUGLEVEL) 0
++  MYCXXFLAGS += -O2
+ @IFEQ $(CC) g++
+-    CXXFLAGS += -g1
++    MYCXXFLAGS += -g1
+ @ENDIF
+   HEADER = std-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 1
+-  CXXFLAGS += -O0 -g3 -Werror
++@IFEQ $(DEBUGLEVEL) 1
++  MYCXXFLAGS += -O0 -g3 -Werror
+   HEADER = debug-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 2
+-  CXXFLAGS += -O2 -g3
++@IFEQ $(DEBUGLEVEL) 2
++  MYCXXFLAGS += -O2 -g3
+   HEADER = debug-header
+   DBGOK=1
+ @ENDIF
+ FOOTER = finishmessage
+ 
+-CXXFLAGS += -Iinclude
++MYCXXFLAGS += -Iinclude
+ 
+ @GNU_ONLY MAKEFLAGS += --no-print-directory
+ 
+@@ -134,10 +134,11 @@
+ @ENDIF
+ 
+ @IFDEF PURE_STATIC
+-  CXXFLAGS += -DPURE_STATIC
++  MYCXXFLAGS += -DPURE_STATIC
+ @ENDIF
+ 
+-@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
++MYCXXFLAGS += $(CXXFLAGS)
++@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+ @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
+ 
+ # Default target
+@@ -150,10 +151,10 @@
+     @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+ 
+-@IFDEF T
++@IFDEF TGT
+     HEADER =
+     FOOTER = target
+-    TARGET = $(T)
++    TARGET = $(TGT)
+ @ENDIF
+ 
+ @IFEQ $(DBGOK) 0
+@@ -228,8 +229,8 @@
+ 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
+ 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
+ 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
+-	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
+-	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
+ 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
+ 	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
+ @IFNDEF PURE_STATIC
+@@ -237,9 +238,9 @@
+ @ENDIF
+ 	-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+ 	-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
+ 	@echo ""
+ 	@echo "*************************************"
+ 	@echo "*        INSTALL COMPLETE!          *"
+@@ -252,7 +253,7 @@
+ 	@echo '  Data:' $(DATPATH)
+ 	@echo 'To start the ircd, run:' $(BASE)/inspircd start
+ 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+-	@echo 'Examples are available at:' $(CONPATH)/examples/
++	@echo 'Examples are available at:' $(CONPATH)
+ 
+ @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
+ @BSD_ONLY RCS_FILES = src/version.sh
+diff -Nuar a/make/unit-cc.pl b/make/unit-cc.pl
+--- a/make/unit-cc.pl	2015-05-10 00:24:10.000000000 -0500
++++ b/make/unit-cc.pl	2015-07-27 05:22:26.107849785 -0500
+@@ -113,7 +113,7 @@
+ 	my $libs = '';
+ 	my $binary = $ENV{RUNCC};
+ 	if ($do_compile) {
+-		$flags = $ENV{CXXFLAGS};
++		$flags = $ENV{MYCXXFLAGS};
+ 		$flags =~ s/ -pedantic// if nopedantic($file);
+ 		$flags .= ' ' . getcompilerflags($file);
+ 
diff --git a/net-irc/inspircd/files/inspircd-r2.initd b/net-irc/inspircd/files/inspircd-r2.initd
new file mode 100644
index 000000000000..653e501627e6
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-r2.initd
@@ -0,0 +1,48 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+INSPIRCD_USER=${INSPIRCD_USER:-"inspircd"}
+INSPIRCD_GROUP=${INSPIRCD_GROUP:-"inspircd"}
+INSPIRCD_CONFIGFILE=${INSPIRCD_CONFIGFILE:-"/etc/inspircd/inspircd.conf"}
+INSPIRCD_LOGFILE=${INSPIRCD_LOGFILE:-"/var/log/inspircd/ircd.log"}
+INSPIRCD_PIDFILE=${INSPIRCD_PIDFILE:-"/run/inspircd/inspircd.pid"}
+INSPIRCD_SSDARGS=${INSPIRCD_SSDARGS:-"--quiet --user \"${INSPIRCD_USER}\" --wait 1000"}
+INSPIRCD_TERMTIMEOUT=${INSPIRCD_TERMTIMEOUT:-"TERM/25/KILL/5"}
+INSPIRCD_OPTS=${INSPIRCD_OPTS:-""}
+
+command="/usr/bin/inspircd"
+command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\" --logfile \"${INSPIRCD_LOGFILE}\""
+start_stop_daemon_args="${INSPIRCD_SSDARGS}"
+pidfile="${INSPIRCD_PIDFILE}"
+retry="${INSPIRCD_TERMTIMEOUT}"
+
+required_files="${INSPIRCD_CONFIGFILE}"
+
+name="InspIRCd"
+
+description="InspIRCd is a modular Internet Relay Chat (IRC) server."
+
+extra_commands="version"
+extra_started_commands="rehash"
+
+depend() {
+	use dns
+	provide ircd
+}
+
+start_pre() {
+	checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")"
+}
+
+rehash() {
+	ebegin "Rehashing InspIRCd"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+version() {
+	ebegin "Retrieve InspIRCd version"
+	${command} --version
+	eend $?
+}
diff --git a/net-irc/inspircd/files/inspircd-r3.confd b/net-irc/inspircd/files/inspircd-r3.confd
new file mode 100644
index 000000000000..af9b3fe15e22
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-r3.confd
@@ -0,0 +1,33 @@
+# Distributed under the terms of the GNU General Public License v2
+
+# Location of configuration file. Modify if you don't like the standard
+# one.
+#
+#INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf"
+
+# File used to store the PID file. Usually you won't need to touch it.
+# If you are changing PID file do not forget to set new PID file in
+# INSPIRCD_CONFIGFILE as well.
+#
+#INSPIRCD_PIDFILE="/run/inspircd/inspircd.pid"
+
+# User to run InspIRCd as
+#
+#INSPIRCD_USER="inspircd"
+#INSPIRCD_GROUP="inspircd"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we start InspIRCd without any output (quiet)
+# as user $INSPIRCD_USER and wait 1000ms after we have started the service
+# to ensure that the daemon is really up and running.
+#INSPIRCD_SSDARGS="--quiet --user \"${INSPIRCD_USER}\" --wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (25 + 5 seconds
+# per default) when you are stopping the service.
+#INSPIRCD_TERMTIMEOUT="TERM/25/KILL/5"
+
+# Options to collectd
+# See `/usr/bin/inspircd --help` for more details
+#INSPIRCD_OPTS=""
diff --git a/net-irc/inspircd/files/inspircd-r3.initd b/net-irc/inspircd/files/inspircd-r3.initd
new file mode 100644
index 000000000000..4d8dac819368
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-r3.initd
@@ -0,0 +1,48 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${INSPIRCD_USER:="inspircd"}
+: ${INSPIRCD_GROUP:="inspircd"}
+: ${INSPIRCD_CONFIGFILE:="/etc/inspircd/inspircd.conf"}
+: ${INSPIRCD_PIDFILE:="/run/inspircd/inspircd.pid"}
+: ${INSPIRCD_SSDARGS:="--quiet --wait 1000"}
+: ${INSPIRCD_TERMTIMEOUT:="TERM/25/KILL/5"}
+: ${INSPIRCD_OPTS:=""}
+
+command="/usr/bin/inspircd"
+command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\""
+command_user="${INSPIRCD_USER}"
+start_stop_daemon_args="${INSPIRCD_SSDARGS}"
+pidfile="${INSPIRCD_PIDFILE}"
+retry="${INSPIRCD_TERMTIMEOUT}"
+
+required_files="${INSPIRCD_CONFIGFILE}"
+
+name="InspIRCd"
+
+description="InspIRCd is a modular Internet Relay Chat (IRC) server."
+
+extra_commands="version"
+extra_started_commands="rehash"
+
+depend() {
+	use dns
+	provide ircd
+}
+
+start_pre() {
+	checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")"
+}
+
+rehash() {
+	ebegin "Rehashing InspIRCd"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
+
+version() {
+	ebegin "Retrieve InspIRCd version"
+	${command} --version
+	eend $?
+}
diff --git a/net-irc/inspircd/files/inspircd.confd b/net-irc/inspircd/files/inspircd.confd
new file mode 100644
index 000000000000..1291f9fd552f
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd.confd
@@ -0,0 +1,38 @@
+# Distributed under the terms of the GNU General Public License v2
+
+# Location of configuration file. Modify if you don't like the standard
+# one.
+#
+#INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf"
+
+# Location of log file. Modify if you don't like the standard
+# one.
+#
+#INSPIRCD_LOGFILE="/var/log/inspircd/ircd.log"
+
+# File used to store the PID file. Usually you won't need to touch it.
+# If you are changing PID file do not forget to set new PID file in
+# INSPIRCD_CONFIGFILE as well.
+#
+#INSPIRCD_PIDFILE="/run/inspircd/inspircd.pid"
+
+# User to run InspIRCd as
+#
+#INSPIRCD_USER="inspircd"
+#INSPIRCD_GROUP="inspircd"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we start InspIRCd without any output (quiet)
+# as user $INSPIRCD_USER and wait 1000ms after we have started the service
+# to ensure that the daemon is really up and running.
+#INSPIRCD_SSDARGS="--quiet --user \"${INSPIRCD_USER}\" --wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (25 + 5 seconds
+# per default) when you are stopping the service.
+#INSPIRCD_TERMTIMEOUT="TERM/25/KILL/5"
+
+# Options to collectd
+# See `/usr/bin/inspircd --help` for more details
+#INSPIRCD_OPTS=""
diff --git a/net-irc/inspircd/inspircd-2.0.23.ebuild b/net-irc/inspircd/inspircd-2.0.23.ebuild
new file mode 100644
index 000000000000..78dbcfc29285
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.23.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs user
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/"
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
+
+RDEPEND="
+	dev-lang/perl
+	ssl? ( dev-libs/openssl:= )
+	geoip? ( dev-libs/geoip )
+	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+	pcre? ( dev-libs/libpcre )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.23-fix-path-builds.patch )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	# Patch the inspircd launcher with the inspircd user
+	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+
+	default_src_prepare
+}
+
+src_configure() {
+	local extras=""
+
+	use geoip && extras="${extras}m_geoip.cpp,"
+	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
+	use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
+	use mysql && extras="${extras}m_mysql.cpp,"
+	use pcre && extras="${extras}m_regex_pcre.cpp,"
+	use posix && extras="${extras}m_regex_posix.cpp,"
+	use postgres && extras="${extras}m_pgsql.cpp,"
+	use sqlite && extras="${extras}m_sqlite3.cpp,"
+	use ssl && extras="${extras}m_ssl_openssl.cpp,"
+	use tre && extras="${extras}m_regex_tre.cpp,"
+
+	if [[ -n "${extras}" ]]; then
+		econf --disable-interactive --enable-extras=${extras%,}
+	fi
+
+	econf \
+		--with-cc="$(tc-getCXX)" \
+		--disable-interactive \
+		--prefix="/usr/$(get_libdir)/${PN}" \
+		--config-dir="/etc/${PN}" \
+		--data-dir="/var/lib/${PN}/data" \
+		--log-dir="/var/log/${PN}" \
+		--binary-dir="/usr/bin" \
+		--module-dir="/usr/$(get_libdir)/${PN}/modules" \
+		$(usex ipv6 '' '--disable-ipv6') \
+		$(usex gnutls '--enable-gnutls' '') \
+		$(usex ssl '--enable-openssl' '')
+}
+
+src_compile() {
+	emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake INSTUID=${PN} DESTDIR="${D%/}" install
+
+	insinto "/usr/include/${PN}"
+	doins -r include/.
+
+	diropts -o"${PN}" -g"${PN}" -m0700
+	dodir "/var/lib/${PN}"
+	dodir "/var/lib/${PN}/data"
+
+	newinitd "${FILESDIR}/${PN}-r2.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	keepdir "/var/log/${PN}"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "Before starting ${PN} the first time, you should create"
+		elog "the /etc/${PN}/${PN}.conf file."
+		elog "You can find example configuration files under /etc/${PN}"
+		elog "Read the ${PN}.conf.example file carefully before "
+		elog "(re)starting the service."
+		elog
+	fi
+}
diff --git a/net-irc/inspircd/inspircd-2.0.24-r1.ebuild b/net-irc/inspircd/inspircd-2.0.24-r1.ebuild
new file mode 100644
index 000000000000..d3c92bdafc33
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.24-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs user versionator
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="https://inspircd.github.com/"
+SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
+
+RDEPEND="
+	dev-lang/perl
+	ssl? ( dev-libs/openssl:= )
+	geoip? ( dev-libs/geoip )
+	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+	pcre? ( dev-libs/libpcre )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+DOCS=( docs/. )
+PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	# Patch the inspircd launcher with the inspircd user
+	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+
+	default_src_prepare
+}
+
+src_configure() {
+	local extras=""
+
+	use geoip && extras="${extras}m_geoip.cpp,"
+	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
+	use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
+	use mysql && extras="${extras}m_mysql.cpp,"
+	use pcre && extras="${extras}m_regex_pcre.cpp,"
+	use posix && extras="${extras}m_regex_posix.cpp,"
+	use postgres && extras="${extras}m_pgsql.cpp,"
+	use sqlite && extras="${extras}m_sqlite3.cpp,"
+	use ssl && extras="${extras}m_ssl_openssl.cpp,"
+	use tre && extras="${extras}m_regex_tre.cpp,"
+
+	if [[ -n "${extras}" ]]; then
+		econf --disable-interactive --enable-extras=${extras%,}
+	fi
+
+	econf \
+		--with-cc="$(tc-getCXX)" \
+		--disable-interactive \
+		--prefix="/usr/$(get_libdir)/${PN}" \
+		--config-dir="/etc/${PN}" \
+		--data-dir="/var/lib/${PN}/data" \
+		--log-dir="/var/log/${PN}" \
+		--binary-dir="/usr/bin" \
+		--module-dir="/usr/$(get_libdir)/${PN}/modules" \
+		$(usex ipv6 '' '--disable-ipv6') \
+		$(usex gnutls '--enable-gnutls' '') \
+		$(usex ssl '--enable-openssl' '')
+}
+
+src_compile() {
+	emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake INSTUID=${PN} DESTDIR="${D%/}" install
+
+	insinto "/usr/include/${PN}"
+	doins -r include/.
+
+	einstalldocs
+
+	diropts -o"${PN}" -g"${PN}" -m0700
+	dodir "/var/lib/${PN}"
+	dodir "/var/lib/${PN}/data"
+
+	newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
+
+	keepdir "/var/log/${PN}"
+
+	rm -r "${D%/}/etc/${PN}" || die
+	dodir "/etc/${PN}"
+	dodir "/etc/${PN}/aliases"
+	dodir "/etc/${PN}/modules"
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		elog "Before starting ${PN} the first time, you *must* create"
+		elog "the /etc/${PN}/${PN}.conf file."
+		elog "You will find example configuration files under "
+		elog "/usr/share/doc/${PN}"
+		elog "Read the ${PN}.conf.example file carefully before "
+		elog "starting the service."
+	fi
+	local pv=""
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least "2.0.24-r1" "${pv}"; then
+			elog "Starting with 2.0.24-r1 the daemon is no longer started"
+			elog "with the --logfile option and you are thus expected to define"
+			elog "logging in the InspIRCd configuration file if you want it."
+			break
+		fi
+	done
+}
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
new file mode 100644
index 000000000000..5bcadd4c1b6e
--- /dev/null
+++ b/net-irc/inspircd/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		InspIRCd is a modular Internet Relay Chat (IRC) server written in C++
+		for Linux, BSD, Windows and Mac OS X systems which was created from
+		scratch to be stable, modern and lightweight.
+	</longdescription>
+	<longdescription lang="es">
+		InspIRCd es un servidor Internet Relay Chat (IRC) escrito en C++
+		para sistemas Linux, BSD, Windows y Mac OS X que se creó desde cero
+		para ser estable, moderno y ligero.
+	</longdescription>
+	<use>
+		<flag name="geoip">Add geoip support for country and city lookup based on IPs</flag>
+		<flag name="gnutls">Enable TLS support</flag>
+		<flag name="ipv6">Enable support for IP version 6</flag>
+		<flag name="ldap">Enable LDAP support</flag>
+		<flag name="mysql">Enable MySQL database backend</flag>
+		<flag name="pcre">Adds support for Perl Compatible Regular Expressions</flag>
+		<flag name="posix">Adds support for POSIX-compatible functions</flag>
+		<flag name="postgres">Enable PostgreSQL database backend</flag>
+		<flag name="sqlite">Enable Sqlite database backend</flag>
+		<flag name="ssl">Enable SSL support</flag>
+		<flag name="tre">Enable support for TRE, a lightweight, robust, and efficient POSIX compliant regexp matching library</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">inspircd/inspircd</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>wadecline@hotmail.com</email>
+		<name>Wade Cline</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-irc/irc-server/Manifest b/net-irc/irc-server/Manifest
new file mode 100644
index 000000000000..5d31311d45e0
--- /dev/null
+++ b/net-irc/irc-server/Manifest
@@ -0,0 +1,8 @@
+AUX 2.10.3_p3-gentoo.patch 475 SHA256 8f8202c7a4cbf9f4e5a697ab40582d1dd259e43ffd29c7d9001ddce8336a1057 SHA512 5ce98259c1b8666ca1df50f6c89004fc0c667d5e86355e632d97f1432ee9e4f16b75570b7bd17e954c51ea3385bcb8f3dd58a55e9d34ffcaabef0c5249ec2f6b WHIRLPOOL 4a929df57e7f373dd457322389e0efc7631613b056729769e68e524051311b08ac4c5d5c35ce9140958446dbc5a179addf68679e494ab1a28b087043771e5e60
+AUX ircd.confd 202 SHA256 f38d61bc0a4c6393ad47eadd165a1a6ccbe93dedb54e8eca959b029b764fba31 SHA512 a490883237ecef81be35278612d9cd1431a2ff597448a7c506ea4a6b8e9a9a595f043c9b5f601a47cd3c22ab453e6f79526aea2ec64c4f3ed5092e5f63d367bf WHIRLPOOL 21cb4dadb74723dfc4435bbfa842627249c63852ab59c972943391a7c12e61fdc92355e029f2c7c3cddb90d7ecacf39c4de9409ba2c0b567b8e221a08571662c
+AUX ircd.rc 663 SHA256 97b061e440e13df637482b2667d21f67e19a82370aa5112fd09f6fa863c038ce SHA512 f6b0ef2ff03632cfd31f23781745facba6f92d67f243682c0f63314932dca9bbff6aead430788fc9faa107f17bde500072d5291227cf51ccf4596bf8a9c2b347 WHIRLPOOL 430935c53664de5d9eae2c23a9db429113601e8e165e85d375cd65b78cadc2e49527f17cc42cfeecb5edb30a4ce16dd673d30faf38c022074e7e125b2d01deb3
+DIST irc2.11.1p1.tgz 770458 SHA256 29f83e82cd55f2e2f4362d95eae1da6b53dc1b7d05ff3f41be7b42e6dcbf2e1d SHA512 cc398ddd0129a044bb681504986f3d4d6f6e9b9b703495d62ec237c2e26a81250986336ae6076236eec7576eb0939ad931b45f09779e852cf69d101569c31c2c WHIRLPOOL eccdf4809446d2dbede0bb88928e2404a515684ef8e4b0870df00c892c70f49801edea93f458d301f99b351a705192799ed8716354961e5e19ab4b7e9bd6a0f5
+EBUILD irc-server-2.11.1_p1-r4.ebuild 2921 SHA256 801555abb42161651d643925380642c826a01db8d510bdf6b62798aac3bd8f64 SHA512 b9d6a482d0323834c90185d65aa91269c907865ad182203596f561a322c0c800d76047f7a97bc7c299cba7d1691e2a9e7eaeff584a52e01c4a6d01a90daf70a5 WHIRLPOOL 3758d4de4bc319f12641c27ec28141794c4e6010690ef99ac2b2cce1c5a390e10de0e7c0ff6c7fa67ec1c105f107cce858e933a835a7d9a2abb85203dc669885
+MISC ChangeLog 3668 SHA256 4607bf810888a04bf46ed0a91bc2dc062b7fe0b75ab017e306516651ed0ed844 SHA512 a49ce0c76ab657b87f5d040ba1a4263623a3ae75d4c9d1da8b70fbf053c6d4e11e1cc251dd2d86096161fc3ff2057318adcdc766cfbe3f6127350fb47d91fa35 WHIRLPOOL 7a5419de944a65cace4712a213666ea2be44d1e950f14f3a09fe67b0e31fde8462da7f163e867ecda4048fe46a0ee5b4525546b1e5b8253dd3029d5c1598c4d0
+MISC ChangeLog-2015 2664 SHA256 e4df6d456420718b51401780d0a9727519a2b634d5ae3f58c1347f67e29ad43e SHA512 ef22dbd41149d567638e7fcd1ce7652b237b92b73c28fca3964cb3c9b5bb838661edf04a128e80ef3af8ee91e988d2fe7b8542c099572e08b57cc887511c794b WHIRLPOOL fa38a038c74ce1494cd199ada1f38e5c0ad14423245cac9d5bdc9a6006436632fae25b7876acd721e7daaade18132991231ebb80c66c2d3361e87523505efb73
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/irc-server/files/2.10.3_p3-gentoo.patch b/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
new file mode 100644
index 000000000000..36f558a70470
--- /dev/null
+++ b/net-irc/irc-server/files/2.10.3_p3-gentoo.patch
@@ -0,0 +1,11 @@
+diff -ur irc2.10.3p3.orig/contrib/tkserv/tkserv.c irc2.10.3p3/contrib/tkserv/tkserv.c
+--- irc2.10.3p3.orig/contrib/tkserv/tkserv.c	2001-03-09 07:55:38.000000000 -0600
++++ irc2.10.3p3/contrib/tkserv/tkserv.c	2004-06-08 00:14:33.648900488 -0500
+@@ -549,6 +549,7 @@
+         case -1:
+             sendto_user("You are not allowed to tkline \"%s\".", host); break;
+         default:
++	  break;
+     }
+ 
+     retv = retv < 0 ? 0 : retv;    /* errors do not allow authorization */
diff --git a/net-irc/irc-server/files/ircd.confd b/net-irc/irc-server/files/ircd.confd
new file mode 100644
index 000000000000..19766668e76c
--- /dev/null
+++ b/net-irc/irc-server/files/ircd.confd
@@ -0,0 +1,10 @@
+# /etc/conf.d/ircd: configuration for /etc/init.d/ircd
+
+# User account to run ircd as.
+
+#IRCD_USER="ircd"
+
+# Put any additional options for ircd here.
+# See ircd(8) for more information.
+
+#IRCD_OPTS=""
diff --git a/net-irc/irc-server/files/ircd.rc b/net-irc/irc-server/files/ircd.rc
new file mode 100644
index 000000000000..0e3a05d5728f
--- /dev/null
+++ b/net-irc/irc-server/files/ircd.rc
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+}
+
+IRCD_USER=${IRCD_USER:-ircd}
+
+checkconfig() {
+	if [ ! -e /etc/ircd/ircd.conf ] ; then
+		eerror "You need to create /etc/ircd/ircd.conf first."
+		eerror "An example can be found in /etc/ircd/ircd.conf.example"
+		return 1
+	fi
+}
+
+start() {
+        checkconfig || return $?
+	ebegin "Starting ircd"
+	start-stop-daemon --start --quiet --chuid "${IRCD_USER}" --exec /usr/sbin/ircd -- ${IRCD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ircd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/ircd/ircd.pid
+	eend $?
+}
diff --git a/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild b/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild
new file mode 100644
index 000000000000..87e58f909ae3
--- /dev/null
+++ b/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator user
+
+MY_P="irc${PV/_/}"
+
+DESCRIPTION="RFC compliant IRC server"
+HOMEPAGE="http://www.irc.org/"
+SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz
+	ftp://ftp.irc.org/irc/server/Old/irc$(get_version_component_range 1-2)/${MY_P}.tgz"
+
+# GPL-2 is for the init script, bug 426038.
+LICENSE="GPL-1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="zlib ipv6"
+
+RDEPEND="sys-libs/ncurses:0
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	sys-apps/grep"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/2.10.3_p3-gentoo.patch )
+
+pkg_setup() {
+	enewgroup ircd
+	enewuser ircd -1 -1 -1 ircd
+}
+
+src_configure () {
+	sed -i \
+		-e "s/^#undef\tOPER_KILL$/#define\tOPER_KILL/" \
+		-e "s/^#undef\tOPER_RESTART$/#define\tOPER_RESTART/" \
+		-e "s/^#undef TIMEDKLINES$/#define\tTIMEDKLINES\t60/" \
+		-e "s/^#undef\tR_LINES$/#define\tR_LINES/" \
+		-e "s/^#undef\tCRYPT_OPER_PASSWORD$/#define\tCRYPT_OPER_PASSWORD/" \
+		-e "s/^#undef\tCRYPT_LINK_PASSWORD$/#define\tCRYPT_LINK_PASSWORD/" \
+		-e "s/^#undef\tIRC_UID$/#define\tIRC_UID\t$IRCUID/" \
+		-e "s/^#undef\tIRC_GID$/#define\tIRC_GID\t$IRCGID/" \
+		-e "s/^#undef USE_SERVICES$/#define\tUSE_SERVICES/" \
+		"${S}"/support/config.h.dist \
+		|| die "failed to sed definitions in config.h.dist"
+
+	if use zlib ; then
+		sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" \
+			"${S}"/support/config.h.dist \
+			|| die "failed to sed ZIP_LINKS definition in config.h.dist"
+	fi
+
+	# The --mandir has single quotes around it, the $prefix is NOT
+	# interpolated into the string.
+	econf \
+		--sysconfdir=/etc/ircd \
+		--localstatedir=/var/run/ircd \
+		--with-logdir=/var/log/ircd \
+		--with-rundir=/var/run/ircd \
+		--mandir='${prefix}/share/man' \
+		$(use_with zlib) \
+		$(use_enable ipv6 ip6)
+}
+
+src_compile() {
+	cd $(support/config.guess) \
+		|| die "failed to change into the source directory in src_compile"
+	emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv
+}
+
+src_install() {
+	cd $(support/config.guess) \
+		|| die "failed to change into the source directory in src_install"
+
+	emake \
+		prefix="${D}"/usr \
+		ircd_conf_dir="${D}"/etc/ircd \
+		ircd_var_dir="${D}"/var/run/ircd \
+		ircd_log_dir="${D}"/var/log/ircd \
+		install-server \
+		install-tkserv
+
+	fowners ircd:ircd /var/run/ircd
+	fowners ircd:ircd /var/log/ircd
+
+	cd ../doc || die "failed to change into the doc directory in src_install"
+
+	dodoc \
+		*-New alt-irc-faq Authors BUGS ChangeLog Etiquette \
+		iauth-internals.txt INSTALL.appendix INSTALL.* \
+		m4macros README RELEASE* rfc* SERVICE*
+
+	docinto Juped
+	dodoc Juped/Advertisement Juped/ChangeLog.* Juped/INSTALL
+
+	docinto Juped/US-Admin
+	dodoc Juped/US-Admin/Networking
+
+	docinto Nets
+	dodoc Nets/IRCNet
+
+	docinto Nets/Europe
+	dodoc Nets/Europe/*
+
+	newinitd "${FILESDIR}"/ircd.rc ircd
+	newconfd "${FILESDIR}"/ircd.confd ircd
+}
diff --git a/net-irc/irc-server/metadata.xml b/net-irc/irc-server/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/irc-server/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/ircii/Manifest b/net-irc/ircii/Manifest
new file mode 100644
index 000000000000..a2a327710564
--- /dev/null
+++ b/net-irc/ircii/Manifest
@@ -0,0 +1,8 @@
+AUX ircii-20110228-glibc.patch 799 SHA256 c8022cc7998f9ae7fd721e227bbe7d2bc405908dadf3e8e8222502bc327de0c8 SHA512 41d897753266acf205236d108b740d34a898ed13be2657a7314d1bbf3fd6f9a556f01b8dabb3b293c69606047bc03c6ef69cd35e5d0cab9d958ee173ab3744e3 WHIRLPOOL 7ee88ff2a2aa4802f435ebcfdf8a2e7cd178f80ec1b92774a544542ddaad01c4661652c789e6e8103c8c58a51619be31adf7247d4b3394d6df77db36d1756520
+DIST ircii-20110228.tar.bz2 558483 SHA256 4fc77ddaf473e35817f55945e6275b1501b7d95585b49a44e0fe998382d72fb2 SHA512 df27f098ad9c134335b7d97a25a07ef5fd9d14063b2e079a707a472d2582a1451d7697f3123508296c76afdb78257ad6dc358a2ec5af584ab53872c765b01782 WHIRLPOOL 2ea4dfa1f1b64152373e4c6f79216bfca803980715745e40c2c72e6f4f8facccee93657a9a1ca40d952e5b69d5522b7034041dc706ef9dc39ae4810de0c1831d
+DIST ircii-20111115.tar.bz2 555731 SHA256 5c6b4390b8ed04cf3b08a3ba72f41eba9b125d0fc09c637f7c7f81eb6bdd91e6 SHA512 6f282debbd27865414a2ef9148b23373f83a051b2917432d9fdc2f153c111f8e592286d42a5ad34fd0cdc155e39938094e140910fbf38be494e3ed3da4cd0b6e WHIRLPOOL dfb1b7326c5ee22c480ff85a3821af9ebb6f832da512f3f2b821ed3ed1437494cc1a7ca93794435e42f58cb3fe0a226105fb085fcf81425334a3e8ff4d209748
+EBUILD ircii-20110228.ebuild 888 SHA256 4eded806e8e012ebb6522d1b7382cb938803f66f6660f08a9644da2a8ff8b81e SHA512 91465b9c564e7f7b978e46cb73e10c837bc77823c3451e117bb34bf112296ec11c2b2e079dec0b01a08b816d92858b701b3ea22cd307593a971b82682ef2d13c WHIRLPOOL e0142315ec2c0469a394e35d306cec2e458f8382001973b7a124c6305c3a7ceb9478581c0be7102803582b4f0aa45f12a084f26e9b45188e503e4d027d2b7682
+EBUILD ircii-20111115.ebuild 837 SHA256 e20f30cb79bcbc0258e476a57edc597fa0433da33583de0b0e7c3090cfa8d1da SHA512 5914ab46ca20f9f5b7db8b26163ac43c62b941f782ad03fe6eba5b5b68968e794116a31ca18b48115ece1df42369c57d4a826b4dee08f6fac72cd38e61af04d7 WHIRLPOOL a3134a731cf962722a6b8066b8e5eea1ffb933ea98fe30b2ce6f03009e859bf7296358e9544402cf4cf93b3a6050fe35a374ab5057e9314e4146f94ceca8050e
+MISC ChangeLog 2546 SHA256 d022b952904e4a7a26aabb735847baf55f2e0e2aefc038ea4a9e72b43c8eaa74 SHA512 31f5847f2b3163100fd62cde3592e05ab789903103d1e94a64519092c2be18c22065dae767321007ad848f5611357e3d488afda2befd18908db10a6243115bfb WHIRLPOOL e5bd7ff70b6c0c94f66f6fb6bd2442adae71cb1d0ea1ccf2306ef875b2b006c8234a66d02ff186340aa227ac617231db0994dde95ad2c529481a4e00ba5aeb1f
+MISC ChangeLog-2015 5146 SHA256 09e616469a608e98066815801cbbe4d2513a0e636e2f1a066e3b6ec72a33e2f1 SHA512 e58d96c69cd53bfd3d8a4a0dcde48237af824aef258720c2a3962cd616fa84df18ba54fd9892900a43c809b1cbe8cb3b1c85e34ad0925a966d69fe039d9031af WHIRLPOOL e75e6c47125dd4f51a78bb4844fea42c953edef04ad07ce1bfa040997793cb6bf032422f98ab7219a4946eeb0c1f25a5be3f8c4dfa4fab445d9654af46417c43
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/ircii/files/ircii-20110228-glibc.patch b/net-irc/ircii/files/ircii-20110228-glibc.patch
new file mode 100644
index 000000000000..291bf3219eb2
--- /dev/null
+++ b/net-irc/ircii/files/ircii-20110228-glibc.patch
@@ -0,0 +1,29 @@
+From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+
+Support glibc systems where SIGRTMAX and SIGRTMIN macros can only be fully expanded at runtime.
+
+--- a/source/mksiginc.c
++++ b/source/mksiginc.c
+@@ -191,12 +191,18 @@
+ 	signames[SIGRETRACT] = "RETRACT";
+ #endif
+ 
+-#if defined(SIGRTMAX) && SIGRTMAX < MY_MAXSIG
+-	signames[SIGRTMAX] = "RTMAX";
++#if defined(SIGRTMAX)
++	/*
++	 * In recent glibc, SIGRTMAX and SIGRTMIN macros are runtime
++	 * function calls into libc and must be evaluated at runtime.
++	 */
++	if (SIGRTMAX < MY_MAXSIG)
++		signames[SIGRTMAX] = "RTMAX";
+ #endif
+ 
+-#if defined(SIGRTMIN) && SIGRTMIN < MY_MAXSIG
+-	signames[SIGRTMIN] = "RTMIN";
++#if defined(SIGRTMIN)
++	if (SIGRTMIN < MY_MAXSIG)
++		signames[SIGRTMIN] = "RTMIN";
+ #endif
+ 
+ #if defined(SIGSAK) && SIGSAK < MY_MAXSIG
diff --git a/net-irc/ircii/ircii-20110228.ebuild b/net-irc/ircii/ircii-20110228.ebuild
new file mode 100644
index 000000000000..30fe9cc6b755
--- /dev/null
+++ b/net-irc/ircii/ircii-20110228.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An IRC and ICB client that runs under most UNIX platforms"
+SRC_URI="ftp://ircii.warped.com/pub/ircII/${P}.tar.bz2"
+HOMEPAGE="http://www.eterna.com.au/ircii/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="ipv6"
+
+DEPEND="sys-libs/ncurses
+	virtual/libiconv"
+# This and irc-client both install /usr/bin/irc #247987
+RDEPEND="${DEPEND}
+	!!net-irc/irc-client"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc.patch
+}
+
+src_configure() {
+	tc-export CC
+	use elibc_glibc || append-libs -liconv
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc ChangeLog INSTALL NEWS README \
+		doc/Copyright doc/crypto doc/VERSIONS doc/ctcp
+}
diff --git a/net-irc/ircii/ircii-20111115.ebuild b/net-irc/ircii/ircii-20111115.ebuild
new file mode 100644
index 000000000000..72b797c9b94c
--- /dev/null
+++ b/net-irc/ircii/ircii-20111115.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An IRC and ICB client that runs under most UNIX platforms"
+SRC_URI="ftp://ircii.warped.com/pub/ircII/${P}.tar.bz2
+	ftp://ircii.warped.com/pub/ircII/old/${P}.tar.bz2"
+HOMEPAGE="http://eterna.com.au/ircii/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="ipv6"
+
+DEPEND="sys-libs/ncurses
+	virtual/libiconv"
+# This and irc-client both install /usr/bin/irc #247987
+RDEPEND="${DEPEND}
+	!!net-irc/irc-client"
+
+src_configure() {
+	tc-export CC
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc ChangeLog INSTALL NEWS README \
+		doc/Copyright doc/crypto doc/VERSIONS doc/ctcp
+}
diff --git a/net-irc/ircii/metadata.xml b/net-irc/ircii/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/ircii/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/ircmap/Manifest b/net-irc/ircmap/Manifest
new file mode 100644
index 000000000000..f56c2e9b2fee
--- /dev/null
+++ b/net-irc/ircmap/Manifest
@@ -0,0 +1,5 @@
+DIST ircmap.tar.gz 27944 SHA256 01215ec0871a05f74ecf9141e98a6fa9e6e5efd7de2244b889059a8d02a1e1ec SHA512 52ce62d7846e5e50525800af86b4296d427da21d129f68b83cd30daa75fdd9fe78c6615771e729c4ad5f8afe75f20b1cab0b6d4b01be4a7c2889524676b60ac9 WHIRLPOOL 61dd6bea1a864383f1a3fd6573a5bf7351929dc3bc50142bf95caeb19f33ddf80bf58f117468fdadda980d8a86e5b006a43e59c8600a2a7d77cf9d808aa5e359
+EBUILD ircmap-0.99.ebuild 1191 SHA256 789250f7e3cf6a100474c24a9acf1412e357d497082c58cca699687f62848787 SHA512 6559cd073e59832d47eabcc09cf859ddf5c1ee39927cda90c9fca9664e0201aee2a3ab564253d405720c921e35be892db3b8008135b55a4294b937c7034fed54 WHIRLPOOL 25b9bcb9ce20bc5587e5e52c95fdfa7e41458522ecac4c17c1a0ef192800322bf74de57898cfb1442f07e3684bf1897102926113fb8ebcb1b5360f02d0c7cdc3
+MISC ChangeLog 2450 SHA256 12f9271f619b99ae761034de3064675f22b0a8fd473880bc7b91df5de1f5172e SHA512 01b52f147c7e97f0de81baf6cded171a8cda6e1802ae17a8060335a87802185e1b860a7661f6eb8e8c3c67a905e9f0f6f8784ba78b0bdc5336d0ae66c5325686 WHIRLPOOL 9efba20f1e38a6c1d0599f702a4baac624d81ba60c4bc107473d1775f6872f9ec814b0c97945df0e0429caf11f058f3477f78bd39999c58892cf496d3ca5821f
+MISC ChangeLog-2015 1244 SHA256 dc7535c170ae15cfacafab63f6915ca3baf076b0616c57f673704abf23844610 SHA512 fe96c1620c6b7059e957d3617ca471b978f6ccc36c3aec35d6dd7034b71fe95d454a7569ea784ce0815cae7e8007ea819be6a3506efb3933d805736622f3c29e WHIRLPOOL 39ea50fd0bd4b46ce6e0f212aca0b807f5ceb567322fd71cf7f9ccc961299d66a08cfbea69217416c09aa96588ad913ff06c28e5ef0ab8a6740dc875fd4feb83
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/ircmap/ircmap-0.99.ebuild b/net-irc/ircmap/ircmap-0.99.ebuild
new file mode 100644
index 000000000000..40b6667a0e02
--- /dev/null
+++ b/net-irc/ircmap/ircmap-0.99.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Scripts to treate diagrams of IRC networks using the LINKS command"
+HOMEPAGE="http://pasky.or.cz/~pasky/irc/"
+SRC_URI="http://pasky.ji.cz/~pasky/irc/${PN}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${RDEPEND}
+	media-gfx/graphviz"
+DEPEND="${DEPEND}
+		>=sys-apps/sed-4"
+
+S="${WORKDIR}"/${PN}
+
+src_compile() {
+	eval $(perl -V:installprivlib)
+
+	sed -i \
+		-e "s:/home/pasky/ircmap:${installprivlib}/ircmap:" \
+		{ircmapC,ircmapR-aa,ircmapR-gvdot,ircmapR-ircnet,ircmapS}.pl
+}
+
+src_install () {
+	dodoc README
+	dobin ircmapS.pl ircmapC.pl ircmapR-aa.pl ircmapR-gvdot.pl ircmapR-ircnet.pl
+
+	eval $(perl -V:installprivlib)
+
+	insinto /"${installprivlib}"/ircmap
+	doins IHash.pm
+}
+
+pkg_postinst() {
+	elog 'Usage:'
+	elog 'IRCSERVER="irc.generic.com ircmapS.pl [-options parameters] \'
+	elog '| tee /tmp/sendmethisifitdoesntwork \'
+	elog '| ircmapC.pl \'
+	elog '| tee /tmp/coredump \'
+	elog '| ircmapR-aa.pl > ${IRCSERVER}.txt'
+	elog ''
+	elog 'cat /tmp/coredump \'
+	elog '| ircmapR-gvdot.pl \'
+	elog '| dot -Tgif -o  ${IRCSERVER}.gif'
+}
diff --git a/net-irc/ircmap/metadata.xml b/net-irc/ircmap/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/ircmap/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/ircservices/Manifest b/net-irc/ircservices/Manifest
new file mode 100644
index 000000000000..172cc5366bbb
--- /dev/null
+++ b/net-irc/ircservices/Manifest
@@ -0,0 +1,14 @@
+AUX ircservices-5.1.17-fPIC-configure.patch 778 SHA256 b94e19034a85a96964ea659716278545dc77c7644e1c5a758dae66d5c9e538c2 SHA512 cfa49ed7572dd78b04d0b39b6927c8d3d9aff2b2d9b3367a9b5daba499070e2e844ae86b5496ebd31acd86b43b7278e404e14611ec042337ed332e62c3c4fbe1 WHIRLPOOL db4c8049019bed9a814f8031ccab9df849bd02dccb541dfa03578b2622985ef568c0dc138d4344ea2b7e3a8e5dd1aeb6085eab34250c72d4258fa39d96d8f837
+AUX ircservices-5.1.17-fPIC.patch 622 SHA256 af5f1472b5c9b1e9ff50f4ade87f6a8e8784addaeb356fddce81f74cffad0f91 SHA512 2dc91b88313aaa2e98518bbc172255e68532d9358a9c8789733cd6949f7a634a55980e0e4bcc4762b2efd9d7b0053ee763fff22aab0170c7cc0d0213bfd6ac8c WHIRLPOOL d3a9adc0bf7f1a93a47085da873c13630d85aed7c00019d0c297ad8b81cf4d726e5d6305602a77aeb15a2fba131daef3d6af4469affc7605aebbecf2e9e3f37d
+AUX ircservices-5.1.24-as-needed.patch 668 SHA256 267c455715797c0f8d939512813f547171fa03c737d77b399e43ef503252d50b SHA512 6f8306b77a8550ca55c47495ab660be2fd780883757e84e705ad5b458eb31bcba69dd7a609cdc6921de3d8f7a3703fc5ac73d927d86402c2db1c4f632cbe6cb8 WHIRLPOOL bb701e99299ed341f92ff4d0a375c3a30ae5e46f2e8d94a27406d7c34d982bcda3998ec7e0ecafdeb1af386c76eb199176d25caea944365a51301cb0c65e940c
+AUX ircservices-5.1.24-fd_set-amd64.patch 9361 SHA256 f20cc762bd575b898136f0bc638ba2c5490ab42b2a2e6963568a1ca9d099a3f4 SHA512 f6145a161517f7c44e7cdecf28a17ac07239542c83af9c8d040de14021678aeabc8d9fc2f750dabfd64a4003f8085bda31ec91bfd7b8008941fe94cbd8facaab WHIRLPOOL 7a43561e46349593d7dd80bd4f518a0816e0f94212cc48590a8e4640b4dd89276cc29fa63889e002ee90dffac8481b28bed5139dee0c74ef81e806572be20752
+AUX ircservices-5.1.24-ircservices-chk-pidfile.patch 562 SHA256 f85d1ba2193713bd4ee396f4f9d51c4806bea536c7224115ce505f08750e43be SHA512 eefc97232257db5d0a0488e3fe47097f41a05252109bb585fcaf3b066e74aae9bfb74dfe21803b2c105424790ad694cf42123fa281482c8b227704b50b5b0414 WHIRLPOOL d9e394ac147c3c3eb567a3abbd94a4b524add57683c03aa1ff177c3583a1a56b819df7eedc24e74d28e1ff00745b01dd2d6b8fddc9c0bab85bc6a4fb4a5fbf1d
+AUX ircservices-5.1.24-ldflags.patch 479 SHA256 1798dac8bf78ceccf24874cecf331d8f6d605a152c5eec75557b69938029c06e SHA512 0985375bd4b775e37cd7f60c750d23318b8dd238114f363f5c970e3b56af982bd4a6f0e7f85366327e037996440578aa8549e15d46a65098266007a40648f3fd WHIRLPOOL d2bc5a27e50b85548ff7cbcd0d6fe6348f13576a5acfdbf44eb303b3876a60dbaf786d9522d6f3fc8502ebff8936071dc9b17f6aceb256240d52b4b9fb99fb03
+AUX ircservices-5.1.24-parallel-make.patch 736 SHA256 54104cc06087db860e1933363071fa7077a914eaf7efbaeea001e611182af6ce SHA512 e312fbf3d621c9fe6223a005c352c5bbb1904c2c04cfa0691c2a573f9d7691ddcce616c4103512066731bb5ec71bf4beaf15f01920c6d5f34b78ebd23a4d8c16 WHIRLPOOL 3517a12b308bfeeeb0f57bc08e5b15a51c22b728935a5689cbd32147c84b754987223c0902048388bdc372f4e7e6a4c5be02000f7cad35f9cf19fa815da87f7e
+AUX ircservices.confd 487 SHA256 cbbd130e360f6d4191baf99d3943f3a5e09f32b016f94803660365879e0c02b7 SHA512 2c126ead7e2e85e8db5097085b4baa7dc0ee18cf0db7428184977d593353f072cabe6769cd07b5cb6bba85d1fb3852c7d7e0c5604102d2e0cd33557d2de6c99d WHIRLPOOL 4f98f05e29a8e53023a552b39e2f17860b438d4d5225a2096bed61cbcf07a9b6e76015998b540b39f392ecb8ab23d5da66158df79d78e5d9616c5d49ed9352d0
+AUX ircservices.initd 759 SHA256 6d9243180f75440737dbc20f1f161667a427ea1088396e4c8215e103f75b7e3a SHA512 cee224e3ba727ef9141e8fda744b4dd488c4603db44c12c5e405d8de2d39f6e6e5e0829b4353a651c5ca9bb23e5ca00188178e7ed6e20d69e2767ef38eb40243 WHIRLPOOL ce11b5bb0790c50d2c3a96481a916f817bf0cb4a770316ff75cdab7e02a2dc5fec883a73e1db8c46de0368670f1ae425a931556dea8bd826b5364c20bedb2dc7
+DIST ircservices-5.1.24.tar.gz 1516612 SHA256 63c88b84ddcd12f3636ca9c69987a06e4055156ae3ebe2ff4f22205c66c2a365 SHA512 1c1a0ec6d0e0a11071532e07792a15b1910fe108f09e991ca27e0196cfeec72e057a067fa69396b8647aca4ed8097c857eb8e714d8bee2ca6a0c5e27593fb06d WHIRLPOOL f8a3fdfb888030d4fd7426e4270a424dc651ef8e5b7e4f030ed0cb882f3911f2f96909eefcb5f65d1d69ced305538ae0ecc575fc3b4f9d558ab56946a42f8f52
+EBUILD ircservices-5.1.24.ebuild 3145 SHA256 d1988b05cee269da579a51920ca9ea98b7c08068d2801dbb188691e85e901c5e SHA512 8dab875a6c4d7ae2a8bac6a8fab348b5d4e7ce320325c6765950198f533d5a5010bb34af1a7fe739b77f248fb553466dcefa3093ad63446eb67fe87367b47a0b WHIRLPOOL d33e8996653839b57bb88404433d6566d36d5e20a91a66e7552e407b7e6943a622d278810db019a75e8e4fc2f3d6978f3c5921b0098ea55c1346011bc5616c86
+MISC ChangeLog 3108 SHA256 73f4446d8291cb2833d21a38cc841f477a6637d4d6844c8c88b1e339a18d7ef1 SHA512 5a8df8214726ebb7e1058fa1cc34c2b8f393e8d6581a251c66e2e1884acc146c3464789bf820c1c3202ab208fe467fa396ffe0690d28a9e02b85f6a87c1f7d4b WHIRLPOOL 30e2a03abfdf66657c36c4e6acbe5d27ab57b0951a33e29390ef0f8f4100209b583bf760373fcde36caac85ebfb88870b856a42acbc66ed2a5ef0e01466a4b23
+MISC ChangeLog-2015 9015 SHA256 bffc3d43cdd6fbeda71d981eec4d9e8dcd98979136cfc4a57c968ca0a5eae1df SHA512 d72b9281ebb44f6ad557acd0ea10435fd43956597db26302f42640b14f4554165950913881a38dd366125dc94ea60a458913b06cc7fcda0d09aec208ef240bce WHIRLPOOL 5ccd03fee2576a410a24d380ae6632526358ff8e76a43d6dcfe1d55d61c3a34c1aa7910b184c041f65dfd9b28fec68c0179b5a5a2f3ab7eb0369d977e6b76716
+MISC metadata.xml 259 SHA256 43367eee3fde3abfd32059666a5e056dc46e3558cdb2fff9491c80f15436f4ee SHA512 35da36c4a432db521f3a3747f4e047d807d3943ee80e9b5f4dc5ab4d341c52d24f4f1f0d622c77e405b5ad96a63904f5662dab4cb191d85388061fdd70737b4d WHIRLPOOL 437e103e1f9ed95441635738663f74ed58336ed273757d5e674e0b648ba86c8fbd538add9c4e0d57fb94a5478fea24cc1991a5d6a2abc3f32ad418d60e8789f4
diff --git a/net-irc/ircservices/files/ircservices-5.1.17-fPIC-configure.patch b/net-irc/ircservices/files/ircservices-5.1.17-fPIC-configure.patch
new file mode 100644
index 000000000000..8e279031b2e0
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices-5.1.17-fPIC-configure.patch
@@ -0,0 +1,14 @@
+--- ircservices-5.1.12/configure	2008-09-22 17:35:52.000000000 +0000
++++ ircservices-5.1.12.orig/configure	2008-09-22 17:33:51.000000000 +0000
+@@ -1296,9 +1296,9 @@
+             fi
+             if [ "$OK" ] ; then
+                 if [ "x`uname -s`" = "xOSF1" ] ; then
+-                    CC_SHARED="$CC -shared -Wl,-expect_unresolved"
++                    CC_SHARED="$CC -shared -Wl,-expect_unresolved -fPIC"
+                 else
+-                    CC_SHARED="$CC -shared"
++                    CC_SHARED="$CC -shared -fPIC"
+                 fi
+                 if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib.c -o $CONFTMP/test-lib.so && run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib2.c -o $CONFTMP/test-lib2.so ; then
+                     log "-shared works"
diff --git a/net-irc/ircservices/files/ircservices-5.1.17-fPIC.patch b/net-irc/ircservices/files/ircservices-5.1.17-fPIC.patch
new file mode 100644
index 000000000000..788723c5be00
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices-5.1.17-fPIC.patch
@@ -0,0 +1,12 @@
+diff -Nur ircservices-5.1.12/modules/Makerules ircservices-5.1.12.orig/modules/Makerules
+--- ircservices-5.1.12/modules/Makerules	2008-09-22 17:37:48.000000000 +0000
++++ ircservices-5.1.12.orig/modules/Makerules	2008-09-22 17:33:51.000000000 +0000
+@@ -172,7 +172,7 @@
+ $(TARGET).o: .compiled-$(TARGET).o FRC
+ 	@echo >/dev/null
+ .compiled-$(TARGET).o: $(TARGET).c $(DEPS) $(INCLUDES2)
+-	cd $(TOPDIR) && $(CC) $(CFLAGS) -I. -c modules/$(DIRNAME)/$< -o modules/$(DIRNAME)/$(TARGET).o
++	cd $(TOPDIR) && $(CC) $(CFLAGS) -fPIC -I. -c modules/$(DIRNAME)/$< -o modules/$(DIRNAME)/$(TARGET).o
+ 	@rm -f $@
+ 	@ln -s $(TARGET).o $@
+ 
diff --git a/net-irc/ircservices/files/ircservices-5.1.24-as-needed.patch b/net-irc/ircservices/files/ircservices-5.1.24-as-needed.patch
new file mode 100644
index 000000000000..b8b3668e1e39
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices-5.1.24-as-needed.patch
@@ -0,0 +1,17 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Date: 2011-06-22
+Subject: Fix missing $(LIBS) in the Makefiles where linking of modules
+	happens.
+
+diff -r 7c815ad6fa2e -r f195c349225a modules/Makerules
+--- a/modules/Makerules	Wed Jun 22 00:14:22 2011 -0400
++++ b/modules/Makerules	Wed Jun 22 13:32:24 2011 -0400
+@@ -104,7 +104,7 @@
+ 
+ # Compile one or more objects into a dynamic module.
+ $(TARGET).so: $(TARGET).o $(OBJECTS)
+-	$(CC_SHARED) $(CFLAGS) $(LFLAGS) $^ -o $@
++	$(CC_SHARED) $(CFLAGS) $(LFLAGS) $^ -o $@ $(LIBS)
+ 
+ # Compile one or more objects into a static module and generate a symbol
+ # list.  The .a file we create here is just a placeholder to show that
diff --git a/net-irc/ircservices/files/ircservices-5.1.24-fd_set-amd64.patch b/net-irc/ircservices/files/ircservices-5.1.24-fd_set-amd64.patch
new file mode 100644
index 000000000000..b15595d570a3
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices-5.1.24-fd_set-amd64.patch
@@ -0,0 +1,236 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Fix compilation on amd64 platform by using a different method
+	of fixing the printf() + size_t problem.
+
+The method used is to test if the `z' printf integer modifier works or
+not. If that works, use it. Otherwise, search for a normal integer
+type of similar length to size_t. Defines PRIdSIZE and PRIuSIZE in
+reminiscence of inttypes.h
+
+diff -r b323b647fe91 -r e10ae0e7b778 Makefile
+--- a/Makefile	Tue Jun 21 00:42:59 2011 -0400
++++ b/Makefile	Tue Jun 21 00:44:38 2011 -0400
+@@ -116,17 +116,17 @@
+ 
+ ifneq ($(STATIC_MODULES),)
+ modules: langstrs.h
+-	@$(MAKE) -C modules all-static CFLAGS="$(CFLAGS)"
++	@$(MAKE) -C modules all-static CFLAGS='$(CFLAGS)'
+ else
+ modules: langstrs.h
+-	@$(MAKE) -C modules all-dynamic CFLAGS="$(CFLAGS)"
++	@$(MAKE) -C modules all-dynamic CFLAGS='$(CFLAGS)'
+ endif
+ 
+ languages:
+-	@$(MAKE) -C lang CFLAGS="$(CFLAGS)"
++	@$(MAKE) -C lang CFLAGS='$(CFLAGS)'
+ 
+ tools: langstrs.h services.h
+-	@$(MAKE) -C tools CFLAGS="$(CFLAGS)"
++	@$(MAKE) -C tools CFLAGS='$(CFLAGS)'
+ 
+ 
+ # Catch any changes in compilation options at the top of this file or the
+diff -r b323b647fe91 -r e10ae0e7b778 configure
+--- a/configure	Tue Jun 21 00:42:59 2011 -0400
++++ b/configure	Tue Jun 21 00:44:38 2011 -0400
+@@ -271,6 +271,7 @@
+ SIZEOF_INT=
+ SIZEOF_LONG=
+ SIZEOF_PTR=
++SIZEOF_SIZE_T=
+ SIZEOF_TIME_T=
+ MAX_TIME_T=
+ SIZEOF_GID_T=bonkle
+@@ -1997,6 +1998,39 @@
+     fi
+ fi
+ 
++MODE="check_size_t       "
++echo2 "Checking the size of size_t... "
++if [ "$SIZEOF_SIZE_T" ]; then
++    echo "(cached) `expr $SIZEOF_SIZE_T \* 8` bits"
++    log "cache supplied `expr $SIZEOF_SIZE_T \* 8` bits"
++else
++    cat >$CONFTMP/test.c <<EOT
++        #include <stdlib.h>
++        #include <stdio.h>
++        int main()
++        {
++            size_t a = 0;
++            printf("%d", sizeof(a));
++            return 0;
++        }
++EOT
++    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test; then
++        a="`$CONFTMP/test`"
++        log "test program output (sizeof(size_t)): $a"
++        if [ ! "$a" ]; then
++            echo "test program failed!  Assuming `expr $SIZEOF_PTR \* 8` bits."
++            log "assuming `expr $SIZEOF_PTR \* 8` bits"
++            SIZEOF_SIZE_T=$SIZEOF_PTR
++        else
++            SIZEOF_SIZE_T="$a"
++            echo `expr $SIZEOF_SIZE_T \* 8` bits
++            log "`expr $SIZEOF_SIZE_T \* 8` bits"
++        fi
++    else
++        whoa_there
++    fi
++fi
++
+ MODE="check_time_t       "
+ echo2 "Checking the size of time_t... "
+ if [ "$SIZEOF_TIME_T" -a "$MAX_TIME_T" ] ; then
+@@ -2135,6 +2169,53 @@
+     fi
+ fi
+ 
++MODE="check_PRIdSIZE    "
++echo2 "Checking how to use size_t with printf... "
++if [ "$SIZE_T_FORMAT" ]; then
++    echo "(cached) $SIZE_T_FORMAT"
++    log "cache $SIZE_T_FORMAT"
++else
++    cat >$CONFTMP/test.c <<EOT
++        #include <stdlib.h>
++        #include <stdio.h>
++        int main()
++        {
++            size_t a = 26;
++            printf("%zu", a);
++            return 0;
++        }
++EOT
++    if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test; then
++        a="`$CONFTMP/test`"
++        log "test program output printf(\"%zu\", (size_t)26): $a"
++        if [ "x$a" = "x26" ]; then
++            echo "can use %zu to print size_t (I love standards-compliance :-))."
++            log "can use %zu to print size_t (I love standards-compliance :-))."
++            CDEFS="$CDEFS -DPRIdSIZE=\\\"zd\\\" -DPRIuSIZE=\\\"zu\\\""
++        else
++            echo "test program indicated that runtime does not accept %zu for size_t."
++            log "test program indicated that runtime does not accept %zu for size_t."
++            if [ "x$SIZEOF_SIZE_T" = "x$SIZEOF_INT" ]; then
++                SIZE_MOD=
++                MATCHED=int
++            else
++                if [ "x$SIZEOF_SIZE_T" = "x$SIZEOF_LONG" ]; then
++                    SIZE_MOD=l
++                    MATCHED=long
++                else
++                    SIZE_MOD=l
++                    MATCHED="no known types"
++                fi
++            fi
++            echo "size_t's size matched $MATCHED, using %$SIZE_MOD""d to print size_t."
++            log "size_t's size matched $MATCHED, using %$SIZE_MOD""d to print size_t."
++            CDEFS="$CDEFS -DPRIdSIZE=\\\"$SIZE_MOD""d\\\" -DPRIuSIZE=\\\"$SIZE_MOD""u\\\""
++        fi
++    else
++        whoa_there
++    fi
++fi
++
+ ###########################################################################
+ 
+ # AIX workaround.
+diff -r b323b647fe91 -r e10ae0e7b778 defs.h
+--- a/defs.h	Tue Jun 21 00:42:59 2011 -0400
++++ b/defs.h	Tue Jun 21 00:44:38 2011 -0400
+@@ -224,11 +224,6 @@
+ 
+ /* Various generally useful macros. */
+ 
+-
+-/* Make sizeof() return an int regardless of compiler (avoids printf
+- * argument type warnings). */
+-#define sizeof(v)       ((int)sizeof(v))
+-
+ /* Length of an array: */
+ #define lenof(a)        (sizeof(a) / sizeof(*(a)))
+ 
+diff -r b323b647fe91 -r e10ae0e7b778 modules/Makefile
+--- a/modules/Makefile	Tue Jun 21 00:42:59 2011 -0400
++++ b/modules/Makefile	Tue Jun 21 00:44:38 2011 -0400
+@@ -18,7 +18,7 @@
+ 
+ all-dynamic:
+ 	@set -e ; for i in $(SUBDIRS) ; do \
+-		$(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS="$(CFLAGS)" ; \
++		$(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS='$(CFLAGS)' ; \
+ 		if $(TEST_NT) ! -f .stamp -o "$$i/.stamp" -nt .stamp ; then \
+ 			echo "touch .stamp" ; \
+ 			touch .stamp ; \
+@@ -33,7 +33,7 @@
+ 	@echo '#include "modsyms.c"' >>modlist.c
+ 	@echo 'struct {const char *name; void *symlist;} modlist[] = {' >>modlist.c
+ 	@set -e ; for i in $(SUBDIRS) ; do \
+-		$(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS="$(CFLAGS)" ; \
++		$(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS='$(CFLAGS)' ; \
+ 		cat $$i/.modext-*.h >>modext.h ; \
+ 		cat $$i/.modsyms-*.c >>modsyms.c ; \
+ 		cat $$i/.modlist-*.c >>modlist.c ; \
+diff -r b323b647fe91 -r e10ae0e7b778 modules/Makerules
+--- a/modules/Makerules	Tue Jun 21 00:42:59 2011 -0400
++++ b/modules/Makerules	Tue Jun 21 00:44:38 2011 -0400
+@@ -153,13 +153,13 @@
+ $(TARGET).o $(TARGET)_static.o: MODULE_CFLAGS += -DMODULE_MAIN_FILE
+ $(TARGET)_static.o: MODULE_CFLAGS += -D_this_module_ptr=_this_module_ptr_$(MODULE_ID) -Dmodule_version=module_version_$(MODULE_ID) -Dmodule_config=module_config_$(MODULE_ID) -Dinit_module=init_module_$(MODULE_ID) -Dexit_module=exit_module_$(MODULE_ID)
+ $(TARGET)_static.o: FRC
+-	@$(MAKE) --no-print-directory $@ TARGET=$(@:_static.o=) INCLUDES2="$(INCLUDES-$(@:_static.o=.o))" CFLAGS="$(CFLAGS) $(MODULE_CFLAGS)" REALLY_COMPILE=2
++	@$(MAKE) --no-print-directory $@ TARGET=$(@:_static.o=) INCLUDES2="$(INCLUDES-$(@:_static.o=.o))" CFLAGS='$(CFLAGS) $(MODULE_CFLAGS)' REALLY_COMPILE=2
+ 	@if $(TEST_NT) ! -f .stamp -o "$@" -nt .stamp ; then \
+ 		echo "touch .stamp" ; \
+ 		touch .stamp ; \
+ 	fi
+ $(TARGET).o $(OBJECTS): FRC
+-	@$(MAKE) --no-print-directory $@ TARGET=$(@:.o=) INCLUDES2="$(INCLUDES-$@)" CFLAGS="$(CFLAGS) $(MODULE_CFLAGS)" REALLY_COMPILE=2
++	@$(MAKE) --no-print-directory $@ TARGET=$(@:.o=) INCLUDES2="$(INCLUDES-$@)" CFLAGS='$(CFLAGS) $(MODULE_CFLAGS)' REALLY_COMPILE=2
+ 	@if $(TEST_NT) ! -f .stamp -o "$@" -nt .stamp ; then \
+ 		echo "touch .stamp" ; \
+ 		touch .stamp ; \
+diff -r b323b647fe91 -r e10ae0e7b778 tools/convert-cygnus.c
+--- a/tools/convert-cygnus.c	Tue Jun 21 00:42:59 2011 -0400
++++ b/tools/convert-cygnus.c	Tue Jun 21 00:44:38 2011 -0400
+@@ -245,7 +245,7 @@
+                 break;
+             }
+             if (strlen(pass) > sizeof(ngi->pass)-1) {
+-                fprintf(stderr, "%s:%d: Password for `%s' truncated to %d"
++                fprintf(stderr, "%s:%d: Password for `%s' truncated to %" PRIdSIZE
+                         " characters\n", fname, line, ni->nick,
+                         sizeof(ngi->pass)-1);
+                 pass[sizeof(ngi->pass)-1] = 0;
+@@ -741,7 +741,7 @@
+             }
+             ci->founder = ni->nickgroup;
+             if (strlen(pass) > sizeof(ci->founderpass)-1) {
+-                fprintf(stderr, "%s:%d: Password for `%s' truncated to %d"
++                fprintf(stderr, "%s:%d: Password for `%s' truncated to %" PRIdSIZE
+                         " characters\n", fname, line, ci->name,
+                         sizeof(ci->founderpass)-1);
+                 pass[sizeof(ci->founderpass)-1] = 0;
+diff -r b323b647fe91 -r e10ae0e7b778 tools/convert-hybserv.c
+--- a/tools/convert-hybserv.c	Tue Jun 21 00:42:59 2011 -0400
++++ b/tools/convert-hybserv.c	Tue Jun 21 00:44:38 2011 -0400
+@@ -198,7 +198,7 @@
+                                 exit(1);
+                             } else {
+                                 fprintf(stderr, "%s:%d: Password for `%s'"
+-                                        " truncated to %d characters\n", fname,
++                                        " truncated to %" PRIdSIZE " characters\n", fname,
+                                         line, ni->nick,
+                                         sizeof(ngi->pass.password)-1);
+                             }
+@@ -564,7 +564,7 @@
+                             exit(1);
+                         } else {
+                             fprintf(stderr, "%s:%d: Password for `%s'"
+-                                    " truncated to %d characters\n", fname,
++                                    " truncated to %" PRIdSIZE " characters\n", fname,
+                                     line, ci->name,
+                                     sizeof(ci->founderpass.password)-1);
+                         }
diff --git a/net-irc/ircservices/files/ircservices-5.1.24-ircservices-chk-pidfile.patch b/net-irc/ircservices/files/ircservices-5.1.24-ircservices-chk-pidfile.patch
new file mode 100644
index 000000000000..b232e8c5e07a
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices-5.1.24-ircservices-chk-pidfile.patch
@@ -0,0 +1,22 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Date: 2011/06/15
+Subject: Use the same datadir/pidfile searching algorithm in
+	ircservices-chk as in ircservices to ensure consistent
+	results.
+
+--- a/tools/ircservices-chk.in
++++ b/tools/ircservices-chk.in
+@@ -21,10 +21,10 @@
+ fi
+ 
+ ok=
+-if [ -f "@DATDEST@/$PIDFILE" ] ; then
+-	pid=`cat "@DATDEST@/$PIDFILE"`
++if ! cd "@DATDEST@" || [ -f "$PIDFILE" ] ; then
++	pid=`cat "$PIDFILE"`
+ 	if echo "0$pid" | grep -q '[^0-9]' ; then
+-		rm -f "@DATDEST@/$PIDFILE"
++		rm -f "$PIDFILE"
+ 	elif kill -0 $pid ; then
+ 		ok=1
+ 	fi
diff --git a/net-irc/ircservices/files/ircservices-5.1.24-ldflags.patch b/net-irc/ircservices/files/ircservices-5.1.24-ldflags.patch
new file mode 100644
index 000000000000..b4041cd74a27
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices-5.1.24-ldflags.patch
@@ -0,0 +1,12 @@
+diff -r e10ae0e7b778 modules/Makerules
+--- a/modules/Makerules	Tue Jun 21 00:44:38 2011 -0400
++++ b/modules/Makerules	Tue Jun 21 13:00:07 2011 -0400
+@@ -104,7 +104,7 @@
+ 
+ # Compile one or more objects into a dynamic module.
+ $(TARGET).so: $(TARGET).o $(OBJECTS)
+-	$(CC_SHARED) $^ -o $@
++	$(CC_SHARED) $(CFLAGS) $(LFLAGS) $^ -o $@
+ 
+ # Compile one or more objects into a static module and generate a symbol
+ # list.  The .a file we create here is just a placeholder to show that
diff --git a/net-irc/ircservices/files/ircservices-5.1.24-parallel-make.patch b/net-irc/ircservices/files/ircservices-5.1.24-parallel-make.patch
new file mode 100644
index 000000000000..910771adcdc5
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices-5.1.24-parallel-make.patch
@@ -0,0 +1,28 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: Fix issues of langstrs.h not being built before modules and
+	tools are, hopefully fixing parallel make.
+
+diff -r ad64cfd2cacc -r b323b647fe91 Makefile
+--- a/Makefile	Mon Jun 20 22:29:07 2011 -0400
++++ b/Makefile	Tue Jun 21 00:42:59 2011 -0400
+@@ -115,17 +115,17 @@
+ 	$(CC) $(LFLAGS) $(OBJS) version.o $(MODLIB) $(LIBS) -o $@
+ 
+ ifneq ($(STATIC_MODULES),)
+-modules:
++modules: langstrs.h
+ 	@$(MAKE) -C modules all-static CFLAGS="$(CFLAGS)"
+ else
+-modules:
++modules: langstrs.h
+ 	@$(MAKE) -C modules all-dynamic CFLAGS="$(CFLAGS)"
+ endif
+ 
+ languages:
+ 	@$(MAKE) -C lang CFLAGS="$(CFLAGS)"
+ 
+-tools: services.h
++tools: langstrs.h services.h
+ 	@$(MAKE) -C tools CFLAGS="$(CFLAGS)"
+ 
+ 
diff --git a/net-irc/ircservices/files/ircservices.confd b/net-irc/ircservices/files/ircservices.confd
new file mode 100644
index 000000000000..6d2bc475ca14
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices.confd
@@ -0,0 +1,11 @@
+# -*- mode: sh; -*-
+
+# The user which ircservices should be run as. Set to an empty value
+# to have ircservices run as the user the initscript is run as (which
+# is generally bad practice).
+IRCSERVICES_USER=ircservices
+
+# The location of the pidfile (as written in ircservices.conf). If the
+# directory containing the pidfile does not exist, and attempt will be
+# made to create that folder and set its owner to IRCSERVICES_USER.
+IRCSERVICES_PIDFILE=/var/run/ircservices/ircservices.pid
diff --git a/net-irc/ircservices/files/ircservices.initd b/net-irc/ircservices/files/ircservices.initd
new file mode 100644
index 000000000000..c938eb0bde8a
--- /dev/null
+++ b/net-irc/ircservices/files/ircservices.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+	use ircd
+	provide irc-services
+}
+
+start() {
+	IRCSERVICES_RUNDIR="${IRCSERVICES_PIDFILE%/*}"
+	if ! [ -d "${IRCSERVICES_RUNDIR}" ]; then
+		ebegin "Creating ${IRCSERVICES_RUNDIR} for ${SVCNAME}"
+		mkdir "${IRCSERVICES_RUNDIR}" && chown "${IRCSERVICES_USER}" "${IRCSERVICES_RUNDIR}"
+		eend $?
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --user ircservices --exec /usr/bin/ircservices -- \
+		-dir=/var/lib/ircservices \
+		-log=/var/log/ircservices/ircservices.log
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile "${IRCSERVICES_PIDFILE}"
+	eend $?
+}
diff --git a/net-irc/ircservices/ircservices-5.1.24.ebuild b/net-irc/ircservices/ircservices-5.1.24.ebuild
new file mode 100644
index 000000000000..3ebf8ce32dd5
--- /dev/null
+++ b/net-irc/ircservices/ircservices-5.1.24.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils fixheadtails flag-o-matic prefix toolchain-funcs user
+
+DESCRIPTION="ChanServ, NickServ, and MemoServ with support for several IRC daemons"
+HOMEPAGE="http://achurch.org/services/"
+SRC_URI="http://achurch.org/services/tarballs/${P}.tar.gz"
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ircservices
+	enewuser ircservices -1 -1 -1 ircservices
+
+	# this is needed, because old ebuilds added the user with ircservices:users
+	usermod -g ircservices ircservices
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.1.17-fPIC.patch \
+		"${FILESDIR}"/${PN}-5.1.17-fPIC-configure.patch \
+		"${FILESDIR}"/${P}-ircservices-chk-pidfile.patch \
+		"${FILESDIR}"/${P}-parallel-make.patch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-fd_set-amd64.patch
+
+	ht_fix_file configure
+	sed -i \
+		-e "s/-m 750/-m 755/" \
+		-e "s/-m 640/-m 644/" \
+		configure || die
+
+	sed -i -e "s;ircservices.pid;${EPREFIX}/var/run/ircservices/&;g" data/example-ircservices.conf || die
+}
+
+src_configure() {
+	append-flags -fno-stack-protector
+	# configure fails with -O higher than 2
+	replace-flags "-O[3-9s]" "-O2"
+
+	RUNGROUP="ircservices" \
+	./configure \
+		-cc "$(tc-getCC)" \
+		-cflags "${CFLAGS}" \
+		-lflags "${LDFLAGS}" \
+		-bindest /usr/bin \
+		-datdest /var/lib/ircservices \
+		|| die "./configure failed"
+}
+
+src_install() {
+	dodir /usr/bin /{etc,usr/{$(get_libdir),share},var/lib}/ircservices
+	keepdir /var/log/ircservices
+
+	emake \
+		BINDEST="${D}"/usr/bin \
+		DATDEST="${D}"/var/lib/ircservices \
+		install
+
+	mv "${D}"/var/lib/ircservices/convert-db "${D}"/usr/bin/ircservices-convert-db || die "mv failed"
+
+	# Now we move some files around to make it FHS conform
+	mv "${D}"/var/lib/ircservices/example-ircservices.conf "${D}"/etc/ircservices/ircservices.conf || die "mv failed"
+	dosym /etc/ircservices/ircservices.conf /var/lib/ircservices/ircservices.conf
+
+	mv "${D}"/var/lib/ircservices/example-modules.conf "${D}"/etc/ircservices/modules.conf || die "mv failed"
+	dosym /etc/ircservices/modules.conf /var/lib/ircservices/modules.conf
+
+	mv "${D}"/var/lib/ircservices/modules "${D}"/usr/$(get_libdir)/ircservices || die "mv failed"
+	dosym /usr/$(get_libdir)/ircservices/modules /var/lib/ircservices/modules
+
+	mv "${D}"/var/lib/ircservices/{helpfiles,languages} "${D}"/usr/share/ircservices  || die "mv failed"
+	dosym /usr/share/ircservices/helpfiles /var/lib/ircservices/helpfiles
+	dosym /usr/share/ircservices/languages /var/lib/ircservices/languages
+
+	fperms 750 /var/{lib,log}/ircservices /etc/ircservices
+	fperms 640 /etc/ircservices/{ircservices,modules}.conf
+	fowners ircservices:ircservices /var/{lib,log}/ircservices
+	fowners root:ircservices /etc/ircservices{,/{ircservices,modules}.conf}
+
+	newinitd "${FILESDIR}"/ircservices.initd ircservices
+	newconfd "${FILESDIR}"/ircservices.confd ircservices
+
+	doman docs/ircservices*.8
+	newman docs/convert-db.8 ircservices-convert-db.8
+
+	dohtml -r docs/*
+	dodoc docs/Changes* README docs/WhatsNew
+}
diff --git a/net-irc/ircservices/metadata.xml b/net-irc/ircservices/metadata.xml
new file mode 100644
index 000000000000..db6fa3b9dde5
--- /dev/null
+++ b/net-irc/ircservices/metadata.xml
@@ -0,0 +1,8 @@
+<?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/ircstats/Manifest b/net-irc/ircstats/Manifest
new file mode 100644
index 000000000000..0b03022053b6
--- /dev/null
+++ b/net-irc/ircstats/Manifest
@@ -0,0 +1,5 @@
+DIST IRCStats-1.1.tgz 47781 SHA256 b75cf327fd543babecd1e25cef966786122ef1c713bd8016b115527cb2e6415a SHA512 009beb7b0aac9138aed6f55131498eefcb004e4478e241dc17ce98b89af607b2599e8ab6879eb1dcd11c6cffad27ded3058bb875eb6516a87c830ed1eda5fe83 WHIRLPOOL d9f219477007933d3f4f63a75d377710cb19829f1bce7bd7701749d83b32a09e5e2e533b65baa1693d7dd1c149119e12e49c9d0fb8d385952b6727bfc362d804
+EBUILD ircstats-1.1-r1.ebuild 865 SHA256 b574a94954e1a221edb39263879f58986163d3f677e736b9047ffecc3ddacf08 SHA512 d40fe39584fab0294633ac76890416a47d2ffa0511a1e0231a4604360771cfc194bdfa5afce4d73d09522410eed72386b4e92accd235e1432d0991884d0e8b07 WHIRLPOOL c408388f5e710bd34ecc706deced2ef213314194fb3724860163c33aa06037b344f457abb377d95371c8e7538aa988239f343634b4cced0a659f1a1643a4bc32
+MISC ChangeLog 2460 SHA256 a9e02a9e1ce8f7a8f5080eacba3f74669e9ca58fdde7fb235f6375fe6a1a34b2 SHA512 4776907154c572100a1987ebb410ba0750ca236c47aef9a2a75b5eb2590a6f4765ed9f67878e0ce0eb89088e377526b53eb24d3fc850a1288a2da0c9ea5791e1 WHIRLPOOL 39d3f820ea7807e40e55e786877b9bda5b24ca6b737a4b9bbcc7c9de417708201379c80816a05d6db00bbf853e0d5d40d1eb87be75bca1b321ae72e43379ff5b
+MISC ChangeLog-2015 1020 SHA256 85b27a11b07390e3dc838451a180f144ea1e68ac4a45ef28384eeae40c69db1a SHA512 716efb2da2e4664e8c35898f716a2552a6965443d60bcfcfd5355fbd974eccbd68249900c007fe8d9a3f2e98038e8882cf4fb4929a55d79d2cfa6abc71ace074 WHIRLPOOL 89ba10d67e9b5abf73f10d894115d2d01d682909fcddff3e4b0b89879e7b4ed8b138b032bc36fcf1e7ed0b087b1a73955c4ad8aae2054639afa7e12bd5a83a88
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/ircstats/ircstats-1.1-r1.ebuild b/net-irc/ircstats/ircstats-1.1-r1.ebuild
new file mode 100644
index 000000000000..8beaf6a9a835
--- /dev/null
+++ b/net-irc/ircstats/ircstats-1.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+MY_P="IRCStats-${PV}"
+
+DESCRIPTION="IRCStats tries to be a log analyzer for Linux similar to mIRCStats"
+HOMEPAGE="http://humdi.net/ircstats/"
+SRC_URI="http://humdi.net/ircstats/${MY_P}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin ircstats || die "dobin failed"
+
+	insinto /usr/share/ircstats
+	doins -r html languages colors || die "doins failed"
+
+	dodoc CHANGES README TODO ircstats.cfg || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "The IRCStats files have been installed in /usr/share/ircstats"
+	elog "You can find an example ircstats.cfg in /usr/share/doc/${PF}"
+}
diff --git a/net-irc/ircstats/metadata.xml b/net-irc/ircstats/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/ircstats/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
new file mode 100644
index 000000000000..91d5c405e169
--- /dev/null
+++ b/net-irc/irker/Manifest
@@ -0,0 +1,24 @@
+AUX 2.17-irkerhook-Remove-file-listing.patch 5956 SHA256 cdbe17d283848c999414742b68b0cc495768248d3d37e28c1c44f87b8fc95466 SHA512 316d79662c8f312dbf8b0255f3ca72929c418d6a10d445c98e5f998d901d6d768ea3c1adc4b6acc04e04adbe0fe551ac4dc8072bf429dcca3623fa299258ebd5 WHIRLPOOL b40f8e8afb79b66a34ddba489a3ebe6a31a2b02f90c7b2bbfae3fe7d4705ddc10701a50bac9c3550c08de6b0992172123f4ef6c48cf57bee136eb7c7c06b9db4
+AUX 2.7-Register-author_name-as-author-instead-of-email-user.patch 1637 SHA256 c742b823b0a14452604d63b6ad5a4f5490f6c923641ddda1ec46fc714a37fed4 SHA512 e72636b7be72d1f896afded5dd566c9876854dc41b1bce3fb9d84e47ac8267a52bc15e315a268f95bb747231178698d59d9cc9136e19619781261049404cfb10 WHIRLPOOL a27111384b551daaad88d44441686d6ed939b6e70bdf20509bd699580f970c28b1b046294590c15c0affcf6d68e034be81ee397c0b48b833ff89249ef487fd3a
+AUX 2.7-irkerhook-Remove-file-listing.patch 6023 SHA256 97ff5bbdfb91dd0c07f339e248fa67acc030502d855784dff0f1b9aff6da6a1e SHA512 a8ecca687b356280581f04f28879044a6c36c3819743312f1e14fb11ce2f83a859eb1fb5fe804640adf969578f6575ce774b4df665ed48721eb0face63ea212f WHIRLPOOL 862b9f2b4a35be9b9f92f07861656c8e4a33d602b76229e95473cbc87dad849eb2db4eb043d25dab7dfa41cc549a667e41f2ea8fc9192985ce2887b3303fd791
+AUX irkerd.confd 474 SHA256 ae185817636a5537514d6269eb273602a3043e963ea5d4f2f83f5d3438c8fa2b SHA512 62e2242cbacd6ed35419b6ef78b969602c2c091e0500bf00d989444d96551087a4eef80ec5b70b5a8f88ecfebb633eb628f7912678862fde8ce7bddb75c87010 WHIRLPOOL 6089ed013d01fa611871fce3f82569ca9d7e7d9069e2aa89817f6732dd2edda4f2d8ba9462a8195ec896bbc6d2df2770fdd476212e554c012fe0fb78a8e72886
+AUX irkerd.initd 1125 SHA256 ce46dff7893f942db2c9fc48afb416a34d269231f8715ba3985a2ae903748061 SHA512 c22838ef63cd2165af958724b4306a260018104224969e612b7175d63619f12a18908c155e94210030f0ada6dcedaabaee6eb0690bd6e327a65ee9934b8d4368 WHIRLPOOL 65c03b8d28b710afdc3acfb25bfa214735f339691f43f89d04a0a3dbb120e2930118c3769662f89e6d441c069ddb5b00b332d7e11df0b5269166e68af1afa4d6
+DIST irker-2.11.tar.gz 41504 SHA256 f7fa5b6020089c7fcb96429c2ce8621ccd9f1ebd14e112c5388b5701201802ab SHA512 b95824f8a68103f7094b13044263e422e98efef163425d88217a7c3f89ef83bf8c4116055b34f92d86ce1641f9c74215a4488c084eba95c56f8cf95fc8067e9b WHIRLPOOL 71d95d32e49b718d59b6a7e63ac267d1cc244281bd557f7914da9292aa0cef4049433a0135637d2bd95ce076128f4b22ac89f4c1148e41d156e6ded785e111cd
+DIST irker-2.12.tar.gz 41693 SHA256 cf76cc289e54c4d0d745e73a2cd9b8d0e40651890f9374220229f59fb220d5a5 SHA512 73606deb3f2b96d72501e876dd05f146e62298fa1f7a051c0f831f0db9fc9554f991b1d645c17ccb9032c7da287c142eedf69b262cf3445ae6b0937a24a5bdb4 WHIRLPOOL b33b395888be786e43340665bdc8067e06d412af0eb516cbb64c384b6f8d7d8883a43bb3e7e3a3516d8afd800ffdb47a9b66eb25fe060922104baedeb5c754f4
+DIST irker-2.13.tar.gz 42733 SHA256 12e8d28f682c6e0bc66d33e8ec69b90db30edef4520ab2ffb26e3b4ff49609c4 SHA512 5aa86354b5f3dabd7e2b46c62df4298b3bc675757b71ee03e2068d9ad14dc35127fb4076ef819ddd0ae84d82937c540516ed77ab5f1177af6dc7381df56af3ac WHIRLPOOL 1cd1da51d5d5834ccdda295833fef20edc4bcae6706b58fdb0fbc1a986e02401c777e8a229b3b074826060554713803201d5fce87878ce6811df7e6f6e1ef52e
+DIST irker-2.15.tar.gz 43765 SHA256 b4055ae0eb39140481a2b637a64b9d49df1d615f687f6fe05d64b6048e7739fb SHA512 94f4bb33a320f4284d03e75c7090ea4714d30d879e1abbf757c3e6eff8898ca5664f718c6ab2f35cae8377c348d41bc9100832b8a70f1b9f1a03c6f7487c2bfe WHIRLPOOL 15cd397c114f3ef44a2ecc04ae3e511328068c753ac5ff45f0e9bd550732a0bdcd4de181f2eb50ee718130cbb1d9c7dc9ecab2699e589e8b755be4084c280308
+DIST irker-2.16.tar.gz 43824 SHA256 3203bdf765fdf70ec9369fce15f52910676f76f1c1714ade3a0411c46f7b38b7 SHA512 6a58938e1d458ad9183d750b4f6d1a4827fffd85caf7c0215c2fa1a9ef5692570c5181ade28f59701bef7398fdc0cfa760fe70d9432b7e54dc7fa663a558fed4 WHIRLPOOL a5de277a01bcd79d7d5951406bacb0346c288860d1265ce99271b6d124bc7bf05e651a9a0ad2f78ddb158061aea142c3579a4d9d4e4944197a72d3f762f73486
+DIST irker-2.17.tar.gz 44139 SHA256 71150b019345c4963d7b94aa38e173c070939ec45360e9ba42a24d9cb25bb2d4 SHA512 030b45c1d64e3c3ebd89aabf99e86d4f3824c8b749ecca02447c0aa1248d928b9c640c3b65ca22f1412d9a9b0609157f7708323234f559111097ee6aa67abac0 WHIRLPOOL f2ff6035ab3080508bc36ccc98b2662d8f63a976c931e5d3ad4a61eb4605dfc10916b98fc39ae8b7afecef8e8f0d2cd132c993a7ab9e0173dfbde4cda91c1312
+DIST irker-2.18.tar.gz 44284 SHA256 faa8bd06fc5e54274e83a0d451840a9520c97b749dcfd460bca01610ef0a2afe SHA512 215f0ab3be03b615f2bb24e04a5e5f6688634c4fb994b5384106b7f3eae62967ac45b2a14d08eee8dbed886dbb0578e077fa19597db599ea9562a67797f75606 WHIRLPOOL 6bd37ace45fcb2f17ecc51ade1a9e67588ebcd99545e74f67cfe5ec0d02d9eb513ac80c4efdbf795932f6fffa6fae38fd93d855373430a12619f8c3f48663bc1
+DIST irker-2.9.tar.gz 41050 SHA256 1c743a86275e8bf91f133b70943a1296d960e2dcc8c5e8dd894bc9a3c9a824b5 SHA512 bdb632414c87ebc3f0d480605a29823d9259defe63a6c6de8f5d1876c13f5a4ab90ef7956a83f62aedf08f17494be7a67bc414e2e30101608f565afd115c5c0f WHIRLPOOL d1c76f1bcc329b4720a823714b1bb6aae81af5913f627474f5b938ac54e09da22f3fbb58f89d79dba0f4833e3a47efeb8f13d2dfffd7a8a2f97c49cf8db200cd
+EBUILD irker-2.11.ebuild 1251 SHA256 9116efaf640347c23676f924e69f7feb8a7db16e2c6ef0a3fb9e77b3f968e56d SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d WHIRLPOOL 88bcd26d7ce9b11b062d1124b309f199fe7430069b52cd977360f550770ea9a39d4dadd83c531325a3fa7c3b6a7fa7faa5d9240a5ad06a4e308a8df2684b1d3d
+EBUILD irker-2.12.ebuild 1251 SHA256 9116efaf640347c23676f924e69f7feb8a7db16e2c6ef0a3fb9e77b3f968e56d SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d WHIRLPOOL 88bcd26d7ce9b11b062d1124b309f199fe7430069b52cd977360f550770ea9a39d4dadd83c531325a3fa7c3b6a7fa7faa5d9240a5ad06a4e308a8df2684b1d3d
+EBUILD irker-2.13.ebuild 1251 SHA256 9116efaf640347c23676f924e69f7feb8a7db16e2c6ef0a3fb9e77b3f968e56d SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d WHIRLPOOL 88bcd26d7ce9b11b062d1124b309f199fe7430069b52cd977360f550770ea9a39d4dadd83c531325a3fa7c3b6a7fa7faa5d9240a5ad06a4e308a8df2684b1d3d
+EBUILD irker-2.15.ebuild 1417 SHA256 77a51535d6237bb5167ec1b1e1f8cf7bd33e68c8ec6edc8bb9c2957b7463e3fa SHA512 9618bcb3630c42443bfdd5dc1143bce97b7145d66fd75cae92a5e6379886e509e934a5ccbfd9ba04cd3494cef25d353629f378f4104ffe66b308980ba7cef265 WHIRLPOOL a6eb7107135e4430265de54449d645d716ec78d97dcbd04969f3533c5458b4ec58afc3148ea11f54aeb0e40dc48e1bfef06bc7c465f5a910b0f0589f836c0df5
+EBUILD irker-2.16.ebuild 1428 SHA256 3c6e248420c88f06318e4cd1ec6c2db508961811b40fdb7e1ee5a013b7da0156 SHA512 20e3d44eae5179f03fe1ca8fd71cd0bac431cf2a41de025e903632e2b8ce816ea55fda83b48ac2aab03de309887c78a68cec43dc1f9b8d07362553dcedf9122f WHIRLPOOL bb9781f05ab1dd950dd4ce3ffbc6e0b6204cbe37a27fab98c4f5ca0581b10d7a76575f4822e90ebb47926ef2601f287bb3ba130899be55707e9035fcf519773a
+EBUILD irker-2.17.ebuild 1480 SHA256 bb6ea87fc07483ddc36d3ae15cc6050830f148ae32d76d7bc09277a0c450e718 SHA512 ca9901fce272f4ee3957170e759031c3b7625c628539b7ec4f8c2dad402b63521afca7174e9c0bec0b5822a0fbf0da425c4b7616cffad1f68c729649406b7183 WHIRLPOOL 52e864c741558745375d1b386c5cf57448c7a05aa85e18896f345f0365801560172b74c614c583f15802566ecdad8febefc016b16fadfa3cb241876919a137cb
+EBUILD irker-2.18.ebuild 1277 SHA256 527b936cf3425f44dccd5ed6e7c0bef8e961e6c5b239e6bcdd7df07820c34952 SHA512 23b6117fbe84aa87cf95a6a0732c8c3504a7c8557af395ce5232dba859fd92902208135e06fe4142fbad94cb1229290f128c1c568ead6e4e3ae0cd84e6dd85bf WHIRLPOOL c3a86c86225b43adc9ddff2ec7112c3f7f236c772a1b4b234f0531a7b7176b8ab0dccc1da0f77b7f7b13834123175bd68aed61fc5c23248f4fd5e333457de1a1
+EBUILD irker-2.9.ebuild 1251 SHA256 9116efaf640347c23676f924e69f7feb8a7db16e2c6ef0a3fb9e77b3f968e56d SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d WHIRLPOOL 88bcd26d7ce9b11b062d1124b309f199fe7430069b52cd977360f550770ea9a39d4dadd83c531325a3fa7c3b6a7fa7faa5d9240a5ad06a4e308a8df2684b1d3d
+MISC ChangeLog 6725 SHA256 3f71941b00bb1df96515121975277f0abec4eb132edb50bab0fc7318f3989f34 SHA512 0c2b7943b3a8ad0bc6f4e6f3094496e7483fed00e52f2a100e618571a37ed729f88a91fbe06936442f40cef81386928c68d1c32f662dee73bb4ef5d66891866a WHIRLPOOL d1aea9adda807fb85b1e315ca966656834fcc350bbeeece167848fef6c6212e4d91e672fd559df386fd60df3e0a5de1b1e8958d88955b9a96f1f0594b97e2a29
+MISC ChangeLog-2015 3061 SHA256 a69f2c1c8c84097ac6fdbe333e63fb5f998c909c511e6c6a9e4a3b93aa69c56b SHA512 ce29b4667a0513eeb1b0e21ea43932b5f91009916da910e4dfb1feaa307a50d0cd2f1eea255badfe49bf3c89650cfa1144ada3d3d603ede0ba2652ef6c8bddbf WHIRLPOOL 15fe73966343d95f3e33f1a14d9221eb4f692cba52a4a28caec96084de3e1e826af73e2f8b7fff505f389b1c225aa2ffdadf51211195b72545a6dc7dc94f28a2
+MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
diff --git a/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch
new file mode 100644
index 000000000000..356bc9ae264f
--- /dev/null
+++ b/net-irc/irker/files/2.17-irkerhook-Remove-file-listing.patch
@@ -0,0 +1,104 @@
+From a5fca5ebbede155329e44fd4b4a4268c0c86ff3f Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Mon, 7 Oct 2013 13:33:30 +0200
+Subject: [PATCH 2/2] irkerhook: Remove file listing
+
+---
+ irkerhook.py | 28 +++-------------------------
+ 1 file changed, 3 insertions(+), 25 deletions(-)
+
+diff --git a/irkerhook.py b/irkerhook.py
+index 18c9b01..0ba6834 100755
+--- a/irkerhook.py
++++ b/irkerhook.py
+@@ -66,7 +66,6 @@ class Commit:
+         self.rev = None
+         self.mail = None
+         self.author = None
+-        self.files = None
+         self.logmsg = None
+         self.url = None
+         self.author_date = None
+@@ -237,7 +236,7 @@ class GitExtractor(GenericExtractor):
+         self.channels = do("git config --get irker.channels")
+         self.email = do("git config --get irker.email")
+         self.tcp = do("git config --bool --get irker.tcp")
+-        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
++        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
+         self.tinyifier = do("git config --get irker.tinyifier") or default_tinyifier
+         self.color = do("git config --get irker.color")
+         self.urlprefix = do("git config --get irker.urlprefix") or "gitweb"
+@@ -286,9 +285,6 @@ class GitExtractor(GenericExtractor):
+             if self.urlprefix in ('gitweb', 'cgit'):
+                 # Also truncate the commit used for the announced urls
+                 commit.commit = commit.rev
+-        # Extract the meta-information for the commit
+-        commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
+-        commit.files = " ".join(commit.files.strip().split("\n")[1:])
+         # Design choice: for git we ship only the first message line, which is
+         # conventionally supposed to be a summary of the commit.  Under
+         # other VCSes a different choice may be appropriate.
+@@ -309,7 +305,7 @@ class SvnExtractor(GenericExtractor):
+             if tok.startswith("--repository="):
+                 self.repository = tok[13:]
+         self.project = os.path.basename(self.repository)
+-        self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
++        self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
+         self.urlprefix = "viewcvs"
+         self.load_preferences(os.path.join(self.repository, "irker.conf"))
+         self.do_overrides()
+@@ -323,7 +319,6 @@ class SvnExtractor(GenericExtractor):
+         commit.rev = "r%s" % self.id
+         commit.author = self.svnlook("author")
+         commit.commit_date = self.svnlook("date").partition('(')[0]
+-        commit.files = self.svnlook("dirs-changed").strip().replace("\n", " ")
+         commit.logmsg = self.svnlook("log").strip()
+         return commit
+     def svnlook(self, info):
+@@ -367,7 +362,7 @@ class HgExtractor(GenericExtractor):
+         self.channels = ui.config('irker', 'channels')
+         self.email = ui.config('irker', 'email')
+         self.tcp = str(ui.configbool('irker', 'tcp'))  # converted to bool again in do_overrides
+-        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
++        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
+         self.tinyifier = ui.config('irker', 'tinyifier') or default_tinyifier
+         self.color = ui.config('irker', 'color')
+         self.urlprefix = (ui.config('irker', 'urlprefix') or
+@@ -397,9 +392,6 @@ class HgExtractor(GenericExtractor):
+         commit.author_date = \
+             datetime.datetime.fromtimestamp(ctx.date()[0]).strftime('%Y-%m-%d %H:%M:%S')
+         commit.logmsg = ctx.description()
+-        # Extract changed files from status against first parent
+-        st = self.repository.status(ctx.p1().node(), ctx.node())
+-        commit.files = ' '.join(st[0] + st[1] + st[2])
+         return commit
+ 
+ def hg_hook(ui, repo, **kwds):
+@@ -440,17 +432,6 @@ def ship(extractor, commit, debug):
+             sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data)
+             raise SystemExit(1)
+ 
+-    # Rewrite the file list if too long. The objective here is only
+-    # to be easier on the eyes.
+-    if extractor.cialike \
+-           and extractor.cialike.lower() != "none" \
+-           and len(metadata.files) > int(extractor.cialike):
+-        files = metadata.files.split()
+-        dirs = set([d.rpartition('/')[0] for d in files])
+-        if len(dirs) == 1:
+-            metadata.files = "(%s files)" % (len(files),)
+-        else:
+-            metadata.files = "(%s files in %s dirs)" % (len(files), len(dirs))
+     # Message reduction.  The assumption here is that IRC can't handle
+     # lines more than 510 characters long. If we exceed that length, we
+     # try knocking out the file list, on the theory that for notification
+@@ -458,9 +439,6 @@ def ship(extractor, commit, debug):
+     # there's nothing much can be done other than ship it expecting the IRC
+     # server to truncate.
+     privmsg = unicode(metadata)
+-    if len(privmsg) > 510:
+-        metadata.files = ""
+-        privmsg = unicode(metadata)
+ 
+     # Anti-spamming guard.  It's deliberate that we get maxchannels not from
+     # the user-filtered metadata but from the extractor data - means repo
diff --git a/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch b/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch
new file mode 100644
index 000000000000..a19da1f4a48d
--- /dev/null
+++ b/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch
@@ -0,0 +1,32 @@
+From 108e898c600cf7a80a3d01a83a270c7579460b42 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <beber@meleeweb.net>
+Date: Mon, 23 Sep 2013 23:10:23 +0200
+Subject: [PATCH 1/3] Register author_name as author instead of email userpart
+
+Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
+---
+ irkerhook.py | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/irkerhook.py b/irkerhook.py
+index 5f15032..36a875e 100755
+--- a/irkerhook.py
++++ b/irkerhook.py
+@@ -275,15 +275,8 @@ class GitExtractor(GenericExtractor):
+         # Design choice: for git we ship only the first message line, which is
+         # conventionally supposed to be a summary of the commit.  Under
+         # other VCSes a different choice may be appropriate.
+-        commit.author_name, commit.mail, commit.logmsg = \
+-            do("git log -1 '--pretty=format:%an%n%ae%n%s' " + shellquote(commit.commit)).split("\n")
+-        # This discards the part of the author's address after @.
+-        # Might be be nice to ship the full email address, if not
+-        # for spammers' address harvesters - getting this wrong
+-        # would make the freenode #commits channel into harvester heaven.
+-        commit.author = commit.mail.split("@")[0]
+-        commit.author_date, commit.commit_date = \
+-            do("git log -1 '--pretty=format:%ai|%ci' " + shellquote(commit.commit)).split("|")
++        commit.logmsg = do("git log -1 '--pretty=format:%s' " + shellquote(commit.commit))
++        commit.author = do("git log -1 '--pretty=format:%an' " + shellquote(commit.commit))
+         return commit
+ 
+ class SvnExtractor(GenericExtractor):
diff --git a/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch
new file mode 100644
index 000000000000..cbbb38c22ea6
--- /dev/null
+++ b/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch
@@ -0,0 +1,105 @@
+From 82376d74107035950ef4181fdc889ae9409378b6 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <beber@meleeweb.net>
+Date: Mon, 7 Oct 2013 13:33:30 +0200
+Subject: [PATCH 2/3] irkerhook: Remove file listing
+
+Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
+---
+ irkerhook.py | 34 +++-------------------------------
+ 1 file changed, 3 insertions(+), 31 deletions(-)
+
+diff --git a/irkerhook.py b/irkerhook.py
+index 36a875e..f2f82cf 100755
+--- a/irkerhook.py
++++ b/irkerhook.py
+@@ -57,7 +57,6 @@ class Commit:
+         self.rev = None
+         self.mail = None
+         self.author = None
+-        self.files = None
+         self.logmsg = None
+         self.url = None
+         self.author_date = None
+@@ -224,7 +223,7 @@ class GitExtractor(GenericExtractor):
+         self.channels = do("git config --get irker.channels")
+         self.email = do("git config --get irker.email")
+         self.tcp = do("git config --bool --get irker.tcp")
+-        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
++        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
+         self.tinyifier = do("git config --get irker.tinyifier") or default_tinyifier
+         self.color = do("git config --get irker.color")
+         self.urlprefix = do("git config --get irker.urlprefix") or "gitweb"
+@@ -269,9 +268,6 @@ class GitExtractor(GenericExtractor):
+             commit.rev = do("git describe %s 2>/dev/null" % shellquote(commit.commit))
+         if not commit.rev:
+             commit.rev = commit.commit[:12]
+-        # Extract the meta-information for the commit
+-        commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit))
+-        commit.files = " ".join(commit.files.strip().split("\n")[1:])
+         # Design choice: for git we ship only the first message line, which is
+         # conventionally supposed to be a summary of the commit.  Under
+         # other VCSes a different choice may be appropriate.
+@@ -292,7 +288,7 @@ class SvnExtractor(GenericExtractor):
+             if tok.startswith("--repository="):
+                 self.repository = tok[13:]
+         self.project = os.path.basename(self.repository)
+-        self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
++        self.template = '%(bold)s%(project)s%(reset)s: %(green)s%(author)s%(reset)s %(repo)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
+         self.urlprefix = "viewcvs"
+         self.load_preferences(os.path.join(self.repository, "irker.conf"))
+         self.do_overrides()
+@@ -306,7 +302,6 @@ class SvnExtractor(GenericExtractor):
+         commit.rev = "r%s" % self.id
+         commit.author = self.svnlook("author")
+         commit.commit_date = self.svnlook("date").partition('(')[0]
+-        commit.files = self.svnlook("dirs-changed").strip().replace("\n", " ")
+         commit.logmsg = self.svnlook("log").strip()
+         return commit
+     def svnlook(self, info):
+@@ -350,7 +345,7 @@ class HgExtractor(GenericExtractor):
+         self.channels = ui.config('irker', 'channels')
+         self.email = ui.config('irker', 'email')
+         self.tcp = str(ui.configbool('irker', 'tcp'))  # converted to bool again in do_overrides
+-        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s / %(bold)s%(files)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
++        self.template = '%(bold)s%(project)s:%(reset)s %(green)s%(author)s%(reset)s %(repo)s:%(yellow)s%(branch)s%(reset)s * %(bold)s%(rev)s%(reset)s: %(logmsg)s %(brown)s%(url)s%(reset)s'
+         self.tinyifier = ui.config('irker', 'tinyifier') or default_tinyifier
+         self.color = ui.config('irker', 'color')
+         self.urlprefix = (ui.config('irker', 'urlprefix') or
+@@ -380,9 +375,6 @@ class HgExtractor(GenericExtractor):
+         commit.author_date = \
+             datetime.datetime.fromtimestamp(ctx.date()[0]).strftime('%Y-%m-%d %H:%M:%S')
+         commit.logmsg = ctx.description()
+-        # Extract changed files from status against first parent
+-        st = self.repository.status(ctx.p1().node(), ctx.node())
+-        commit.files = ' '.join(st[0] + st[1] + st[2])
+         return commit
+ 
+ def hg_hook(ui, repo, **kwds):
+@@ -423,27 +415,7 @@ def ship(extractor, commit, debug):
+             sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data)
+             raise SystemExit, 1
+ 
+-    # Rewrite the file list if too long. The objective here is only
+-    # to be easier on the eyes.
+-    if extractor.cialike \
+-           and extractor.cialike.lower() != "none" \
+-           and len(metadata.files) > int(extractor.cialike):
+-        files = metadata.files.split()
+-        dirs = set([d.rpartition('/')[0] for d in files])
+-        if len(dirs) == 1:
+-            metadata.files = "(%s files)" % (len(files),)
+-        else:
+-            metadata.files = "(%s files in %s dirs)" % (len(files), len(dirs))
+-    # Message reduction.  The assumption here is that IRC can't handle
+-    # lines more than 510 characters long. If we exceed that length, we
+-    # try knocking out the file list, on the theory that for notification
+-    # purposes the commit text is more important.  If it's still too long
+-    # there's nothing much can be done other than ship it expecting the IRC
+-    # server to truncate.
+     privmsg = unicode(metadata)
+-    if len(privmsg) > 510:
+-        metadata.files = ""
+-        privmsg = unicode(metadata)
+ 
+     # Anti-spamming guard.  It's deliberate that we get maxchannels not from
+     # the user-filtered metadata but from the extractor data - means repo
diff --git a/net-irc/irker/files/irkerd.confd b/net-irc/irker/files/irkerd.confd
new file mode 100644
index 000000000000..42ae7323612a
--- /dev/null
+++ b/net-irc/irker/files/irkerd.confd
@@ -0,0 +1,20 @@
+# /etc/conf.d/irkerd: config file for /etc/init.d/irkerd
+
+# Nick-Serv login
+# IRKERD_NICK=""
+
+# Nick-Server password
+# IRKERD_PASSWORD=""
+
+# Log file, if none syslog is used (facility daemon)
+# IRKERD_LOGFILE=""
+
+# Debug Level (critical, error, warning, info, debug)
+# IRKERD_LOGLEVEL=""
+
+# To run an anonymous irkerd safely. It should not be able
+# to write to anywhere on your system
+# IRKERD_USER=""
+
+# see man pages for irkerd for valid cmdline options
+# IRKERD_OPTS=""
diff --git a/net-irc/irker/files/irkerd.initd b/net-irc/irker/files/irkerd.initd
new file mode 100644
index 000000000000..6417d45ebf8e
--- /dev/null
+++ b/net-irc/irker/files/irkerd.initd
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${pidfile:=/run/${RC_SVCNAME}.pid}
+
+: ${IRKERD_NICK:=}
+: ${IRKERD_PASSWORD:=}
+: ${IRKERD_USER:=nobody}
+
+depend() {
+        use net
+}
+
+start () {
+	if [[ ${IRKERD_LOGFILE} ]] ; then
+		checkpath -f \
+			-o "${IRKERD_USER}" \
+			"${IRKERD_LOGFILE}" \
+			|| return 1
+	fi
+
+	if [[ -z "${IRKERD_USER}" ]] ; then
+		die "IRKERD_USER is mandatory"
+	fi
+
+	[[ -n "${IRKERD_LOGLEVEL}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -d ${IRKERD_LOGLEVEL}"
+	[[ -n "${IRKERD_LOGFILE}"  ]] && IRKERD_OPTS="${IRKERD_OPTS} -l ${IRKERD_LOGFILE}"
+	[[ -n "${IRKERD_NICK}"     ]] && IRKERD_OPTS="${IRKERD_OPTS} -n ${IRKERD_NICK}"
+	[[ -n "${IRKERD_PASSWORD}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -p ${IRKERD_PASSWORD}"
+
+        ebegin "Starting ${RC_SVCNAME}"
+        start-stop-daemon --start \
+                --quiet --background \
+                --user "${IRKERD_USER}" \
+                --make-pidfile --pidfile "${pidfile}" \
+                --exec /usr/bin/irkerd \
+                -- ${IRKERD_OPTS} < /dev/null
+        eend $?
+}
diff --git a/net-irc/irker/irker-2.11.ebuild b/net-irc/irker/irker-2.11.ebuild
new file mode 100644
index 000000000000..9b6fdbbae2e1
--- /dev/null
+++ b/net-irc/irker/irker-2.11.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+inherit python-single-r1 eutils
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto"
+
+src_prepare() {
+	# https://gitorious.org/irker/irker/merge_requests/25
+	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
+
+	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	python_doscript "${ED}/usr/bin/irkerd"
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}/irkerd.initd" irkerd
+	newconfd "${FILESDIR}/irkerd.confd" irkerd
+
+	dodoc NEWS README hacking.txt security.txt
+	dohtml irkerd.html irkerhook.html
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
diff --git a/net-irc/irker/irker-2.12.ebuild b/net-irc/irker/irker-2.12.ebuild
new file mode 100644
index 000000000000..9b6fdbbae2e1
--- /dev/null
+++ b/net-irc/irker/irker-2.12.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+inherit python-single-r1 eutils
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto"
+
+src_prepare() {
+	# https://gitorious.org/irker/irker/merge_requests/25
+	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
+
+	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	python_doscript "${ED}/usr/bin/irkerd"
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}/irkerd.initd" irkerd
+	newconfd "${FILESDIR}/irkerd.confd" irkerd
+
+	dodoc NEWS README hacking.txt security.txt
+	dohtml irkerd.html irkerhook.html
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
diff --git a/net-irc/irker/irker-2.13.ebuild b/net-irc/irker/irker-2.13.ebuild
new file mode 100644
index 000000000000..9b6fdbbae2e1
--- /dev/null
+++ b/net-irc/irker/irker-2.13.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+inherit python-single-r1 eutils
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto"
+
+src_prepare() {
+	# https://gitorious.org/irker/irker/merge_requests/25
+	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
+
+	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	python_doscript "${ED}/usr/bin/irkerd"
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}/irkerd.initd" irkerd
+	newconfd "${FILESDIR}/irkerd.confd" irkerd
+
+	dodoc NEWS README hacking.txt security.txt
+	dohtml irkerd.html irkerhook.html
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
diff --git a/net-irc/irker/irker-2.15.ebuild b/net-irc/irker/irker-2.15.ebuild
new file mode 100644
index 000000000000..6965033dce31
--- /dev/null
+++ b/net-irc/irker/irker-2.15.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+inherit python-single-r1 systemd eutils
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto"
+
+src_prepare() {
+	# https://gitorious.org/irker/irker/merge_requests/25
+	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
+
+	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
+
+	# Rely on systemd eclass for systemd service install
+	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
+		|| die "sed failed"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	python_doscript "${ED}/usr/bin/irkerd"
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}/irkerd.initd" irkerd
+	newconfd "${FILESDIR}/irkerd.confd" irkerd
+
+	systemd_dounit irkerd.service
+
+	dodoc NEWS README hacking.txt security.txt
+	dohtml irkerd.html irkerhook.html
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
diff --git a/net-irc/irker/irker-2.16.ebuild b/net-irc/irker/irker-2.16.ebuild
new file mode 100644
index 000000000000..9171b100f45f
--- /dev/null
+++ b/net-irc/irker/irker-2.16.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="ssl"
+
+inherit python-single-r1 systemd eutils
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto"
+
+src_prepare() {
+	# https://gitorious.org/irker/irker/merge_requests/25
+	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
+
+	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
+
+	# Rely on systemd eclass for systemd service install
+	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
+		|| die "sed failed"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	python_doscript "${ED}/usr/bin/irkerd"
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}/irkerd.initd" irkerd
+	newconfd "${FILESDIR}/irkerd.confd" irkerd
+
+	systemd_dounit irkerd.service
+
+	dodoc NEWS README hacking.txt security.txt
+	dohtml irkerd.html irkerhook.html
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
diff --git a/net-irc/irker/irker-2.17.ebuild b/net-irc/irker/irker-2.17.ebuild
new file mode 100644
index 000000000000..12222762dd6b
--- /dev/null
+++ b/net-irc/irker/irker-2.17.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="ssl"
+
+inherit python-single-r1 systemd eutils
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="socks5"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	socks5? ( dev-python/PySocks[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	# https://gitorious.org/irker/irker/merge_requests/25
+	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
+
+	epatch "${FILESDIR}/2.17-irkerhook-Remove-file-listing.patch"
+
+	# Rely on systemd eclass for systemd service install
+	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
+		|| die "sed failed"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	python_doscript "${ED}/usr/bin/irkerd"
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}/irkerd.initd" irkerd
+	newconfd "${FILESDIR}/irkerd.confd" irkerd
+
+	systemd_dounit irkerd.service
+
+	dodoc NEWS README hacking.txt security.txt
+	dohtml irkerd.html irkerhook.html
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
diff --git a/net-irc/irker/irker-2.18.ebuild b/net-irc/irker/irker-2.18.ebuild
new file mode 100644
index 000000000000..2dae81311ef9
--- /dev/null
+++ b/net-irc/irker/irker-2.18.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="ssl"
+
+inherit python-single-r1 systemd
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="socks5"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	socks5? ( dev-python/PySocks[${PYTHON_USEDEP}] )"
+
+DOCS=( NEWS README hacking.txt security.txt )
+HTML_DOCS=( irkerd.html irkerhook.html )
+
+src_prepare() {
+	default
+
+	# Rely on systemd eclass for systemd service install
+	sed -i -e "/^SYSTEMDSYSTEMUNITDIR/d" Makefile \
+		|| die "sed failed"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EPREFIX}:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	default
+
+	python_doscript "${ED%/}/usr/bin/irkerd"
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}/irkerd.initd" irkerd
+	newconfd "${FILESDIR}/irkerd.confd" irkerd
+
+	systemd_dounit irkerd.service
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
diff --git a/net-irc/irker/irker-2.9.ebuild b/net-irc/irker/irker-2.9.ebuild
new file mode 100644
index 000000000000..9b6fdbbae2e1
--- /dev/null
+++ b/net-irc/irker/irker-2.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl"
+
+inherit python-single-r1 eutils
+
+DESCRIPTION="Submission tools for IRC notifications"
+HOMEPAGE="http://www.catb.org/esr/irker/"
+SRC_URI="http://www.catb.org/esr/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto"
+
+src_prepare() {
+	# https://gitorious.org/irker/irker/merge_requests/25
+	epatch "${FILESDIR}/2.7-Register-author_name-as-author-instead-of-email-user.patch"
+
+	epatch "${FILESDIR}/2.7-irkerhook-Remove-file-listing.patch"
+
+	# Prefix support
+	sed -i -e "/^ExecStart=/ s:=/:=${EROOT}:" irkerd.service \
+		|| die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+
+	python_doscript "${ED}/usr/bin/irkerd"
+	# Not installed with the default Makefile
+	python_doscript irk irkerhook.py
+
+	newinitd "${FILESDIR}/irkerd.initd" irkerd
+	newconfd "${FILESDIR}/irkerd.confd" irkerd
+
+	dodoc NEWS README hacking.txt security.txt
+	dohtml irkerd.html irkerhook.html
+
+	docinto examples
+	dodoc filter-example.py filter-test.py
+}
diff --git a/net-irc/irker/metadata.xml b/net-irc/irker/metadata.xml
new file mode 100644
index 000000000000..40aa45df2b01
--- /dev/null
+++ b/net-irc/irker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
new file mode 100644
index 000000000000..5883b3fd072d
--- /dev/null
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -0,0 +1,10 @@
+AUX iroffer-dinoex-3.29-config.patch 7014 SHA256 2d634a778eeff7fa5014b23b4608040f13708303a439cf6b61e605c610be3121 SHA512 dfb8930341ba93dfec9d29fa5ddb1d457d055e27c74d2dbfba197a17b16685810bf63dceeb19dc6182f8d8086825741cb5e87f952837265084acea0266e0f2e8 WHIRLPOOL 8a7229feb528f2cefd0599eee224b879327af4004b238e08b31f50953aa965e76a82946a209e799b7f7425e707660027e0fdc53a8f7d7df9f0987ed2fc8ef349
+AUX iroffer-dinoex-Werror.patch 498 SHA256 a475717491baac498f4865be62097bc75f31880bd5b6ff3888dbe04fc11effab SHA512 6d8b1e9410c90f635186749f0335e1de689333bcde2918453e7fd6e4ed3e917553d36cba694c1a8a4077a6e45c3019290cd56646aa39c6677802042e5ab131db WHIRLPOOL a6a8780ad4959246cecb4f9cea303222da4c76b25e04eab0c9b8dac3c41859c2f1c5e4445b3073f37170eb02dd9fd961c884850892b562f78c13f3319bc598b4
+AUX iroffer-dinoex.conf 378 SHA256 e934eba1390e7492101c02dab4c3867dd9df61139063d072ce8115ef2bd23d0d SHA512 6dee05c4fdc5d8e62c9ac76406a7e85f1e944bb2b1f82237422f01002c6adceaf4f05073c3e378e3f61000652814292639640e1dcc2a0dbcd2bd68a76687d634 WHIRLPOOL a6a24945c1a144b4d4d818e0af0800673418ac29e92fc0e301d9088a7dbbe50a09a41c1c26e4bbebb13d6fd1df826e8bb757d2803302576ea19f743369d4b8a6
+AUX iroffer-dinoex.init 1130 SHA256 38557694ab8cf5ff75e49680f2e5d56fc9f45d7d14374a38549931cd847c51e0 SHA512 5fdae78dac704cfc8594fff417e0d223069d2a3f33536043550aef4f7143a3cdb69e6ae102d21cd14b97e3ccf61c6d1c11fbb3a87c3e1a1096fa40e36a1c772a WHIRLPOOL 609a7b9cfea7896cab448cad80c812564717a95604af595d52229eea6212888a0a22d9b10c109ce2aa29c180f43a7fd18efbc76173d3d12567bb2f9cc89d0fa6
+AUX iroffer-dinoex.logrotate 173 SHA256 f6c52cb4411cf83718b537ee4271144b9fb0347a03d0d3b5ea677108ac6317c5 SHA512 6eb9a7f1949720a7d1544b90a22a190ad868b77d3ed604c5ec3acdc62e5711353d84a8e10dbfa332c4ceab13fedc3fa06d1679ce95d4612443a055f04f310015 WHIRLPOOL 34124d5e7ebff5bcb0bf35c197b832095b27774923e0f2966fb1ebbf422bd267beb073a7b8197b141265d2c385dd3dbaa6f829065db6324f94c1c20c929956eb
+DIST iroffer-dinoex-3.29.tar.gz 537027 SHA256 d96c307062552878d7594e280eef3a8669b4af955f1efe1d6e3e7ad660f9a6fb SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0 WHIRLPOOL 2917244bfc2c0d05f5660b767dfa39da6099e5388dedea5c2578a483fc52747959c296f65a71cd3a8a24740afca1c3fab8e7825052fec4ac5eadce558917fcd7
+EBUILD iroffer-dinoex-3.29.ebuild 2646 SHA256 c72cce16b468b6327f71febe397818e2aa484fb9e7e0c679109cd1532669c74b SHA512 d47ffa947ae63147ce8939ce99f63114f9593b32f23d3a34d0ba3567bee14bb3d2ebcd14ae608fc0c841cc88d38abe7c2e57a06a54da0fbb3befd38af32b859e WHIRLPOOL 767ee3b0dc2d64a9f320e37270215895e25f1af307ff2521389b252a5b4cae61405d48e3034f740d62bf75a3f7dd03b34d982af37d0c79f9cd29fd49805b7d41
+MISC ChangeLog 2540 SHA256 828f011072153b88fb328d5dd27c13ff3e3a25739406bfb7700630da44cdaa48 SHA512 a4d10d42398209d2b3eef631043f89343735df5dcd1f0d4d47afb350ecb0044fe9b1c8c5fa9b483736223373fd2e4b886e8ba34aa997bfaa9cab4ec0425e965c WHIRLPOOL f14f3e63c21d0ddbba2befaec13ad55682235d8f1afdce4bce10f3b07da7a993ac1326407248ea98ef9f3be4458f4f64d12d63267efee290b6a1c3783f6704d3
+MISC ChangeLog-2015 2060 SHA256 0c19a710c56943e824a48b81eb3c10b709ba679cff6dbaf9074f1c41507eae67 SHA512 59509214873a2db554e84edce6706ef4a9f4601c0423da04892af059173a389dbcfdd7d43487d5a2b808641c0c7ffc4d900a6aa5af4189ee8e9ea727290927b0 WHIRLPOOL 6544b161e0e23fd08c3d650852e5fad1e460eb86490fa9c982004a6aa8a0557718104da15b6bb78e1adf691e584c96fab590ef24b424dda68a7c9312adb65657
+MISC metadata.xml 795 SHA256 f715e2f691ffb98083f12ab8ab10cda9df63164650fa1654d0d18e9dc890986f SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3 WHIRLPOOL 52ec0025415dab0cd5225a2bc51d2290c6db396a58ec2acb25bbc229a291375ebeda49445e9a09eefc1e5a436e912a1b906b8dfa22bb57bdac680aa23928663a
diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch
new file mode 100644
index 000000000000..5dc9d6183ef6
--- /dev/null
+++ b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch
@@ -0,0 +1,130 @@
+diff -ru iroffer-dinoex-3.29/beispiel.config iroffer-dinoex-3.29.NEW/beispiel.config
+--- iroffer-dinoex-3.29/beispiel.config	2013-02-01 08:28:18.000000000 +0100
++++ iroffer-dinoex-3.29.NEW/beispiel.config	2013-03-09 18:43:33.084000000 +0100
+@@ -15,19 +15,19 @@
+ ##############################################################################
+ ###                             - pid file -                               ###
+ ### Schreibt die Prozess-ID beim Start in diese Datei                      ###
+-pidfile mybot.pid
++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
+ 
+ ##############################################################################
+ ###                             - log file -                               ###
+ ### logfile gibt die Logdatei f�r den Bot an.                              ###
+-logfile mybot.log
++logfile /var/log/iroffer-dinoex/mybot.log
+ 
+ ##############################################################################
+ ###                            - log rotate -                              ###
+ ### logrotate gibt den Zeitraum vor, nach dem die Logdatei gewechselt      ###
+ ### wird, m�gliche Werte "none" (nie), "monthly" (monatlich),              ###
+ ### "weekly" (w�chentlich), "daily" (t�glich) und 1-24 (st�ndlich).        ###
+-logrotate weekly
++logrotate none
+ 
+ ##############################################################################
+ ###                         - expire logfiles -                            ###
+@@ -48,7 +48,7 @@
+ ### Diese Datei dient als allgemeines Datenlager f�r die bereitgestellten  ###
+ ### Dateien und die dazugeh�rigen statistische Daten. Hier werden auch die ###
+ ### Beschreibungen der Pakete gespeichert.                                 ###
+-statefile mybot.state
++statefile /var/lib/iroffer-dinoex/mybot.state
+ 
+ ##############################################################################
+ ###                          - old state file -                            ###
+@@ -74,7 +74,7 @@
+ ### als Packliste auf einer Webseite zu dienen, oder f�r andere Zwecke.    ###
+ ### Wenn xdcclistfileraw gesetzt ist, werden die IRC-Farbcode auch mit     ###
+ ### ausgegeben.                                                            ###
+-xdcclistfile mybot.txt
++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
+ #xdcclistfileraw
+ 
+ ##############################################################################
+diff -ru iroffer-dinoex-3.29/exemple.config iroffer-dinoex-3.29.NEW/exemple.config
+--- iroffer-dinoex-3.29/exemple.config	2013-02-01 08:26:21.000000000 +0100
++++ iroffer-dinoex-3.29.NEW/exemple.config	2013-03-09 18:45:35.340000000 +0100
+@@ -15,18 +15,18 @@
+ ##############################################################################
+ ###                             - pid file -                               ###
+ ### �crit l'identifiant du processus dans ce fichier au lancement.         ###
+-pidfile monbot.pid
++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
+ 
+ ##############################################################################
+ ###                             - log file -                               ###
+ ### �crit le journal du robot dans ce fichier.                             ###
+-logfile monbot.log
++logfile /var/log/iroffer-dinoex/mybot.log
+ 
+ ##############################################################################
+ ###                            - log rotate -                              ###
+ ### Archivage du journal jamais (��none��), quotidien (��daily��),         ###
+ ### hebdomadaire (��weekly��) ou mensuelle (��monthly��).                  ###
+-logrotate weekly
++logrotate none
+ 
+ ##############################################################################
+ ###                         - expire logfiles -                            ###
+@@ -44,7 +44,7 @@
+ ##############################################################################
+ ###                             - state file -                             ###
+ ### Fichier temporaire de stockage des informations d'�tat d'Iroffer.      ###
+-statefile monbot.state
++statefile /var/lib/iroffer-dinoex/mybot.state
+ 
+ ##############################################################################
+ ###                          - old state file -                            ###
+@@ -71,7 +71,7 @@
+ ### ��xdcclistfile�� et Iroffer �crira la liste XDCC d�s que n�cessaire.   ###
+ ### Si ��xdcclistfileraw�� est d�fini, le fichier sera �crit avec les      ###
+ ### caract�res sp�ciaux IRC (couleur, format, etc.)                        ###
+-xdcclistfile monbot.txt
++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
+ #xdcclistfileraw
+ 
+ ##############################################################################
+diff -ru iroffer-dinoex-3.29/sample.config iroffer-dinoex-3.29.NEW/sample.config
+--- iroffer-dinoex-3.29/sample.config	2013-02-01 08:26:58.000000000 +0100
++++ iroffer-dinoex-3.29.NEW/sample.config	2013-03-09 18:46:30.612000000 +0100
+@@ -15,18 +15,18 @@
+ ##############################################################################
+ ###                             - pid file -                               ###
+ ### Writes the process id to this file on startup                          ###
+-pidfile mybot.pid
++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
+ 
+ ##############################################################################
+ ###                             - log file -                               ###
+ ### Writes logging information to this file.                               ###
+-logfile mybot.log
++logfile /var/log/iroffer-dinoex/mybot.log
+ 
+ ##############################################################################
+ ###                            - log rotate -                              ###
+ ### After the time given here a logfile will be rotated.                   ###
+ ### logrotate can be set to none, 1 - 24 hours, daily, weekly or monthly   ###
+-logrotate weekly
++logrotate none
+ 
+ ##############################################################################
+ ###                         - expire logfiles -                            ###
+@@ -44,7 +44,7 @@
+ ##############################################################################
+ ###                             - state file -                             ###
+ ### temporary storage for iroffer state information across restarts        ###
+-statefile mybot.state
++statefile /var/lib/iroffer-dinoex/mybot.state
+ 
+ ##############################################################################
+ ###                          - old state file -                            ###
+@@ -71,7 +71,7 @@
+ ### needed.                                                                ###
+ ### If xdcclistfileraw is set the file will be written with the IRC        ###
+ ### control characters included (color, formatting, etc..).                ###
+-xdcclistfile mybot.txt
++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
+ #xdcclistfileraw
+ 
+ ##############################################################################
diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex-Werror.patch b/net-irc/iroffer-dinoex/files/iroffer-dinoex-Werror.patch
new file mode 100644
index 000000000000..cb8bf9248b03
--- /dev/null
+++ b/net-irc/iroffer-dinoex/files/iroffer-dinoex-Werror.patch
@@ -0,0 +1,21 @@
+--- Configure1	2013-02-07 22:10:22.000000000 +0400
++++ Configure	2013-02-07 22:11:37.000000000 +0400
+@@ -884,18 +884,6 @@
+  ${msg} " ${irt_no}"
+ fi
+ 
+-${msg} -n "${irt_seeingif} $cctype ${irt_accepts} '-Werror'... "
+-echo "
+-#include <stdlib.h>
+-${main0}" > config.temp.c
+-if $cctype -o config.temp -Werror $CFLAGS config.temp.c $LDFLAGS $libs $LIBS; then
+- ${msg} "${irt_yes}"
+- WERROR="-Werror"
+-else
+- ${msg} " ${irt_no}"
+-fi
+-
+-
+ ${msg} -n "${irt_seeing16bit}... "
+ echo "
+ #include <stdlib.h>
diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex.conf b/net-irc/iroffer-dinoex/files/iroffer-dinoex.conf
new file mode 100644
index 000000000000..a26ccf6a4218
--- /dev/null
+++ b/net-irc/iroffer-dinoex/files/iroffer-dinoex.conf
@@ -0,0 +1,18 @@
+# Binary for executing as a daemon
+BIN="/usr/bin/iroffer"
+
+# User/Group to drop privileges
+USER="iroffer"
+GROUP="iroffer"
+
+# PID file location
+PIDFILE="/var/run/iroffer-dinoex/iroffer-dinoex.pid"
+
+# Directory for log files
+LOG="/var/log/iroffer-dinoex"
+
+# Directory for runtime files
+STATE="/var/lib/iroffer-dinoex"
+
+# Bot configuration
+MYBOT="/etc/iroffer-dinoex/mybot.config"
diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex.init b/net-irc/iroffer-dinoex/files/iroffer-dinoex.init
new file mode 100644
index 000000000000..ea6363c71d13
--- /dev/null
+++ b/net-irc/iroffer-dinoex/files/iroffer-dinoex.init
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="reload reconnect"
+
+description_reload="Reload the config file"
+description_reconnect="Force reconnection to an IRC server"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	if [ ! -f "${MYBOT}" ]; then
+		eerror "${MYBOT} not found"
+		return 1
+	fi
+
+	checkpath -d -o "${USER}":"${GROUP}" /var/run/iroffer-dinoex
+	checkpath -d -o "${USER}":"${GROUP}" /var/log/iroffer-dinoex
+	checkpath -d -o "${USER}":"${GROUP}" /var/lib/iroffer-dinoex
+}
+
+start() {
+	ebegin "Starting iroffer-dinoex"
+	start-stop-daemon --start --quiet  --pidfile "${PIDFILE}" --user "${USER}:${GROUP}" --exec "${BIN}" -- -b "${MYBOT}" -w "${STATE}" -s
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping iroffer-dinoex"
+	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec "${BIN}"
+	eend $?
+}
+
+reload(){
+	ebegin "Reload iroffer-dinoex"
+	start-stop-daemon --signal SIGUSR2 --pidfile "${PIDFILE}"
+	eend $?
+}
+
+reconnect(){
+	ebegin "Try to reconnect iroffer-dinoex to servers"
+	start-stop-daemon --signal SIGUSR1 --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex.logrotate b/net-irc/iroffer-dinoex/files/iroffer-dinoex.logrotate
new file mode 100644
index 000000000000..67e4d65e0e4e
--- /dev/null
+++ b/net-irc/iroffer-dinoex/files/iroffer-dinoex.logrotate
@@ -0,0 +1,7 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+/var/log/iroffer-dinoex/*.log {
+	missingok
+	su iroffer iroffer
+}
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild
new file mode 100644
index 000000000000..e07c9359c4a9
--- /dev/null
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PLOCALES="de en fr it"
+PLOCALE_BACKUP="en"
+
+inherit eutils l10n toolchain-funcs user
+
+DESCRIPTION="IRC fileserver using DCC"
+HOMEPAGE="http://iroffer.dinoex.net/"
+SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
+	http://iroffer.dinoex.net/HISTORY/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
+
+REQUIRED_USE="
+	admin? ( http )
+	gnutls? ( ssl )
+"
+
+RDEPEND="chroot? ( dev-libs/nss )
+	curl? (
+		net-misc/curl[ssl?]
+		gnutls? ( net-misc/curl[curl_ssl_gnutls] )
+		!gnutls? ( ssl? ( net-misc/curl[curl_ssl_openssl] ) )
+	)
+	geoip? ( dev-libs/geoip )
+	gnutls? ( net-libs/gnutls )
+	ruby? ( dev-lang/ruby )
+	ssl? ( !gnutls? ( dev-libs/openssl ) )"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup iroffer
+	enewuser iroffer -1 -1 -1 iroffer
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-config.patch"\
+	       "${FILESDIR}/${PN}-Werror.patch"
+	epatch_user
+	l10n_find_plocales_changes "" 'help-admin-' '.txt'
+}
+
+do_configure() {
+	echo ./Configure $*
+	./Configure $* || die "configure phase failed"
+}
+
+src_configure() {
+	do_configure \
+		PREFIX="${EPREFIX}/usr"\
+		$(usex debug '-profiling' '' '' '')\
+		$(usex debug '-debug' '' '' '')\
+		$(usex geoip '-geoip' '' '' '')\
+		$(usex chroot '' '-no-chroot' '' '')\
+		$(usex curl '-curl' '' '' '' )\
+		$(usex gnutls  '-tls' '' '' '' '')\
+		$(usex upnp '-upnp' '' '' '')\
+		$(usex ruby '-ruby' '' '' '')\
+		$(usex kqueue '-kqueue' '' '' '')\
+		$(usex blowfish '' '-no-blowfish' '' '')\
+		$(usex ssl '' '-no-openssl' '' '')\
+		$(usex http '' '-no-http' '' '')\
+		$(usex admin '' '-no-admin' '' '')\
+		$(usex telnet '' '-no-telnet' '' '')\
+		$(usex memsave '' '-no-memsave' '' '')
+}
+
+src_compile() {
+	# TODO: default compile targets always include chrooted target, which is not good
+	emake CC="$(tc-getCC)" $(l10n_get_locales)
+}
+
+myloc() {
+	emake DESTDIR="${D}" install-${1}
+
+	dodoc help-admin-${1}.txt
+	use http && dohtml doc/INSTALL-linux-${1}.html
+
+	insinto /etc/${PN}
+	case ${1} in
+	"de")
+		doins beispiel.config;;
+	"fr")
+		doins exemple.config;;
+	*)
+		doins sample.config;;
+	esac
+}
+
+src_install() {
+	l10n_for_each_locale_do myloc
+
+	dodoc README* THANKS TODO
+	doman iroffer.1 xdcc.7
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	newconfd "${FILESDIR}/${PN}.conf" ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use ruby; then
+		insinto /usr/share/${PN}
+		doins ruby-sample.rb
+	fi
+
+	if use http; then
+		insinto /usr/share/${PN}/htdocs
+		doins htdocs/*
+	fi
+}
diff --git a/net-irc/iroffer-dinoex/metadata.xml b/net-irc/iroffer-dinoex/metadata.xml
new file mode 100644
index 000000000000..dbdad77e576d
--- /dev/null
+++ b/net-irc/iroffer-dinoex/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+	</maintainer>
+	<use>
+		<flag name="admin">Compile with HTTP Admin</flag>
+		<flag name="blowfish">Compile with blowfish encryption support</flag>
+		<flag name="chroot">Compile with chroot support</flag>
+		<flag name="http">Compile with HTTP server support</flag>
+		<flag name="kqueue">Compile with kqueue() support</flag>
+		<flag name="memsave">Compile with memory protection</flag>
+		<flag name="telnet">Compile with Telnet server support</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-irc/irssi-otr/Manifest b/net-irc/irssi-otr/Manifest
new file mode 100644
index 000000000000..0024412b5547
--- /dev/null
+++ b/net-irc/irssi-otr/Manifest
@@ -0,0 +1,9 @@
+AUX irssi-otr-1.0.0-cflags.patch 555 SHA256 0f4fb9e226e8e81b87640adc087e2966dd9f023090133ee760293ebc900e3f8e SHA512 b34ad91361e96bf5dae84c8f38220131737e97f1e36e790bdb427370a236177ee50251939b917b32ba64a05613ec282dd64a0874d01285f311a3b0e12e6ce168 WHIRLPOOL 606da32a818a7c7bfc0ee71b8a499b18d4d272c5ecbeb759ce218b19a156a37705e5e7629fb49350fb0d0be47834992803d655707e345f87791b3276a6416071
+AUX irssi-otr-1.0.2-cflags.patch 555 SHA256 8c6ebcf69aebcc2b61db49b2b562be856da252b79fafdc64f3809978ec7cbc2a SHA512 16243ca1e3e8287f97f04538bdfb10f6a3969c65de62afb788ebd8d28cd31f71684283d2c994deb000a9eaed842d81c701884e89a8f80e868868e84264c5e605 WHIRLPOOL ae0d67c9615b08a622952e8815c9865b3aae6a82ea60b2f4b46bf15c5040a12c6ee05e17a010f953705f19c0e9b7fdb45802b3554cd045ec7a288f3868537ee2
+DIST irssi-otr-1.0.0.tar.gz 39481 SHA256 bad09a2853ea6fb1a7af42c8f15868fd3ce45f973be90c78944ddf04f8ab517e SHA512 988e50b9df430511ae21a9128ffd27ad27efc102aaa10ec59992c6e642f38dd776396a0768021e3a0588d2a8c30e6316a7b0720d31a05ac21bb47055b0d8c488 WHIRLPOOL 998dc495fb600e635ba342162efc153483fe838d5466995ab248d3c1da358f0cf538d020280157ffffcbe27fbe91b504ed48d1ce28bb396515f560f1fe9197f4
+DIST irssi-otr-1.0.2.tar.gz 40947 SHA256 4619208b9c9171aa97a41960b3e892390b6473e2988a056b9fe8e110daa1ae9c SHA512 983bc861e5d38774305425b412368689f17a1e11298bcef49b9f0ea7a2275b1443ba2ce0a9ef9866e537097f1c6c00e9264085f5cd711f0d78faf252fba18d2f WHIRLPOOL b4684c8617969b5be07c9bd9ea836ce1ca976b425cc357d0c07e2862f162cb84f5206d8cd4347cefb3da9d39a6f8f3faaf577f9c9dafe60494d45ca8189e7dbd
+EBUILD irssi-otr-1.0.0-r1.ebuild 926 SHA256 c8c987e62842327ed765625dced021690e1e649a8ab9ed758eb82ae1ee7c3bad SHA512 a7d7225d63254a2f542097d1295df24ea443c67c774a9325cd9b95b972a51e516e2de548f8e5ae697095701772134918710e07b6aa99ad98bd44d8bc6b499743 WHIRLPOOL 28c25f11a7934660f3ae07aa68ecf540d4c456f754d0e03e42958bd316d8dfa0af2f1eceba9edf22ee128ea5cb1b7401942fe55f79cad946cd027fddbd6cb90f
+EBUILD irssi-otr-1.0.2.ebuild 739 SHA256 578cb409288a625795c42e6c74a1c7d19a57b69df3f6f95ab0b82f170e196826 SHA512 9fef92d54c95ad882569dac3217b19a868c308db4a76a7c5bb2383e19d3ed51c45444ff172900cd309ec9cdd7035f2cc58f78a06bfd977a69e483dd8a8110acf WHIRLPOOL 81b0e335fd2c311057c0adf23696d399f71488c469ca929b1970315357c310093f23adcc27bc8175cb112e1fb9eca57ba1913dc84284af9682a1285d79aacb58
+MISC ChangeLog 3315 SHA256 53e73e164d5b319030456d3018b82953df160e145e45567b52937b1fe19e107c SHA512 448ac7a8630455318382e9c8d74b62d82e7651df4802a5df5261d60efed3d313b674d4d64f61a45cf3e05f39a1067ae48ea9460a7ca8ce4e670da86637867bd7 WHIRLPOOL c7456f210057836cec309e447428d5b0cc8de2522d0453a327da300ca476099590e2bb0c1e378ee67941db3c657a2c1eaefda197238f64f1889681a1eccc8485
+MISC ChangeLog-2015 3180 SHA256 098c420e885da4c9d40a1171abbb974372d622da774fce3b983c9c94afbccbf3 SHA512 0f59b989b12cdf4547a95a166a20a9c9f3ca6756ed0eb94e225df48081e232978c6ecad303186036df827779fb6063a068d14868206b037b3990b2ddcf5e58b5 WHIRLPOOL c14e53364e3c2afb131435142c44d8ee8b48f8845158e814eb41e092ca29de2752009944261eb193ae9bcfa8dccc04422ab6c9cb8bc8e857e129385a8fcc8fc8
+MISC metadata.xml 337 SHA256 bd40d1a9b6e45691b4094a8cbcfa09ca41fae3b0fb3c78154a3d0edfd0757792 SHA512 b2ec2bbbe169d06dc33a607ccab79b7cea71a9bc4e5a33eadf9b3521dca0322a80fb1d7c4a544ab8f449bb22510e42c2fee45df84730ed083f95bafa327ea9bb WHIRLPOOL 76fe01f505123165d343b25444fce0fbea3bd13b55c1e13d98ce64384ca81e8e9ff3d4070202494aa669bb0f8e11f1f95a7409634a316406b88b31977fad07d1
diff --git a/net-irc/irssi-otr/files/irssi-otr-1.0.0-cflags.patch b/net-irc/irssi-otr/files/irssi-otr-1.0.0-cflags.patch
new file mode 100644
index 000000000000..50b57c58e8a4
--- /dev/null
+++ b/net-irc/irssi-otr/files/irssi-otr-1.0.0-cflags.patch
@@ -0,0 +1,11 @@
+--- configure.ac	2014-02-13 04:50:45.000000000 +0400
++++ configure.ac.new	2014-12-07 12:13:17.346849284 +0300
+@@ -64,7 +64,7 @@
+ 
+ LT_INIT
+ 
+-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS"
++CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS"
+ 
+ DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include"
+ AC_SUBST(DEFAULT_INCLUDES)
diff --git a/net-irc/irssi-otr/files/irssi-otr-1.0.2-cflags.patch b/net-irc/irssi-otr/files/irssi-otr-1.0.2-cflags.patch
new file mode 100644
index 000000000000..3ab13288e11d
--- /dev/null
+++ b/net-irc/irssi-otr/files/irssi-otr-1.0.2-cflags.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2014-02-13 04:50:45.000000000 +0400
++++ b/configure.ac	2014-12-07 12:13:17.346849284 +0300
+@@ -64,7 +64,7 @@
+ 
+ LT_INIT
+ 
+-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -O1 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS"
++CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing -fstack-protector-all -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now -fPIE -pie $PACKAGE_CFLAGS"
+ 
+ DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include"
+ AC_SUBST(DEFAULT_INCLUDES)
diff --git a/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..acbe377b4c6a
--- /dev/null
+++ b/net-irc/irssi-otr/irssi-otr-1.0.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils multilib
+
+DESCRIPTION="Off-The-Record messaging (OTR) for irssi"
+HOMEPAGE="https://github.com/cryptodotis/irssi-otr"
+SRC_URI="https://github.com/cryptodotis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~sparc x86"
+IUSE=""
+
+# please note >=libotr-4.1.0 is required due to critical bugfix
+# d748757e581b74e7298df155ad49174cb914102b, see README.md
+RDEPEND="
+	>=dev-libs/glib-2.22.0:2
+	>=dev-libs/libgcrypt-1.2.0:0
+	>=net-libs/libotr-4.1.0
+	>=net-irc/irssi-0.8.15[perl]"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+AUTOTOOLS_AUTORECONF="yes"
+DOCS=( README.md )
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
+
+src_prepare() {
+	autotools-utils_src_prepare
+
+	sed -i -e "s|/usr/lib/irssi/modules|/usr/$(get_libdir)/irssi/modules|" configure.ac || die
+}
diff --git a/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild b/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild
new file mode 100644
index 000000000000..6d49124e48ae
--- /dev/null
+++ b/net-irc/irssi-otr/irssi-otr-1.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Off-The-Record messaging (OTR) for irssi"
+HOMEPAGE="https://github.com/cryptodotis/irssi-otr"
+SRC_URI="https://github.com/cryptodotis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	>=dev-libs/libgcrypt-1.7.3
+	>=net-libs/libotr-4.1.0
+	>=net-irc/irssi-1.0.0[perl]"
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${P}-cflags.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+	sed -i -e "s|/usr/lib/irssi/modules|/usr/$(get_libdir)/irssi/modules|" configure.ac || die
+}
diff --git a/net-irc/irssi-otr/metadata.xml b/net-irc/irssi-otr/metadata.xml
new file mode 100644
index 000000000000..b65267194902
--- /dev/null
+++ b/net-irc/irssi-otr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">cryptodotis/irssi-otr</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-irc/irssi-xmpp/Manifest b/net-irc/irssi-xmpp/Manifest
new file mode 100644
index 000000000000..721d082eb94e
--- /dev/null
+++ b/net-irc/irssi-xmpp/Manifest
@@ -0,0 +1,8 @@
+AUX irssi-xmpp-0.53-irssi-1.0.patch 1877 SHA256 8c84ae86a980cb37455ce93e79dc1b856c8d1a9f4995fc6c96e24a0811226d96 SHA512 8fabc71b9b45eace69041c4b446f8227e92ce426980bb03f3251d7fac1d0cf96ef00a3f5f0a21b07590dabc97db605ac39f5d78131d945b95e466c3fd6a2cac7 WHIRLPOOL 968067ba325d9e7b08a4d375d39a5e5622ec8986d799ec1e21dd88cff3aae108fd5aef69f9ca6decb99d982b57380c4cff41399503a196b1404ce8f62f2d3892
+DIST irssi-xmpp-0.52.tar.gz 68105 SHA256 c63975e0562e7ec6a1b68cb607829b3933ec822aa4a844c3d6dccf16f110dbdc SHA512 27f7b877d02e0812b59e9f23ee12e58b842e3923ab5f0aa8cdf874dc9b30d9d22dbae9ef848ee5ffe2dcb667a0344f960125a3ffc072ce065e1fdf714eb98b27 WHIRLPOOL d6b760de57542a6d3e2fa8e167d2c21700f59bd9c64252cc6448dcebf935507adc9ef5dc8f10874c620cfd1c447871a5ac5a906921a3e9b532be9f91e54f64b7
+DIST irssi-xmpp-0.53.tar.gz 65649 SHA256 6487362d23af7b9c185d8ac74e6b651e697cacc01de8bb9c750db1752140536f SHA512 09969db01b77e95248a080599d480b8271dcbe6d42bc90e5e2bb304a2d1b9695b70090ef0a6b7342bf6e17326e0f7a50c11c85e02e6ed742ec55820ffad655be WHIRLPOOL ab43a8436f6e7ceb548f238d4c57665ad6c5e46eec9a68fd9346af0d70d0e826bbf03e9c1749b1ccca7e5524eb9999c10bfe99f3ccaebcdf9eda9854f615345e
+EBUILD irssi-xmpp-0.52.ebuild 776 SHA256 24b1b26d1dc1d083e979213424f6cef66c16eef7733c74978e80f203022f99f0 SHA512 9940d259b0bece0c06c2f92446d5e0d815a783757d3881dd53a5ed622aa69a4444f7f33e297876d13a408d2dcb4e418889e49bc014fbe5852be5147926599215 WHIRLPOOL 41fe92eb738ecc56be8dab045af52bd9ccad03c9a7f78b730ff3e1a47dd5d42b84700bec28f04e997029a06bee6faee09feed850d04fa43da7eb037b6d4b4492
+EBUILD irssi-xmpp-0.53.ebuild 794 SHA256 8a758a98d5c99690a6ce4bb611eef02833ab58b6b69ae623c0cbaed41f91bce7 SHA512 3236a53cdb10bebaf15f5644f20fec2a1a47f2423d7c0d03163978d9c41a1a86a66a5bf6d611cb259db9345d825b6409b1631abd33aac24d5229147eb7bcc83a WHIRLPOOL d7065b064293551389e07704b280b8ad74207912e20411ba204e686d6dcbb4e53e317b6c7b1c3da2571638805dd40d578bfa6218a3b4005d23e53ca1da3c43df
+MISC ChangeLog 3091 SHA256 28e92bdaf38b5dfdf765e0b54d567e3bb228626a7bda56c4d3ce36c14432fe96 SHA512 58bfb5f5ed949d5736e3b1eacbf87e4f2c451bee6d798c90116cc1eb141939c7026eef4cad3484a19031e176b44d5573d0737cbea0b4907f891b0d259a18d807 WHIRLPOOL 5a8b8cba9ca4827fedbe19381dc4bba68bee233b76fb65e9e5a70749a62c60771a602645e1949f84e6414d922f4b6d7399df8e08c07fced2340f55bb0177afd2
+MISC ChangeLog-2015 2010 SHA256 c37d4da48460c2b404b0b71f69a3aea4268ff39955e402df25735ada8ea78a68 SHA512 ca408f38f68f7f24210692fac690f7d12b1d0c19c04ad98652bffc8cd19ebee77e275b6e94f0a1c7db4db5866eb8e3125e80f840fe110c41e51a1a49b099d5e0 WHIRLPOOL 856612e3b4e4dc0ab4eead0ca24f9ef182d7f8f40a2522c62a05740e6802e03d260b29515b4cdabd88fa68cab8855e0135eeba2f1757d34493ae15ecd090b903
+MISC metadata.xml 250 SHA256 be9cdac43b527e7b3e192181a6122018db694cfc6be5b6aaba3633d7b0a5cb58 SHA512 ef7d2ea71e78c9684960143c24b05c0be118fe34e7ff731d4aa37d15b7435d5483440d235a59c2e223674b74cf7a9103c9e70fa1513225cc71b31ec01ea057cb WHIRLPOOL c0e80caa6d27d9f35fff3a5f4ca878224a418689c25cced23f9994be232b1b15eb37239e585d5cf93d398d72f1c7eb0229bcd26c6fe2dc4211849a5807eeeb3c
diff --git a/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch b/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch
new file mode 100644
index 000000000000..a92d4db4739b
--- /dev/null
+++ b/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch
@@ -0,0 +1,57 @@
+From 0d9e5f7f1a0edaea0de312828ce47d11f74ee3dc Mon Sep 17 00:00:00 2001
+From: benaryorg <binary@benary.org>
+Date: Fri, 20 Jan 2017 06:31:28 +0100
+Subject: [PATCH] fix build with irssi 1.0
+
+use_ssl field of SERVER_CONNECT_REC has been renamed to use_tls.
+
+Original patch from darix.
+
+Signed-off-by: benaryorg <binary@benary.org>
+---
+ src/core/xmpp-servers.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c
+index 405ecd9..8d0b62d 100644
+--- a/src/core/xmpp-servers.c
++++ b/src/core/xmpp-servers.c
+@@ -32,6 +32,11 @@
+ #include "rosters-tools.h"
+ #include "tools.h"
+ 
++/* IRSSI_ABI_VERSION was introduced in 0.8.18 */
++#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6
++#  define use_tls use_ssl
++#endif
++
+ static void
+ channels_join(SERVER_REC *server, const char *data, int automatic)
+ {
+@@ -151,7 +156,7 @@ xmpp_server_init_connect(SERVER_CONNECT_REC *connrec)
+ 	server->connect_pid = -1;
+ 
+ 	if (server->connrec->port <= 0)
+-		server->connrec->port = (server->connrec->use_ssl) ?
++		server->connrec->port = (server->connrec->use_tls) ?
+ 		    LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT;
+ 
+ 	if (conn->real_jid == NULL)
+@@ -335,7 +340,7 @@ lm_open_cb(LmConnection *connection, gboolean success,
+ 		g_free(host);
+ 	} else
+ 		signal_emit("server connecting", 1, server);
+-	if (server->connrec->use_ssl)
++	if (server->connrec->use_tls)
+ 		signal_emit("xmpp server status", 2, server, 
+ 		    "Using SSL encryption.");
+ 	else if (lm_ssl_get_use_starttls(lm_connection_get_ssl(server->lmconn)))
+@@ -470,7 +475,7 @@ xmpp_server_connect(XMPP_SERVER_REC *server)
+ 		return;
+ 	error = NULL;
+ 	err_msg = NULL;
+-	if (server->connrec->use_ssl) {
++	if (server->connrec->use_tls) {
+ 		if (!set_ssl(server->lmconn, &error, server, FALSE)) {
+ 			err_msg = "Cannot init ssl";
+ 			goto err;
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild
new file mode 100644
index 000000000000..cc4668cad98f
--- /dev/null
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.52.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
+HOMEPAGE="http://cybione.org/~irssi-xmpp/"
+SRC_URI="http://cybione.org/~${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="<net-irc/irssi-1
+	>=net-libs/loudmouth-1.4.0[debug]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e "s/{MAKE} doc-install/{MAKE}/" \
+		-i Makefile || die #322355
+	sed -e "/^CFLAGS\|LDFLAGS/ s/=/+=/" \
+		-i config.mk || die
+}
+
+src_compile() {
+	emake PREFIX=/usr CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
+	dodoc README NEWS TODO docs/*
+}
diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild
new file mode 100644
index 000000000000..897b1d37ddd4
--- /dev/null
+++ b/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="An irssi plugin providing Jabber/XMPP support"
+HOMEPAGE="https://cybione.org/~irssi-xmpp/"
+SRC_URI="https://github.com/cdidier/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=net-irc/irssi-0.8.13
+	>=net-libs/loudmouth-1.4.0"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-irssi-1.0.patch" )
+
+src_prepare() {
+	default
+	sed -e "s/{MAKE} doc-install/{MAKE}/" \
+		-i Makefile || die #322355
+}
+
+src_compile() {
+	emake PREFIX=/usr CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr IRSSI_LIB=/usr/$(get_libdir)/irssi install
+	dodoc README NEWS TODO docs/*
+}
diff --git a/net-irc/irssi-xmpp/metadata.xml b/net-irc/irssi-xmpp/metadata.xml
new file mode 100644
index 000000000000..d726f7c84157
--- /dev/null
+++ b/net-irc/irssi-xmpp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">cdidier/irssi-xmpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
new file mode 100644
index 000000000000..f7f538c77d6f
--- /dev/null
+++ b/net-irc/irssi/Manifest
@@ -0,0 +1,13 @@
+AUX irssi-0.8.20-tinfo.patch 639 SHA256 945b046849bbbe90ed166c5f5fbb1f6dbb0b9e5e8988f6da33e6ae3ade5fb722 SHA512 2fb53e8bd0cfd3d07b33d532cb63af95e8b1b6fe742634f6f8598dfcd06cda94b3f564a53b14daa4005cb0217bece531804faf82cc06cfbb191695e73840266d WHIRLPOOL e2e83adc4173881a1701046e1002a9ea4e986c2cbb4a9076a9ea24aff274b5613f52da1ea6ac332eae2186af2bc6a6e41ba4d999d7c85449891eb6bc28eeb259
+DIST irssi-0.8.21.tar.xz 1007524 SHA256 e433063b8714dcf17438126902c9a9d5c97944b3185ecd0fc5ae25c4959bf35a SHA512 110934ab85c8574fc76bce367c58378e28603898e63a5014a72170ffe441ffe3dbda432531e899176f5c4126f47d929a3a01a2f87bcacbfe0ba4d6d8cb31e642 WHIRLPOOL 8426a82cbf5b488c1fd9497fdeb69ee98d211aa9775560b9d6efc9645d74926fff6b627c2f681642a0df10e83f68dc4d6403d706faaf677391005af5bdccf143
+DIST irssi-1.0.2.tar.xz 1027912 SHA256 5c1c3cc2caf103aad073fadeb000e0f8cb3b416833a7f43ceb8bd9fcf275fbe9 SHA512 0b5048b1babecaafcd6f2be59523635a3f028c17ceb751776099d74c50fc3daf8fdf52ef5c37f9b765f7a1e5e82f5e41230d14f05530de54386f7190c610d458 WHIRLPOOL 59cd0ee40115f8a93769b693d1d6a3f8f3c004ce03c19c3b87548d6fd5b1313c26b7258049ac2bf6015f3c502d9ba9e773f48b5784b5e8d0f5afb3f4797cef47
+DIST irssi-1.0.3.tar.xz 1029980 SHA256 838220297dcbe7c8c42d01005059779a82f5b7b7e7043db37ad13f5966aff581 SHA512 3a369d9bad4e2016a6a0395b35e3db1f1a6ff7ff6b8361fe5d828c29dd6f81c4b8d1bdfe0304cb05402eecddde97f6d369a5e98f215bfd177287f303d3d714eb WHIRLPOOL 2cdef3c2208cbe93d74298862add82281d36cd518ad5baf9285aa14df8fef263cd857ad39f5058635f9e81938385fc07b6c545685681562ad4f7273b4ca1e6da
+DIST irssi-1.0.4.tar.xz 1030956 SHA256 b85c07dbafe178213eccdc69f5f8f0ac024dea01c67244668f91ec1c06b986ca SHA512 8025c3b90275e5c0b910c08efcac80f56da4400662cd4a9f09cc6035ce23840fe6ed0ac5297b9631a5b28bd798b4ebca2bb5550f9e0e01aefc7a69e9f787195d WHIRLPOOL 27065e67eda3fd09a88989456ba36a748965190a1a808a8dcab9c1170e7d7c856987e98801fdc83cdcced6aa47539410be0c2207fb037454a659b0a3973b6f5f
+EBUILD irssi-0.8.21.ebuild 1570 SHA256 60ae5fd3f3a7968a44deb1163922b68c49de376075038aad75a154a84836c3af SHA512 5eb487ea8dfa8aa99fa13c33da3806f7fa0dd507571a99aa4594341ebe17f254c2a9aecbcdf2a176840e426a766898001bff5decbdfc0b6fab9582225e7de39d WHIRLPOOL 075422ffc7313ae60639b4c7334c400d03e8a8a5e0b28eda41056fccf85d1985ae5beb49d99a4bb9d7752f4c1ee7030d4afbb2e4c6f598bb838ab227d99d623e
+EBUILD irssi-1.0.2.ebuild 1342 SHA256 0a0344944b1c5ce2392f1a41fc7647a5efdfde81032bbe5bbe2035b87adbe7ac SHA512 78620fa32de9108c8ae115394c474a1846e4030ea49c3fda5001c6c7ee55122ea22a1448482ea772693871fa21f30e47f0104d85a79c1f7cbe7af701f0643a02 WHIRLPOOL 089194a6f163e0f29b40058a1bdd27a71951b17265d92f3c2b07bb49b22c6effbbb86f4139f60c08bf82a9460aacd700ce0d9d0e1094e8be086e34a3e223a4fb
+EBUILD irssi-1.0.3.ebuild 1283 SHA256 aea3699cf11642b76f920f01d7d0c4aea90160d226214adc94564d81e1a35370 SHA512 bf9a1f2cd57182443182e14fd340f30eb811e6a3c070425673e98e9b10b35369adbc66476d30719176866cba7e3317f4b596273d5910125055f13b68dba4778d WHIRLPOOL 265d9929a0b503fda5fdf3015d57f2100c076b36a3f6304325de1ed468df66d601d8a9932202a5951243f5a8973eac42752c7e8f4a5ef854abe8cd140400ae91
+EBUILD irssi-1.0.4.ebuild 1262 SHA256 c7285b8b22b4bb139b7324494b9a77bf945f9439d5f61cf363ebecf1e1d86fa0 SHA512 b4ba04fe03cc81a833aa1394303bb2055718293b8c906edd46fcc97af54ffb1cd0a353c16416bb3598626bbdfc2ff1b19c8a93f4f262a18b830eec0b7661c164 WHIRLPOOL b3c640badeaa973f0967709d0f2411a2705da0c5e217088e55ec20a1749b05fb9683507f14e47a407368952e68b1ef6bb89e8746324b4a7a82616fe17b589566
+EBUILD irssi-9999.ebuild 1202 SHA256 cc5f71cddf2eecaadd1ffe49c3c9b90a81440687707ca89473185b9b19c3e69f SHA512 fc9126562591b6df88a71b2c3beb4d99a91f62f65f3df46da2808b63eee490f988291b6271de857ea430fcc3c4e1cedb9bc1e00248877bc22d5414f408943954 WHIRLPOOL 76c0b70e8baa0aa959eaa08137aa11e2f2db56534550d9b35d5180b19d373a88a5108924344f100b165b3154742ef48ea75a7dfd26bef885f27744ec5957a9ae
+MISC ChangeLog 7207 SHA256 6d69fc71b2c617fed5ed3c8fd3dbce54d9a2b5c28bc6e74277a2f891b2881360 SHA512 48602f0c9f995060181002b7e4cb806844a067d698932dd6d2b6094d6e13b6cea19cc5a4f52247fc41d6ea6266ec8fd6a9326b2203d47d8617a4d98acad82cdc WHIRLPOOL 5d56140c7e0f3f37db62f49ea0524702814ec0dc4c5ceadc8d91a0e69b9195fda8c1b8dbb608a5bdca65e0f023628f3e3106cbe1837960d0af321e29075403c4
+MISC ChangeLog-2015 30677 SHA256 88717bc23faff4ed5b75b1e2253dce491386537f43439a0eec75b64f978bf3e3 SHA512 b25d7dce21d3a8191b737bec93f4f9f2e23fce7e605266117244aa8a5d0d97d5ac15f69f6852af33d6a18408f234e93d13ccb775bc3fc43f4bf9566ffc6196e9 WHIRLPOOL 3f204165ccc3e92656fd112215ea2ab38411b122ed670486b1290b24e81fbcd919c3c6ae39acfac8e79c478c073516f04ca30a6951eaff0cd346aa013ec19620
+MISC metadata.xml 571 SHA256 09f1deff8c7d550cdde6acd1932953f2b8ee53beece272adec887c899760d4a4 SHA512 ec9159c0cb62b0901c30601a7750309f4474ab26c60a611065a8774ceac3c3f5dcc8f8cc69b7a3fd0f010b22e661c17b9789acd3ca4e224f437c2113edf511e7 WHIRLPOOL a0be9002c41f1ff27a0b39141c9d95124c3f0c5d74e8d67f739a91a9f1750eaf0395e0c19af07d406878b1c0dedbb3ca89adbb92c8015c8390528ba6976293c7
diff --git a/net-irc/irssi/files/irssi-0.8.20-tinfo.patch b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
new file mode 100644
index 000000000000..346c6e963e56
--- /dev/null
+++ b/net-irc/irssi/files/irssi-0.8.20-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/m4/curses.m4	2010-04-04 02:19:58.000000000 +1000
++++ b/m4/curses.m4	2014-03-06 16:36:12.404404130 +1100
+@@ -218,9 +218,17 @@
+ 			CURSES_LIBS="$CHECKLIBS"
+ 		],, $CHECKLIBS)
+ 	    ], $CURSES_LIBS)
++	    AC_CHECK_LIB(ncurses, tputs, [
++	        true;
++	    ], [
++                CHECKLIBS=`echo "$3"|sed 's/-lncurses/-lncurses -ltinfo/g'`
++		AC_CHECK_LIB(tinfo, tputs, [
++			CURSES_LIBS="$CHECKLIBS"
++		],, $CHECKLIBS)
++	    ], $CURSES_LIBS)
+ 	    CURSES_INCLUDEDIR="$4"
+ 	    search_ncurses=false
+-	    screen_manager="$5"
++	    screen_manager=$5
+             AC_DEFINE(HAS_CURSES)
+             has_curses=true
+ 	    has_ncurses=true
diff --git a/net-irc/irssi/irssi-0.8.21.ebuild b/net-irc/irssi/irssi-0.8.21.ebuild
new file mode 100644
index 000000000000..a82b29f33ae2
--- /dev/null
+++ b/net-irc/irssi/irssi-0.8.21.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic perl-module toolchain-funcs
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6 +perl selinux ssl socks5 +proxy libressl"
+
+CDEPEND="sys-libs/ncurses:0=
+	>=dev-libs/glib-2.6.0
+	ssl? (
+		!libressl? ( dev-libs/openssl:= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	perl? ( dev-lang/perl:= )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-irc )
+	perl? ( !net-im/silc-client )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.20-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-ncurses="${EPREFIX}"/usr \
+		--with-perl-lib=vendor \
+		--enable-static \
+		--enable-true-color \
+		$(use_with proxy) \
+		$(use_with perl) \
+		$(use_with socks5 socks) \
+		$(use_enable ssl) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use perl && perl_delete_localpod
+
+	prune_libtool_files --modules
+
+	dodoc AUTHORS ChangeLog README.md TODO NEWS
+}
diff --git a/net-irc/irssi/irssi-1.0.2.ebuild b/net-irc/irssi/irssi-1.0.2.ebuild
new file mode 100644
index 000000000000..43b884cd42cf
--- /dev/null
+++ b/net-irc/irssi/irssi-1.0.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+perl selinux socks5 +proxy libressl"
+
+CDEPEND="
+	sys-libs/ncurses:0=
+	>=dev-libs/glib-2.6.0
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	perl? ( dev-lang/perl:= )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-irc )
+	perl? ( !net-im/silc-client )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS ChangeLog README.md TODO NEWS )
+
+src_configure() {
+	econf \
+		--with-perl-lib=vendor \
+		--enable-true-color \
+		$(use_with proxy) \
+		$(use_with perl) \
+		$(use_with socks5 socks)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use perl && perl_delete_localpod
+
+	prune_libtool_files --modules
+
+	einstalldocs
+}
diff --git a/net-irc/irssi/irssi-1.0.3.ebuild b/net-irc/irssi/irssi-1.0.3.ebuild
new file mode 100644
index 000000000000..5cf5aa46b11c
--- /dev/null
+++ b/net-irc/irssi/irssi-1.0.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+perl selinux socks5 +proxy libressl"
+
+CDEPEND="
+	sys-libs/ncurses:0=
+	>=dev-libs/glib-2.6.0
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	perl? ( dev-lang/perl:= )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-irc )
+	perl? ( !net-im/silc-client )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--with-perl-lib=vendor \
+		--enable-true-color \
+		$(use_with proxy) \
+		$(use_with perl) \
+		$(use_with socks5 socks)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use perl && perl_delete_localpod
+	prune_libtool_files --modules
+	einstalldocs
+}
diff --git a/net-irc/irssi/irssi-1.0.4.ebuild b/net-irc/irssi/irssi-1.0.4.ebuild
new file mode 100644
index 000000000000..7ce8d6b8ba6a
--- /dev/null
+++ b/net-irc/irssi/irssi-1.0.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils perl-module
+
+# Keep for _rc compability
+MY_P="${P/_/-}"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+perl selinux socks5 +proxy libressl"
+
+CDEPEND="
+	sys-libs/ncurses:0=
+	>=dev-libs/glib-2.6.0
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	perl? ( dev-lang/perl:= )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-irc )
+	perl? ( !net-im/silc-client )"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--with-perl-lib=vendor \
+		--enable-true-color \
+		$(use_with proxy) \
+		$(use_with perl) \
+		$(use_with socks5 socks)
+}
+
+src_install() {
+	default
+	use perl && perl_delete_localpod
+	prune_libtool_files --modules
+	einstalldocs
+}
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
new file mode 100644
index 000000000000..7c30d8608ca7
--- /dev/null
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools perl-module git-r3
+
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+
+DESCRIPTION="A modular textUI IRC client with IPv6 support"
+HOMEPAGE="https://irssi.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+perl selinux socks5 +proxy libressl"
+
+CDEPEND="sys-libs/ncurses:0=
+	>=dev-libs/glib-2.6.0
+	!libressl? ( dev-libs/openssl:= )
+	libressl? ( dev-libs/libressl:= )
+	perl? ( dev-lang/perl:= )
+	socks5? ( >=net-proxy/dante-1.1.18 )"
+
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig
+	dev-lang/perl
+	|| (
+		www-client/lynx
+		www-client/elinks
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-irc )
+	perl? ( !net-im/silc-client )"
+
+src_prepare() {
+	sed -i -e /^autoreconf/d autogen.sh || die
+	NOCONFIGURE=1 ./autogen.sh || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-perl-lib=vendor \
+		--enable-true-color \
+		$(use_with proxy) \
+		$(use_with perl) \
+		$(use_with socks5 socks)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use perl && perl_delete_localpod
+
+	prune_libtool_files --modules
+
+	dodoc AUTHORS ChangeLog README.md TODO NEWS
+}
diff --git a/net-irc/irssi/metadata.xml b/net-irc/irssi/metadata.xml
new file mode 100644
index 000000000000..0b6cb4557135
--- /dev/null
+++ b/net-irc/irssi/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>swegener@gentoo.org</email>
+		<name>Sven Wegener</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<use>
+		<flag name="proxy">Adds support for a loadable IRC proxy module</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">irssi/irssi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/irssistats/Manifest b/net-irc/irssistats/Manifest
new file mode 100644
index 000000000000..4e9d6424a2b0
--- /dev/null
+++ b/net-irc/irssistats/Manifest
@@ -0,0 +1,5 @@
+DIST irssistats-0.75.tar.gz 54434 SHA256 7aabbdb55158299997f82a39f1b403339a4ad74b4679030f317a27042d87eb90 SHA512 d7ac167d64c850f3803e6192f1fbf98e13cf296902b92bc3c5847f5f97a678938e7bff41b3195d2845c5ddb92f0557fea1b3a82b61d18b6a307b94ceae1c62f6 WHIRLPOOL 3921e62485408bf3e32fa5b6b9dd4ee66132cc21606821c703f0984984043b6222ff258ac38b5027afb95957f3072a8d520ea25553a43bfa65a4ab26c341eace
+EBUILD irssistats-0.75.ebuild 614 SHA256 d9c88250b5d2a78627d777c031c3f27f74a503557f59421f19bfc91de45631f2 SHA512 aba0b898ec4b8e5c9310b2eb952d772dd6110678b8b11f60297a7ade888a61819222732cf873bcbe03ed02cd8d7f60a841d758138f436de1308cda0ea4225947 WHIRLPOOL 4211c12e624c089e4df6279508a8b26aef439bef9d608e0da3351236d131e6e44bd0fc21829e7014599474c26e6a9d9b3bc7165c23332345601936c4b8af87c2
+MISC ChangeLog 2631 SHA256 3d7de9036660045d24f4c9bdadf93a5d97117682f1a8094e0c95bdc1171016ac SHA512 6ef46dd86639aa5b75fe01f7f46f223e006fc57599b33018131a94f053b76693d6404f5f326386419766a78974024669319f210ac953468872eb805fbf7b95cc WHIRLPOOL af3a3ea2459ce83ec520cec12110957b3fb79dad4c1c950cf5a58b5b93041a003b27427ee7088e47038cb61c07cfa451ac57f1816da77407b22ac7412c34b54a
+MISC ChangeLog-2015 2718 SHA256 1d8452145d9f2dc1e615647d6cf823def1e587d7a52864e904d3b83539a7531d SHA512 de78211bca61c373cecb44fc6ef5f807eadae87ff725cb474e300dfc0eede95afef71c625956728f5202b7acc0c8b6e7b0f8bdcdeb46a80f1e76ba140546772f WHIRLPOOL 0221e048240ea80a153be951d46230801ba2097821de2dd09ee4a2deaf2d5abd0af004ede149a96b52a6293a61c67178f35615a62b7ad921087927b63a445f99
+MISC metadata.xml 247 SHA256 e06c317c09e8b7e2ff279f0637875c0bb80f093451cbdf59f8921791a65d6703 SHA512 6b67bcfd1c47571c43f484d58c9132df98bb173dc939307124e0bacf8178a281d404b903954a5d23761a54b07123b0c0a83f999fa3cd578dcac141a5a6df661c WHIRLPOOL 6b4e791b4ff83c6c78e3156a5a3a0b6986eb608b095007af785e4ae0f0987cdff2b99632f12c05acc41ad42fa4af92e09d21b60ebdc39c81fe8406e1fe6a47d8
diff --git a/net-irc/irssistats/irssistats-0.75.ebuild b/net-irc/irssistats/irssistats-0.75.ebuild
new file mode 100644
index 000000000000..83a10ff8894c
--- /dev/null
+++ b/net-irc/irssistats/irssistats-0.75.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates HTML IRC stats based on irssi logs"
+HOMEPAGE="http://royale.zerezo.com/irssistats/"
+SRC_URI="http://royale.zerezo.com/irssistats/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	$(tc-getCC) -o irssistats ${CFLAGS} ${LDFLAGS} irssistats.c || die "compile failed"
+}
+
+src_install() {
+	emake \
+		PRE="${D}"/usr \
+		DOC="${D}"/usr/share/doc/${PF} \
+		install \
+		|| die "make install failed"
+}
diff --git a/net-irc/irssistats/metadata.xml b/net-irc/irssistats/metadata.xml
new file mode 100644
index 000000000000..4c8a12b5bc36
--- /dev/null
+++ b/net-irc/irssistats/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>monsieurp@gentoo.org</email>
+	<name>Patrice Clement</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-irc/jircii/Manifest b/net-irc/jircii/Manifest
new file mode 100644
index 000000000000..61464998a127
--- /dev/null
+++ b/net-irc/jircii/Manifest
@@ -0,0 +1,5 @@
+DIST jerkb41.tgz 1140707 SHA256 fa6d193eb967da97268de031e9a236e709789a98f706e204fb3eeb3fa18769dc SHA512 e10fe685c2d507e2590fd69dc9309c9dfebf2c82a04941a799ed03114d9ecbc86a73ebf418caa36235e0ad7804e5e1224d1be684d7915fec61e0078cf727bd3a WHIRLPOOL 3ef2daa831d13b88c5274c000e1983ba07190c82d5ee5c051934d6a96e8c8a37a5fcc91e85bcc80d5b7e9cfaf40f5c0003b21a8ba8b8ab3c466e727182ffb3cb
+EBUILD jircii-41.ebuild 657 SHA256 6a8aa690c4e451c8ab68180da008c5db775197af4ca8807f3b882fdec60fb3b0 SHA512 010d43ed3325ef0fd412aced2bec32822b3b0a62ca3ede4c88f4f9d6f4877e10d5aaceed317e35199898a300224a51ae29492a51056f37fff9baf2101e5ba6a8 WHIRLPOOL 4807e394743dbcba0be57aa71a0195936d0116e31c1b1d87c371d3f703b23784a5daed849008de66aa1422fe92999c72bc9968dc3060c9d741b927681c88eb55
+MISC ChangeLog 2580 SHA256 5857d1ccc7b76f61b38f3edc49033738d19becff4f53c369ef2f904370e93982 SHA512 0c4b685fbe5ddc9899557a716ced214fe048998a8866e2e22ade8046a4bf841544757bf393cbb4f9b63d945dc8e27ef9e999c8505a77375fce8bbcbf8b915ca5 WHIRLPOOL 57e6bdf59e675266d3298f75518b9989961481acfbf753852c7cd571ac6b579f01b8a626ebb9d254aba2251991d805f5162f6be376a09ef43efec51e068dac1d
+MISC ChangeLog-2015 4284 SHA256 a2e67e9812eb49e0f891d3371439bfa865922de94781d692902bf07864f84bb9 SHA512 449a7b13bf6390e5b6f7d696141afe83b881854d048dd7441d94f408fbf47edc159f7f19cdac4a36d7b5b03027d3764c2512eb4346354683b07f54594e3b8853 WHIRLPOOL 4769f200e0a650b867d96c323ffef952f6072402a3bfad6dafb8fea9e1becc5472512cc89ccadf34ec530d918027e6cb57e4eb668ba3912b917e22245c22a2f6
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/jircii/jircii-41.ebuild b/net-irc/jircii/jircii-41.ebuild
new file mode 100644
index 000000000000..34c8eeb45a18
--- /dev/null
+++ b/net-irc/jircii/jircii-41.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit java-pkg-2
+
+DESCRIPTION="jIRCii - IRC client written in Java"
+HOMEPAGE="http://jirc.hick.org/"
+SRC_URI="http://jirc.hick.org/download/jerkb${PV}.tgz"
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=""
+
+S="${WORKDIR}"/jIRCii
+
+src_compile() {
+	true
+}
+
+src_install() {
+	java-pkg_dojar jerk.jar || die "java-pkg_dojar failed"
+	java-pkg_dolauncher jircii --jar "${JAVA_PKG_JARDEST}"/jerk.jar || die "java-pkg_dolauncher"
+
+	dodoc readme.txt whatsnew.txt docs/*.pdf extra/*.irc || die "dodoc failed"
+}
diff --git a/net-irc/jircii/metadata.xml b/net-irc/jircii/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/jircii/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
new file mode 100644
index 000000000000..c109d2417d0f
--- /dev/null
+++ b/net-irc/konversation/Manifest
@@ -0,0 +1,6 @@
+AUX konversationrc 350 SHA256 923ac0ab58c466d8d1cace175d8d75abb8e44f241cc97ae570981696900c891d SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731 WHIRLPOOL 95f2f5760a2aa1bd895d9bc3097f687f2b4a0f07889a99c0ef9d8efd1d731bb5e2b615c3e1c57736c57aa02a3c98644894c370c995596edab0347e432ccf59aa
+DIST konversation-1.7.2.tar.xz 3736968 SHA256 5ff96e84cee4e1eefc404a31d778067ea50dddd8a6c848911fac70bd52812618 SHA512 91523043afd7d7698c8166256d3eba225d8ff1ba44cad6811b00bf0004b765ce1ed618e900c8cafa7b395217b3fa3703db62a79b0a491bcef6c0bb65037add06 WHIRLPOOL 842fac84013a6915b5acad2c7ee8abab794c01722628fb4cbd7a3c462229fadf1c88b340fd094efadb1ac62e2c1838de80a26114bff0c98064c9f57e87974860
+EBUILD konversation-1.7.2.ebuild 1757 SHA256 9d3d02a35e7edcc3e6319ac33ea25d0934da92158e668aedbc0cfaa0171da03a SHA512 6108c9c797e413c44bca4a3a570c820fa0184c6d7ade4c0f79671cb58ba164fd84e32a3e65ed98d8259c79827c3e5a71f25c2a50ce1dc7b68cbb6be408447d69 WHIRLPOOL 601ffafa0ff6b8b4c4f6ff41a12c0277a341256880300a8edddf49046dbaf426ab61e2a352474465d82cbe4b2e1a29804fbad48578c0f5ba71fb78862984bd4a
+MISC ChangeLog 4424 SHA256 e7ce43917d507178eaa7b6f54ae86a52dff3c72adc635ecdcdcfbee86e3bce47 SHA512 201c65a4c61acba62885494509e1128bbed73d9c1baf2223209e528e0c1b5fcb6af446f71a305e24cce28d04bd6e1f7d95e03fd766f503ea399403298c0a1659 WHIRLPOOL 994fe6050e59ca77df8c1809d5db924539aee3fce76cdaf58a8dc8f1d39803b0b6ef7e6ff448a050bc34220e4c01695b7bd0e99d44438a8b11c521b98c9c4631
+MISC ChangeLog-2015 18031 SHA256 cee214b9f81a6331f35fe326694e8741ae9457fa49ac0c525122249ad391d605 SHA512 84acb3f03ede0561e4e7805d1d9e213c290685d97c13806601e24d9a8af64b0584dfc295e2c2fd2563491d2b21d006b6a7b4597d97bc8f42a9a794a4829e7c45 WHIRLPOOL 564aec04b0df354d10486972291e4df257aeb68a9d76b4f828fa71ab3580645ee33937f7e374d79b69f09bebf8621b928a9b9abf6dd746c26a0d587cc9bcc9c6
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/net-irc/konversation/files/konversationrc b/net-irc/konversation/files/konversationrc
new file mode 100644
index 000000000000..932374b6bf45
--- /dev/null
+++ b/net-irc/konversation/files/konversationrc
@@ -0,0 +1,24 @@
+[Channel 0]
+Name=#gentoo
+
+[Channel 1]
+Name=#gentoo-desktop
+
+[Channel 2]
+Name=#gentoo-kde
+
+[Channel 3]
+Name=#gentoo-xfce
+
+[Server 0]
+Port=8001
+SSLEnabled=false
+Server=chat.freenode.net
+
+[ServerGroup 0]
+AutoConnect=false
+AutoJoinChannels=Channel 0,Channel 1,Channel 2,Channel 3
+EnableNotifications=true
+Expanded=false
+Name=Freenode
+ServerList=Server 0
diff --git a/net-irc/konversation/konversation-1.7.2.ebuild b/net-irc/konversation/konversation-1.7.2.ebuild
new file mode 100644
index 000000000000..bedb2f5c384a
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="A user friendly IRC Client"
+HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org"
+SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="+crypt"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kemoticons)
+	$(add_frameworks_dep kglobalaccel)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kidletime)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5(+)]
+	sys-devel/gettext
+	crypt? ( app-crypt/qca:2[qt5] )
+"
+RDEPEND="${DEPEND}
+	!net-irc/konversation:4
+	crypt? ( app-crypt/qca:2[ssl] )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+
+	# Bug 616162
+	insinto /etc/xdg
+	doins "${FILESDIR}"/konversationrc
+}
diff --git a/net-irc/konversation/metadata.xml b/net-irc/konversation/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/net-irc/konversation/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
new file mode 100644
index 000000000000..bcbe54546406
--- /dev/null
+++ b/net-irc/kvirc/Manifest
@@ -0,0 +1,8 @@
+DIST kvirc-5.0_pre20170801214745.tar.gz 6024368 SHA256 ed47c63930be5a9f1f3dd8804fa68d6b22e4119bdbbfd2328450b7842b765beb SHA512 a662faf3cdb593b7576aca4957ea225240b5732cd2544952b8bfe3b46c6e9671a0357f2de778a15119b6ba0201fe3356ca2c7e8e81487e40651e139a55ed485c WHIRLPOOL 1090caf0ce9624aed0853c62643bff14054df15c0eeabe0242164bba697d5001e63c7ea77492a79799f88414f4a39bbeada676e8c1479d56e61d79bce519ae23
+DIST kvirc-5.0_pre20171001143427.tar.gz 6035319 SHA256 fdb00940319840cae266a8ca16f2814a937220ae37b8c354405393a80fd0d370 SHA512 ccf9b032737ce24cc98c23f3e1363b7ad874452837805b9a240dfd0d5e067da556dcd6003398f3cb2826f144656540592189e7f88d68608d6fbb2e8294535640 WHIRLPOOL 1bf28d9714d03d53a5e7f5881ef25e0ebfdda37bdc498c74291a867e9e03ed3cd97db649833c1dcbf8ac31af1cc8527a8a9471388f9936d5558e62ca2ab374cf
+EBUILD kvirc-5.0_pre20170801214745.ebuild 3846 SHA256 037813ba420482c00f8c531c1ff8471721674375b71240c45345f51a41f76193 SHA512 aea5f1a90da4462a068683a0da2ab7127676cda31ca9930d146d033bb4cb3bb94152ed6f0320bd39bf0e838ac13fa0187cc32a23839f5b382cdb765077f08331 WHIRLPOOL 46bf389313800d8d054e0b469edb253b758ff8f54e04da09bbecc4f04980fdf41193c91e3af89a4a29013739bd80905fbca72d33f5aff9e4b5550a1efd3dc156
+EBUILD kvirc-5.0_pre20171001143427.ebuild 3848 SHA256 46a98d9864c27473bc7102b7adffc7d73b947596b8c62c3fcb644773d36bcbb2 SHA512 13c415a56592b0ad4bb36448c4330477590681e755da7589bf8f087cd0f282d86950cc1bfc6a4432533ae2f903a8050517ef12386ba5498eb1ccd1c3bb5d7236 WHIRLPOOL 1e42ab029b551cb59722c574397bdc98762ba71884d2c8e43121ad5c824e5b6d18f38204abee3588a78138f241ec6b3a98dd93197b9ad8283e845a1a7c0f88bb
+EBUILD kvirc-9999.ebuild 3785 SHA256 fc6860b7343a41e83a284b7a8283bc217fabaa654e08b63174eed90a2f23252e SHA512 c867319c4d13c8a88a6fb1eb9076340542372e763441bcef5c3ac4f99a77b8c786eac38b5b91c2667322fbf6e923e545ad29373cd783f7a148e1f05d6ea5aa0b WHIRLPOOL 1daf5913434a68c5e4a9ba7ef2e2d4866aff614ae452c3dcc329ab65e6da26bfc5b99454d9ed78eb7aafe5eda5974f37e75c5c8737cc84da3b8a365c5c63df83
+MISC ChangeLog 6269 SHA256 33e0ff7d17095245561b09576525e2b4531303f792c4bea6e7fc193c56bba8f9 SHA512 e3ed624d9bbc4b4c72c96600061c8f596e937e8a242c54ff3902239473f5c99d59bd67f108575fc336376e9f33c9c9f2f7f9f414a6efd8429911f525361794df WHIRLPOOL e2ebeace3a35f00931039cb9130852cc0666b7a915d8730805c2eb74619e9cb80351f1aa6f2f57d1803d63dad387ef520758b441b71a21bcf018ee11e28e425c
+MISC ChangeLog-2015 23441 SHA256 85389751e734123240b9102adc923c470898bc704800f9c1793684bb73775721 SHA512 3161cc1aaa00d078c85d9d16a9cd74fdd6bfced25864a43197cc1b0cd5f101a882dcad20502465735c7602cc362803a364ea022ba5b95d25a9e31108af98703f WHIRLPOOL 19e3129e366cfb571f57a9385ea6bb8d013a2c7ce70b3f9255df8cd2b2bf84f8604e541e03af308a407f1615dc355b320a5bf9dc64cd02250368b21739e9e7f5
+MISC metadata.xml 618 SHA256 49bb084dd00fd82452727c2eeb8a3704333efbf05796d1f5d7d658f37fcb5027 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae WHIRLPOOL 1a1accf48cd310e66bd36b2c2ddc7189083240b55205991d25639e2c15145df130f59daedb8c97cf309da20d5d078d24c3b39e573fbdfcef278c9c48e1f1e22e
diff --git a/net-irc/kvirc/kvirc-5.0_pre20170801214745.ebuild b/net-irc/kvirc/kvirc-5.0_pre20170801214745.ebuild
new file mode 100644
index 000000000000..b7ca953b5f8e
--- /dev/null
+++ b/net-irc/kvirc/kvirc-5.0_pre20170801214745.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+inherit cmake-utils flag-o-matic gnome2-utils multilib python-single-r1 xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE=""
+else
+	inherit vcs-snapshot
+
+	KVIRC_GIT_REVISION="aa9a7c70cc4064e5ed97c7a6d21fa010f7292680"
+	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
+	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
+fi
+
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="kvirc"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	sys-libs/zlib:0=
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	audiofile? ( media-libs/audiofile )
+	dbus? ( dev-qt/qtdbus:5 )
+	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
+	kde? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/kservice:5
+		kde-frameworks/kwindowsystem:5
+		kde-frameworks/kxmlgui:5
+	)
+	perl? ( dev-lang/perl:0= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant:0= )
+	ssl? ( dev-libs/openssl:0= )
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis
+	)
+	webkit? ( dev-qt/qtwebkit:5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	gsm? ( media-sound/gsm )"
+
+DOCS=(ChangeLog doc/FAQ)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ "${PV}" == "9999" ]]; then
+		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
+		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	fi
+	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
+	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		-DWANT_ENV_FLAGS=yes
+		-DWANT_VERBOSE=yes
+
+		-DWANT_CRYPT=yes
+		-DWANT_DCC_VOICE=yes
+		-DWANT_IPC=yes
+		-DWANT_IPV6=yes
+		-DWANT_TRANSPARENCY=yes
+
+		-DWANT_AUDIOFILE=$(usex audiofile)
+		-DWANT_DCC_VIDEO=$(usex dcc_video)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_DOXYGEN=$(usex doc)
+		-DWANT_GETTEXT=$(usex nls)
+		-DWANT_GSM=$(usex gsm)
+		-DWANT_KDE=$(usex kde)
+		-DWANT_MEMORY_PROFILE=$(usex profile)
+		-DWANT_OGG_THEORA=$(usex theora)
+		-DWANT_OPENSSL=$(usex ssl)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PERL=$(usex perl)
+		-DWANT_PHONON=$(usex phonon)
+		-DWANT_PYTHON=$(usex python)
+		-DWANT_QTDBUS=$(usex dbus)
+		-DWANT_QTWEBKIT=$(usex webkit)
+		-DWANT_SPELLCHECKER=$(usex spell)
+
+		# COMPILE_SVG_SUPPORT not used in source code.
+		-DWANT_QTSVG=no
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-irc/kvirc/kvirc-5.0_pre20171001143427.ebuild b/net-irc/kvirc/kvirc-5.0_pre20171001143427.ebuild
new file mode 100644
index 000000000000..a55bfa4996d1
--- /dev/null
+++ b/net-irc/kvirc/kvirc-5.0_pre20171001143427.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+inherit cmake-utils flag-o-matic gnome2-utils multilib python-single-r1 xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE=""
+else
+	inherit vcs-snapshot
+
+	KVIRC_GIT_REVISION="150eeeab99ce7f340bf17e337b7ef1357ba375ad"
+	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
+	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
+fi
+
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="kvirc"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	sys-libs/zlib:0=
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	audiofile? ( media-libs/audiofile )
+	dbus? ( dev-qt/qtdbus:5 )
+	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
+	kde? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/kservice:5
+		kde-frameworks/kwindowsystem:5
+		kde-frameworks/kxmlgui:5
+	)
+	perl? ( dev-lang/perl:0= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant:0= )
+	ssl? ( dev-libs/openssl:0= )
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis
+	)
+	webkit? ( dev-qt/qtwebkit:5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	gsm? ( media-sound/gsm )"
+
+DOCS=(ChangeLog doc/FAQ)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ "${PV}" == "9999" ]]; then
+		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
+		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	fi
+	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
+	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		-DWANT_ENV_FLAGS=yes
+		-DWANT_VERBOSE=yes
+
+		-DWANT_CRYPT=yes
+		-DWANT_DCC_VOICE=yes
+		-DWANT_IPC=yes
+		-DWANT_IPV6=yes
+		-DWANT_TRANSPARENCY=yes
+
+		-DWANT_AUDIOFILE=$(usex audiofile)
+		-DWANT_DCC_VIDEO=$(usex dcc_video)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_DOXYGEN=$(usex doc)
+		-DWANT_GETTEXT=$(usex nls)
+		-DWANT_GSM=$(usex gsm)
+		-DWANT_KDE=$(usex kde)
+		-DWANT_MEMORY_PROFILE=$(usex profile)
+		-DWANT_OGG_THEORA=$(usex theora)
+		-DWANT_OPENSSL=$(usex ssl)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PERL=$(usex perl)
+		-DWANT_PHONON=$(usex phonon)
+		-DWANT_PYTHON=$(usex python)
+		-DWANT_QTDBUS=$(usex dbus)
+		-DWANT_QTWEBKIT=$(usex webkit)
+		-DWANT_SPELLCHECKER=$(usex spell)
+
+		# COMPILE_SVG_SUPPORT not used in source code.
+		-DWANT_QTSVG=no
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
new file mode 100644
index 000000000000..f6b1cfac9a9c
--- /dev/null
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=(python2_7)
+
+inherit cmake-utils flag-o-matic gnome2-utils multilib python-single-r1 xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE=""
+else
+	inherit vcs-snapshot
+
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
+	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
+fi
+
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="kvirc"
+SLOT="0"
+KEYWORDS=""
+IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	sys-libs/zlib:0=
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	audiofile? ( media-libs/audiofile )
+	dbus? ( dev-qt/qtdbus:5 )
+	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
+	kde? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/kservice:5
+		kde-frameworks/kwindowsystem:5
+		kde-frameworks/kxmlgui:5
+	)
+	perl? ( dev-lang/perl:0= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant:0= )
+	ssl? ( dev-libs/openssl:0= )
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis
+	)
+	webkit? ( dev-qt/qtwebkit:5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	gsm? ( media-sound/gsm )"
+
+DOCS=(ChangeLog doc/FAQ)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ "${PV}" == "9999" ]]; then
+		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
+		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	fi
+	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
+	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		-DWANT_ENV_FLAGS=yes
+		-DWANT_VERBOSE=yes
+
+		-DWANT_CRYPT=yes
+		-DWANT_DCC_VOICE=yes
+		-DWANT_IPC=yes
+		-DWANT_IPV6=yes
+		-DWANT_TRANSPARENCY=yes
+
+		-DWANT_AUDIOFILE=$(usex audiofile)
+		-DWANT_DCC_VIDEO=$(usex dcc_video)
+		-DWANT_DEBUG=$(usex debug)
+		-DWANT_DOXYGEN=$(usex doc)
+		-DWANT_GETTEXT=$(usex nls)
+		-DWANT_GSM=$(usex gsm)
+		-DWANT_KDE=$(usex kde)
+		-DWANT_MEMORY_PROFILE=$(usex profile)
+		-DWANT_OGG_THEORA=$(usex theora)
+		-DWANT_OPENSSL=$(usex ssl)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PERL=$(usex perl)
+		-DWANT_PHONON=$(usex phonon)
+		-DWANT_PYTHON=$(usex python)
+		-DWANT_QTDBUS=$(usex dbus)
+		-DWANT_QTWEBKIT=$(usex webkit)
+		-DWANT_SPELLCHECKER=$(usex spell)
+
+		# COMPILE_SVG_SUPPORT not used in source code.
+		-DWANT_QTSVG=no
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
new file mode 100644
index 000000000000..0bd31948cd6d
--- /dev/null
+++ b/net-irc/kvirc/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>arfrever.fta@gmail.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="dcc_video">Support video connections over DCC protocol</flag>
+		<flag name="phonon">Support Phonon for audio output</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">kvirc/KVIrc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
new file mode 100644
index 000000000000..a3fcc31954d6
--- /dev/null
+++ b/net-irc/limnoria/Manifest
@@ -0,0 +1,8 @@
+DIST limnoria-20150523.tar.gz 937583 SHA256 16d7e9ccfddfb67eca616997be938b268347be7b17ccc43d38aea6b48bb3cd0e SHA512 d94ea8fe64a648605e8e45317f3283fac837e8bfe1465407fa7522ea5e2259c64a0ea3aa4585313b5c21def735fa7b0e62d7774fabfc2647683efc2f4c38d599 WHIRLPOOL 40baeebf15051a5bc36a39645f984ba9aa4710e8da08cf53bb69e330b3ba6a62c40317919ba5a7ea0e3841187e89087054f1072862d512dff9443e812d4728b8
+DIST limnoria-20150829.tar.gz 939733 SHA256 b86ca1cb24b6f54c9e892a978c1afad1df17cb9308883764f6cc7381e2d124dc SHA512 51c941adf596716a610f6233a606958eae39fb90ad2ab02fcde670596c174b99196da7d29d31c438db0eeb79bd2d8c1067fdf21f0e6e42ba25a80cd5249b89a2 WHIRLPOOL 118f532c2ec4c9b75a7194bc2ea65e9aa707601276fbb3abf7066f5e96d297a7454fb0d477aa9e595d9dadb4750f00a549e78f5408a15a3c264526a8b83dd507
+EBUILD limnoria-20150523.ebuild 2627 SHA256 87a7c250f772e9a855fcc29c16e1d9eab724b5de0381da108fde134bf46ba628 SHA512 3240cd36ff12d0222dae15945970c07103494b2d874df34b64b72850dc2657ca5272046c4da67f4c5cbe32bad564052aae4c568dfbd7f499d37be8110eedb4e3 WHIRLPOOL 4717e07ceb6fb816d426221f7d56b2e93e2cd68540f7303b83b1a1b672661225941c85fce036b8efb218ce90bd2ed1ead7ac6be48bdbb965fbc911af59cca666
+EBUILD limnoria-20150829.ebuild 2631 SHA256 f178bd4280ff78578cb8c0435041ee10fdc00aa9d2b16a636b91a29629a1270e SHA512 75c82036fa8488f5c2f63f193bddc73b970530601ac5d572ae41efc2e20a63dc13e3424fdd7b4d32832dd40c357cecf360e65a69c1fc76b4f2c1c971a119ee4f WHIRLPOOL 28a188718fa42439e4e7951ecc5826653193c667ea291966e04866656b5b2b5331bc76770fd274313f3adfca339352509d78f2947cebc428906e692c3faf5c77
+EBUILD limnoria-99999999.ebuild 2631 SHA256 f178bd4280ff78578cb8c0435041ee10fdc00aa9d2b16a636b91a29629a1270e SHA512 75c82036fa8488f5c2f63f193bddc73b970530601ac5d572ae41efc2e20a63dc13e3424fdd7b4d32832dd40c357cecf360e65a69c1fc76b4f2c1c971a119ee4f WHIRLPOOL 28a188718fa42439e4e7951ecc5826653193c667ea291966e04866656b5b2b5331bc76770fd274313f3adfca339352509d78f2947cebc428906e692c3faf5c77
+MISC ChangeLog 2923 SHA256 fdc4c196462aa34d7344bc84f3bc6727991439eaec511f02e907929cd2958697 SHA512 443e37b8b29bd177b11ac6d8567757b591bd4db37c94f916076710a47701eda6bca66973dbd191a023ac310222a30a218dd12d8eeafa88170b1ef3f4ec37e928 WHIRLPOOL 5d96c85e203423e874e9a31e87c2ae2b86c8346ea4d28b9c36d79553decf9bcaf4f47d2b300df0ebc54e020eb29f30717bef110ba1468ea9d0f7ba3708a8ab5b
+MISC ChangeLog-2015 1505 SHA256 deb0c5d528ee4d5bdef0cf6edb38aa5760435c33ba2025f6c130f8a1eecd29e2 SHA512 3baafb869eac12f72acd69cd3c69eb7bf3e80cf1c274a76919b359a4b74fc3a3428cf09790ab2b2ff9d20c8d267cd54099237c27499dd9b0842223ad0aec0de4 WHIRLPOOL 592ef387efa193caa9b6660c43ac8fd10aeb2bcb01074631bc57c735cf1b8c789299f53755ae8be837ce2049d74e84a9c93510579964bf776a697341fe905e68
+MISC metadata.xml 408 SHA256 acd1fd34c43b52dbcaa04f64a5b2478a358912d490fc3e0add5877f3ddbb5b7f SHA512 6be6681e4b0f8555cd0e769937580068315acae5b1d1c722c354748b8c0a16c0146950b716a1b7b46f0230623580b2576f53c757b13125577698f458f824732e WHIRLPOOL ca24af7cd365a608c63355223fb3396d0921009ce8c9ad374b650e6d30504856bbf204d511fd0d7170940f1d40128fda9d3615bef0340e6f6bd4e0e730c54288
diff --git a/net-irc/limnoria/limnoria-20150523.ebuild b/net-irc/limnoria/limnoria-20150523.ebuild
new file mode 100644
index 000000000000..3077cf78f228
--- /dev/null
+++ b/net-irc/limnoria/limnoria-20150523.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+MY_PN="Limnoria"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${PV} == "99999999" ]]; then
+	EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git"
+	EGIT_BRANCH="testing"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
+fi
+
+DESCRIPTION="Python based extensible IRC infobot and channel bot"
+HOMEPAGE="https://supybot.aperio.fr/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="crypt ssl test"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	!net-irc/supybot
+	!net-irc/supybot-plugins
+	"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+python_prepare(){
+	distutils-r1_python_prepare
+	if python_is_python3; then
+		einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
+		einfo "bindings and feedparser."
+		rm -rf "plugins/RSS" || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/*
+}
+
+python_test() {
+	pushd "${T}" > /dev/null
+	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
+	# recommended by upstream, unknown random failure
+	EXCLUDE_PLUGINS=( --exclude="${PLUGINS_DIR}/Scheduler" )
+	# recommended by upstream, unknown random failure
+	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Filter" )
+	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
+	# runs successfully when running the tests on the installed system
+	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
+	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
+		--plugins-dir="${PLUGINS_DIR}" --no-network \
+		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
+		|| die "Tests failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/"
+	elog ""
+	elog "Use supybot-wizard to create a configuration file."
+	elog "Run supybot </path/to/config> to use the bot."
+}
diff --git a/net-irc/limnoria/limnoria-20150829.ebuild b/net-irc/limnoria/limnoria-20150829.ebuild
new file mode 100644
index 000000000000..0280102ac95c
--- /dev/null
+++ b/net-irc/limnoria/limnoria-20150829.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+MY_PN="Limnoria"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${PV} == "99999999" ]]; then
+	EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git"
+	EGIT_BRANCH="testing"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
+fi
+
+DESCRIPTION="Python based extensible IRC infobot and channel bot"
+HOMEPAGE="https://supybot.aperio.fr/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="crypt ssl test"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	!net-irc/supybot
+	!net-irc/supybot-plugins
+	"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+python_prepare(){
+	distutils-r1_python_prepare
+	if python_is_python3; then
+		einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
+		einfo "bindings and feedparser."
+		rm -rf "plugins/RSS" || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/*
+}
+
+python_test() {
+	pushd "${T}" > /dev/null
+	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
+	# recommended by upstream, unknown random failure
+	EXCLUDE_PLUGINS=( --exclude="${PLUGINS_DIR}/Scheduler" )
+	# recommended by upstream, unknown random failure
+	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Filter" )
+	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
+	# runs successfully when running the tests on the installed system
+	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
+	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
+		--plugins-dir="${PLUGINS_DIR}" --no-network \
+		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
+		|| die "Tests failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/"
+	elog ""
+	elog "Use supybot-wizard to create a configuration file."
+	elog "Run supybot </path/to/config> to use the bot."
+}
diff --git a/net-irc/limnoria/limnoria-99999999.ebuild b/net-irc/limnoria/limnoria-99999999.ebuild
new file mode 100644
index 000000000000..0280102ac95c
--- /dev/null
+++ b/net-irc/limnoria/limnoria-99999999.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
+MY_PN="Limnoria"
+MY_P="${MY_PN}-${MY_PV}"
+
+if [[ ${PV} == "99999999" ]]; then
+	EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git"
+	EGIT_BRANCH="testing"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
+fi
+
+DESCRIPTION="Python based extensible IRC infobot and channel bot"
+HOMEPAGE="https://supybot.aperio.fr/"
+LICENSE="BSD"
+SLOT="0"
+IUSE="crypt ssl test"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	!net-irc/supybot
+	!net-irc/supybot-plugins
+	"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+src_unpack() {
+	if [[ ${PV} == "99999999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+python_prepare(){
+	distutils-r1_python_prepare
+	if python_is_python3; then
+		einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
+		einfo "bindings and feedparser."
+		rm -rf "plugins/RSS" || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/*
+}
+
+python_test() {
+	pushd "${T}" > /dev/null
+	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
+	# recommended by upstream, unknown random failure
+	EXCLUDE_PLUGINS=( --exclude="${PLUGINS_DIR}/Scheduler" )
+	# recommended by upstream, unknown random failure
+	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Filter" )
+	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
+	# runs successfully when running the tests on the installed system
+	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
+	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
+		--plugins-dir="${PLUGINS_DIR}" --no-network \
+		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
+		|| die "Tests failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/"
+	elog ""
+	elog "Use supybot-wizard to create a configuration file."
+	elog "Run supybot </path/to/config> to use the bot."
+}
diff --git a/net-irc/limnoria/metadata.xml b/net-irc/limnoria/metadata.xml
new file mode 100644
index 000000000000..7d0ba75439c3
--- /dev/null
+++ b/net-irc/limnoria/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>NP-Hardass@gentoo.org</email>
+		<name>NP-Hardass</name>
+	</maintainer>
+	<use>
+		<flag name="crypt">Enables user authentication with GPG</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ProgVal/Limnoria</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/metadata.xml b/net-irc/metadata.xml
new file mode 100644
index 000000000000..29c5171b1496
--- /dev/null
+++ b/net-irc/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The net-irc category contains IRC (Internet Relay Chat) clients and
+		servers.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-irc enthält Clients und Server für den Internet
+		Relay Chat (IRC).
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-irc contiene clientes y servidores IRC.
+	</longdescription>
+	<longdescription lang="ja">
+		net-ircカテゴリーにはインターネット・リレー・チャットの
+		クライアントとサーバーが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-irc categorie bevat clients &amp; servers voor IRC (Internet Relay Chat).
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória net-irc obsahuje klientské a serverové programy pre IRC (Internet Relay Chat).
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-irc chứa các client và server IRC (Internet Relay Chat).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-irc contiene client e server per IRC (Internet Relay Chat).
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria net-irc contém clientes e servidores de IRC
+		(Internet Relay Chat).
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria net-irc zawiera klienty i serwery sieci IRC (Internet Relay Chat).
+	</longdescription>
+</catmetadata>
+
diff --git a/net-irc/miau/Manifest b/net-irc/miau/Manifest
new file mode 100644
index 000000000000..be478ba5ffd9
--- /dev/null
+++ b/net-irc/miau/Manifest
@@ -0,0 +1,5 @@
+DIST miau-0.6.6.tar.bz2 188284 SHA256 5409fd19748fe0eb98b9975270233878d02718538e9c3b438fe0b74d61465804 SHA512 0f61eae1a8c1ab60aee63b9cab482097381aa23218811e228f6bede0a73e194b4c34ac9add7d85c7160d74da25c840c1d356fb6afae31c10d90d7fc01de5e170 WHIRLPOOL 52d09103743db9f33c3f49d2daf8bb6aa3f45a69343c5bb193fdb3651e3c0ee191a9284d7b83b74d719625790fac2e051a669c1aedd4fcfcd66d1d2c570ebfe7
+EBUILD miau-0.6.6.ebuild 1713 SHA256 960124f90b294d85a7c7814710e860420999dfa01f2f3c03b278fde616601aeb SHA512 62e5b2373688de767bd74359b908ce753082b82e428dad060aa0fb938cca6d72e2a9bdc23b118b5a83b66cae07fbf763b953dc668cf4ae56f657aa1254449a83 WHIRLPOOL 58b5b2067d5c8b605b7c07173fdf716ab3f7f710956813f96a9c3aa543cbfd43b757ca5f08fb5b92487458b9027caf98092bfefa15af9a9ad1d7369bcd3d91f7
+MISC ChangeLog 2446 SHA256 d16bf45ecb3ff37f14592bddc4a27df720e0bb44cb89277031ca0db7b25bcb7f SHA512 f073b47f38a5af2c32eaec63fe04565e08da7f49dd6e5c9d61addb448f83d918925cbe0fc9157e8fb17431e36597f3bf78a320eb5e2c012c7280d289a6569cf3 WHIRLPOOL 125dbb167ae17847443c940755279ebaad0091e0f952e1b4df091872b30b1bcd7c4e5a9d52aa481a839eec2bf67f9eff136566639e1a33af249f65c3f6089dd5
+MISC ChangeLog-2015 2286 SHA256 f0ea90bdbe81e6aa78926b663486d935f8d731a629314d23b5623b985f97606e SHA512 fa9c6b7de586303deffa17b793c37f41cfe965ea4c5f1e660558a715794d231168a16c927a34b30f4cda9e67f94c33e0a8794c19b638b9825bb9545af352a2cb WHIRLPOOL b4962ac3015c06b249d230302504f9162a109981eae62997022aa2d7a815e618c7e3b21a775060b27d2e615ecfa8a3700f513b94f575fbec4ba4a095c269f65c
+MISC metadata.xml 241 SHA256 8f7eb5c25b3674ebc4b9189643464bf1996fdf642964aee11f2900f9cdb958d2 SHA512 1391533556b78e1e4be27e9ff6e5aefdcc7fcd024d04e426949d1fd6dca76abb6ec36b1ba06a850d5755945b31fdc2e76a823d290c2a9cd4d386feaf6820aa73 WHIRLPOOL d20cbf80f3c6f9c2e30ff7452043b00312651a19f483035d49c4dca3fd356d73cf81e694d0240d11132ecdab5986cb8c5d4989459c4c0cfa0d0d41f979891670
diff --git a/net-irc/miau/metadata.xml b/net-irc/miau/metadata.xml
new file mode 100644
index 000000000000..00c3cb76b553
--- /dev/null
+++ b/net-irc/miau/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">miau</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/miau/miau-0.6.6.ebuild b/net-irc/miau/miau-0.6.6.ebuild
new file mode 100644
index 000000000000..84cabb01c912
--- /dev/null
+++ b/net-irc/miau/miau-0.6.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="Persistent IRC bouncer with multi-client support - a fork of muh"
+HOMEPAGE="http://miau.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="debug ipv6"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	if use ipv6; then
+		echo
+		ewarn "Enabling the ipv6 useflag will disable ipv4 entirely. Press"
+		ewarn "Ctrl+C now if you don't want this."
+		echo
+		ebeep 5
+	fi
+}
+
+src_compile() {
+	# --disable-debug seems to actually enabled it, using if use rather than
+	# use_enable to get around it.
+	if use debug; then
+		myconf="--enable-debug"
+	fi
+	econf \
+		--enable-dccbounce \
+		--enable-automode \
+		--enable-releasenick \
+		--enable-ctcp-replies \
+		--enable-mkpasswd \
+		--enable-uptime \
+		--enable-chanlog \
+		--enable-privlog \
+		--enable-onconnect \
+		--enable-empty-awaymsg \
+		$(use_enable ipv6) \
+		${myconf} \
+		$(use_enable debug enduserdebug) \
+		$(use_enable debug pingstat) \
+		$(use_enable debug dumpstatus) \
+		|| die "econf failed."
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed."
+	dodoc AUTHORS ChangeLog TODO README || die "dodoc failed."
+
+	mv "${D}/usr/share/doc/miau/examples/miaurc" \
+		"${D}/usr/share/doc/${PF}/miaurc.sample"
+	rm -rf "${D}/usr/share/doc/miau"
+}
+
+pkg_postinst() {
+	echo
+	elog "You'll need to configure miau before running it."
+	elog "Put your config in ~/.miau/miaurc"
+	elog "You can use the sample config is in /usr/share/doc/${PF}/miaurc.sample"
+	elog "For more information, see the documentation."
+	echo
+}
diff --git a/net-irc/muh/Manifest b/net-irc/muh/Manifest
new file mode 100644
index 000000000000..0486763a8f7a
--- /dev/null
+++ b/net-irc/muh/Manifest
@@ -0,0 +1,6 @@
+DIST muh-2.2a.tar.gz 130672 SHA256 d5743f18edd3dbf044a7844f32ff5dbfcda696141a7d26d182bd4394b6823680 SHA512 2e3ba080f420cf063627d4d9b1f4001c76575efb1d3e99ff9c5eee4a483d5beda6e326f0c0d60c3d848b78cac092aac51a98cabc351760ccfa38fe1549c4b4ee WHIRLPOOL dec6f1079ccebca6ee3d3265ceb75f3bfda25d1dda53e811544ff79281568d3bc758f3aca713d8520624c3340693fbacd0bc69e034c2b27eb49d406141f7870e
+EBUILD muh-2.2a-r1.ebuild 743 SHA256 02c4453e91a320d251be8c9fad340deb3e41521ee4f77afe2e5d748b7c4fb4f4 SHA512 759bb74809ef27f11d62468c299a4770214592a5313e1f600742f303bfca8e4e922bd7fa0a24b8abbb577042666576ee8d326d46ee622d1879987af5755386fb WHIRLPOOL c690d765471dd9c615d03a5d52f48cb489dafad94dce1691a5db6cb003c71edf55e260800486907c5056fc4bf2e9bbc5394cc721177342466933a4172d923009
+EBUILD muh-2.2a.ebuild 790 SHA256 4cc83d29d70183c122559dc8d38d7b7bbfe3067bb02acb7f110db7a3cbf215e3 SHA512 0e8fbacf05c2fe058d0cf6b484eba62fe3e1d29bb53ad18e4085f36f00bc5551d706a0b2194d8ef3753a0f887e0786a4b73c479731428aba87cc66398fb01aee WHIRLPOOL 761f2748429495905705aaf9796c08ffd675aa67d7510f6de52bea3898ad1b939c34da8d9a23af67299091c4b2f4a3d78603e413448b4418302c623f5104940c
+MISC ChangeLog 2441 SHA256 1c614f502bb1d886ad6d7dbf889e39e84bfe7d495164f72e4a5f74875581f0df SHA512 9c6f001a48f58ffd5178b01d2327349d34285b9061284d2398a4465a3fe08c347a2295dd3f65951cffef377ed1c8514379af711d9da17423ba087c65c2701575 WHIRLPOOL 2d3536d62af5134b94966de5244cb49237af40ab66fa89b798f4651da412c7b27049a400f6acb3aa7096ce96e79dbfe705c0a772ce36960d8d23ccf38d9c3f1e
+MISC ChangeLog-2015 2300 SHA256 2e3d11c5333d45915b268d99fa9fdadfbab884059ea2e9a8ed8b44ba83a9616c SHA512 1cc3d01cbe44a8c76e2d17063f5ca55a7ce1f1160262d7a3b073d4d26c7fbc81767d34420bad5d23d66379ab68ea9f44ea935c665330c79f7511eadf81b9500f WHIRLPOOL 307a9655971dd178602fff91e9a027652111041e8b2e773d7715835492f72001350ff2055164cd9f74d4b8e3122c688569f95e1a16ebfe67809033e82c896af4
+MISC metadata.xml 312 SHA256 bd3163cb4eaa156af72356edd7ddfddbd4f9bcfd2e774c7bc0f0be23ca65879c SHA512 2f77f253666a974f580a98a89580870394b7e97488a21dbc80a0607842eff9c534ac061f9a66f8d8cbf576a7e0c366e0e307f35363fbe1c8b064590d02a4ec9c WHIRLPOOL 17b14515560e18fda96481006b9e99a1d27543875edc5b70bff9eb651d74d7e1bc2548b35ff6f5bcfb62d1f7ad044347476173d13302fcc948dee06eda70bed3
diff --git a/net-irc/muh/metadata.xml b/net-irc/muh/metadata.xml
new file mode 100644
index 000000000000..fbfe8acaee73
--- /dev/null
+++ b/net-irc/muh/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+    Persistent IRC bouncer.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">muh</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-irc/muh/muh-2.2a-r1.ebuild b/net-irc/muh/muh-2.2a-r1.ebuild
new file mode 100644
index 000000000000..c5c9dc85ad91
--- /dev/null
+++ b/net-irc/muh/muh-2.2a-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Persistent IRC bouncer"
+HOMEPAGE="http://mind.riot.org/muh/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="ipv6"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf --datadir=/usr/share/muh $(use_enable ipv6)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog TODO
+}
+
+pkg_postinst() {
+	elog
+	elog "You'll need to configure muh before running it."
+	elog "Put your config in ~/.muh/muhrc"
+	elog "A sample config is /usr/share/muh/muhrc"
+	elog "For more information, see the documentation."
+	elog
+}
diff --git a/net-irc/muh/muh-2.2a.ebuild b/net-irc/muh/muh-2.2a.ebuild
new file mode 100644
index 000000000000..8e6aff1cf710
--- /dev/null
+++ b/net-irc/muh/muh-2.2a.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Persistent IRC bouncer"
+HOMEPAGE="http://mind.riot.org/muh/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~hppa ~mips ppc ~sparc x86"
+IUSE="ipv6"
+
+DEPEND=""
+
+src_compile() {
+	econf --datadir=/usr/share/muh $(use_enable ipv6) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog TODO
+}
+
+pkg_postinst() {
+	elog
+	elog "You'll need to configure muh before running it."
+	elog "Put your config in ~/.muh/muhrc"
+	elog "A sample config is /usr/share/muh/muhrc"
+	elog "For more information, see the documentation."
+	elog
+}
diff --git a/net-irc/nebula/Manifest b/net-irc/nebula/Manifest
new file mode 100644
index 000000000000..0d5bd6064b05
--- /dev/null
+++ b/net-irc/nebula/Manifest
@@ -0,0 +1,5 @@
+DIST nebula-0.5.tar.gz 115950 SHA256 077f0ee97a578523df1d06a50586bc2dd8e5edde878db7c05f80521afa57a558 SHA512 ae97aae4e878b6a20343ac3b8be235367cbce990e2858a59220f477cd8f57b4aad28527454c6dca1f509675b4a48b5f8ace06c3f867b1e0458126f418911ef83 WHIRLPOOL b2e70a8cbfd0f8677ad7894d5bb9aa0df84e51295abddf7ecf04a69418b911a2a1491532b108937ccd58c87e843fa40be740b01c1893b546f9aa5dc44ff9900e
+EBUILD nebula-0.5.ebuild 408 SHA256 ec7ec24cb13d3475cd3ef21c514919b4fa1ac06acc8d56cc839d164dee242672 SHA512 41a5c70fc89158ef638c0a8bd8ab7650017d3c747ce0f1bfd88aa5fa111985b97c1ffe5f4d3445f908064cffdac3835cc1407c929a59a8dde8dfc196265de28b WHIRLPOOL 9f6f5cac27233564c60193ad322ac0b0ec92dc3c8668b8dbf0bcf06550ffc31d80220433c7150fcf6e323769d702ddc4282e62a63104c1baf1a6d2a2c88d3412
+MISC ChangeLog 2448 SHA256 7578631c9abc8726abe832e6db23dbd628d53f937a8931eb874e7680d2bdba86 SHA512 b1fe8c47fa19acdd828e35594c3cc6e1dcd5ece4255073c29a593a92447345de09df0338b17b3caa687d6707d10afad5db22f7056c85b2e6469a443e71586f94 WHIRLPOOL 6b3bcb581172b9bfa5517f425fc461f5b3fa07548368925227c32fa4bcb1430b735c0b3dfb2b8cd6051a84d92035c2b56b216994d6c7fec628144f9791812a11
+MISC ChangeLog-2015 1288 SHA256 d8d39d02249f4ad6f1b9aa621fc6a654955d1e90944a64e512e4f0cf69dac2bd SHA512 cfd6b99c67db24b9627dce22d24c502a59921489436ce9f44f47db6b62847878e72f13d5a31326fe438b586efc0369c52aea258c0854c9bd4f5be3fc71cd9302 WHIRLPOOL 5abb98494da23e898bf7b6f30c8d2f2f07a8232031f779a7448cb6e8083fdf41dd626babf2a9f856240eb3f4e30514031e2cd2159146ae8ecf09d08c41fcfa5c
+MISC metadata.xml 627 SHA256 384a42f0ae0ce5f94fb3611bd60eee442cddfea41e18c08bbbe8c94ffd02f6cd SHA512 ce422588d7c22186e53a7b120f5334301b15fed9508e9a81682c92f7298c03d91e66b062d7a18a1b28dffa27113cef99198f8664e3414fe86b9b90ad9e8289b3 WHIRLPOOL 8a47b2b9a7ddc19bd8f4a019a81e036f5a6fe1afc9e4b47ecfc4cc06fe742e402c177def159920675e864b986111c572c9a8a4b372f02fe59bb25edcf460e83d
diff --git a/net-irc/nebula/metadata.xml b/net-irc/nebula/metadata.xml
new file mode 100644
index 000000000000..93de494624ab
--- /dev/null
+++ b/net-irc/nebula/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+Nebula aims to be a graphical IRC client, aimed at the unix and compatible platforms and using the motif/openmotif or the lesstif ToolKit.
+The goals are
+- portability to various unix systems (planned are already Linux, *BSD, Solaris, Irix and AIX)
+- small footprint and low system resource usage
+- speed
+- clear, non intrusive GUI
+- security
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">nebula-irc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/nebula/nebula-0.5.ebuild b/net-irc/nebula/nebula-0.5.ebuild
new file mode 100644
index 000000000000..94f2f3fc71f4
--- /dev/null
+++ b/net-irc/nebula/nebula-0.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="An IRC client for X11 and Motif"
+HOMEPAGE="http://nebula-irc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-irc/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+DEPEND=">=x11-libs/motif-2.3:0"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
new file mode 100644
index 000000000000..d5ea7bf80d9d
--- /dev/null
+++ b/net-irc/ngircd/Manifest
@@ -0,0 +1,8 @@
+AUX ngircd.init-r1.d 388 SHA256 b941f1cb0f8c8f5c8d3bf24dd995a6ac08c5cc6d4b7d23c7ae991d713b3f1009 SHA512 12e62e23899d1143a35e60bf983c319f72aa13c49123b497963f96317b2990cb2529919336da5a9b5c230e55479c289358261af92d25ef54bd19079908e18158 WHIRLPOOL 3dcd87598a89d0f60fa02c3b58f6bde7155524c36e7a76b47b8241d6e8bd0ecf5dd1b60e39fe86a19fab2ec256ab11e1549b4b14c9c3d01cb0c7cb4036e0e205
+DIST ngircd-23.tar.gz 517686 SHA256 99b8b67a975a9ae9b81c96bdee02133a10f515c718825d34cedcb64f1fc95e73 SHA512 714fbb4af12335e62c615fa1e8de9c7366c4c6da6af9b334019ba900dce072067f7b08199de8c96aad5dd4b9b786b57d536ba9dc92c62b37d2ae11960dbd01b1 WHIRLPOOL 06e1b3a9675277c980898118e71e9a6c08de998c93919f431ecd7505f64dc57617beef885aae5e5c72b27cd1df3c89204dbc2101c1f4a30970fceb78a7825441
+DIST ngircd-24.tar.gz 524968 SHA256 3e00a7da52c81fc1e02bb996a27bf43da905ba7037bf8c6bb3bd13321e0c85ab SHA512 66d1b9576c03d0a70be17a235f2da50ee661646cd428d18a6c61975407671dd4a3a545069258536773b27d4fb63523527366bbbf4f35cb08111dc60842924395 WHIRLPOOL 5c163820638cad6e2dcad3118b4e35113696aa16501f81c177ed68e28cdebfaf37bd65fcd12c3d750a8f3c01fb5af40068ac812d76bb578074bdbe7dbe08f763
+EBUILD ngircd-23-r1.ebuild 1652 SHA256 ac599fb6f5c3ae27e2a372290fc77a18d7643ad923a3e456dd43f1b8d25da076 SHA512 73b2afe89051a7609677b8d3e13a2e0c1247878a3c0cd73ab282d7b50a481cda8f39be5d7aff833c8683d1c0f1f05cefb986856f01e52a7360fce820f604680d WHIRLPOOL 1b3f0ccf429a4e89d297b485af1c2accc7e4ca005952179fee90dff3795a20a033c90029400a6a812b459ec1252b5d4ac4131b5f5771586713b532703fce55cd
+EBUILD ngircd-24.ebuild 1687 SHA256 70e183c9a57ed5b03e079df22e014fd9d748271c23b6b0a5f8bed3bb1dce58d3 SHA512 5ceea4ac27feeabc5f739e8b1e8c7abb423636dbe1e710139258c9346cd8543a893ebad15e6b5f002a93675187b1d5c1169762decc10aca17f65f5b111e2d484 WHIRLPOOL c89a8c1ff948458c8db7e3dfb04420fb2673320a85a01a6863e9ab1ee434cb24af2bf1ea78fe467cbcf7ceda91318b217100092457aa8dac3e17b35ef372cf76
+MISC ChangeLog 4497 SHA256 48457e2fb3ece3251ed28b35c89d0d99a79531de862c47df3abc932e736e4555 SHA512 6106b0fab37234f88e478c5a9fb669c6cf9d2cb333680fd026b45b80d05b7d2a9e0f53c9b4b83ddef5d5e1222df730c0495f3b45940fe1ce0c0a6e7b4a95ef9c WHIRLPOOL 4d29bb8665bd5b1cb6298ee616b828090eb75c30fcc27460ab64de7c2bff45a5864b4b38a4d6ecdad3776dad32add25aece3135b4104b7c89d1b446c55bb64a7
+MISC ChangeLog-2015 7734 SHA256 06c6e8dfaf968b8b1006cfd1e7052e171688b7afe2f8a6659109350a7d3d04f4 SHA512 5f86e6655f8ee82b426c4a02772d3b8a46a98098b2ef6194a3c9aedd7e5a555ac7d05a1a08eb58240e100a4f1c5bddac44672f28ec2baf516f6158e8161885ca WHIRLPOOL 7c4e8c5ca21a551f530828a54b4647a4d28e8453fbc6c0c985174beabb0149d4a9fba4c4e5b96a5ec97c31d453ce29eed1ec72c93c9caabb412974a0721b87ef
+MISC metadata.xml 535 SHA256 9f0def0bdd3839bfbc7fe843e196a8c4f01e4af92c95897944b24227a2c07ec2 SHA512 04a89d880eb3a7e89d42051b9499447fe7a3455a7ef751acc9b68f6f607b056febf7b55dfa22e4d03172fd2c80fc71f183ddc21545aada84d300f7016c5cba26 WHIRLPOOL 374ee4970ebf4db11f4b3f3623d578a60eaa3b10d51c50f7c9bf11fd00254ffeaa0dafeecd767143cf2d5519de1fb73242bbac196dcd1008dd932640a4a2ed0a
diff --git a/net-irc/ngircd/files/ngircd.init-r1.d b/net-irc/ngircd/files/ngircd.init-r1.d
new file mode 100644
index 000000000000..3346d698d441
--- /dev/null
+++ b/net-irc/ngircd/files/ngircd.init-r1.d
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use logger
+	provide ircd
+}
+
+start() {
+	ebegin "Starting ngIRCd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/ngircd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ngIRCd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/ngircd
+	eend $?
+}
diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml
new file mode 100644
index 000000000000..67847df04ad8
--- /dev/null
+++ b/net-irc/ngircd/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@blackphoenix.de</email>
+		<name>Moritz Kick</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="ident">Enables support for <pkg>net-libs/libident</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/net-irc/ngircd/ngircd-23-r1.ebuild b/net-irc/ngircd/ngircd-23-r1.ebuild
new file mode 100644
index 000000000000..3a8fdf576959
--- /dev/null
+++ b/net-irc/ngircd/ngircd-23-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools-utils eutils user
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="http://ngircd.barton.de/"
+SRC_URI="http://ngircd.barton.de/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE="debug gnutls iconv ident ipv6 libressl pam ssl tcpd zlib"
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	ident? ( net-libs/libident )
+	pam? ( virtual/pam )
+	ssl? (
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0 )
+		)
+		gnutls? ( net-libs/gnutls )
+		libressl? ( dev-libs/libressl )
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+"
+
+RESTRICT="test"
+
+src_configure() {
+	if ! use prefix; then
+		sed -i \
+			-e "s:;ServerUID = 65534:ServerUID = ngircd:" \
+			-e "s:;ServerGID = 65534:ServerGID = nogroup:" \
+			doc/sample-ngircd.conf.tmpl || die
+	fi
+
+	local myeconfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--sysconfdir="${EPREFIX}"/etc/ngircd
+		$(use_enable debug sniffer)
+		$(use_enable debug)
+		$(use_enable ipv6)
+		$(use_with iconv)
+		$(use_with ident)
+		$(use_with pam)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with zlib)
+	)
+
+	if use ssl; then
+		myeconfargs+=(
+			$(use_with !gnutls openssl)
+			$(use_with gnutls)
+		)
+	else
+		myeconfargs+=(
+			--without-gnutls
+			--without-openssl
+		)
+	fi
+
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		enewuser ngircd
+		chown ngircd "${ROOT}"/etc/ngircd/ngircd.conf
+	fi
+}
diff --git a/net-irc/ngircd/ngircd-24.ebuild b/net-irc/ngircd/ngircd-24.ebuild
new file mode 100644
index 000000000000..ed2882a05f8e
--- /dev/null
+++ b/net-irc/ngircd/ngircd-24.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit user
+
+DESCRIPTION="An IRC server written from scratch"
+HOMEPAGE="https://ngircd.barton.de/"
+SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE="debug gnutls iconv ident ipv6 libressl pam ssl tcpd test zlib"
+
+RDEPEND="
+	iconv? ( virtual/libiconv )
+	ident? ( net-libs/libident )
+	pam? ( virtual/pam )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	test? (
+		dev-tcltk/expect
+		net-misc/netkit-telnetd
+	)
+"
+
+# Testsuite fails server-login-test
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	if ! use prefix; then
+		sed -i \
+			-e "s:;ServerUID = 65534:ServerUID = ngircd:" \
+			-e "s:;ServerGID = 65534:ServerGID = nogroup:" \
+			doc/sample-ngircd.conf.tmpl || die
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--sysconfdir="${EPREFIX}"/etc/"${PN}"
+		$(use_enable debug sniffer)
+		$(use_enable debug)
+		$(use_enable ipv6)
+		$(use_with iconv)
+		$(use_with ident)
+		$(use_with pam)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with zlib)
+	)
+
+	if use ssl; then
+		myconf+=(
+			$(use_with !gnutls openssl)
+			$(use_with gnutls)
+		)
+	else
+		myconf+=(
+			--without-gnutls
+			--without-openssl
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd
+}
+
+pkg_postinst() {
+	if ! use prefix; then
+		enewuser ngircd
+		chown ngircd "${EROOT%/}"/etc/ngircd/ngircd.conf || die
+	fi
+}
diff --git a/net-irc/ninja/Manifest b/net-irc/ninja/Manifest
new file mode 100644
index 000000000000..fb689119382e
--- /dev/null
+++ b/net-irc/ninja/Manifest
@@ -0,0 +1,5 @@
+DIST ninja-1.5.9pre14.tar.gz 920668 SHA256 151422413acf67a6d695346fa21d8b9ce8901ee31d0e6ac07d997d5793ff3c38 SHA512 5a379ed355c06d28f26ed7b97e657b463deec0832ebf822424ed92379e85066e8aca971943ad751e695c003a6ef1ab7fa46ff29e5febe30c439cdfdf6b4d6cfb WHIRLPOOL a735179313f785b8ffeb3b89f67e8af28f069feecb95dd45785234642372d7c16f89c5455d9a82196fe22e7e344c5f64f0d0058e404c117d0d746674e94eb006
+EBUILD ninja-1.5.9_pre14-r1.ebuild 601 SHA256 03e1143e5d3031a865e0404489ce061694319bfbd26a37a7d83482d1be8273f4 SHA512 f2309dfb4424d08350176aac36aad5a856c5369763ea37e34d0aa271e4dc9918078e165f0c503fc7c6f0ac66154e10bf60437cc0c14b32862f662497d95689e6 WHIRLPOOL cb8f046eda5cecbc0078dc8b89e4ae66acd620a1506550a383dbcff8160a69e9b506f8179481b34da5935f7949ef989642c2d545c1cf0eb55f3f19336d69d9d5
+MISC ChangeLog 3228 SHA256 70a52cd2a96eb6af12a481b4fda9b4b372d93cd4f61424662a4136f78bfd0b41 SHA512 d05d2b38c55ed58e1109f52bf5c722b2ec4c081b5dde9e62875012f23ba667ea8cb6c5141da3b19bafa6621d2905ee607dc7816e6eb7e86532ce6b9a878f1eea WHIRLPOOL 99fb72caec4420a563b263d3c782501bd709c8526a5d11fed0d4dc9831cbe24351ee3e19ccb78f2c641f6f27ec3d9dbd3ff6f15faadbf83523e5bf8846cfa21d
+MISC ChangeLog-2015 2539 SHA256 07da5470fac0761002d8a90902724809c2048cc43f9d42434efb865a1ffa231a SHA512 b884d805a580762dcf7292e22c650a29a684f1d20c3503cec3c7cea5507e8acf3878d58e30bffba13e3c19c1a00f5f741bbb275598f0f94821c4eefacce8c3e5 WHIRLPOOL 49a3e885a1bfb670dca2685679a307708161857b0c29f1f9eb6b46a63e1e8f01c92e78631ef57d3804365b6d5e2a186fa0623edf326d93d5aef66bbfd96b35e0
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/ninja/metadata.xml b/net-irc/ninja/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/ninja/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
new file mode 100644
index 000000000000..d63b26d27a72
--- /dev/null
+++ b/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+S=${WORKDIR}/${P/_*/}
+
+DESCRIPTION="Ninja IRC Client"
+HOMEPAGE="http://ninja.qoop.org/"
+SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+IUSE="ncurses ipv6 ssl"
+
+RESTRICT="test"
+
+DEPEND="ncurses? ( sys-libs/ncurses )
+	ssl?  ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/bin/ninja{,_irc} || die #436804
+}
diff --git a/net-irc/onis/Manifest b/net-irc/onis/Manifest
new file mode 100644
index 000000000000..093f9f11ea4c
--- /dev/null
+++ b/net-irc/onis/Manifest
@@ -0,0 +1,7 @@
+AUX 0.6.0-nochdir.patch 257 SHA256 dba0e7bbb4a00dba5038e7dd43478614485be8d18b351311da7f688dad532d08 SHA512 cdc0599fbb6d0155adbb9d7123e01bc001051e325585ab6342d1aa2271d2f86d7d124ca4a8a62063d78edbb37394afe63853fc13c790a9f0263744aa39fcdbc5 WHIRLPOOL 8c0a25dfc9d406646a4a12497e0a0525f1d1b4b9a39c2e19923d5b01810a666fd4c5713f896dd1fc85a09f67371e6d4e477d5aae12b56d460de770f3f349d9f9
+DIST onis-0.8.2.tar.bz2 100135 SHA256 fc7e164ae16757457a0971f3f08936920736cedbb5b7a03e72ec5d10e5ff214a SHA512 f0b7f49fc65c77953956d4ba8c699d9f30967586514f79047282be2a0ea19e69224989937e4abc9a868c556776e579f68d58e541ad81b071b6575579ea29f928 WHIRLPOOL 9403affe0ac05e2f0352dd48c83be0f4229489abe0590bdf0f358728119a75bdbac1511a67d3272bb76e995760696409a8e5b29d5bdb3ecf128a83d0ca988e5d
+EBUILD onis-0.8.2-r1.ebuild 930 SHA256 055a73f683c885946ef475cffca78618548a743efd7e163c05f592192cc0ed60 SHA512 2695c5f7d730331d2d74980748c1b71b8f11fc52267cbd4a0d522c95c166f0591bcbfc81f104bb669841d07b036fd48d27695e5a535da81b95778ce5f4ae8411 WHIRLPOOL b15bdc770729d66bad42ad5ea3bec44c78742338f3eb7c8d5e71f624756fd6c78f45766543fd60ae64af4e4bb91414084e825068a1100c4c8275386cc8607607
+EBUILD onis-0.8.2.ebuild 998 SHA256 a3b028448f8abf1c3290e1abbf1bd2cd73ca87341bfc475aeba6412b7b9a2c96 SHA512 fc18d07ebf68f6b75ab2807944dc351036a64720960191962f9494e39a26f01c72095e5d16404bae3047b5645548d1545d63d0e1bc3b86f3cc24960f54043c27 WHIRLPOOL a5d210bf84e2a972d4e9d2216663808444c33d376cf3779db6a2695172778a25fcbbba2144548caf27031fbf65bc00469f8f0c6ffc8898386b3b38747c9fe8eb
+MISC ChangeLog 2474 SHA256 1a8c84144fe1b78a29cea49cccb74ac78318780346cffae9156a22c15ad8e593 SHA512 eebb279f392b874ad5f8ed80e7eda5a48030ad2ec86cf8432b5fa3f05d97fef6ab93e8eb818d30a5027a360ee4b85beb2e3cda86e3683ffdf7ea743318f5bce5 WHIRLPOOL c7d704a7336c194ebd83889507227668c975567be15e38dd12171ab776c9a3edca1e18a8c5559f5004417a8f87c8f49ef041010b29d2251f40d737aa143a460a
+MISC ChangeLog-2015 1880 SHA256 2ef9b33c33c73598f833fa2c069700f5c76ec6dcb6323461d4462e9e5b2544a5 SHA512 0a446c1697f253b7f225c265e0d22f11b21b3bb953206a6a1d9c206e82d74871f77d941ad58f7e785ba9e540456c39ce4fde47501f8a4e3dbe54df77840e827b WHIRLPOOL 9394c618d0c26b519321747b3939a9f6c2f7952b286a11e59b901a208e375efa56f9ba68d35f27c648e5acccd4f8eb57a9ae8bf9c874106c065728127b75fcba
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/onis/files/0.6.0-nochdir.patch b/net-irc/onis/files/0.6.0-nochdir.patch
new file mode 100644
index 000000000000..17f26973a8af
--- /dev/null
+++ b/net-irc/onis/files/0.6.0-nochdir.patch
@@ -0,0 +1,11 @@
+--- a/onis	2004-03-15 00:48:07.874308008 +0100
++++ b/onis	2004-03-15 00:48:17.110903832 +0100
+@@ -15,8 +15,6 @@
+ 
+ BEGIN
+ {
+-	if ($0 =~ m#^(.*)[/\\]#) { chdir ($1); }
+-
+ 	unshift (@INC, 'lib');
+ 
+ 	# 0x0010   Language (make not-translated lines red/yellow)
diff --git a/net-irc/onis/metadata.xml b/net-irc/onis/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/onis/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/onis/onis-0.8.2-r1.ebuild b/net-irc/onis/onis-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..9e2b93169c40
--- /dev/null
+++ b/net-irc/onis/onis-0.8.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="onis not irc stats"
+HOMEPAGE="http://verplant.org/onis/"
+SRC_URI="http://verplant.org/${PN}/${P}.tar.bz2"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+PATCHES=( "${FILESDIR}/0.6.0-nochdir.patch" )
+
+src_prepare() {
+	default
+	sed -i -e s:lang/:/usr/share/onis/lang/: onis.conf || die "sed failed"
+}
+
+src_install () {
+	eval $(perl -V:installprivlib)
+
+	dobin onis
+
+	insinto "${installprivlib}"
+	doins -r lib/Onis
+
+	insinto /usr/share/onis
+	doins -r lang reports/*
+
+	dodoc CHANGELOG README THANKS onis.conf users.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "The onis themes have been installed in /usr/share/onis/*-theme"
+	elog "You can find a compressed sample configuration at /usr/share/doc/${PF}/config"
+	elog
+}
diff --git a/net-irc/onis/onis-0.8.2.ebuild b/net-irc/onis/onis-0.8.2.ebuild
new file mode 100644
index 000000000000..293ac6ea707d
--- /dev/null
+++ b/net-irc/onis/onis-0.8.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="onis not irc stats"
+HOMEPAGE="http://verplant.org/onis/"
+SRC_URI="http://verplant.org/${PN}/${P}.tar.bz2"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/0.6.0-nochdir.patch
+
+	sed -i -e s:lang/:/usr/share/onis/lang/: onis.conf || die "sed failed"
+}
+
+src_install () {
+	eval $(perl -V:installprivlib)
+
+	dobin onis || die "dobin failed"
+
+	insinto "${installprivlib}"
+	doins -r lib/Onis || die "doins failed"
+
+	insinto /usr/share/onis
+	doins -r lang reports/* || die "doins failed"
+
+	dodoc CHANGELOG README THANKS onis.conf users.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "The onis themes have been installed in /usr/share/onis/*-theme"
+	elog "You can find a compressed sample configuration at /usr/share/doc/${PF}/config"
+	elog
+}
diff --git a/net-irc/pisg/Manifest b/net-irc/pisg/Manifest
new file mode 100644
index 000000000000..71c9a81c5b36
--- /dev/null
+++ b/net-irc/pisg/Manifest
@@ -0,0 +1,5 @@
+DIST pisg-0.73.tar.gz 236539 SHA256 979efdd489114c10360dff9c7c8fdc287c126508e65790dfd0d0aa6fdf7d7c3b SHA512 290656fc556090fa8a263eaf123bad8e12b0ac50a2c1eb4619c50faf70fd3ee8afc7a8d97dbc4ff6338dd0fa9f73f7b19c60ca996b6612def95f1c494b3ef91e WHIRLPOOL a958d4b52fb0a09ca444878d1be27da55c1c584d5702cbdad7693d502d2aa01d1103eb1dbc1ee6276674d8bc785bb42e3088abce21efb3fd89f5b7a333cc9038
+EBUILD pisg-0.73-r1.ebuild 979 SHA256 39910ff4adbf020c53b74954944fcf542f49671005754b4a2215ca7636edfcdd SHA512 aa8d59bd63a533324ec5619bac1b842a8ea5f965653c30169b896d10cc7b418963a2b41ab06310605b3fd8487ec3d69b289c706047433944a39f900a801766df WHIRLPOOL 86e336547204247b4bfeb9ea52007e813b07cbb4ebd3998ab7f4038ec3b13c45ae266a4dc25312f825799dbddc730dbfbf399ba41ae5216301340d71c7614508
+MISC ChangeLog 2450 SHA256 75e8b0efd7408584cff06138ce04c420d6fda6487fb2324a76e69fc4360b840c SHA512 9d9341277c9f184653948501643ab8b2c8b546d74c24385fdc6ecea69c0fba43b0e313db1615db2566642309cb37a48136b04918abd6a8f0791361ca8d61cc4b WHIRLPOOL c0af5ea7af34bec6a2cf605bc548d3e86f4205184fa04ccf47a165350f6b020bfd41e96d6716f75684c3d9661e0ef1c177dcfa8c7c8d873209ac6af05ce3917e
+MISC ChangeLog-2015 8403 SHA256 c7a58bbb00beaa5342a099eb913d3d6cff3b7f501bf3a5338edc4777ef5a6ffc SHA512 4fb5cf414481dc82784a48fcc74e5c87cfc1aeb33cee51d2ada71490e2809c4152e294b26d8968a906fea6a61c37e8121d3aab8537bc7e146f75bc4ad74584e7 WHIRLPOOL 548be2d014f30e20b553d3ee1605245c2b94bc34e66bf62dab833a650da5e289444798a3fabbc72e63943315e68c103df6f287d2a63a83bbe79be5da80e7b411
+MISC metadata.xml 241 SHA256 93d59d600f4cb18ed49795ae2ae5487be794eeba696e5a78c88249568454842f SHA512 1fb73fbdd72b001e72b07c527a4b50a52fc0dd03645230521f018cf0f26cd3a31fef6d09099a8d5a991278404661e3654331999bb85b59d5fac94e78481d9493 WHIRLPOOL 90bfb29a480c360407e46303c1eb8e7ce8572e34286ab0e269fb7cb4e16726fedbc53737f4b745175d4017910523d771e721b08ab5f760501d22cec2b4dc0e37
diff --git a/net-irc/pisg/metadata.xml b/net-irc/pisg/metadata.xml
new file mode 100644
index 000000000000..573e63b80b6e
--- /dev/null
+++ b/net-irc/pisg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">pisg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/pisg/pisg-0.73-r1.ebuild b/net-irc/pisg/pisg-0.73-r1.ebuild
new file mode 100644
index 000000000000..dc8366108518
--- /dev/null
+++ b/net-irc/pisg/pisg-0.73-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="Perl IRC Statistics Generator"
+HOMEPAGE="http://pisg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+
+IUSE=""
+
+RDEPEND="dev-perl/Text-Iconv"
+DEPEND=">=sys-apps/sed-4"
+
+src_prepare() {
+	sed -i \
+		-e 's!lang\.txt!/usr/share/pisg/lang.txt!' \
+		-e 's!layout/!/usr/share/pisg/layout/!' \
+		modules/Pisg.pm || die "sed failed"
+}
+
+src_compile() {
+	einfo "Nothing to compile"
+}
+
+src_install() {
+	perl_set_version
+
+	dobin pisg || die "dobin failed"
+
+	insinto "${VENDOR_LIB}"
+	doins -r modules/.
+
+	insinto /usr/share/pisg
+	doins -r gfx layout lang.txt
+
+	dodoc docs/{FORMATS,pisg-doc.txt} \
+		docs/dev/API pisg.cfg README
+	doman docs/pisg.1
+	dohtml docs/pisg-doc.html
+}
+
+pkg_postinst() {
+	einfo "The pisg images have been installed in /usr/share/pisg/gfx"
+}
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
new file mode 100644
index 000000000000..38d1e2c4a284
--- /dev/null
+++ b/net-irc/polari/Manifest
@@ -0,0 +1,7 @@
+DIST polari-3.22.2.tar.xz 617316 SHA256 c7b4c382a9bae8094a576dbd9d022de0a90e186a36529a2eab914fe9d9b0045f SHA512 36bc3b506c73f5d27c32430a19134c2b147f6344840d3cd3ee2bee14369f4c8fc87b30445fbb8186e0dc79fbc8336985d6ef2e018c9a1f8809f06ee7ac68c876 WHIRLPOOL 2b7da35e441d4a3f55803f9ba59c150d559fbd87d092c0c3cf89b4d0c72ffc683c865be447c806b96603d5988875132271a70be6a5e112466d9eef6991df6d87
+DIST polari-3.24.2.tar.xz 804160 SHA256 3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42 SHA512 23a475d657556e7f4e93dde8e545bf7bede227635d540bd006b85b068923d87e713bd05f14d8ccde458bf6efd4920665bca02ea41c4de870680581ebfa595f0e WHIRLPOOL 12f6b4d4059d3606d4c254b34299ef8355180447eececaa869dd73dd3020714b5bc6669597656c30327e1e79a76c73d29ea29ce12206d9dcd43b78f92a22f96d
+EBUILD polari-3.22.2.ebuild 795 SHA256 071100f57d136bfbbc8a53ed9dd077bac15b06ddc040e21e51e1ebee51121180 SHA512 863e10ad80d9a587a7bdc02dfad147d9c873dc0895d60de71bd4d682a1690c2d5b83e437658af6fedb33ba3d1251568954eeb893acaf1dda48b6e17bdba2fbbe WHIRLPOOL 9f09417237099782c4e6f78d1a6c7181a71884b91e080fe37ba8601363d382b64e7c9a62f4e77a2bede11942c587e6d2cefe911a95e9ad3b3cd95aed3fd37c8e
+EBUILD polari-3.24.2.ebuild 868 SHA256 9a4ec2195ee64b9594291f5c5b78bd8e4ca990038a6b10fcc227778de91ddf35 SHA512 80307103cf1cfa6cb23bf266532e2a117021cd37a06f05257e3905ae864567230ab8154bd3cbbc68e147ea9c93ffaaae29eb99b89033a43164124d0e6294268f WHIRLPOOL 288fad84f3a9ae27503bcd42343f44b80794bc81e7cbb88283d59ff2c2752f0779207fa35e568eb869ba7b1b45693d74ba86775c236c044457ca87f476095189
+MISC ChangeLog 6159 SHA256 3484de0c1cf408efb9e2d5c0fced158b07af54eee62b87d421f8b883f42a9b7d SHA512 5429f5614dedce66c7e0ed48b72b097fa1b4ab5fa592ea608746baf057d9ca5e7d8511c3cb3733472d7c1889a1ba9d44990fd0ec98cbf067121da0f4cfa9df52 WHIRLPOOL 58dc3676dbaa52002faa4ef43c1ead5d32bda2dd099c98b31bf51ce85d59a341c6b7bc8755825b0d67cb16bc4b9cd4d6343b60b6b61dc02212e0f34e95c0f4c9
+MISC ChangeLog-2015 375 SHA256 ea3a9593936fbf16fe0f4f5896557c6f9da58bdb128097770f36530703df6476 SHA512 78c75750c769a903a826d35719f7c9778481d4d1efba764db19b47707ad0262e395583b720b9b8862f2620a2baffc28302d45f826bf89933cd66b4b2959f63c9 WHIRLPOOL 96115ed9e78270f9489ec692cb66d54cb7ff688bdbc33cd81fab9604bbf4bfac72b9c0944333bf843575c5fb08fa56ba2d4a9c382ce9b84bf4aa11d3a7bd7870
+MISC metadata.xml 253 SHA256 8f92439176f4cd2ba6a060c523c6b29ab210cd9aab7903b6db6eecc6654b1e21 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442 WHIRLPOOL d5d853bd8a39a54c45728e16a1aa295e014e0a3a105a01ec6b3c93a4f53d7b7055644708301751b7f5be68543056d3f0bd611d5ce0be442eb5d06f5e032fe154
diff --git a/net-irc/polari/metadata.xml b/net-irc/polari/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/net-irc/polari/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-irc/polari/polari-3.22.2.ebuild b/net-irc/polari/polari-3.22.2.ebuild
new file mode 100644
index 000000000000..247adce60aeb
--- /dev/null
+++ b/net-irc/polari/polari-3.22.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="An IRC client for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+COMMON_DEPEND="
+	app-crypt/libsecret[introspection]
+	>=dev-libs/gjs-1.45.3
+	>=dev-libs/glib-2.43.4:2
+	>=dev-libs/gobject-introspection-1.50:=
+	net-im/telepathy-logger[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.21.6:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+"
diff --git a/net-irc/polari/polari-3.24.2.ebuild b/net-irc/polari/polari-3.24.2.ebuild
new file mode 100644
index 000000000000..66af60098535
--- /dev/null
+++ b/net-irc/polari/polari-3.24.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="An IRC client for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=x11-libs/gtk+-3.21.6:3[introspection]
+	net-libs/telepathy-glib[introspection]
+	>=dev-libs/glib-2.43.4:2
+	>=dev-libs/gobject-introspection-1.50:=
+	>=dev-libs/gjs-1.45.3
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=app-text/gspell-1.4.0[introspection]
+	x11-libs/pango[introspection]
+	app-crypt/libsecret[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-im/telepathy-logger[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+"
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
new file mode 100644
index 000000000000..eca0e3eb9ce8
--- /dev/null
+++ b/net-irc/psybnc/Manifest
@@ -0,0 +1,15 @@
+AUX compile.diff 3224 SHA256 1d95bcc66ee8bffda1a56e54a18b50d955bc8522f709c5b8c5892a001ff24e4e SHA512 f0b7e573b401812bba613342ece8e2a9d3ab3dee4b8746cbc3fa5a24f817efd05eccb6676b0e003f43eb6c83f76ad4f42988981e4f30c0a93fd5ec0e78c2cd1d WHIRLPOOL 25ee1696f3d46ee69366ba4e22c0dce122a49812ba224066a246a0d0c72a4b161eb0f832a8b6e9c91709e06a067b23499e467a1b6a1bcaf54c85e9557193fde9
+AUX ldflags-fix.patch 540 SHA256 377c903ab1aa510480ca07bdf47884a13adcac9756778e581860b70625330aff SHA512 9ade1e441b0b890a8c2284128124c02786868803771d9acdae560811a7dc56d0cab3673250491b6e99e012a6265db1e0e17fbe5f19aa913d6cc9796c61619d9f WHIRLPOOL 2042252b7d60d072ff52e2d9d7c13770c05020c91fdcb9e5bc613bbb24b1300173abc38ee2fa68119a1523ce095330b30d57e910603a36bba722a01ddaeb417a
+AUX oidentd.conf.psybnc 92 SHA256 0363f6f7c2b2a39dc2b1ee3e41596adf6209bf3e770e9e7c0f13a9f6787c50dc SHA512 1670c597922c557eb4124ec75c41e30135dce47ced3f080051ef1f896b5b24ce8d0833b147fb5ba7b5056cc0c333ecd7a6105bb68f92a72e64f753253a2595ad WHIRLPOOL b742522ac7d32e3b2cf7191c2ecd1e8b229f814cc90e17a6103a6a661188432008cf52c3fb5850513b6ef9bbf0f8090c39d6afdd6c43d6e53803984abea7fcbb
+AUX psybnc-2.3.2.9-multinetwork.patch 261 SHA256 485375e40144079c69ba3dfd942ad9924aba2c7fc4545b67114d74c943c92fed SHA512 fee258905d67ff49e2a227767c0355146687b54307601d931ba8435a88e3399fc5c2a1efbaf6f368f8d316aec76f5810e1a3b664fa72bff29af0b79d761a2be4 WHIRLPOOL 007600b978c40fcc75533eaba23752aa6add080c2dc1a048c33ac8c08586d1f24f7993ee7f231e76da3f57419cd59b140a5f369456ae426be136b3ca17f144b5
+AUX psybnc-2.3.2.9-oidentd.patch 237 SHA256 43593043db85bf3dc3f1a5162afd873ac079afcb0aff9520799b51f362a2e29f SHA512 0c095c74ff6a9a76b417bdefa1b6d103b7fc25dd62c9446a8a2cf1faf0f3b46310e4c47b7b9072d081b240099d60420289eb5c2d1701b59e33a2a398a7e8d211 WHIRLPOOL 1e1ef9a60e2f7f34b886f4cf9ecfcfdc015f7efc23bf708016547133663f3a227cf622f8732bc200ed5a0051e922edb3c150fa5f9d3c42aca21dbd9fd2e5c0f1
+AUX psybnc-2.3.2.9-scripting.patch 244 SHA256 393a51d8da1de671e77072728086dba215e968823a1d53a5371977c9b1419396 SHA512 946d0cd7c79209f113dfea2bb4d35bfcb0f2a045e94d97cb969b7ac510cd61a1f32ee5a863fa751780bb05e808eeaefce3219cc9553a1232c09d1816421f5ae0 WHIRLPOOL 538b73bcf47a3baad93d217b8d3b82d0df84d59d8ff21c7ab20be7a8f5b8b31e05a4a7e7fc77717df7a9a22f4ec96d8497be4811be266ef5dbf87c3ebcc865a5
+AUX psybnc-oidentd.initd 931 SHA256 fbdc1b869b4e18f16670b9fbfa6814420aa62a050e3e01eca8648b577b6c6c25 SHA512 bc338b243d5cf73da0c662601ea2e5fadbe34a64f57cd0d09be55c773e1e1f807fb0c43d46d225a9461d353762b16cf6010710fbf4f43a9dece5130374952e12 WHIRLPOOL e11a4c973be18c56c85141d722756445a48db68eb557202a7360b1613a4e5a957e03e78d099120671579ded67df28d19aa4b8d484a99edfdd96a4e1fa1da8dac
+AUX psybnc.conf 313 SHA256 e4b04c86a4a1ed910b6cf21fa834eb1eeed166bb372cffbfe9674613f68a080f SHA512 0a5f587e70f9c9a83da820a03e77b6b119c5094fa334397762c4838c0a88bb5574a17d7aded274dab9bb6b041d1758e08e3f0d78df71b382bdc04fc8aabe3317 WHIRLPOOL 0927959b19c7cab8a805d87556707bdfeb5776ef1474394906e572436341908f44373b8fd0233bdbf4192c41272f71e9df12645d8657826c952c438a22206549
+AUX psybnc.confd 113 SHA256 5077226f94b59e2e1874b0019d00375f17b73a77a25533275a59f18af6bf24f2 SHA512 e58704dec299271d9a450eb243d0af1323aca58d555b61fc3aa899324a6bdc9aa82afc0597c190dc07c278f22c7cb448592a271e9ee6e4aa3552518ce6254753 WHIRLPOOL 019acd892c39342f53644071a7df8770d2638e881c8fbcb8dd3aa634b3a721d64aa36305eff60b2be9afd2a74026d9a872d623871602d0b7411143a655967d7c
+AUX psybnc.initd 898 SHA256 b7df97726262d4b504df4c466d5611cff847dc7105efc8729f3200b4f7d28ba6 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd WHIRLPOOL 2502f7cd824e4d426dd9e2456c05d9302e7f3f39816fb08806f7f37719d17668332e8ae6c9f2f9e9153ccb9bb4f98157872125d1efac165babb143507b3b97a1
+DIST psyBNC-2.3.2-9.tar.gz 318676 SHA256 9129ade198f26f7a47301d2ab5933a2844bdd187fca437f8264ae88f168e1644 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b WHIRLPOOL ebbab2b659aedcd81561a4a2c4a12142f1553d2bc097197ad332fd373559bba6d4f23bb16e7a7a4eaf74f33abfc3f3ec405263664e8d1ab3d26eda56b80af3b8
+EBUILD psybnc-2.3.2.9-r2.ebuild 4582 SHA256 edec8d6d63ad7b0da403b3fe2c2959581220fa7cdd1a102b0bb64acb76d962d2 SHA512 f4c18d8ec6bb989006fa6d81c9cff3a5cc7aa91ec5894b22e16d11948e02c24b5238d9d706f474f31a17d5020eb2621ad2f4a6af70799cbace0fb3ac96854374 WHIRLPOOL 77fcac9bbeb89aec14f48035995cbd81948c1a66e617742077f18d210d0bd4960227a92f3c8cb671929d288e297d8504d53b5c830de413c4e0c581f81e12c560
+MISC ChangeLog 3277 SHA256 3efd2e8d5b29618e90fa380423f8fdf1ded46f0ab5d46a5fc3bd034db1ac764b SHA512 f51be79fa3a38837445a9510e30ef0fe77c26d0764a4dc286fd916d6c7a1c46a44d99f39d331d36a78b35ef8b0946dd7727e9dbc3ba13c8f0de5f76d29702417 WHIRLPOOL c143900c3c7cf418bd05b71814dc4764ee2583d5ea80e06658b8e4c9f92dc0b9dfc4cb6d9cdc8127558b3d4534ee72852d56666850832da7d985f034739eb8d1
+MISC ChangeLog-2015 3095 SHA256 e86f910e1e8f621d9a9e6850d1a06a99f8cf32ea6d1229dee7ed376ee6dfbd34 SHA512 245ccf081d72dfabc26f873cd0e2b54e93ef89e682f4b3882705f97b509a89fe2a9c47302fa1d005327c7f00f456661b9f355fad648d2aea6b5ef837253e6b5b WHIRLPOOL 80a8525d06c88d69b1208eaf64dde0c9e3986b5d551891d64a556b363167a2cb0a548279c122f02d93f39cd6ca80e6067408e3988422870bb9d935052a8fc73d
+MISC metadata.xml 554 SHA256 8675ef9a975203e70f1260e8f4ea972b86dd3c4ad29aca4f7e94ccc7adf267ad SHA512 cbf3d7b05da1d5f3700e37b5f2b860a295eca80c2917afd08e5ca10df677f8e8860b4a78da43a43efe7e7f37d3b638ca78c82133e45d9f64767fd97540824f23 WHIRLPOOL 2c53e830a9a8d60878008bcd0364ad26fe3d12f522cbd19cbeab62c35930528c4bd315ecef951870c6e6493a37275056d70d5287a1a8153cc9490860cfca2bb6
diff --git a/net-irc/psybnc/files/compile.diff b/net-irc/psybnc/files/compile.diff
new file mode 100644
index 000000000000..fdee75c60732
--- /dev/null
+++ b/net-irc/psybnc/files/compile.diff
@@ -0,0 +1,79 @@
+diff -Naurp src/p_blowfish.c src/p_blowfish.c
+--- src/p_blowfish.c	2007-02-26 12:16:53.000000000 +0000
++++ src/p_blowfish.c	2007-02-26 12:17:11.000000000 +0000
+@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)# $Id$
+ #include <string.h>
+ #include <config.h>
+ 
+-char *strmncpy(char *dest, char *source, size_t len);
++char *strmncpy(char *dest, const char *source, size_t len);
+ char *lngtxt(int msgnum);
+ 
+ #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
+diff -Naurp src/p_global.h src/p_global.h
+--- src/p_global.h	2007-02-26 12:16:53.000000000 +0000
++++ src/p_global.h	2007-02-26 12:17:11.000000000 +0000
+@@ -972,8 +972,8 @@ int checklogging(int usern);
+ #endif
+ 
+ #ifndef P_MEMORY
+-unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line);
+-void _pfree(void * pointer,char *module, char *function, int line);
++unsigned long *__pmalloc(unsigned long size,const char *module,const char *function,int line);
++void _pfree(void * pointer,char *module, const char *function, int line);
+ struct usert *user(int usern);
+ struct newpeert *newpeer(int usern);
+ struct datalinkt *datalink(int usern);
+@@ -1092,7 +1092,7 @@ int replace(char *rps, char whatc, char 
+ char *nobreak(char *tobreak);
+ char *randstring(int length);
+ char *strmcat(char *first,char *second);
+-char *strmncpy(char *dest, char *source, unsigned int len);
++char *strmncpy(char *dest, const char *source, unsigned int len);
+ int strmncasecmp(char *one, char *two);
+ int strmcmp(char *one, char *two);
+ int strmwildcmp(char *line, char *wildcard);
+diff -Naurp src/p_memory.c src/p_memory.c
+--- src/p_memory.c	2007-02-26 12:16:53.000000000 +0000
++++ src/p_memory.c	2007-02-26 12:17:11.000000000 +0000
+@@ -32,7 +32,7 @@ FILE *logm=NULL;
+ 
+ /* malloc-wrapper. No memory will log an error entry and kill the bouncer */
+ 
+-unsigned long *__pmalloc(unsigned long size,char *module,char *function, int line)
++unsigned long *__pmalloc(unsigned long size,const char *module,const char *function, int line)
+ {
+     unsigned long *rc;
+     if (!(rc=(unsigned long *)malloc(size)))
+@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s
+     return rc;
+ }
+ 
+-void _pfree(unsigned long *pointer, char *module, char *function, int line)
++void _pfree(unsigned long *pointer, char *module, const char *function, int line)
+ {
+ #ifdef LOGALLOC
+     if(logm==NULL)
+diff -Naurp src/p_string.c src/p_string.c
+--- src/p_string.c	2007-02-26 12:16:53.000000000 +0000
++++ src/p_string.c	2007-02-26 12:17:11.000000000 +0000
+@@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum)
+ 
+ /* string copy with len and zero delimit */
+ 
+-char *strmncpy(char *dest, char *source, unsigned int len)
++char *strmncpy(char *dest, const char *source, unsigned int len)
+ {
+     char bf[strlen(source)+2];
+     char *pt;
+diff -Naurp src/match.c src/match.c
+--- src/match.c	2007-02-26 12:26:10.000000000 +0000
++++ src/match.c	2007-02-26 12:26:17.000000000 +0000
+@@ -36,6 +36,7 @@
+ /* Remove the next line to use this in IrcII */
+ #define EGGDROP
+ 
++#include <p_global.h>
+ 
+ /* ===================================================================
+  * Best to leave stuff after this point alone, but go on and change
diff --git a/net-irc/psybnc/files/ldflags-fix.patch b/net-irc/psybnc/files/ldflags-fix.patch
new file mode 100644
index 000000000000..f5bc776b1e6b
--- /dev/null
+++ b/net-irc/psybnc/files/ldflags-fix.patch
@@ -0,0 +1,12 @@
+diff -aurp a/tools/autoconf.c b/tools/autoconf.c
+--- a/tools/autoconf.c	2010-10-10 20:25:29.295001235 +0000
++++ b/tools/autoconf.c	2010-10-10 20:26:02.738999569 +0000
+@@ -449,7 +449,7 @@ int main()
+     fprintf(makefile,"TARGET	= psybnc\n");
+     fprintf(makefile,"\n");
+     fprintf(makefile,"all:	$(OBJS)\n");
+-    fprintf(makefile,"	$(CC) -o $(TARGET) $(CFLAGS) $(OBJS) $(LIBS)\n");
++    fprintf(makefile,"	$(CC) -o $(TARGET) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)\n");
+     fprintf(makefile,"	@strip $(TARGET)\n");
+     if(ssl==0)
+     {
diff --git a/net-irc/psybnc/files/oidentd.conf.psybnc b/net-irc/psybnc/files/oidentd.conf.psybnc
new file mode 100644
index 000000000000..c8e4ed67505c
--- /dev/null
+++ b/net-irc/psybnc/files/oidentd.conf.psybnc
@@ -0,0 +1,7 @@
+user psybnc {
+	default {
+		allow spoof
+		allow spoof_all
+		allow spoof_privport
+	}
+}
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
new file mode 100644
index 000000000000..4d796961d6ff
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
@@ -0,0 +1,13 @@
+--- config.h.orig	2009-06-10 21:30:24.000000000 +0000
++++ config.h	2009-06-10 21:30:39.000000000 +0000
+@@ -50,6 +50,10 @@
+ 
+ #define BLOCKDNS
+ 
++/* Allow multiple irc connections per user */
++
++#define NETWORK
++
+ /* Fixes the freeze bug */
+ 
+ #define FREEZEFIX
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
new file mode 100644
index 000000000000..fbb4b163e3a3
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
@@ -0,0 +1,13 @@
+--- config.h.orig	2008-12-14 20:02:57.000000000 +0000
++++ config.h	2008-12-14 20:03:35.000000000 +0000
+@@ -14,6 +14,10 @@
+ 
+ #define TRANSLATE
+ 
++/* Support oIdentd */
++
++#define OIDENTD
++
+ /* Allow internal network */
+ 
+ #define INTNET
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-scripting.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-scripting.patch
new file mode 100644
index 000000000000..08dce4fa715b
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-scripting.patch
@@ -0,0 +1,13 @@
+--- config.h.orig	2009-01-03 17:30:41.000000000 +0000
++++ config.h	2009-01-03 17:31:27.000000000 +0000
+@@ -26,6 +26,10 @@
+ 
+ #define TRAFFICLOG
+ 
++/* Allow scripting */
++
++#define SCRIPTING
++
+ /* Allow linkage of bouncers */
+ 
+ #define LINKAGE
diff --git a/net-irc/psybnc/files/psybnc-oidentd.initd b/net-irc/psybnc/files/psybnc-oidentd.initd
new file mode 100644
index 000000000000..354e6416c23e
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc-oidentd.initd
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net oidentd
+}
+
+check_config() {
+	if [[ ! -f ${PSYBNC_CONFIG} ]]
+	then
+	    eerror "Please set \$PSYBNC_CONFIG in /etc/conf.d/psybnc!"
+	    return 1
+	fi
+
+	if [[ ! -d "${PSYBNC_HOME}" ]]
+	then
+	    eerror "Please set \$PSYBNC_HOME in /etc/conf.d/psybnc!"
+	    return 1
+	fi
+
+	if [[ -z "${PSYBNC_USER}" ]]
+	then
+	    eerror "Please set \$PSYBNC_USER in /etc/conf.d/psybnc!"
+	    return 1
+	fi
+}
+
+start() {
+	check_config || return 1
+	ebegin "Starting psyBNC"
+	start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" -e HOME="${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" &>/dev/null
+	eend $?
+}
+
+stop() {
+	check_config || return 1
+	ebegin "Stopping psyBNC"
+	start-stop-daemon --stop --quiet --pidfile "${PSYBNC_HOME}"/psybnc.pid --signal 9
+	eend $?
+}
diff --git a/net-irc/psybnc/files/psybnc.conf b/net-irc/psybnc/files/psybnc.conf
new file mode 100644
index 000000000000..8a1ca8907e86
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc.conf
@@ -0,0 +1,17 @@
+# Name
+PSYBNC.SYSTEM.ME=Gentoo
+
+# Default listener
+PSYBNC.SYSTEM.PORT1=23998
+PSYBNC.SYSTEM.HOST1=*
+PSYBNC.HOSTALLOWS.ENTRY0=*;*
+
+# Default SSL listener
+PSYBNC.SYSTEM.PORT2=23889
+PSYBNC.SYSTEM.HOST2=S=*
+PSYBNC.HOSTALLOWS.ENTRY1=*;*
+
+# Default user
+USER1.USER.NICK=gentoo
+USER1.USER.PASS=gentoo
+USER1.USER.RIGHTS=1
diff --git a/net-irc/psybnc/files/psybnc.confd b/net-irc/psybnc/files/psybnc.confd
new file mode 100644
index 000000000000..cdd8f31f9457
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/psybnc
+
+PSYBNC_CONFIG="/etc/psybnc/psybnc.conf"
+PSYBNC_HOME="/var/lib/psybnc"
+PSYBNC_USER="psybnc"
diff --git a/net-irc/psybnc/files/psybnc.initd b/net-irc/psybnc/files/psybnc.initd
new file mode 100644
index 000000000000..add37167139b
--- /dev/null
+++ b/net-irc/psybnc/files/psybnc.initd
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+}
+
+check_config() {
+	if [[ ! -f ${PSYBNC_CONFIG} ]]
+	then
+	    eerror "Please set \$PSYBNC_CONFIG in /etc/conf.d/psybnc!"
+	    return 1
+	fi
+
+	if [[ ! -d "${PSYBNC_HOME}" ]]
+	then
+	    eerror "Please set \$PSYBNC_HOME in /etc/conf.d/psybnc!"
+	    return 1
+	fi
+
+	if [[ -z "${PSYBNC_USER}" ]]
+	then
+	    eerror "Please set \$PSYBNC_USER in /etc/conf.d/psybnc!"
+	    return 1
+	fi
+}
+
+start() {
+	check_config || return 1
+	ebegin "Starting psyBNC"
+	start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" &>/dev/null
+	eend $?
+}
+
+stop() {
+	check_config || return 1
+	ebegin "Stopping psyBNC"
+	start-stop-daemon --stop --quiet --pidfile "${PSYBNC_HOME}"/psybnc.pid --signal 9
+	eend $?
+}
diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml
new file mode 100644
index 000000000000..fc7667fe9321
--- /dev/null
+++ b/net-irc/psybnc/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+		<flag name="multinetwork">Adds support for multiple networks</flag>
+	</use>
+	<longdescription>psyBNC is a multi-user and multi-server gateway to IRC networks</longdescription>
+</pkgmetadata>
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
new file mode 100644
index 000000000000..22fce24e47d3
--- /dev/null
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils versionator toolchain-funcs flag-o-matic user
+MY_PV="$(replace_version_separator 3 -)"
+PSYBNC_HOME="/var/lib/psybnc"
+
+DESCRIPTION="psyBNC is a multi-user and multi-server gateway to IRC networks"
+HOMEPAGE="http://www.psybnc.at/index.html"
+SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
+IUSE="ipv6 ssl oidentd scripting multinetwork"
+
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d )
+		oidentd? ( >=net-misc/oidentd-2.0 )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}"/"${PN}"
+
+pkg_setup() {
+	enewgroup psybnc
+	enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Useless files
+	rm -f */INFO
+
+	# Pretend we already have a certificate, we generate it in pkg_config
+	mkdir key
+	touch key/psybnc.cert.pem
+
+	if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]
+	then
+		einfo "Using existing salt.h for password encryption"
+		cp "${ROOT}"/usr/share/psybnc/salt.h salt.h
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/compile.diff"
+	epatch "${FILESDIR}/ldflags-fix.patch"
+
+	# add oidentd
+	use oidentd && epatch "${FILESDIR}/${P}-oidentd.patch"
+
+	# add scripting support
+	use scripting && epatch "${FILESDIR}/${P}-scripting.patch"
+
+	# add multinetwork support
+	use multinetwork && epatch "${FILESDIR}/${P}-multinetwork.patch"
+
+	# Prevent stripping the binary
+	sed -i -e "/@strip/ d" tools/autoconf.c
+}
+
+src_compile() {
+	use ipv6 || rm -f tools/chkipv6.c
+	use ssl || rm -f tools/chkssl.c
+
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin psybnc
+
+	insinto /usr/share/psybnc
+	doins -r help lang salt.h
+	fperms 0600 /usr/share/psybnc/salt.h
+
+	insinto /etc/psybnc
+	doins "${FILESDIR}"/psybnc.conf
+
+	keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
+	dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
+	dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
+
+	fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts} /etc/psybnc/psybnc.conf
+	fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
+	fperms 0640 /etc/psybnc/psybnc.conf
+
+	if use ssl
+	then
+		keepdir /etc/psybnc/ssl
+		dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
+	else
+		# Drop SSL listener from psybnc.conf
+		sed -i -e "/^# Default SSL listener$/,+4 d" "${D}"/etc/psybnc/psybnc.conf
+	fi
+
+	if use oidentd
+	then
+		insinto /etc
+		doins "${FILESDIR}"/oidentd.conf.psybnc
+		fperms 640 /etc/oidentd.conf.psybnc
+		# install init-script with oidentd-support
+		newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
+	else
+		# install init-script without oidentd-support
+		newinitd "${FILESDIR}"/psybnc.initd psybnc
+	fi
+
+	newconfd "${FILESDIR}"/psybnc.confd psybnc
+
+	dodoc CHANGES FAQ README SCRIPTING TODO
+	docinto example-script
+	dodoc scripts/example/DEFAULT.SCRIPT
+}
+
+pkg_config() {
+	if use ssl
+	then
+		if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f ${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]]
+		then
+			ewarn "Existing /etc/psybnc/psybnc.cert.pem or /etc/psybnc/psybnc.key.pem found!"
+			ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge --config =${CATEGORY}/${PF} again."
+			return
+		fi
+
+		einfo "Generating certificate request..."
+		openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes
+		einfo "Generating self-signed certificate..."
+		openssl req -x509 -days 365 -in "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem
+		einfo "Setting permissions on files..."
+		chown root:psybnc "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem
+		chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem
+	fi
+}
+
+pkg_postinst() {
+	if use ssl
+	then
+		elog
+		elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to create needed SSL certificates."
+	fi
+	if use oidentd
+	then
+		elog
+		elog "You have enabled oidentd-support. You will need to set"
+		elog "up your /etc/oident.conf file before running psybnc. An example"
+		elog "for psyBNC can be found under /etc/oidentd.conf.psybnc"
+	fi
+	elog
+	elog "You can connect to psyBNC on port 23998 with user gentoo and password gentoo."
+	elog "Please edit the psyBNC configuration at /etc/psybnc/psybnc.conf to change this."
+	elog
+	elog "To be able to reuse an existing psybnc.conf, you need to make sure that the"
+	elog "old salt.h is available at /usr/share/psybnc/salt.h when compiling a new"
+	elog "version of psyBNC. It is needed for password encryption and decryption."
+	elog
+}
diff --git a/net-irc/ptlink-ircd/Manifest b/net-irc/ptlink-ircd/Manifest
new file mode 100644
index 000000000000..9cf28ca41c15
--- /dev/null
+++ b/net-irc/ptlink-ircd/Manifest
@@ -0,0 +1,7 @@
+AUX ptlink-ircd.confd 167 SHA256 21241fe4cbbef6e8fbe61192be988a15ba4c2140e8094691eefbb97a7aec0471 SHA512 21059ef835fc56e4c8d2780dcc94abbb4951d6a10b89aa1d27cb702489ab1ac398f0928f63392f45e7b0b27949a59f07e9c0c280ef42abededc65749fc5f68e6 WHIRLPOOL a51effce87e8ef44c0c04420d169096b6f23ba5bbb63b4763df958d131d6d29fc6d414781bcf246248e5c6657cc0b980c8d165d012b19bbb959ad18265d4bd06
+AUX ptlink-ircd.initd 505 SHA256 da25c64d4708f77427845c6b003473c6406adaa1388f9b4f585d11bdbf75b573 SHA512 c1d9848181c9c91024b6e54e242b200b9eaee0823f5e39deb3ab0e5cbcafa16de03085c4a13a0a574886b14711feebcbcda96deebeb9b70dab0aacb0342b0472 WHIRLPOOL f33baed364cbeb722f00416fa701f7540f22680c1efe0223fce460bb6e1b9265dba1c2328733201b96ab30289c94a2f8e61485cc4f609543deb2b3147d38f5a7
+DIST PTlink6.19.6.tar.gz 799388 SHA256 80a9100b0f0c41c914dda6c576207721fa05bb4a0ccf77c6337d6740d1ce0131 SHA512 5036efc429d8c5dbb5076cc690221b9409990bfe71a710bf6f8ce60e8779ff8f55e695c1fc1ca56435928d416bc1907c91105cf533538dafeea4344cd038d4d5 WHIRLPOOL 7328e2c550592422beb29ae0895a80b98541ae91932963df9338983bf86053886ba309f7a775d2cfb0dce12ff91ee08d1148dec32f0788304150ec90d556d4f9
+EBUILD ptlink-ircd-6.19.6-r3.ebuild 2329 SHA256 42239b0f57ba2a622a17df35e6c5579c61b6f59e0df01b988f68df786c48dfbe SHA512 2fe66e1b2805e4a6ca744ab88f2f1840f2bcf81cd8da83ed915036b747d5db7c35af20f4ed6b8de36a762a33751d8842b8e65298f1a8ae43aa4a66ad27d75ddd WHIRLPOOL 2a49ab43b677e8ed67e68bd5ba8947f04e4946fa6d4ade5ccff10cdebd23c333ff8ab12660dcee418859e97b6a599824fcb0e5b6f4c8970463d9fdc2e206979b
+MISC ChangeLog 2958 SHA256 4a056b0b8a6c182ea401ed205509931711d192017713133d33f445507242a66c SHA512 4174cb426ab9fb3bfaca1e2e242d9d7be649e1bc5a89f8e09aaaca651fa198e53a7496318109016ff5333797ce52d425e59aa83b1e307644ecc8ee4480a6d6e6 WHIRLPOOL 774274883b927c436142a20ecd47659450b100275491c0ea69b76eb6191f13edfbcbbb371177eecf912036ec5d424c64a79120ef98a1157f2f70425027973fa7
+MISC ChangeLog-2015 3958 SHA256 3fa187d623f005919124b0fe6253b3aa12f7b79eadb634365aaa2cd4881295d3 SHA512 a402c2420205a2fc7449e8c5e6c6f3fb47184a5788e69031b228acc7937c7a5a4a47dce81652e6e7897f248c2a36fe8d4cf45ccccbeb575891642152a4be4057 WHIRLPOOL 3d2ebe3e187b291156b6a06a144378a91676e62430bf90fc1fb0033ebdfcb42bf03a2a85974b11b9ad707cd77aa93944c997558e434b45ff28efcd922959ff1b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/ptlink-ircd/files/ptlink-ircd.confd b/net-irc/ptlink-ircd/files/ptlink-ircd.confd
new file mode 100644
index 000000000000..a14466cc412b
--- /dev/null
+++ b/net-irc/ptlink-ircd/files/ptlink-ircd.confd
@@ -0,0 +1,5 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# User to run ptlink-ircd as
+PTLINKIRCD_USER="ptlink-ircd"
diff --git a/net-irc/ptlink-ircd/files/ptlink-ircd.initd b/net-irc/ptlink-ircd/files/ptlink-ircd.initd
new file mode 100644
index 000000000000..5b7c1f441d7e
--- /dev/null
+++ b/net-irc/ptlink-ircd/files/ptlink-ircd.initd
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use dns
+	provide ircd
+}
+
+start() {
+	ebegin "Starting ptlink-ircd"
+	start-stop-daemon --start --quiet --exec /usr/bin/ptlink-ircd \
+		--chuid ${PTLINKIRCD_USER} -- -l /var/lib/ptlink-ircd \
+		-e /etc/ptlink-ircd >/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down ptlink-ircd"
+	start-stop-daemon --stop --pidfile /var/lib/ptlink-ircd/ircd.pid
+	eend $?
+}
diff --git a/net-irc/ptlink-ircd/metadata.xml b/net-irc/ptlink-ircd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/ptlink-ircd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild
new file mode 100644
index 000000000000..6b9f9a8ccdcc
--- /dev/null
+++ b/net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils ssl-cert user
+
+MY_P="PTlink${PV}"
+
+DESCRIPTION="Secure IRC daemon with many advanced features"
+HOMEPAGE="http://www.ptlink.net/"
+SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ircd/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE="ssl"
+
+DEPEND="
+	sys-libs/zlib
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	ecvs_clean
+
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-ipv6 \
+		$(use_with ssl ssl openssl)
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	newbin src/ircd ptlink-ircd
+	newbin tools/fixklines ptlink-ircd-fixklines
+	newbin tools/mkpasswd ptlink-ircd-mkpasswd
+
+	insinto /etc/ptlink-ircd
+	fperms 700 /etc/ptlink-ircd
+	doins samples/{kline.conf,{opers,ptlink}.motd,help.{admin,oper,user}}
+	newins samples/example.conf.short ircd.conf
+	newins samples/example.conf.trillian ircd.conf.trillian
+	newins samples/main.dconf.sample main.dconf
+	newins samples/network.dconf.sample network.dconf
+
+	insinto /usr/share/ptlink-ircd/codepage
+	doins src/codepage/*.enc
+	dosym /usr/share/ptlink-ircd/codepage /etc/ptlink-ircd/codepage
+
+	rm -rf doc/old
+	dodoc doc/* doc_hybrid6/* ircdcron/* CHANGES README
+
+	keepdir /var/log/ptlink-ircd /var/lib/ptlink-ircd
+	dosym /var/log/ptlink-ircd /var/lib/ptlink-ircd/log
+
+	newinitd "${FILESDIR}/ptlink-ircd.initd" ptlink-ircd
+	newconfd "${FILESDIR}/ptlink-ircd.confd" ptlink-ircd
+}
+
+pkg_postinst() {
+	# Move docert from src_install() to install_cert for bug #201678
+	use ssl && (
+		if [[ ! -f "${ROOT}"/etc/ptlink-ircd/server.key.pem ]]; then
+			install_cert /etc/ptlink-ircd/server || die "install_cert failed"
+			mv "${ROOT}"/etc/ptlink-ircd/server.{crt,cert.pem}
+			mv "${ROOT}"/etc/ptlink-ircd/server.{csr,req.pem}
+			mv "${ROOT}"/etc/ptlink-ircd/server.key{,.pem}
+		fi
+	)
+
+	enewuser ptlink-ircd
+
+	chown ptlink-ircd \
+		"${ROOT}"/{etc,var/{log,lib}}/ptlink-ircd \
+		"${ROOT}"/etc/ptlink-ircd/server.key.pem
+
+	echo
+	elog "PTlink IRCd will run without configuration, although this is strongly"
+	elog "advised against."
+	echo
+	elog "You can find example cron script ircd.cron here:"
+	elog "   /usr/share/doc/${PF}"
+	echo
+	elog "You can also use /etc/init.d/ptlink-ircd to start at boot"
+	echo
+}
diff --git a/net-irc/ptlink-opm/Manifest b/net-irc/ptlink-opm/Manifest
new file mode 100644
index 000000000000..6735b0a35a91
--- /dev/null
+++ b/net-irc/ptlink-opm/Manifest
@@ -0,0 +1,7 @@
+AUX ptlink-opm.conf.d 164 SHA256 22c8a7596fbfd50a955fca1399f8dae278b026b55ec9cb3a13c119f27b78104d SHA512 a0fd7fca178cc1b8416c7f08d0d86e756c84bfed8256b77051a05d3a1aed95406c4eb759438b50a05cf81b4e3755b606265e2fb1cb2d1edf92b442a1aebc2f4a WHIRLPOOL 1dd0f450e711dbf7380e7345753b66c16d6d591e72a300b99e5705442da6be4a868d79a17d3f57ced811a044ce45f3d7c0dae4b838a830ef2e7af22bddd32619
+AUX ptlink-opm.init.d 428 SHA256 807a75bf2e8fd9a0cc3edfa482d7c8aa8732b35d874e4226049759200e974f36 SHA512 411034db9dec378ddfe2692fb85eba1fc6f2124fd9dd4ec79224dcd3cf6219748e6dfd43151a99f86978f8eb577cb304f1fde6b7b835156d9dee7c22ce3ece6d WHIRLPOOL 0a04c926d5718bff10ceee6e3fb0295f789701b9fad67cfd4dc8a603c5a78062e98210688458e1d067a0e0f18b5aad69a91b04a89af5f3c8b42aa9b6d5a373d1
+DIST PTlink.OPM1.3.1.tar.gz 156068 SHA256 0392e9e2a121fd3ae529c49306cfc7450236c6881ff38134f86883c16a26802a SHA512 1a8955486db8c1a318dda1b7bfdaf1be9f55d68a5acafde37a5f15e80e21b8d45c51138efb9d5ca1d1fad9f46d0ccdc4b91cf9128ba2ca7086f1c0925a36a141 WHIRLPOOL 6d814f14a612717f0d3e74e8f050b3b27e20a0adf62ba93a5b9cfd314212ece0e9f3a9567814f967f7eed66816020ec1318529a5f6904914803c49fccf4a331e
+EBUILD ptlink-opm-1.3.1-r1.ebuild 1004 SHA256 b11739309cedbd4b9a16b0abe4a5ed6fc6daf7a7b08eff6213dfe57619265d58 SHA512 59f030ec2c9f5e23b24ca5ac834fac44497fed5e89c85de6a47847671f597a599cc4916619069dc2d882e07e36e1d4cdd973a433d285bf5ad13db01ce8c6c452 WHIRLPOOL 524bb31cd5837cc3590ca749a78733946581fec24a30ecb984e6ce015e1aef1793631ea5e5a39c053deba7fd5f6005735dc6a6fa0a32e99e5126508bebcab8c9
+MISC ChangeLog 2937 SHA256 93bc8733a63c8aa5dd5789e3580c17412e8cafdc9bd8a4f1051f3f4971aefa3e SHA512 342fb6df6040f4c7a8e153428c2b3475d4ad3c2984cc50f0694b5d1198a6e4047ec9e8440b91c16e1e05d290667c32acb67730e371996e39c56ebb10b66cc379 WHIRLPOOL d594c87ca5a1cf1e9c699a7a45694d7095a362701e0e44fb96d1947e1e398ed775918cbf87db5ff20d95a140cfc23f95bbe1c219a39264f316e93047e88ce68c
+MISC ChangeLog-2015 1754 SHA256 8601d1a4b3ac0d8828055603441f1e983115b557a45a20520c9432058e29a7e0 SHA512 16fcc2063b4b4810f79d73b09c97f4ade6faf858f054344bf2539d7ace1be71f56a3ce3128bc5718541dd3d82b7204a571ee3364e34fd37ee4019194d35826da WHIRLPOOL 6611a17ade5d2d7b983be63d37d3cd2363c187c9b4c0f4c37e50f505d633bd0100fccf40f927bcf2d7c7ec0fa4f7c346f641c40587a8259871af0799a0a1e78c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/ptlink-opm/files/ptlink-opm.conf.d b/net-irc/ptlink-opm/files/ptlink-opm.conf.d
new file mode 100644
index 000000000000..939c3cb518e6
--- /dev/null
+++ b/net-irc/ptlink-opm/files/ptlink-opm.conf.d
@@ -0,0 +1,5 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# User to run ptlink-opm as
+PTLINKOPM_USER="ptlink-opm"
diff --git a/net-irc/ptlink-opm/files/ptlink-opm.init.d b/net-irc/ptlink-opm/files/ptlink-opm.init.d
new file mode 100644
index 000000000000..70e0f0970c14
--- /dev/null
+++ b/net-irc/ptlink-opm/files/ptlink-opm.init.d
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use dns ircd
+}
+
+start() {
+	ebegin "Starting ptlink-opm"
+	start-stop-daemon --start --quiet --exec /usr/bin/ptlink-opm \
+		--chuid ${PTLINKOPM_USER} >/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down ptlink-opm"
+	start-stop-daemon --stop --exec /usr/bin/ptlink-opm
+	eend $?
+}
diff --git a/net-irc/ptlink-opm/metadata.xml b/net-irc/ptlink-opm/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/ptlink-opm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..1f705ea294b7
--- /dev/null
+++ b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user
+
+MY_P="PTlink.OPM${PV}"
+
+DESCRIPTION="PTlink Open Proxy Monitor"
+HOMEPAGE="http://www.ptlink.net/"
+SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ptopm/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=sys-apps/sed-4"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/ptlink-opm \
+		--localstatedir=/var/lib/ptlink-opm
+}
+
+src_install() {
+	newbin src/ptopm ptlink-opm
+
+	insinto /etc/ptlink-opm
+	newins samples/ptopm.dconf.sample ptopm.dconf
+	doins samples/scan_rules.dconf
+
+	keepdir /var/{lib,log}/ptlink-opm
+	dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log
+
+	dodoc CHANGES README || die "dodoc failed"
+
+	newinitd "${FILESDIR}"/ptlink-opm.init.d ptlink-opm
+	newconfd "${FILESDIR}"/ptlink-opm.conf.d ptlink-opm
+}
+
+pkg_postinst() {
+	enewuser ptlink-opm
+	chown ptlink-opm "${ROOT}"/var/{log,lib}/ptlink-opm
+}
diff --git a/net-irc/quassel-irssi/Manifest b/net-irc/quassel-irssi/Manifest
new file mode 100644
index 000000000000..8850e9cc98d2
--- /dev/null
+++ b/net-irc/quassel-irssi/Manifest
@@ -0,0 +1,8 @@
+AUX quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch 1192 SHA256 8402bf43c3d624b3fa1ba7ad07fb930ea34e08997700f63eae9b9bac83db888e SHA512 71ff7b0dd2dd14556be5dfd6b92f2ca13af51fb876e731980a979ac27d0e195170e92a915f48bdeaa3556eff7666ee9f563fd5cf89a565d9b6da93dadea5e40a WHIRLPOOL d6700424c3540d2f818a089c6c5f08ad6f6e1401d810cdbc648a0a11f709a417cd647612fd36e8ee3393b91d39b558e04d1b2af7af70f17dd2f0e95b92ab6e72
+AUX quassel-irssi-0_p20170107-tls-ssl-rename.patch 1017 SHA256 6279ae5575a3bc3ac45790478f60d57f4d9582077d5a356077f548eee25f97fc SHA512 33d4e78d9872a24819a8b653d2d635992377ab3b6b1b990af5b14381be109a11c8a139e3fc578090dbf2bee6f1b3b5d26847f2dc1fbfcb5c4c42f52192f08d93 WHIRLPOOL e49620fed909e333a229c37a5dc5797a5ce98eaa0917936bb46213e3c61c00a53340983f15174b4c5e7c477ebe27fd27b85819a59c100d487e26248db966324b
+DIST quassel-irssi-0_p20170107-r1.zip 42745 SHA256 d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814 WHIRLPOOL a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
+DIST quassel-irssi-0_p20170107.zip 42745 SHA256 d159b7db11dbd741fbbc1569f3583301fc36697d5efb770696bb7f8813ce2e67 SHA512 1d7e4e15af2d73fd7e581c517384604a41b68e3a5152dcaf2776a20bc15b459e4a5a7caf39a9c06a11e65ad5d9fea0aa81fa001caa9060f55b821e12b4fed814 WHIRLPOOL a74b6452fe0cece5b63e326dc10522a45d6bbb7a80554027af52f8a8dd9a690d862ab75201f98260eed841b473cfc10bbe21ee78ec878f808c19e69156944c5e
+EBUILD quassel-irssi-0_p20170107-r1.ebuild 1762 SHA256 f45c6ee8c991a3e7e93cdaf15a9832b217a53fc6d9b25c1e2156b7c43e99c35a SHA512 b4aaacfb00912017081c755bff069dfd34944062220ac6953589c754a3e2e669630947b3e630954cc46aad7c0a06d25c6b3c46aec642f0f7ada6de871f919796 WHIRLPOOL 745681f06b2047b9d821dcafe985d795c8ea9345111171b83b3a02780d28623a95b56f4021c6adbd1386f0a39db4288cf64a190111952025971d4e2289f804d2
+EBUILD quassel-irssi-0_p20170107.ebuild 1383 SHA256 c0d69319e833b8e730bc2ec28750e259d9742fdd91dd53afe58a74ddd71c855c SHA512 bffed91730d9e2f882766036ce81fc93f57c7cf7848b68466a319eb8d77ba35c443a6fafe90a587bdd09a2c8eb781c319b9fce4918ad60442bf4c5653e32ddbb WHIRLPOOL bd6a96ae7c1cf54ab1f1aff22227d4fa3ac9ca79689183646dff9448ebb1565ab61e6eab78647f4da2751be798b4ce6dc63844aac5b4732e5166cae5d075493d
+MISC ChangeLog 454 SHA256 b43e7aa1677bfe5cf479d016ca3ed1505c014691e3ce30467cea189e4a28c741 SHA512 cbc09fc8529c78cb935f27ba98a788de916b686acd8b8017e230fc2fd12d5a8139cb5c911be8563fed5d57c49dccbc870a592772aa1630f1e0e88f8caed2d899 WHIRLPOOL f4c6a266158ee873a73f2b5516b65d7e927d0614b896a8a2f6d91817bd284c498f9208db98e7ffc71944b941a0d54560dd8112d826e52ed1a2d85828e486b565
+MISC metadata.xml 557 SHA256 5613b558b7a5d8a5e77786da97ec90da47889937eddc5edf111aa47259b75b2a SHA512 4e9f077d0c9b6945e0fc66312ec7a264e5a7ba59039add39c2283debaf97ff71c921d016090ecbc27cdbba222672db8fc209fad11ededafe0354bbceaf068d78 WHIRLPOOL 0517ec1a7010dcd4421fcae8daae5935327f3998fc5da64d5f70aea53abc64ed0792b2c5c6d60281c60976c645e8e161764c395a1e7b642e33cd906ed369339e
diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
new file mode 100644
index 000000000000..ddd96ff33316
--- /dev/null
+++ b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-fix_build_with_irssi_1.0.patch
@@ -0,0 +1,38 @@
+From 35555999f810f49b49ca2a6ec13d4f5b03503007 Mon Sep 17 00:00:00 2001
+From: Pierre-Hugues Husson <husson@archos.com>
+Date: Wed, 11 Jan 2017 10:24:08 +0100
+Subject: [PATCH] Fix build for irssi 1.0.0
+
+---
+ core/quassel-net.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/core/quassel-net.c b/core/quassel-net.c
+index 8a6eb55..9ab4829 100644
+--- a/core/quassel-net.c
++++ b/core/quassel-net.c
+@@ -117,6 +117,10 @@ static const char *get_nick_flags(SERVER_REC *server) {
+ 	return "";
+ }
+ 
++// IRSSI_ABI_VERSION was introduced in 0.8.18
++#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6
++#  define use_tls use_ssl
++#endif
+ static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
+ 	Quassel_SERVER_CONNECT_REC *r = (Quassel_SERVER_CONNECT_REC*) conn;
+ 
+@@ -132,10 +136,10 @@ static SERVER_REC* quassel_server_init_connect(SERVER_CONNECT_REC* conn) {
+ 	ret->got = 0;
+ 	server_connect_ref(SERVER_CONNECT(conn));
+ 
+-	if(conn->use_ssl) {
++	if(conn->use_tls)
+ 		ret->ssl = 1;
+-	}
+-	ret->connrec->use_ssl = 0;
++
++	ret->connrec->use_tls = 0;
+ 
+ 	ret->channels_join = quassel_irssi_channels_join;
+ 	ret->send_message = quassel_irssi_send_message;
diff --git a/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
new file mode 100644
index 000000000000..b38154ea0551
--- /dev/null
+++ b/net-irc/quassel-irssi/files/quassel-irssi-0_p20170107-tls-ssl-rename.patch
@@ -0,0 +1,20 @@
+diff -rupN quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c quassel-irssi-patched/core/irssi/network-openssl.c
+--- quassel-irssi-7b034e3a8084d08e87869a96795ab59aa4901c74/core/irssi/network-openssl.c	2017-01-19 14:07:24.000000000 -0500
++++ quassel-irssi-patched/core/irssi/network-openssl.c	2017-01-20 16:07:01.599114339 -0500
+@@ -437,11 +437,11 @@ GIOChannel *irssi_ssl_get_iochannel(GIOC
+ 	SSL *ssl;
+ 	SSL_CTX *ctx = NULL;
+ 
+-	const char *mycert = server->connrec->ssl_cert;
+-	const char *mypkey = server->connrec->ssl_pkey;
+-	const char *cafile = server->connrec->ssl_cafile;
+-	const char *capath = server->connrec->ssl_capath;
+-	gboolean verify = server->connrec->ssl_verify;
++	const char *mycert = server->connrec->tls_cert;
++	const char *mypkey = server->connrec->tls_pkey;
++	const char *cafile = server->connrec->tls_cafile;
++	const char *capath = server->connrec->tls_capath;
++	gboolean verify = server->connrec->tls_verify;
+ 
+ 	g_return_val_if_fail(handle != NULL, NULL);
+ 
diff --git a/net-irc/quassel-irssi/metadata.xml b/net-irc/quassel-irssi/metadata.xml
new file mode 100644
index 000000000000..508c6b3e1163
--- /dev/null
+++ b/net-irc/quassel-irssi/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wraeth@gentoo.org</email>
+		<name>Sam Jorna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">phhusson/quassel-irssi</remote-id>
+		<bugs-to>https://github.com/phhusson/quassel-irssi/issues</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+	A plugin for the Irssi IRC client to allow connecting to a Quassel core
+	hosted either locally or remotely.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild b/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild
new file mode 100644
index 000000000000..97d9cc73ba21
--- /dev/null
+++ b/net-irc/quassel-irssi/quassel-irssi-0_p20170107-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
+# allow QuasselC to be installed as a separate package.
+
+# Commit Date: Sat, 7 Jan 2017 14:50:15 +0000
+COMMIT="f23e97a6188129cfae4c52f7e1a75940185454f4"
+
+DESCRIPTION="Irssi module to connect to Quassel cores."
+HOMEPAGE="https://github.com/phhusson/quassel-irssi/"
+SRC_URI="https://github.com/phhusson/${PN}/archive/${COMMIT}.zip -> ${PF}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# fails to build with irssi-1.0
+RDEPEND=">=net-irc/irssi-1.0.0"
+DEPEND="${RDEPEND}
+	net-libs/quasselc"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+# Patches for building against irssi-1.0, obtained from:
+#   http://pkgs.fedoraproject.org/cgit/rpms/quassel-irssi.git/plain/35555999f810f49b49ca2a6ec13d4f5b03503007.patch
+#   http://pkgs.fedoraproject.org/cgit/rpms/quassel-irssi.git/plain/quassel-irssi-tls-ssl-rename.patch
+PATCHES=(
+	"${FILESDIR}/${P}-fix_build_with_irssi_1.0.patch"
+	"${FILESDIR}/${P}-tls-ssl-rename.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
+		-e 's:^CFLAGS=.*:CFLAGS+=$(IRSSI_CFLAGS) $(QUASSELC_FLAGS):' \
+		-i "${S}/core/Makefile" || die
+
+	sed -e 's:gcc -shared:$(CC) -shared:' -i "${S}/core/Makefile" || die
+
+	tc-export CC
+	export SYSTEM_QUASSELC=1
+}
+
+src_compile() {
+	emake IRSSI_LIB="${ROOT}usr/$(get_libdir)/irssi" -C core
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install
+	default
+}
+
+pkg_postinst() {
+	elog "Note that this requires additional configuration of your irssi client. See"
+	elog "    ${ROOT}usr/share/doc/${P}/README.md.bz2'"
+	elog "for instructions."
+}
diff --git a/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild b/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
new file mode 100644
index 000000000000..6a49ea9bf6f1
--- /dev/null
+++ b/net-irc/quassel-irssi/quassel-irssi-0_p20170107.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+# https://github.com/phhusson/quassel-irssi/pull/10 if accepted will
+# allow QuasselC to be installed as a separate package.
+
+# Commit Date: Sat, 7 Jan 2017 14:50:15 +0000
+COMMIT="f23e97a6188129cfae4c52f7e1a75940185454f4"
+
+DESCRIPTION="Irssi module to connect to Quassel cores."
+HOMEPAGE="https://github.com/phhusson/quassel-irssi/"
+SRC_URI="https://github.com/phhusson/${PN}/archive/${COMMIT}.zip -> ${PF}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# fails to build with irssi-1.0
+RDEPEND="<=net-irc/irssi-0.8.21"
+DEPEND="${RDEPEND}
+	net-libs/quasselc"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+
+	sed -e "s:pkg-config:$(tc-getPKG_CONFIG):" \
+		-e 's:^CFLAGS=.*:CFLAGS+=$(IRSSI_CFLAGS) $(QUASSELC_FLAGS):' \
+		-i "${S}/core/Makefile" || die
+
+	sed -e 's:gcc -shared:$(CC) -shared:' -i "${S}/core/Makefile" || die
+
+	tc-export CC
+	export SYSTEM_QUASSELC=1
+}
+
+src_compile() {
+	emake IRSSI_LIB="${ROOT}usr/$(get_libdir)/irssi" -C core
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="${ROOT}usr/$(get_libdir)" -C core install
+	default
+}
+
+pkg_postinst() {
+	elog "Note that this requires additional configuration of your irssi client. See"
+	elog "    ${ROOT}usr/share/doc/${P}/README.md.bz2'"
+	elog "for instructions."
+}
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
new file mode 100644
index 000000000000..555738aae826
--- /dev/null
+++ b/net-irc/quassel/Manifest
@@ -0,0 +1,12 @@
+AUX quassel.logrotate 105 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45 SHA512 60371b4046c3c20c06d01f9cbf3f8465b40c9a989f392ed3e5a4724deff71960015eeb1707817af256618be8085b2aa5809377fec8cfae59e6b8fc958317e780 WHIRLPOOL 5b5185a6a68c12ce08ec5b41bb10644e487308f81b3e5d554524b05f70573410e31b299ac5fcec8806390deb37d0529ac69c435d0fcbaac005e59aec5a4095c5
+AUX quasselcore.conf 607 SHA256 2939b389370db7a3512f26e4c60b302e7c063519bd2c8d1cc8a04dd281eec2ec SHA512 b1fd0382d83c5983f6266c7500ac12dc00b964ff1f104cb20de9dd40b93edcbf90f98f5ab3f6f2cb87e6be63580c3ab2958f2e3ae57eb9569c24c49d8506bc38 WHIRLPOOL 31ada0d0b9fc364030ab319b641917e1c084b7eb075b92090a4400e7f4430f660151c873cff6ca32c334942762947ce50a0889b66e9f8380d8d64aafd3a7478a
+AUX quasselcore.conf-r1 333 SHA256 7d7ea29e58f49a0cc56aa3df4cc54814a67510169ce6cefad7ad5e5493671df7 SHA512 7d3f320b5d5c9cc27db399a5460ea37f33688d523340d4509ebd2fcf20620b43d4b1a05cdb91fa07931798b18a2bdcee9f4f29c75e867bd4b5a7f170cd02ba90 WHIRLPOOL 1d680d8df581dcb63f41d26db4f0e7ae667afad116c4cd579188d89e3a5296f47ec263e53fab02651cd96009ada3221044760e3a379347cb9a26304b41d0795f
+AUX quasselcore.init 1742 SHA256 c9fa4401dc8f58fdaba8b71f75edbcf362431490f3c09a84ea80d3db0d0cb2e7 SHA512 eddd620b43439becc3f714854b7d1c9f9a65b4784325b11298c94c9f15b6e1fe2547f566f8ae2ebf1134d6361228bdb047964df3ae439d540d57d8864cdecd6d WHIRLPOOL 9757ee2da43e14b22d79d68da54cf4f17cf04cdd03c0919b20273963a3ae0a02ec281a5d6be6ea8ee37afb7841cc7a753b66a5747f8bac069f462b51c3944f18
+AUX quasselcore.init-r1 490 SHA256 f533256d8406754b1aa471f58087f5f8b266187de769def783c4ce86e85450c7 SHA512 71b2381e834d86a29269516270fe2463adfe59de16d9916d9cc496959e6931719262bf980763662bfb309acb79c6508ae33c61ceacd53be912d3161105ba0c69 WHIRLPOOL 25ee3a393660faedff0e55069a69bce7a841845c490615062f19ee8597df9b11560014067f527905ca16022f0616a365489cb462e795002a2c4dc75731d66af0
+AUX quasselcore.service 189 SHA256 33c71f621f69f2eb6a5c613b979238c085a1e1aef3ee162011341c1a26821dae SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776 WHIRLPOOL 97e88e0581d064305390a7e093bc550f1fcad9a782ca7d7bae941aa56d9f6fbd72a98d67c0d85b3cf6f17d282ddc76e4c61ddc83a2ee14079b4643f8b29cb5fd
+DIST quassel-0.12.4.tar.bz2 3742639 SHA256 93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d SHA512 66bc12a9634534e6492787172a199c774ef1642d1ddb268c24ed96608698628bca7b278021a006a4db76783b19b1e1dead9d019bb8a6cbe1e12b8857792e7b92 WHIRLPOOL 13a6078aa8f0a3d039e9c240c870a13744b3eb3324f45508f62a37aa8da13c0b00f94f53fe2602762503459a1110e3796673c104397b37297390cc406f2eaa66
+EBUILD quassel-0.12.4.ebuild 5569 SHA256 628e0bfb2ebe1f586a19af44f8a82dc5dacf95ae98a39778e2010a7aa280690f SHA512 5ccaeb6cb5f237d2fdd3b03102b410d71b029333c73938acc8a07edba21abbb521d7b01568a5c118c2176f65e5116f2bea3b1716841aeec262e76b1672ad56a7 WHIRLPOOL fa17861b2d59942ddf7bb5e61e1ef4339f7872dfb2e1e62d34494bc980f353429369539a785b6d5f5c4075c694b986f41a33d35447a2f2a6fd7fca531259be35
+EBUILD quassel-9999.ebuild 4677 SHA256 ad9df842153c0e2c6a138aa4b1a66020ef87247f48bbf57adac063df8047a050 SHA512 bb9cba8ce7b1389e51ab42c76e14419ec8b5adce5716cff68c4faec7343580099a24a8af5f38f8d4efa4931a224b8924a32bf88bce9cd1ca4d075cbe8fc7359f WHIRLPOOL a2685d11ac5890aa683f44dec753235254bbe6897a829c6d1056c8a9f5287d1abcf1dddb99ce308266be81fa43853eb5fca3b9304dee5ef720b7fb0a034bab72
+MISC ChangeLog 8551 SHA256 380523247326e53489799a60accf1e1d5f287e7bf63bdaa5c70847da1c848596 SHA512 d38a4cc3578fa19fc901f94aad58b9e57dbc81a9c161f8e6f9fd8dbae83e11c86b14ad855a505b5ca53086d4c3ba1616d23bb38a7f72f229154bf33d83371fd9 WHIRLPOOL 0832a8889e45cfc404d2001e1675d9f6086ef983e2c09137420365f11aed4c7155a15a3f8b23a142b43b302ec8d09a16c61ffe7f4f4bb4c92a91010c0bc4e7c7
+MISC ChangeLog-2015 33096 SHA256 73e43554c4b61045c50b6edc224d0aa77068a764b71defadb4bde57419acba53 SHA512 3a3a7ed10b819b958b6906982e7496d55c46f870239ae6309c521de86c917b8868ea31111236d17d9737a296fa1b1e3d529dee15c4c0dd1321160cf1b8d06194 WHIRLPOOL 5006e2dff2334ff22ac0f323981f6650f4576ad103ba487c7ff48bebbd8691d6feeb4865a0a474e676b50763b35b13cc83ed7e6b1dc000eb0f9ced79eaf6834f
+MISC metadata.xml 1942 SHA256 05bd446a5ebec8d501520873ea2b64802fc74f39bd41df8d65bb75e5d03da3d9 SHA512 abf82cf9fe2bd552c1b26591e20da212cc3a118f6fb4ac92df8340d6ad5c7b6757e9290f8c6e8175dd95384b385dfd0399d6693d7fe6dc480b5a6d6f9b851d05 WHIRLPOOL 90c77de4ce540bff43cd606c4e992f98c587d178878eac3c56c4b21ad6f02ab1e28aace2ff58d3ea5eeab3da5ec58951b5db7358fddd024a1449fd8d96a61726
diff --git a/net-irc/quassel/files/quassel.logrotate b/net-irc/quassel/files/quassel.logrotate
new file mode 100644
index 000000000000..8e7208350020
--- /dev/null
+++ b/net-irc/quassel/files/quassel.logrotate
@@ -0,0 +1,9 @@
+/var/log/quassel.log {
+	compress
+	rotate 4
+	weekly
+	delaycompress
+	copytruncate
+	missingok
+	notifempty
+}
diff --git a/net-irc/quassel/files/quasselcore.conf b/net-irc/quassel/files/quasselcore.conf
new file mode 100644
index 000000000000..960203500fe4
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore.conf
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Loglevel Debug|Info|Warning|Error. Default is: Info
+# The logfile is located at /var/log/quassel.log.
+#LOGLEVEL="Info"
+
+# The address(es) quasselcore will listen on. Default is 0.0.0.0
+#LISTEN="0.0.0.0"
+
+# The port quasselcore will listen at. Default is: 4242
+#PORT="4242"
+
+# User we want our daemon to run under.
+#QUASSEL_USER="quassel"
+
+# Directory we store all quasselcore content.
+#CONFIGDIR="/var/lib/quassel"
+
+# File quasselcore will log all its events into.
+#LOGFILE="/var/log/quassel.log"
diff --git a/net-irc/quassel/files/quasselcore.conf-r1 b/net-irc/quassel/files/quasselcore.conf-r1
new file mode 100644
index 000000000000..29e14467a8f3
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore.conf-r1
@@ -0,0 +1,11 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Loglevel Debug|Info|Warning|Error. Default is: Info
+#LOGLEVEL="Info"
+
+# The address(es) quasselcore will listen on. Default is 0.0.0.0
+#LISTEN="0.0.0.0"
+
+# The port quasselcore will listen at. Default is: 4242
+#PORT="4242"
diff --git a/net-irc/quassel/files/quasselcore.init b/net-irc/quassel/files/quasselcore.init
new file mode 100644
index 000000000000..468c24ec2990
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore.init
@@ -0,0 +1,62 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount net
+	after bootmisc postgres
+}
+
+CORE="$(which quasselcore)"
+PID="/var/run/quassel.pid"
+LOGFILE=${LOGFILE:-"/var/log/quassel.log"}
+CONFIGDIR=${CONFIGDIR:-"/var/lib/quassel"}
+QUASSEL_USER=${QUASSEL_USER:-"quassel"}
+
+checkconfig() {
+	# set defaults
+	LOGLEVEL=${LOGLEVEL:-"Info"}
+
+	# check config folder
+	if [ ! -d "${CONFIGDIR}" ]; then
+		mkdir "${CONFIGDIR}" || return 1
+	fi
+	# permissions always changed just to avoid runtime issues
+	chown -R "${QUASSEL_USER}":"${QUASSEL_USER}" "${CONFIGDIR}" || return 1
+
+	# check log file
+	if [ ! -e "${LOGFILE}" ]; then
+		touch "${LOGFILE}" || return 1
+	fi
+	# permissions always changed just to avoid runtime issues
+	chown "${QUASSEL_USER}":"${QUASSEL_USER}" "${LOGFILE}" || return 1
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Quassel Core"
+
+	if [ -n "${RC_UNAME}" ]; then
+		# running on baselayout-2/openrc
+		start-stop-daemon --start --user "${QUASSEL_USER}" --background --make-pidfile \
+		--pidfile "${PID}" \
+		--exec "${CORE}" -- --logfile="${LOGFILE}" --loglevel="${LOGLEVEL}" \
+		${LISTEN:+--listen="${LISTEN}"} ${PORT:+--port="${PORT}"} \
+		--configdir="${CONFIGDIR}"
+	else
+		# running on baselayout-1
+		start-stop-daemon --start --chuid "${QUASSEL_USER}" --background --make-pidfile \
+		--pidfile "${PID}" --env HOME="${CONFIGDIR}" \
+		--exec "${CORE}" -- --logfile="${LOGFILE}" --loglevel="${LOGLEVEL}" \
+		${LISTEN:+--listen="${LISTEN}"} ${PORT:+--port="${PORT}"} \
+		--configdir="${CONFIGDIR}"
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Quassel Core"
+	start-stop-daemon --stop --pidfile "${PID}" --exec "${CORE}"
+	eend $?
+}
diff --git a/net-irc/quassel/files/quasselcore.init-r1 b/net-irc/quassel/files/quasselcore.init-r1
new file mode 100644
index 000000000000..5976235aafa4
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore.init-r1
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	after logger postgres
+}
+
+LISTEN=${LISTEN:-"0.0.0.0"}
+LOGLEVEL=${LOGLEVEL:-"Info"}
+PORT=${PORT:="4242"}
+
+command="/usr/bin/quasselcore"
+command_args="--configdir=/var/lib/quassel
+	--listen=${LISTEN}
+	--loglevel=${LOGLEVEL}
+	--port=${PORT}
+	--syslog"
+command_background="yes"
+command_user="quassel"
+description="Quassel Core"
+pidfile="/run/quassel.pid"
diff --git a/net-irc/quassel/files/quasselcore.service b/net-irc/quassel/files/quasselcore.service
new file mode 100644
index 000000000000..f5b49ab0373b
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Quassel Core
+After=network.target
+
+[Service]
+User=quassel
+Group=quassel
+ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
new file mode 100644
index 000000000000..973e5423b38c
--- /dev/null
+++ b/net-irc/quassel/metadata.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<use>
+		<flag name="breeze">
+			Support the Breeze and Breeze-Dark icon sets (default for Plasma 5).
+		</flag>
+		<flag name="crypt">
+			Support core-&gt;network per-channel and per-query blowfish
+			encryption via <pkg>app-crypt/qca</pkg> SLOT 2.
+		</flag>
+		<flag name="dbus">
+			Support desktop notifications via the StatusNotifier D-Bus service
+			(used by most modern desktop environments).
+		</flag>
+		<flag name="monolithic">
+			Build standalone client with integrated core, no external
+			quasselcore needed. Only useful if you don't want to use Quassel's
+			client/server model. The server and X flags are not needed in this
+			case but it is possible to enable them too.
+		</flag>
+		<flag name="oxygen">
+			Support the Oxygen icon set that was the default for KDE4.
+		</flag>
+		<flag name="phonon">
+			Build client with phonon backend support. This enables sound
+			playback in client.
+		</flag>
+		<flag name="server">
+			Build the server binary. If this USE flag is disabled, the
+			'core' server binary for quassel is not built, and cannot be
+			used. You need this enabled on the server, but you might want to
+			disable it on the client.
+		</flag>
+		<flag name="snorenotify">
+			Support for Snore notification framework.
+		</flag>
+		<flag name="urlpreview">
+			Use QtWebEngine rendering engine for showing URL thumbnails.
+		</flag>
+		<flag name="X">
+			Build the Qt5 GUI client for quassel. If this USE flag is
+			disabled, the GUI is not built, and cannot be used. You might
+			want to disable this on the server, but you need it enabled on
+			the client.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-irc/quassel/quassel-0.12.4.ebuild b/net-irc/quassel/quassel-0.12.4.ebuild
new file mode 100644
index 000000000000..4b8e4eb39bec
--- /dev/null
+++ b/net-irc/quassel/quassel-0.12.4.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils pax-utils systemd user versionator
+
+EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="http://quassel-irc.org/"
+[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
+SLOT="0"
+IUSE="ayatana crypt dbus debug kde monolithic phonon postgres qt5 +server
+snorenotify +ssl syslog webkit X"
+
+SERVER_RDEPEND="
+	qt5? (
+		dev-qt/qtscript:5
+		crypt? ( app-crypt/qca:2[qt5,ssl] )
+		postgres? ( dev-qt/qtsql:5[postgres] )
+		!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	)
+	!qt5? (
+		dev-qt/qtscript:4
+		crypt? ( app-crypt/qca:2[qt4,ssl] )
+		postgres? ( dev-qt/qtsql:4[postgres] )
+		!postgres? ( dev-qt/qtsql:4[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	)
+	syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dbus? (
+			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+			dev-qt/qtdbus:5
+		)
+		kde? (
+			kde-frameworks/kconfigwidgets:5
+			kde-frameworks/kcoreaddons:5
+			kde-frameworks/knotifications:5
+			kde-frameworks/knotifyconfig:5
+			kde-frameworks/ktextwidgets:5
+			kde-frameworks/kwidgetsaddons:5
+			kde-frameworks/kxmlgui:5
+			kde-frameworks/sonnet:5
+		)
+		phonon? ( media-libs/phonon[qt5(+)] )
+		snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+		webkit? ( dev-qt/qtwebkit:5 )
+	)
+	!qt5? (
+		dev-qt/qtgui:4
+		ayatana? ( dev-libs/libindicate-qt )
+		dbus? (
+			>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt4]
+			dev-qt/qtdbus:4
+			kde? (
+				kde-frameworks/kdelibs:4
+				kde-frameworks/oxygen-icons:*
+			)
+		)
+		phonon? ( media-libs/phonon[qt4] )
+	)
+"
+
+RDEPEND="
+	sys-libs/zlib
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5[ssl?]
+	)
+	!qt5? ( dev-qt/qtcore:4[ssl?] )
+	monolithic? (
+		${SERVER_RDEPEND}
+		${GUI_RDEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_RDEPEND} )
+		X? ( ${GUI_RDEPEND} )
+	)
+"
+DEPEND="${RDEPEND}
+	qt5? (
+		dev-qt/linguist-tools:5
+		kde-frameworks/extra-cmake-modules
+	)
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+REQUIRED_USE="
+	|| ( X server monolithic )
+	ayatana? ( || ( X monolithic ) )
+	crypt? ( || ( server monolithic ) )
+	dbus? ( || ( X monolithic ) )
+	kde? ( || ( X monolithic ) phonon )
+	phonon? ( || ( X monolithic ) )
+	postgres? ( || ( server monolithic ) )
+	qt5? ( !ayatana )
+	snorenotify? ( qt5 || ( X monolithic ) )
+	syslog? ( || ( server monolithic ) )
+	webkit? ( qt5 || ( X monolithic ) )
+"
+
+pkg_setup() {
+	if use server; then
+		QUASSEL_DIR=/var/lib/${PN}
+		QUASSEL_USER=${PN}
+		# create quassel:quassel user
+		enewgroup "${QUASSEL_USER}"
+		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package ayatana IndicateQt)
+		$(cmake-utils_use_find_package crypt QCA2)
+		$(cmake-utils_use_find_package crypt QCA2-QT5)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_OXYGEN=$(usex !kde)
+		-DWANT_MONO=$(usex monolithic)
+		$(cmake-utils_use_find_package phonon Phonon)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		-DUSE_QT5=$(usex qt5)
+		-DWANT_CORE=$(usex server)
+		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+		-DWITH_WEBKIT=$(usex webkit)
+		-DWANT_QTCLIENT=$(usex X)
+		-DEMBED_DATA=OFF
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# Something broke upstream detection since Qt 5.5
+	if use ssl ; then
+		mycmakeargs+=("-DHAVE_SSL=TRUE")
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server ; then
+		# needs PAX marking wrt bug#346255
+		pax-mark m "${ED}/usr/bin/quasselcore"
+
+		# prepare folders in /var/
+		keepdir "${QUASSEL_DIR}"
+		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
+
+		# init scripts & systemd unit
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
+
+		# logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel
+	fi
+}
+
+pkg_postinst() {
+	if use monolithic && use ssl ; then
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
+	fi
+
+	if use server; then
+		einfo "If you want to generate SSL certificate remember to run:"
+		einfo "	emerge --config =${CATEGORY}/${PF}"
+	fi
+
+	if use server || use monolithic ; then
+		einfo "Quassel can use net-misc/oidentd package if installed on your system."
+		einfo "Consider installing it if you want to run quassel within identd daemon."
+	fi
+}
+
+pkg_config() {
+	if use server && use ssl; then
+		# generate the pem file only when it does not already exist
+		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
+			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
+				-out "${QUASSEL_DIR}/quasselCert.pem"
+			# permissions for the key
+			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+		else
+			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+			einfo "Remove it if you want to create new one."
+		fi
+	fi
+}
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
new file mode 100644
index 000000000000..7bf54b67a40a
--- /dev/null
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils pax-utils systemd user
+
+EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
+HOMEPAGE="http://quassel-irc.org/"
+[[ "${PV}" == "9999" ]] || SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="+breeze crypt +dbus debug kde monolithic oxygen postgres +server snorenotify +ssl syslog urlpreview X"
+
+SERVER_RDEPEND="
+	dev-qt/qtscript:5
+	crypt? ( app-crypt/qca:2[qt5,ssl] )
+	postgres? ( dev-qt/qtsql:5[postgres] )
+	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
+	syslog? ( virtual/logger )
+"
+
+GUI_RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	breeze? ( kde-frameworks/breeze-icons:5 )
+	dbus? (
+		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
+		dev-qt/qtdbus:5
+	)
+	kde? (
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/knotifyconfig:5
+		kde-frameworks/ktextwidgets:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+		kde-frameworks/sonnet:5
+	)
+	oxygen? ( kde-frameworks/oxygen-icons:5 )
+	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
+	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
+"
+
+RDEPEND="
+	sys-libs/zlib
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl?]
+	monolithic? (
+		${SERVER_RDEPEND}
+		${GUI_RDEPEND}
+	)
+	!monolithic? (
+		server? ( ${SERVER_RDEPEND} )
+		X? ( ${GUI_RDEPEND} )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	kde-frameworks/extra-cmake-modules
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+REQUIRED_USE="
+	|| ( X server monolithic )
+	crypt? ( || ( server monolithic ) )
+	kde? ( || ( X monolithic ) )
+	monolithic? ( || ( breeze oxygen ) )
+	postgres? ( || ( server monolithic ) )
+	snorenotify? ( || ( X monolithic ) )
+	syslog? ( || ( server monolithic ) )
+	X? ( || ( breeze oxygen ) )
+"
+
+pkg_setup() {
+	if use server; then
+		QUASSEL_DIR=/var/lib/${PN}
+		QUASSEL_USER=${PN}
+		# create quassel:quassel user
+		enewgroup "${QUASSEL_USER}"
+		enewuser "${QUASSEL_USER}" -1 -1 "${QUASSEL_DIR}" "${QUASSEL_USER}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT4=OFF
+		-DUSE_QT5=ON
+		-DWANT_CORE=$(usex server)
+		-DWANT_MONO=$(usex monolithic)
+		-DWANT_QTCLIENT=$(usex X)
+		-DWITH_KDE=$(usex kde)
+		-DWITH_WEBKIT=OFF
+		-DWITH_WEBENGINE=$(usex urlpreview)
+		-DWITH_BREEZE=OFF
+		-DWITH_BREEZE_DARK=OFF
+		-DWITH_OXYGEN=OFF
+		-DEMBED_DATA=OFF
+		-DCMAKE_SKIP_RPATH=ON
+		$(cmake-utils_use_find_package crypt QCA2-QT5)
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server ; then
+		# needs PAX marking wrt bug#346255
+		pax-mark m "${ED}/usr/bin/quasselcore"
+
+		# prepare folders in /var/
+		keepdir "${QUASSEL_DIR}"
+		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
+
+		# init scripts & systemd unit
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+		systemd_dounit "${FILESDIR}"/quasselcore.service
+
+		# logrotate
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/quassel.logrotate" quassel
+	fi
+}
+
+pkg_postinst() {
+	if use monolithic && use ssl ; then
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at http://bugs.quassel-irc.org/projects/quassel-irc/wiki/Client-Core_SSL_support."
+	fi
+
+	if use server; then
+		einfo "If you want to generate SSL certificate remember to run:"
+		einfo "	emerge --config =${CATEGORY}/${PF}"
+	fi
+
+	if use server || use monolithic ; then
+		einfo "Quassel can use net-misc/oidentd package if installed on your system."
+		einfo "Consider installing it if you want to run quassel within identd daemon."
+	fi
+}
+
+pkg_config() {
+	if use server && use ssl; then
+		# generate the pem file only when it does not already exist
+		if [ ! -f "${QUASSEL_DIR}/quasselCert.pem" ]; then
+			einfo "Generating QUASSEL SSL certificate to: \"${QUASSEL_DIR}/quasselCert.pem\""
+			openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+				-keyout "${QUASSEL_DIR}/quasselCert.pem" \
+				-out "${QUASSEL_DIR}/quasselCert.pem"
+			# permissions for the key
+			chown ${QUASSEL_USER}:${QUASSEL_USER} "${QUASSEL_DIR}/quasselCert.pem"
+			chmod 400 "${QUASSEL_DIR}/quasselCert.pem"
+		else
+			einfo "Certificate \"${QUASSEL_DIR}/quasselCert.pem\" already exists."
+			einfo "Remove it if you want to create new one."
+		fi
+	fi
+}
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
new file mode 100644
index 000000000000..a2d47b58dfe5
--- /dev/null
+++ b/net-irc/quasselgrep/Manifest
@@ -0,0 +1,4 @@
+DIST quasselgrep-0_p20170411.tar.gz 29117 SHA256 06f7729c3f51a728b93a82979ca0adb4135ce8345bb55deaeb42aa9a985ab229 SHA512 b216c49e340cddfeb4fe28046c698a5517a873602a4303c7c6976d6d7f0bfffbb78f170a33126a16089e239a67e1624410f8e727b5ed6ab977f78745362db0e2 WHIRLPOOL 97ad005be19910c2ce503b12c3d4ff4e7c8be74054802847a8b2be444823511bcc508d075f2073a89c671bfae2d7e1fd2f22dc225c68d74056c179d78cf9601c
+EBUILD quasselgrep-0_p20170411.ebuild 896 SHA256 baf759081982590aa83aa7a559660d101b1e9debcbdec0bbfb8f3511cbc0c236 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050 WHIRLPOOL 1e10db422d561e252c2c289e08df40f000ae6126fe16944e03c3a5dc51b9efa4cce14b45f73ad7223db1495665b18a4c4f7e35d8ee42e9a232053610beb86d75
+EBUILD quasselgrep-9999.ebuild 896 SHA256 baf759081982590aa83aa7a559660d101b1e9debcbdec0bbfb8f3511cbc0c236 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050 WHIRLPOOL 1e10db422d561e252c2c289e08df40f000ae6126fe16944e03c3a5dc51b9efa4cce14b45f73ad7223db1495665b18a4c4f7e35d8ee42e9a232053610beb86d75
+MISC metadata.xml 471 SHA256 cc6130d9420c35bd030a437bc60cccba5bdfacf0f74c2a18c2964e39fc4c51b7 SHA512 7f98316bf30d230ea931fe88e2f0b976f68a195a22ffd6069c3c68e06de855fcda658dd46d443de73dcb1c676fa987d05013e1d0047bbd2154ccd239c87c69bb WHIRLPOOL 58ba22cd9a0f86b4d87b4033474c2bd78b7f1390ad8a6eeecc38faae5cce3c7476c68265d88bfa8ad3235ab2ce48892f408ea841284372e7031abbd13ade9958
diff --git a/net-irc/quasselgrep/metadata.xml b/net-irc/quasselgrep/metadata.xml
new file mode 100644
index 000000000000..23dc8ab4748e
--- /dev/null
+++ b/net-irc/quasselgrep/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>om@organizedmagnetism.com</email>
+		<name>Scott Martin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<doc>https://github.com/fish-face/quasselgrep/blob/master/README.md</doc>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20170411.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20170411.ebuild
new file mode 100644
index 000000000000..efe0f9483d65
--- /dev/null
+++ b/net-irc/quasselgrep/quasselgrep-0_p20170411.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_COMMIT=502c88bdc7613abb68e868eb520e39ec8a5cf6dd
+
+DESCRIPTION="Tool for searching quassel logs from the commandline"
+HOMEPAGE="https://github.com/fish-face/quasselgrep"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fish-face/quasselgrep"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fish-face/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
+	S="${WORKDIR}/fish-face-${PN}-${MY_COMMIT:0:7}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.5.3[${PYTHON_USEDEP}]"
+
+src_configure() {
+	sed -i 's/pycrypto/pycryptodome/g' "${S}"/setup.py || die "sed failed"
+}
diff --git a/net-irc/quasselgrep/quasselgrep-9999.ebuild b/net-irc/quasselgrep/quasselgrep-9999.ebuild
new file mode 100644
index 000000000000..efe0f9483d65
--- /dev/null
+++ b/net-irc/quasselgrep/quasselgrep-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+MY_COMMIT=502c88bdc7613abb68e868eb520e39ec8a5cf6dd
+
+DESCRIPTION="Tool for searching quassel logs from the commandline"
+HOMEPAGE="https://github.com/fish-face/quasselgrep"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fish-face/quasselgrep"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fish-face/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
+	S="${WORKDIR}/fish-face-${PN}-${MY_COMMIT:0:7}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.5.3[${PYTHON_USEDEP}]"
+
+src_configure() {
+	sed -i 's/pycrypto/pycryptodome/g' "${S}"/setup.py || die "sed failed"
+}
diff --git a/net-irc/rbot/Manifest b/net-irc/rbot/Manifest
new file mode 100644
index 000000000000..d3509912e17d
--- /dev/null
+++ b/net-irc/rbot/Manifest
@@ -0,0 +1,11 @@
+AUX rbot-rakefile-gettext.patch 376 SHA256 646e77e0ec84e3822f4371c78854bfc6865325e3391f5b4f405190ed70cbf5c5 SHA512 240de2ffdb6f81910f1ec5cee74a3754f5282aa636fbb0b99305a46936cd727527f2fa14e34be88a11093b89ae5a4d907b87e8c6df1279f4a612a3a5729dbe02 WHIRLPOOL 9728533616368c2f4f96352466edb8809c85ff2bef1c4213e6ad9a7a7d7ab27c602e455fbec2159fcf4493f1c8202cc13891bf2a339c3d87dcb3f572a6366754
+AUX rbot.conf 944 SHA256 89ccc3e036414c2a4b1ba8338408cc9a5b89c3bfae4268a27fb9c6094bcc95f6 SHA512 fa68050203a50cbcb8a8ec95f4cf7864d614eb23f75fa43a2236796851da590399096d3871c11a012aa58dd2466af454d5f099eb6c9b4bc0eea2110d5cb926b4 WHIRLPOOL 29557e61deb3abd13f2baea145fb3613816c9c4e18ee314ebbd8085691d05ebfeaaf2d080f4c54eaa86eb0e82bcac3f10f3080814d97f4487c80a42302d7e319
+AUX rbot.conf2 1111 SHA256 22c2b489846c56d054f3e88e1763486bcb59df621c288e8b816fd2a109b08742 SHA512 19f96fdcdd7c312da58f22f1ca089cf4e9bde03273e37ecd179e5fa94e1d59f8ebada435a0f27e7c6c5fae39b9ba575d9e397fa9543d82f846bcc5eb728bd0f8 WHIRLPOOL 7f8fc775a7abcd76c9a3a2987cdf0524c48e72e10bbb66617eb9129dd281c5acd59c40cc432017ad523499bd67ff3af69617168a1d112ff69834557f59a316bc
+AUX rbot.init 1459 SHA256 0ea2be247687db9f2bebc051164bfd0070cc197afcda0e9e89d311667b11b485 SHA512 57f5504829ed7524b70102833a5de168f7ea08e594a92ece6d7c0f2eab7de8c9dd14a6d199c5e63b6298209bdf5de4adcb06aded0c23d05c35f7e9774742ecea WHIRLPOOL 29d244c8388b4aa41d4b29654613cb546d5913eb1727bd1b848fc8393218d1896e46d25ce4aed4cb73c42778e701b6b217949edeef71e78edd1facbb5cb02e75
+AUX rbot.init2 1345 SHA256 e6593b52b6ee655ce32f5507e78e57762915444f40c238f725f46ad275a19e09 SHA512 b3d8b83eea4d429a47657f4f9b6cb0aed6c283aa4e7535307305f33bc84c53c0c82e2b76a7cf45ec192c7db68c71e70ee5b000ffbd6f0ff59039de8f69f88dff WHIRLPOOL affe65fee4917f11b1b54763a33f8f690641d253fd66344310126ff64b27acfd5227ded8e687678098ee485cf845e238c66863686843f78e916a7f21f0ec4f96
+DIST rbot-0.9.15_p20160325.tar.gz 762685 SHA256 ae638f53607ad0f1d365ff3c4408ef3c27c8e0f5e83ae355742185c1076ec96e SHA512 b0bc90ee2c6ddb3cdd92cdd5f3a45520d20bc97327b3d694235f7ba94f13ef3c884d4658b083f71bfee2cbeff3cbc7a57c251c4d28bfee293e2556f64e7b4160 WHIRLPOOL e2fbeb41c065ea8642bff49ffade38992c6ab7ccee107d1e140c1810daed869e6e378ac59f7453eeacf8f24e3a980dcb5b911f706475c6f2457a61e3b0483902
+EBUILD rbot-0.9.15_p20160325-r1.ebuild 5382 SHA256 4fc69f35aee71d3204e1bb640f11f0f7a92e642a34e9b08553ed4073f53e7f95 SHA512 ba393920dd86537df7b5cd5aa08e76879613783bf90c8a35c5ca6641dcf7dcadcc78dd056fda47c18e78da0edb69ca59105b79d5b1659fd15b05527fa6944a40 WHIRLPOOL e1e6be5c584534dd45ee18cb1880af47e69f8d2d6450fee73e60a45848064a610972d2e2b5b15711e48003988da5ea1e4809538b15e43808b8d55c2ef597cb44
+EBUILD rbot-0.9.15_p20160325.ebuild 5078 SHA256 83080f4130c2af9654cc542ca754b2a25c4de1c21a4ca3d182bc752b69bf2e55 SHA512 d69608ab6e307de540d9a434c9d62edf75aa87c1b1080277bdb888a1c280689e87f846a3afa850be3cae6d610c327fd887deeadcb2b8a516a0a0859e7a8591a3 WHIRLPOOL a4199c17fa2baefdc56a5c095947d05b51562948b9ce6d1f26affeb6daf291347810752f7eafa9f7d810b7c795c7078a8c738889deb0f91378997db0c50ef890
+MISC ChangeLog 3665 SHA256 7253c91b74699f6deceef8de0809cda1d8fa047aa28baa73844eb8268678a6e1 SHA512 f953dc60668b10b55b3f8d6bdcfdb65bf07bcca748a25640aa7bc54b35d35ba403207a4c7fb31c5e03d7957a8f06d104c9c32999f1c50e62ec2538728d1d3ed0 WHIRLPOOL 831d9bad5db48488cb7d9adfacffa86613c1fdacb12c0d4e9222e382aa79763bbd0d909a0544d01e86c19b7d59da33945c91aa7dc1756ab01d3af7b6aa5ef92b
+MISC ChangeLog-2015 10517 SHA256 de7d97c80656a6049d7f2f12646dfd203072075e562aa8803372ba6b9b535700 SHA512 f44bc28a2480c0549b0ee068f3c298061976be113bad0aef59289467a8654af432c8bc4793abe9d2961159d1690fc5df4d9809622cff53ac616891e8adf3db1a WHIRLPOOL ddccb544a4205f4ea30abf9d17308139e40656029af0be1204c6b685e22e88e4544b4d650c3cd370c6a5ca3257633f0b341f2c1d3385780de00cbcec85b45fea
+MISC metadata.xml 2656 SHA256 00263ee4376ad48677f9e79b6bb40b91646bc031e4e68fb91011155066305cd1 SHA512 03c3fc8b4f700eb1039feb5f656f772a55c3b928658e494c542cf69d3325d08b2723e23cfb753afe5ea3bad240011e642a4923e9a84673cba1e06b24cfc60918 WHIRLPOOL e7f7143938e17198e30965d9bd16ec4866f603773fa9c9191c4facc760a63aeb7fb6cf880be7ce2e540e17b6b243478eae56612689293e3d4a5ead95f4f1c8a5
diff --git a/net-irc/rbot/files/rbot-rakefile-gettext.patch b/net-irc/rbot/files/rbot-rakefile-gettext.patch
new file mode 100644
index 000000000000..4fc3735f4523
--- /dev/null
+++ b/net-irc/rbot/files/rbot-rakefile-gettext.patch
@@ -0,0 +1,13 @@
+--- Rakefile.old	2013-08-20 01:00:05.000000000 +0200
++++ Rakefile	2013-10-21 19:42:06.800019343 +0200
+@@ -125,8 +126,8 @@
+ }) do |t|
+   po_file, mo_file = t.source, t.name
+   puts "#{po_file} => #{mo_file}"
+-  require 'gettext/utils'
+-  GetText.rmsgfmt po_file, mo_file
++  require 'gettext/tools'
++  GetText::Tools::MsgFmt.run po_file, mo_file
+ end
+ 
+ task :check_po_tools do
diff --git a/net-irc/rbot/files/rbot.conf b/net-irc/rbot/files/rbot.conf
new file mode 100644
index 000000000000..0c22544f385a
--- /dev/null
+++ b/net-irc/rbot/files/rbot.conf
@@ -0,0 +1,22 @@
+# Configuration file for rbot service(s)
+# 
+# To allow running more than one rbot service on your box, you can
+# symlink /etc/init.d/rbot to any name starting with rbot.
+# By doing this, after this configuration file, the service will
+# source the relative /etc/conf.d/rbot.$name file, where you can set
+# your particular configuration for that rbot instance.
+#
+# NOTE: please make sure you always use a different RBOTDIR for
+# multiple instances; you can still use the same user though.
+# Also note that, as in the home of the user there will be the
+# password for both rbot and NickServ access, the directory should not
+# have world readable permissions.
+
+# Base directory for the bot, with the configuration data
+RBOTDIR="/var/lib/rbot"
+
+# User to run the rbot instance with.
+# Note 1: you can specify also a group in the form of user:group.
+# Note 2: the HOME of the user will be hardwired to /dev/null for
+# safety.
+RBOTUSER="rbot:nobody"
diff --git a/net-irc/rbot/files/rbot.conf2 b/net-irc/rbot/files/rbot.conf2
new file mode 100644
index 000000000000..203429d1aa24
--- /dev/null
+++ b/net-irc/rbot/files/rbot.conf2
@@ -0,0 +1,26 @@
+# Configuration file for rbot service(s)
+# 
+# To allow running more than one rbot service on your box, you can
+# symlink /etc/init.d/rbot to any name starting with rbot.
+# By doing this, after this configuration file, the service will
+# source the relative /etc/conf.d/rbot.$name file, where you can set
+# your particular configuration for that rbot instance.
+#
+# NOTE: please make sure you always use a different RBOTDIR for
+# multiple instances; you can still use the same user though.
+# Also note that, as in the home of the user there will be the
+# password for both rbot and NickServ access, the directory should not
+# have world readable permissions.
+
+# Base directory for the bot, with the configuration data
+RBOTDIR="/var/lib/rbot"
+
+# User to run the rbot instance with.
+# Note 1: you can specify also a group in the form of user:group.
+# Note 2: the HOME of the user will be hardwired to /dev/null for
+# safety.
+RBOTUSER="rbot:nobody"
+
+# The Ruby interpreter to run rbot with. Use full paths.
+# This defaults to whatever is put as default by eselect ruby.
+RBOTRUBY="/usr/bin/$(readlink /usr/bin/ruby)"
diff --git a/net-irc/rbot/files/rbot.init b/net-irc/rbot/files/rbot.init
new file mode 100644
index 000000000000..d054665f8604
--- /dev/null
+++ b/net-irc/rbot/files/rbot.init
@@ -0,0 +1,54 @@
+#!/sbin/openrc-run
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	 need net
+	 use dns
+}
+
+start() {
+	if ! [ -d "${RBOTDIR}" ]; then
+		eerror "The path you specified (${RBOTDIR}) is not a directory."
+		eerror "Please set RBOTDIR variable in /etc/conf.d/${myservice}"
+		eerror "to a proper value for an rbot base directory."
+		return 1
+	fi
+
+	if ! [ -f "${RBOTDIR}/conf.yaml" ]; then
+		eerror "You didn't configure rbot yet. Please configure rbot by running"
+		eerror "	rbot ${RBOTDIR}"
+		eerror "at least once."
+		return 1
+	fi
+
+	# for a series of reason, we can't rely on the process being started
+	# with 'ruby' name. As using ruby18 would break for ruby 1.9, get the
+	# linked name to use as rubyname.
+	ruby="$(readlink /usr/bin/ruby)"
+
+	export USER="${RBOTUSER%%:*}"
+	export HOME="/dev/null"
+	ebegin "Starting rbot"
+	start-stop-daemon \
+		--start \
+		--exec "/usr/bin/${ruby}" --name "${ruby}" \
+		--pidfile "${RBOTDIR}/rbot.pid" \
+		--chuid "${RBOTUSER}" \
+		-- /usr/bin/rbot --background "${RBOTDIR}"
+	eend $?
+}
+
+stop() {
+	# for a series of reason, we can't rely on the process being started
+	# with 'ruby' name. As using ruby18 would break for ruby 1.9, get the
+	# linked name to use as rubyname.
+	ruby="$(readlink /usr/bin/ruby)"
+
+	ebegin "Stopping rbot"
+	start-stop-daemon --stop \
+		--exec "/usr/bin/${ruby}" \
+		--pidfile "${RBOTDIR}/rbot.pid" \
+		--user "${RBOTUSER%%:*}"
+	eend $?
+}
diff --git a/net-irc/rbot/files/rbot.init2 b/net-irc/rbot/files/rbot.init2
new file mode 100644
index 000000000000..52bb39d0f8a9
--- /dev/null
+++ b/net-irc/rbot/files/rbot.init2
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	 need net
+	 use dns
+}
+
+start() {
+	if ! [ -d "${RBOTDIR}" ]; then
+		eerror "The path you specified (${RBOTDIR}) is not a directory."
+		eerror "Please set RBOTDIR variable in /etc/conf.d/${SVCNAME}"
+		eerror "to a proper value for an rbot base directory."
+		return 1
+	fi
+
+	if ! [ -f "${RBOTDIR}/conf.yaml" ]; then
+		eerror "You didn't configure rbot yet. Please configure rbot by running"
+		eerror "	rbot ${RBOTDIR}"
+		eerror "at least once."
+		return 1
+	fi
+
+        if ! [ -x "${RBOTRUBY}" ]; then
+		eerror "The configured Ruby interpreter for rbot is not an executable."
+		eerror "Use \`eselect ruby' to set a default interpreter or adapt the"
+		eerror "RBOTRUBY variable in /etc/conf.d/${SVCNAME}."
+		return 1
+	fi
+
+	export USER="${RBOTUSER%%:*}"
+	export HOME="/dev/null"
+	ebegin "Starting rbot"
+	start-stop-daemon \
+		--start \
+		--exec "${RBOTRUBY}" --name "$(basename ${RBOTRUBY})" \
+		--pidfile "${RBOTDIR}/rbot.pid" \
+		--chuid "${RBOTUSER}" \
+		-- /usr/bin/rbot --background "${RBOTDIR}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rbot"
+	start-stop-daemon --stop \
+		--exec "${RBOTRUBY}" \
+		--pidfile "${RBOTDIR}/rbot.pid" \
+		--user "${RBOTUSER%%:*}"
+	eend $?
+}
+
+# vim:set sts=8 sw=8 ts=8 noexpandtab:
diff --git a/net-irc/rbot/metadata.xml b/net-irc/rbot/metadata.xml
new file mode 100644
index 000000000000..9be5ac250eb4
--- /dev/null
+++ b/net-irc/rbot/metadata.xml
@@ -0,0 +1,65 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <use>
+    <flag name="timezone">
+    Add dependency over <pkg>dev-ruby/tzinfo</pkg> to enable the "time"
+    plugin for rbot. If the USE flag is disabled the plugin is also
+    disabled by default.
+  </flag>
+    <flag name="aspell">
+    Use aspell instead of ispell in the "spell" plugin for rbot. The
+    vanilla plugin uses ispell, but enabling this flag makes it use
+    the ispell interface from aspell instead.
+    </flag>
+    <flag name="translator">
+    Add dependency over <pkg>dev-ruby/mechanize</pkg>, which is needed
+    to enable the "translator" plugin for rbot. If the USE flag is
+    disabled the plugin is also disabled by default.
+  </flag>
+    <flag name="shorturl">
+    Add dependency over <pkg>dev-ruby/shorturl</pkg>, which is needed
+    to enable the "shortenurl" plugin for rbot. If the USE flag is
+    disabled the plugin is also disabled by default.
+  </flag>
+    <flag name="nls">
+    Build and install translation for the messages coming from the bot
+    and its plugins (through <pkg>dev-ruby/ruby-gettext</pkg>).
+  </flag>
+    <flag name="figlet">
+    Add dependency over <pkg>app-misc/figlet</pkg>, which is used by
+    the "figlet" plugin for rbot. If the USE flag is disabled the
+    plugin will be unable to use figlet; if toilet is also disabled,
+    the plugin will be disabled.
+  </flag>
+    <flag name="toilet">
+    Add dependency over <pkg>app-misc/toilet</pkg>, which is used by
+    the "figlet" plugin for rbot. If the USE flag is disabled the
+    plugin will be unable to use toilet; if figlet is also disabled,
+    the plugin will be disabled.
+  </flag>
+    <flag name="fortune">
+    Add dependency over <pkg>games-misc/fortune-mod</pkg>, which is
+    needed to enable the "fortune" plugin for rbot. If the USE flag is
+    disabled the plugin is also disabled by default.
+  </flag>
+    <flag name="cal">
+    Add dependency over a package providing the /usr/bin/cal command,
+    which is needed to enable the "cal" plugin for rbot. If the USE
+    flag is disabled the plugin is also disabled by default.
+    </flag>
+    <flag name="host">
+    Add dependency over <pkg>net-dns/bind-tools</pkg> (providing
+    /usr/bin/host), which is needed to enable the "host" plugin for
+    rbot. If the USE flag is disabled the plugin is also disabled by
+    default.
+  </flag>
+  </use>
+  <upstream>
+    <remote-id type="github">ruby-rbot/rbot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
new file mode 100644
index 000000000000..9d5251d93d3f
--- /dev/null
+++ b/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2"
+inherit ruby-ng eutils user
+
+DESCRIPTION="A ruby IRC bot"
+HOMEPAGE="http://ruby-rbot.org/"
+SRC_URI="https://github.com/ruby-rbot/rbot/archive/${GITHUB_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( feh GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="spell aspell timezone translator shorturl nls figlet
+	fortune cal host sqlite toilet"
+ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
+RUBY_S="${PN}-${GITHUB_COMMIT}"
+
+for lang in $ILINGUAS; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+
+RUBY_PATCHES=( rbot-rakefile-gettext.patch )
+
+RDEPEND+="
+	spell? (
+		aspell? ( app-text/aspell )
+		!aspell? ( app-text/hunspell )
+	)
+	figlet? ( app-misc/figlet )
+	sqlite? ( dev-ruby/sqlite3 )
+	toilet? ( app-misc/toilet )
+	fortune? ( games-misc/fortune-mod )
+	cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) )
+	host? ( net-dns/bind-tools )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/sqlite3
+	)
+	nls? (
+		>=dev-ruby/ruby-gettext-2
+		dev-ruby/rake
+	)"
+
+ruby_add_rdepend "
+	dev-ruby/tokyocabinet
+	timezone? ( dev-ruby/tzinfo:* )
+	translator? ( dev-ruby/mechanize )
+	shorturl? ( dev-ruby/shorturl )
+	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
+"
+
+pkg_setup() {
+	enewuser rbot -1 -1 /var/lib/rbot nobody
+}
+
+all_ruby_prepare() {
+	# Avoid tests that are only compatible with ruby22
+	rm -f test/test_journal.rb || die
+
+	# Fix deprecated code that was removed with ruby22
+	sed -i -e 's/::Config/::RbConfig/' setup.rb || die
+
+	# Avoid tests for optional dependencies that are not packaged.
+	sed -i -e '/RegistryDaybreakTest/,/^end/ s:^:#:' test/test_registry.rb || die
+
+	# Avoid broken tests that call code that doesn't exist
+	rm -f test/test_plugins_threshold.rb || die
+}
+
+all_ruby_compile() {
+	disable_rbot_plugin() {
+		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
+	}
+	use_rbot_plugin() {
+		use $1 && return
+		disable_rbot_plugin "$2"
+	}
+	rbot_conf() {
+		echo "$1: $2" >> "${T}"/rbot.conf
+	}
+	use_rbot_conf_path() {
+		use "$1" \
+			&& rbot_conf "$2" "$3" \
+			|| rbot_conf "$2" /bin/false
+	}
+
+	local spell_program="/usr/bin/hunspell -i"
+	if use !spell; then
+		disable_rbot_plugin spell
+		spell_program="/bin/false"
+	elif use aspell; then
+		spell_program="/usr/bin/ispell-aspell"
+	fi
+
+	rbot_conf spell.program "${spell_program}"
+
+	if use !figlet && use !toilet; then
+		disable_rbot_plugin figlet
+	fi
+
+	use_rbot_conf_path figlet figlet.path /usr/bin/figlet
+	use_rbot_conf_path toilet toilet.path /usr/bin/toilet
+
+	use_rbot_plugin timezone time
+	use_rbot_plugin translator translator
+	use_rbot_plugin shorturl shortenurls
+
+	use_rbot_plugin fortune fortune
+	use_rbot_conf_path fortune fortune.path /usr/bin/fortune
+
+	use_rbot_plugin cal cal
+	use_rbot_conf_path cal cal.path /usr/bin/cal
+
+	use_rbot_plugin host host
+	use_rbot_conf_path host host.path /usr/bin/host
+
+	local rbot_datadir="${D}"/usr/share/rbot
+
+	# This is unfortunately pretty manual at the moment, but it's just
+	# to avoid having to run special scripts to package new versions
+	# of rbot. The default if new languages are added that are not
+	# considered for an opt-out here is to install them, so you just
+	# need to add them later.
+	if use nls; then
+		strip-linguas ${ILINGUAS}
+		if [[ -n ${LINGUAS} ]]; then
+			# As the the language name used by the rbot data files does
+			# not correspond to the ISO codes we usually use for LINGUAS,
+			# the following list of local varables will work as a
+			# dictionary to get the name used by rbot from the ISO code.
+			local lang_rbot_zh_CN="traditional_chinese"
+			local lang_rbot_ru="russian"
+			local lang_rbot_nl="dutch"
+			local lang_rbot_de="german"
+			local lang_rbot_fi="finnish"
+			local lang_rbot_fr="french"
+			local lang_rbot_it="italian"
+			local lang_rbot_ja="japanese"
+
+			for lang in ${ILINGUAS}; do
+				use linguas_${lang} && continue
+
+				lang_varname="lang_rbot_${lang}"
+				lang_rbot=${!lang_varname}
+
+				rm -r \
+					"${S}"/data/rbot/languages/${lang_rbot}.lang \
+					"${S}"/data/rbot/templates/lart/larts-${lang_rbot} \
+					"${S}"/data/rbot/templates/lart/praises-${lang_rbot} \
+					"${S}"/data/rbot/templates/salut/salut-${lang_rbot} \
+					"${S}"/po/${lang} &>/dev/null
+			done
+		fi
+
+		${RUBY} /usr/bin/rake makemo || die "locale generation failed"
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} setup.rb config --prefix="/usr" \
+		|| die "setup.rb install failed"
+}
+
+each_ruby_test() {
+	pushd test || die
+	${RUBY} -Ilib:. -e "Dir['test_*'].each{|f| require f}" || die
+	popd || die
+}
+
+each_ruby_install() {
+	${RUBY} setup.rb install --prefix="${D}" \
+		|| die "setup.rb install failed"
+}
+
+all_ruby_install() {
+	diropts -o rbot -g nobody -m 0700
+	keepdir /var/lib/rbot
+
+	insinto /etc
+	doins "${T}"/rbot.conf
+
+	newinitd "${FILESDIR}/rbot.init2" rbot
+	newconfd "${FILESDIR}/rbot.conf2" rbot
+}
+
+pkg_postinst() {
+	elog "rbot can be started as a normal service."
+	elog "Check /etc/conf.d/rbot file for more information about this feature."
+	ewarn "DEPRECATION NOTICE:"
+	ewarn "The bdb database backend is deprecated and only available on Ruby 1.8."
+	ewarn "To migrate to the new tokyocabinet-based backend, change the core.db"
+	ewarn "parameter in your bot's conf.yaml to 'tc' and restart rbot."
+	ewarn "This procedure requires a Ruby version supporting both BDB and TC."
+}
diff --git a/net-irc/rbot/rbot-0.9.15_p20160325.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
new file mode 100644
index 000000000000..48af140afb3e
--- /dev/null
+++ b/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+GITHUB_COMMIT="e358601cc521d8aced941eb928fae2d8c53cf0c2"
+inherit ruby-ng eutils user
+
+DESCRIPTION="A ruby IRC bot"
+HOMEPAGE="http://ruby-rbot.org/"
+SRC_URI="https://github.com/ruby-rbot/rbot/archive/${GITHUB_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( feh GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="spell aspell timezone translator shorturl nls figlet
+	fortune cal host toilet"
+ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
+RUBY_S="${PN}-${GITHUB_COMMIT}"
+
+for lang in $ILINGUAS; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+
+RUBY_PATCHES=( rbot-rakefile-gettext.patch )
+
+RDEPEND+="
+	spell? (
+		aspell? ( app-text/aspell )
+		!aspell? ( app-text/hunspell )
+	)
+	figlet? ( app-misc/figlet )
+	toilet? ( app-misc/toilet )
+	fortune? ( games-misc/fortune-mod )
+	cal? ( || ( sys-apps/util-linux sys-freebsd/freebsd-ubin ) )
+	host? ( net-dns/bind-tools )"
+
+ruby_add_bdepend "
+	nls? (
+		>=dev-ruby/ruby-gettext-2
+		dev-ruby/rake
+	)"
+
+ruby_add_rdepend "
+	dev-ruby/tokyocabinet
+	timezone? ( dev-ruby/tzinfo:* )
+	translator? ( dev-ruby/mechanize )
+	shorturl? ( dev-ruby/shorturl )
+	nls? ( dev-ruby/ruby-gettext >=dev-ruby/locale-2.0.5-r2 )
+"
+
+pkg_setup() {
+	enewuser rbot -1 -1 /var/lib/rbot nobody
+}
+
+all_ruby_prepare() {
+	# Avoid tests that are only compatible with ruby22
+	rm -f test/test_journal.rb || die
+
+	# Fix deprecated code that was removed with ruby22
+	sed -i -e 's/::Config/::RbConfig/' setup.rb || die
+}
+
+all_ruby_compile() {
+	disable_rbot_plugin() {
+		mv "${S}"/data/rbot/plugins/$1.rb{,.disabled}
+	}
+	use_rbot_plugin() {
+		use $1 && return
+		disable_rbot_plugin "$2"
+	}
+	rbot_conf() {
+		echo "$1: $2" >> "${T}"/rbot.conf
+	}
+	use_rbot_conf_path() {
+		use "$1" \
+			&& rbot_conf "$2" "$3" \
+			|| rbot_conf "$2" /bin/false
+	}
+
+	local spell_program="/usr/bin/hunspell -i"
+	if use !spell; then
+		disable_rbot_plugin spell
+		spell_program="/bin/false"
+	elif use aspell; then
+		spell_program="/usr/bin/ispell-aspell"
+	fi
+
+	rbot_conf spell.program "${spell_program}"
+
+	if use !figlet && use !toilet; then
+		disable_rbot_plugin figlet
+	fi
+
+	use_rbot_conf_path figlet figlet.path /usr/bin/figlet
+	use_rbot_conf_path toilet toilet.path /usr/bin/toilet
+
+	use_rbot_plugin timezone time
+	use_rbot_plugin translator translator
+	use_rbot_plugin shorturl shortenurls
+
+	use_rbot_plugin fortune fortune
+	use_rbot_conf_path fortune fortune.path /usr/bin/fortune
+
+	use_rbot_plugin cal cal
+	use_rbot_conf_path cal cal.path /usr/bin/cal
+
+	use_rbot_plugin host host
+	use_rbot_conf_path host host.path /usr/bin/host
+
+	local rbot_datadir="${D}"/usr/share/rbot
+
+	# This is unfortunately pretty manual at the moment, but it's just
+	# to avoid having to run special scripts to package new versions
+	# of rbot. The default if new languages are added that are not
+	# considered for an opt-out here is to install them, so you just
+	# need to add them later.
+	if use nls; then
+		strip-linguas ${ILINGUAS}
+		if [[ -n ${LINGUAS} ]]; then
+			# As the the language name used by the rbot data files does
+			# not correspond to the ISO codes we usually use for LINGUAS,
+			# the following list of local varables will work as a
+			# dictionary to get the name used by rbot from the ISO code.
+			local lang_rbot_zh_CN="traditional_chinese"
+			local lang_rbot_ru="russian"
+			local lang_rbot_nl="dutch"
+			local lang_rbot_de="german"
+			local lang_rbot_fi="finnish"
+			local lang_rbot_fr="french"
+			local lang_rbot_it="italian"
+			local lang_rbot_ja="japanese"
+
+			for lang in ${ILINGUAS}; do
+				use linguas_${lang} && continue
+
+				lang_varname="lang_rbot_${lang}"
+				lang_rbot=${!lang_varname}
+
+				rm -r \
+					"${S}"/data/rbot/languages/${lang_rbot}.lang \
+					"${S}"/data/rbot/templates/lart/larts-${lang_rbot} \
+					"${S}"/data/rbot/templates/lart/praises-${lang_rbot} \
+					"${S}"/data/rbot/templates/salut/salut-${lang_rbot} \
+					"${S}"/po/${lang} &>/dev/null
+			done
+		fi
+
+		${RUBY} /usr/bin/rake makemo || die "locale generation failed"
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} setup.rb config --prefix="/usr" \
+		|| die "setup.rb install failed"
+}
+
+each_ruby_test() {
+	pushd test || die
+	${RUBY} -Ilib:. -e "Dir['test_*'].each{|f| require f}" || die
+	popd || die
+}
+
+each_ruby_install() {
+	${RUBY} setup.rb install --prefix="${D}" \
+		|| die "setup.rb install failed"
+}
+
+all_ruby_install() {
+	diropts -o rbot -g nobody -m 0700
+	keepdir /var/lib/rbot
+
+	insinto /etc
+	doins "${T}"/rbot.conf
+
+	newinitd "${FILESDIR}/rbot.init2" rbot
+	newconfd "${FILESDIR}/rbot.conf2" rbot
+}
+
+pkg_postinst() {
+	elog "rbot can be started as a normal service."
+	elog "Check /etc/conf.d/rbot file for more information about this feature."
+	ewarn "DEPRECATION NOTICE:"
+	ewarn "The bdb database backend is deprecated and only available on Ruby 1.8."
+	ewarn "To migrate to the new tokyocabinet-based backend, change the core.db"
+	ewarn "parameter in your bot's conf.yaml to 'tc' and restart rbot."
+	ewarn "This procedure requires a Ruby version supporting both BDB and TC."
+}
diff --git a/net-irc/redirbot/Manifest b/net-irc/redirbot/Manifest
new file mode 100644
index 000000000000..d4f393f1cb24
--- /dev/null
+++ b/net-irc/redirbot/Manifest
@@ -0,0 +1,5 @@
+DIST redirbot-0.0.5.tar.gz 4549 SHA256 2e09db06b7c29d3fa03989a3e4177b96fdabf9c25f2a73e2928885f2e96df35d SHA512 7cbd7e8dc792527f26f20ec9953ddafd5fef8dbca457a00198c8bb3e34b660be7e0fadf25d755375e5a40acf64bf4191bf6725a077616a8bdbe120200ec198c7 WHIRLPOOL 3879f9f5411849310241aa846fa8a904862815c52986949da8afe3f979302f4e7e2c16c5bc8d20d2032927291b4bce15a59939715d7cbcb2b8ba6e36bb38ac34
+EBUILD redirbot-0.0.5-r1.ebuild 667 SHA256 ce448ffce90a4ab7fc66b0134c64a713f6493776eca6ada238d8d2ba162dcf40 SHA512 f1bb1f69c45b731bf86e2f3c4e7c902a25844d4468858e094b17009977691191d114bff6a028622ecfb494a08087048aa48b26bd670533f457adcb277d7bc9ba WHIRLPOOL 8c1c97d52af6acd433986ac64079bb4e4c8fa62cdfb6a99128c08e53fa2ab4b538e0f21bdbb2ac393228fd6f5185673efb53d1406fa1cdc31414359abca07a76
+MISC ChangeLog 2532 SHA256 6c1f9650182bc18f84fa69848a4ff02649de93e965cb3062eccea162d5ac65f6 SHA512 b769846709d71e98809f98364da8ac28d04f22774c6111096d186e2d25021fee86c8c3da8a32df0cccdc3b053390b924c11da7f13e8c5cce46794034473a068c WHIRLPOOL c4d68b03bfc384163109a7c7bbfb33629abdba0101522f2ca62a3457ec46b983d896bb3a11db773ea5476d644bd3125aea9bfdf8b9dfa6eb50533fd404b0aa23
+MISC ChangeLog-2015 1031 SHA256 16f4e49b2fcb003965af8e3441ae3e209a40ad994fbfa798ea642b9607ee24d8 SHA512 8221e645c2d2075f74ca40bdd808edd16e1e72bb9957434c583c7817a3bd7f37cdedaa140764fe8c1e9ddca2d6ddd25f84f406cd084e201c44cfcb1f9f2c5f8e WHIRLPOOL c0b55dcf1f10a6c31a68281705a1e2a81fdc93f5cd5b0d998967c26b3150c0f13e533bdb1e1a46214fedaac0ccd7779a27f4593ce94f76f0006e7216e3606ede
+MISC metadata.xml 299 SHA256 bfe6b9a5d9299f24b8c9944407e4c4e0c3887125efa958bac9a0183522e4f4bd SHA512 83d9c0efb67343154d8dcae73314507a11ed50d896c8c25e518b3ad1d445733bc46b6ae673794409eb604d25559fc43642bc482c417cb382c85753d8a68173b4 WHIRLPOOL 92691a783db440cc7de75aca67ca2497e9d2cb9b357397e9444f6749586aae9fea760910465312adebbf88264b8771dacab7e86d2136e602b84f6c46a67aeb5d
diff --git a/net-irc/redirbot/metadata.xml b/net-irc/redirbot/metadata.xml
new file mode 100644
index 000000000000..fa34a2abadd7
--- /dev/null
+++ b/net-irc/redirbot/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="pypi">redirbot</remote-id>
+    <remote-id type="github">yaccz/redirbot</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-irc/redirbot/redirbot-0.0.5-r1.ebuild b/net-irc/redirbot/redirbot-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..614b3605678a
--- /dev/null
+++ b/net-irc/redirbot/redirbot-0.0.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DOCS=( ChangeLog README.rst  )
+
+inherit distutils-r1
+
+DESCRIPTION="IRCBot, telling people they should contact you on different nickname"
+HOMEPAGE="https://github.com/yaccz/redirbot"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	|| (
+		>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+		( >=dev-python/twisted-core-11.1.0[${PYTHON_USEDEP}]
+		  dev-python/twisted-words[${PYTHON_USEDEP}]
+		)
+	)
+"
+RDEPEND="${DEPEND}"
diff --git a/net-irc/rhapsody/Manifest b/net-irc/rhapsody/Manifest
new file mode 100644
index 000000000000..dd17a4ef3f08
--- /dev/null
+++ b/net-irc/rhapsody/Manifest
@@ -0,0 +1,6 @@
+AUX rhapsody-0.28b-uclibc.patch 382 SHA256 89c0bddf5a60065c874ecbc95d516eeee1248b9985b9402f0e000f110534e7f7 SHA512 6bb29efcca48fbab3e53f0d71f21ae558b3aff14c1ced6188fb3f1ae4f627ffa723d70ca65c4f05fe85943224f784dcb968340f1d0ebe2677fd26e1d25a49525 WHIRLPOOL 26e801fd68b4dec202d5e44944933aad6f528c588b73f50d6b18835b063867c8eb61bab8e70db1a68ec1df9fa50a51e22cebfeac53f7607066ddb254dccab1d8
+DIST rhapsody_0.28b.tgz 110062 SHA256 606d767f9bd4c810343b1ce94492f4aaf993552edee090ec881627b29294b4dd SHA512 1ff9f29d281421b7fe3dcdccbd8b2559572cc6e7167ff9e0f1a46dcff07486115de245055b3d72107f40f40a484d9aef94c7ed21b55a7bdf80094198d69dec6d WHIRLPOOL b8b26234f045b687e68b3fd923cd1281dffcbb5fe2b5b50176d2c08f647e34612fb530cf47fef47c08b79da0ce2ae7a57e4cb4f962dff0ddf5281e849d8d6858
+EBUILD rhapsody-0.28b.ebuild 803 SHA256 4912e150b50aea5a22d50ee582a36a6b943cf8eee0295e25d52446d1d3a3140a SHA512 566383aab83b4a11dea00409b3fd80580bd2ac21a67d0f7066b90d57dee0f1c70c66e3f325660574d8ae8a5a423281179969b815116d6afbe3d32758d01d58d9 WHIRLPOOL 6ff368a288dfacd8a1835c74e222f98001474c80db654f21f6eb9370caa20cd263ae6ca5edab7c50f5d6ece48e70a934a0d15cdefc084750151c1e2e7fd4fe70
+MISC ChangeLog 2494 SHA256 30eed0068e6cc8a11480d8844a031a9144ace9a3a36675b808dfa9c4da406731 SHA512 a57e5cab2cc471c286e1cb1530b3ac149fbf1835410947a04fc07d3f116996ffc9b6cc37c055b88d065f66a7ed69cd032071c077b512b46f787417faa1ec2326 WHIRLPOOL 4009a01942017c294491b95d4d4c00ae203c3387a0c826ab21e0cf37ea879e0c954df89e5a2abff80eb2d4d394cdcedcdfb47e293ec4b11434bc348c979a66d0
+MISC ChangeLog-2015 1575 SHA256 b75c4fb3e24ff534c9729c688f0a912549d29ccb4816affc94ebbe8f648284a6 SHA512 909ee91beeaba12bddab870aa9345b613b1527bbab0b481e9272e5be765eaea358d2956bde86b1d622f4853da858826f1dc64a394dcd89bb23452829718ebdfc WHIRLPOOL f8baf1feffc4a0b10f7802b663b99cce1d15eb0113260526d3798f406a1ca78d5edb1aac9cd10a466aaabca30e1eeec50992288838fd0b3e2fdafb062e5187d8
+MISC metadata.xml 245 SHA256 922948b5418229f4b27449b07d740bd8d3e713f5e338a7ed0b136748c018bed7 SHA512 513af093eab23f31409638d76341a397635e358dde908edc462bc80ed46a95e37f7c1a7c8d9d30c7935c214e2e8ea4d071603b294ba133e7092f4bc71bdfe192 WHIRLPOOL e5c7fc167ca397094b6a717ea3cd6804762f6c4caa521aca678c1389a502c4ae655dcf034b26a3722f2226366789aa84a16e4d4038d19eca591c6d5182c14701
diff --git a/net-irc/rhapsody/files/rhapsody-0.28b-uclibc.patch b/net-irc/rhapsody/files/rhapsody-0.28b-uclibc.patch
new file mode 100644
index 000000000000..28196177414f
--- /dev/null
+++ b/net-irc/rhapsody/files/rhapsody-0.28b-uclibc.patch
@@ -0,0 +1,10 @@
+--- rhapsody-0.28b/src/main.c.orig	2008-04-29 09:53:53 +0000
++++ rhapsody-0.28b/src/main.c	2008-04-29 09:55:13 +0000
+@@ -20,6 +20,7 @@
+ /*                                                                           */
+ /*****************************************************************************/
+ 
++#define _GNU_SOURCE 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
diff --git a/net-irc/rhapsody/metadata.xml b/net-irc/rhapsody/metadata.xml
new file mode 100644
index 000000000000..266675de63bf
--- /dev/null
+++ b/net-irc/rhapsody/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">rhapsody</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/rhapsody/rhapsody-0.28b.ebuild b/net-irc/rhapsody/rhapsody-0.28b.ebuild
new file mode 100644
index 000000000000..51a622f12e21
--- /dev/null
+++ b/net-irc/rhapsody/rhapsody-0.28b.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="IRC client intended to be displayed on a text console"
+HOMEPAGE="http://rhapsody.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-uclibc.patch
+}
+
+src_compile() {
+	./configure -i /usr/share/rhapsody || die "configure failed"
+	emake CC="$(tc-getCC)" LOCALFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin rhapsody || die "dobin failed"
+
+	insinto /usr/share/rhapsody/help
+	doins help/*.hlp || die "doins failed"
+
+	dodoc docs/CHANGELOG || die "dodoc failed"
+}
diff --git a/net-irc/savirc/Manifest b/net-irc/savirc/Manifest
new file mode 100644
index 000000000000..ae848e0b3e5a
--- /dev/null
+++ b/net-irc/savirc/Manifest
@@ -0,0 +1,5 @@
+DIST savirc-1.99.tar.bz2 260625 SHA256 a026b74b932a0520271d08e55dc2d51b75848bd4372d717d6ef2730e237b6d1c SHA512 c74d8232a3b0de35ce74b5c540a2835b2c18f18347ddd61c31a24e01472cdda79816a7893f68db203e5b0305e516ba18cfd80372f35f5ee3e97097d1d1a68790 WHIRLPOOL ec215d844f3e8f4deb96d60b5a605c500468e69816b8a8153c1510c2457ed280b8297f4571cd4083bd9583a4de428d87f10349efbad8c4b060e7e17e05d2d13a
+EBUILD savirc-1.99-r1.ebuild 427 SHA256 b67f611ad746495b14dbb633c649df15814809fb6c20641ebfb3c49e301ce12b SHA512 dc37ad61e6c71041bb036ad3e829a31ed10448b874502413a7892480ec3da7668ba996b6edc84a737cfc2896e2ed95bb429387164ffe7a25f5719bd84e368b13 WHIRLPOOL 9ebc6b918b20c99431ee5d01d89fdad253de8982e906df6fced68f748b5cda5855506367dd6c271c060b8160777420e682987e2bcfe46c92f6835f4bc8b1bcaf
+MISC ChangeLog 2456 SHA256 edfb3e63efd98b336e4e2674d46bbb16067e749f16b0f03ca7a41da55eeaec0a SHA512 c65a528f7c1469b0f707397dfc44e83d69719fa8ee3c725740d01b1be2491557ed0487505b9e94362948bdab8f452b862040f16028bfa983aca2366fb7ebcdc5 WHIRLPOOL 522292e5a0bf81bf38b7c4934e3a02fed24a2381c03877db465033b3ba443bf45e780ae6aae06154c479ef39ca5967a662a6b11a8e0cc1a1f0ad7bcbedaa1c31
+MISC ChangeLog-2015 1472 SHA256 f685b3dfaab6d473d0c7a77b1c5a2d06084a16814436c4e3e09710089eb4454b SHA512 58a949960bde0f84861cb90ca40c84b92f4f530f40e5ca166463cf21d22f385af79a418bb1c2338381b021941f2b48b7bc0dd14d7f98ec3e808cbddf7f7afe9f WHIRLPOOL 7b0e65222c6044753084c0e56bc624f95b346675d0165f131758c9eb950b8cfd74ca4c852b59045152b1f3fd2bbb91a80267482a52f0b62ff638cf2fb9160f9f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/savirc/metadata.xml b/net-irc/savirc/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/savirc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/savirc/savirc-1.99-r1.ebuild b/net-irc/savirc/savirc-1.99-r1.ebuild
new file mode 100644
index 000000000000..fc2342250099
--- /dev/null
+++ b/net-irc/savirc/savirc-1.99-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="User friendly IRC client with unicode support and tcl/tk scripting"
+SRC_URI="http://www.savirc.com/Downloads/savirc-Lin/${P}.tar.bz2"
+HOMEPAGE="http://www.savirc.com/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-lang/tcl-8.3.0:0=
+	>=dev-lang/tk-8.3.0:0="
+DEPEND=""
diff --git a/net-irc/scrollz/Manifest b/net-irc/scrollz/Manifest
new file mode 100644
index 000000000000..23412286f44b
--- /dev/null
+++ b/net-irc/scrollz/Manifest
@@ -0,0 +1,11 @@
+AUX scrollz-2.2-cppflags.patch 492 SHA256 d0f6465007a7ed365d393cf71efeeb54bcbf42b2cbf29c3ca15bf0a82af6c02d SHA512 f6888bfc7fe2d96c9f9f85fa953d1b8fa60d5f0406f285114c3bf7eb18322028afafd167d459abef7f3def74e8c649697e3be70c10a8004abe1dc4d331e949cd WHIRLPOOL 9ee03dccde92f13bce2265e190279522557aa9aa27bc83468eb4e55338e78f43a51178bcf531433017268a95c685e1f14f184fcbc910135b67edd1afa14f7f93
+AUX scrollz-2.2-make-install.patch 714 SHA256 f3d5690b92b745e08d84241789adf7266c94ca29591cd3eb3d5987aff27975d1 SHA512 11772827d81bbe3e4184861f9091a31a32589d598e2c2f85a83ea042dc1efe750ea8140d8c0dc28dcb808f3c4ddd243f2f28ac44ce0d7fa07dd06b75f65de685 WHIRLPOOL 31dee1205d2157a406d5a1e6cec7337b59de3a4b2319ee2aa15bef541ddafd6ea6e6ac7867f9d97f39a7269f7ac774a06144bde8d843770a5a717cd20c02625a
+DIST ScrollZ-2.2.1.tar.gz 940738 SHA256 5481686fdf80da522d1f384e095856cc87c6d23f1fc1ce4120efbabadb13c519 SHA512 38eac6a2ecf8789b2d5e042a6ff59463aecf65646c3b07ca1980f60dc47f153dd5f6e42f5a0c1edbef7d1b6743a368f9f4b25be57406353b8e34919e82c7bc21 WHIRLPOOL a7350e93314a9fc6c53e5c9acaa0a5fe6f87f9e4203b1f8c1c2004cc9dfd329e5cf202383320e678bb03d49afcc146819cb06d015c6808a915676ba15a7627a5
+DIST ScrollZ-2.2.tar.gz 939999 SHA256 ed467c0f920bb84d85cdd8cea3e18a014025274b1a1ad688fd3725851f2bf653 SHA512 0b77c5173f09d78f6f7594d8e43d842604d85fb21dcd83bce4507c578a8ce42e6f4f0e02e0b1ecc81564a6e5c01799e1628c664a11cf859eeb5f5535b77a6fab WHIRLPOOL d621e33d2a1f4cd1013568397313c938767a9e7275da21297ebc29b89dd74670fef59a5beb4c3fc40982fccaa4df4badeb64dfb5dccb65787f33caf7a3a6a3a9
+DIST scrollz_2.1.orig.tar.gz 950734 SHA256 90de0fb08cd2a5971423c167b6c0556d1446e81fd97756c2dc43f058a0a6f919 SHA512 b26771368531fd53651c412bef87bb50d15b89a91fabbc0f393f1c6c560b76fd0fa62ef6b143d1bd023aaae3d077570ee0ad32df68f9d03cf29d64e7f5fe8570 WHIRLPOOL d598c912457b82d870348eca08ddb74de0b6d2e71c3d8edbe3ef429e2752f37248ff4ace78752739e534dcafb02b05716365ae6d29545e07fcc33bec341acac6
+EBUILD scrollz-2.1.ebuild 1029 SHA256 c119c9d9aca308a142b2fe93d742d800ea8082b84cb2e44c3cf9eca58bf30c52 SHA512 1e1a877be49c9add1dcfc10564eff2c807bb6e41cb6ff9056cb1326b0601f782b80debb327e57d81aa486effb4130af5cfcd14239c01560ed27ca666140af309 WHIRLPOOL 4b9662ee5daa071b575af30ff3950e27672251979157a07a8bb80ec3d97b67f716232feba75970d379406ae606a4c654d8953bcf7c7a0ad045a646b2240dc439
+EBUILD scrollz-2.2.1.ebuild 1235 SHA256 c5157d60be292ccdd239b3e890a6136afa2de33f50733a8b4557413ee528676a SHA512 bbc8404ce6b6175eb36a13c4bb35993ab79078c8cf3bd88b97ecc9dcce04837ccecc81a545bda1b0a36e4fbc4cd7c4aaae7570d60744ad1996421d684353dd41 WHIRLPOOL 2c8951d856ad3e52bec70f212d50b798f629c39320ff0c40c3f7dea4d45804e1e35697dd576cb37e1fcdf42c0e1c0936a760062ea594ee06972c64a931fa8c82
+EBUILD scrollz-2.2.ebuild 1225 SHA256 8e158a9b1df9d20e20985aa1647076c2bf62b34be41997179735a23403ffc472 SHA512 a144c91521640580996e212b0b0df74904c155a717854b428f804c2ebd21e392039e684e0dd0675116d79069e4255ffa75395c861f5d40bef5176cd23833a5ac WHIRLPOOL 20fe4984d38eb2822d9ad4f6b80c37372cd9f1852b317fecdd97af6986410e60b030e9ea6478db7226f80bdb4e046f5711864969255d04a6b6bde6848eb35ca0
+MISC ChangeLog 2629 SHA256 27469e51496b3576479d493f121e2865c148408cddc78a0a683c84329a28d130 SHA512 1de04f9ecbb2a130e50b9fca6d124bc488286308f4ecc551b52a5908cea31a0f89a2c97c3b2cfb76b2dad5e1c55658ab0673e39384b4c95c9ca72c3c03c670af WHIRLPOOL 8c3ef28ce9e35f593f5ecad3698cd41f0671002585e3250b6c3f122f77552e39b1aa8a1c7dac2c9407f49a468f2434efdc16bf624b044dec3247064730f67fac
+MISC ChangeLog-2015 5467 SHA256 ba5e4e6b71497a398245d9beb66c93c3557efd8980a6d08afc5cf4ad43907664 SHA512 3034ab8692ba1a1b17b5ae39f464540f18412c7cf89a3b03696f11cbd55d3757a39cf6ba0f34abcefba888ab98a462290e9abea6a2fd8e3876f6e418538e451b WHIRLPOOL 382b7bc0e131eb24af0f37c7f967803d9925a13c896f4e013a8268a44eba85bd4da910b82a6d0edd89c2b29f3793ebdd05742a56620ede5233d5ef2b7106ad25
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/scrollz/files/scrollz-2.2-cppflags.patch b/net-irc/scrollz/files/scrollz-2.2-cppflags.patch
new file mode 100644
index 000000000000..a6727544eca5
--- /dev/null
+++ b/net-irc/scrollz/files/scrollz-2.2-cppflags.patch
@@ -0,0 +1,26 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Subject: [PATCH] Respect CPPFLAGS.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -68,7 +68,7 @@
+ IRCDOC = ${IRCSHARE}/doc
+ 
+ CC = @CC@
+-DEFS = @DEFS@
++DEFS = @DEFS@ @CPPFLAGS@
+ LIBS = @LIBS@
+ 
+ # Set this to -g if you want to be able to debug the client, otherwise
+
+--- a/source/Makefile.in
++++ b/source/Makefile.in
+@@ -11,7 +11,7 @@
+ LDFLAGS	= @LDFLAGS@
+ LEX	= @LEX@
+ LEXLIB	= @LEXLIB@
+-DEFS	= @DEFS@
++DEFS	= @DEFS@ @CPPFLAGS@
+ LN	= @LN@
+ RM	= @RM@
+ 
diff --git a/net-irc/scrollz/files/scrollz-2.2-make-install.patch b/net-irc/scrollz/files/scrollz-2.2-make-install.patch
new file mode 100644
index 000000000000..f5591f2a8212
--- /dev/null
+++ b/net-irc/scrollz/files/scrollz-2.2-make-install.patch
@@ -0,0 +1,24 @@
+From: Nathan Phillip Brink <binki@gentoo.org>
+Date: 2011-01-03
+Subject: [PATCH] Fix parallel make install.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -179,7 +179,7 @@
+ 	@(cd $(DESTDIR)/$(bindir) ; $(LN) scrollz-$(VERSION) scrollz)
+ 	@cp doc/ScrollZ.doc $(DESTDIR)/$(IRCDOC)
+ 
+-installman: scrollz.1
++installman: installdirs scrollz.1
+ 	$(INSTALL) scrollz.1 $(DESTDIR)/$(mandir)
+ 
+ installserv: installio
+@@ -197,7 +197,7 @@
+ 		$(DESTDIR)/$(INSTALL_SCRIPT) \
+ 		$(DESTDIR)/$(HELP_DIR) $(DESTDIR)/$(IRCDOC) $(DESTDIR)/$(mandir)
+ 
+-installhelp:
++installhelp: installdirs
+ 	$(INSTALL_HELP_CMD)
+ 	find $(DESTDIR)/$(HELP_DIR) -type d -print | xargs chmod a+rx
+ 	find $(DESTDIR)/$(HELP_DIR) -type f -print | xargs chmod a+r
diff --git a/net-irc/scrollz/metadata.xml b/net-irc/scrollz/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/scrollz/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/scrollz/scrollz-2.1.ebuild b/net-irc/scrollz/scrollz-2.1.ebuild
new file mode 100644
index 000000000000..9316aa567d73
--- /dev/null
+++ b/net-irc/scrollz/scrollz-2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Advanced IRC client based on ircII"
+HOMEPAGE="https://packages.qa.debian.org/s/scrollz.html"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="gmp gnutls ipv6 socks5 ssl"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+RDEPEND="sys-libs/ncurses
+	gmp? ( dev-libs/gmp )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}.orig
+
+src_configure() {
+	local _myssl
+
+	if use ssl; then
+		if use gnutls; then
+			_myssl="--with-ssl"
+		else
+			_myssl="--with-openssl"
+		fi
+	fi
+
+	econf \
+		--with-default-server=irc.gentoo.org \
+		$(use_enable socks5) \
+		$(use_enable ipv6) \
+		--enable-regexp \
+		$(use_enable gmp fish) \
+		${_myssl}
+}
+
+src_install() {
+	einstall \
+		sharedir="${ED}/usr/share" \
+		mandir="${ED}/usr/share/man/man1"
+
+	dodoc ChangeLog* NEWS README* todo
+}
diff --git a/net-irc/scrollz/scrollz-2.2.1.ebuild b/net-irc/scrollz/scrollz-2.2.1.ebuild
new file mode 100644
index 000000000000..988aa51efb5b
--- /dev/null
+++ b/net-irc/scrollz/scrollz-2.2.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_P=ScrollZ-${PV}
+
+DESCRIPTION="Advanced IRC client based on ircII"
+HOMEPAGE="http://scrollz.com/"
+SRC_URI="http://www.scrollz.com/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="gmp gnutls ipv6 socks5 ssl"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+RDEPEND="sys-libs/ncurses
+	gmp? ( dev-libs/gmp )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2-cppflags.patch
+	epatch "${FILESDIR}"/${PN}-2.2-make-install.patch
+}
+
+src_configure() {
+	local _myssl
+
+	if use ssl; then
+		if use gnutls; then
+			_myssl="--with-ssl"
+		else
+			_myssl="--with-openssl"
+		fi
+	fi
+
+	tc-export CC #397441, ancient autoconf
+	econf \
+		--with-default-server=irc.gentoo.org \
+		$(use_enable socks5) \
+		$(use_enable ipv6) \
+		--enable-regexp \
+		$(use_enable gmp fish) \
+		${_myssl}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		mandir="${EPREFIX}/usr/share/man/man1" \
+		install
+
+	dodoc ChangeLog* NEWS README* todo
+}
diff --git a/net-irc/scrollz/scrollz-2.2.ebuild b/net-irc/scrollz/scrollz-2.2.ebuild
new file mode 100644
index 000000000000..49f0c795b243
--- /dev/null
+++ b/net-irc/scrollz/scrollz-2.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+MY_P=ScrollZ-${PV}
+
+DESCRIPTION="Advanced IRC client based on ircII"
+HOMEPAGE="http://scrollz.com/"
+SRC_URI="http://www.scrollz.com/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="gmp gnutls ipv6 socks5 ssl"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+RDEPEND="sys-libs/ncurses
+	gmp? ( dev-libs/gmp )
+	ssl? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( dev-libs/openssl )
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cppflags.patch
+	epatch "${FILESDIR}"/${P}-make-install.patch
+}
+
+src_configure() {
+	local _myssl
+
+	if use ssl; then
+		if use gnutls; then
+			_myssl="--with-ssl"
+		else
+			_myssl="--with-openssl"
+		fi
+	fi
+
+	tc-export CC #397441, ancient autoconf
+	econf \
+		--with-default-server=irc.gentoo.org \
+		$(use_enable socks5) \
+		$(use_enable ipv6) \
+		--enable-regexp \
+		$(use_enable gmp fish) \
+		${_myssl}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		mandir="${EPREFIX}/usr/share/man/man1" \
+		install
+
+	dodoc ChangeLog* NEWS README* todo
+}
diff --git a/net-irc/shadowircd/Manifest b/net-irc/shadowircd/Manifest
new file mode 100644
index 000000000000..588c85d33d58
--- /dev/null
+++ b/net-irc/shadowircd/Manifest
@@ -0,0 +1,10 @@
+AUX format-security.patch 14907 SHA256 1be22c026a500063bd064a435c600f2777b24d273ea91732333a99e664a7cfec SHA512 1f258c683f49d053aed52a30e9d77ce1aeda39d4376332a8e2caa8247f3d9b476accf5847ce5c04e7ae322bf88bcb40d0849de40d4f1d270cde7df6b5609c8a0 WHIRLPOOL 8acbbc3b4d084c4cb657f3576dc124b2e10a67193cb4d7475a61df72a3772a171576220efffa1ea9e76a20933fd83075c565d40fbc2f3370a1dd7e6fd9dd8271
+AUX shadowircd.confd 196 SHA256 adc35dde76f6425581ece95de8f7ef53fa7adb8deb294f61a675a80ad7b39604 SHA512 64ffcf4f2d90009e2d085f920f00de20812344c1cf03f1f3c128176f16e1dc7dcba70ea2193e5ac97775fc95a4fc6d2413826d0f29f58d077a50e4eccfc6f267 WHIRLPOOL a979829b44ac646539f11d65728c3ee90d0982aaca8790f82faa3b123c92789202324f3481ddd75d35364897bedddd7fb83fd26e85344c5b88cfd61d5b254a6b
+AUX shadowircd.initd 857 SHA256 b95c41941cc82758c70ec54c08d6ecfd00431a1b21feb3f5bbf5d88db9939669 SHA512 7e9d8b8d7eea5e6ff8474b862e0b07aec426b96268b41fc294bb97f26609eda2518b65e285cbef80876b111ab94dd8d7c80a52ca9425cc7f9385516a3f4bd74b WHIRLPOOL 5992ee26b4591fe1666902963cc6fc4298d06d523de578ace439c8da74c5221dbabaf521ffa3f2198ca8957282609f6553f4c24657666459c477db7a2d845cd0
+AUX shadowircd.initd-r1 595 SHA256 9a307878131c76c2e6311a47d86fb56ab0c5dcd0256ce5ceec5849dc2c8ce0cd SHA512 d8c168c7fbe60ec0d90e780158a66a4b1f1a916a6e24a40ea834b43f7e9f6d153607a565e79de51b0b7b39e0750124cf41ac49f50bcfc3ce5ebecf0d73a59342 WHIRLPOOL 7ed99128406e08f361ee9812e6034ac3edf1a585cf3c660213b8e7f7b64f884f962e54e7c3479637010fbbe5187934ce52bab3c77ab7bf13dde3778c29ff8276
+DIST shadowircd-6.3.3.tar.gz 1980432 SHA256 a3b6189a473e837d4248b8f18b1e8454ab111c8eafeb46eda477095771636f24 SHA512 f3638bee6d49c56738cf05dd7c67d93344ed5787eb8777589390dbc38a1481e9a28895bdd4534124dcc8dbe247f3e28e299fe0bc0bb89e4d974b4aff734701d4 WHIRLPOOL 59e76beab8814f5fcfe8cc60cf2363e4ec0a8306a6503f28b234d805ae71b2c15bdefe9695ebf1d280932328f14669a295954b86c239c09b498f8b1b2bc95369
+EBUILD shadowircd-6.3.3-r1.ebuild 2383 SHA256 5414c1ff9d512fb7c0e2a291f8d8156772c8f79f6dd775520aec982070fb14af SHA512 257222f868a452a11f4350c28c19e452a52fa7ab5acef0e26d214c405ee25a9ff15d4c0bd84b2bb0ec6d8550747bfa244b54462ee2411afb898256438ba7840f WHIRLPOOL c9e825c8c81dd7446eb5eb3345b1a7af3f23b7d6587ca523b8e0846926269005c42f03f68fe2f34e7387e9987c4bd989361b6d9a185633743e9ba9e1fb897e05
+EBUILD shadowircd-6.3.3.ebuild 2340 SHA256 40e921a291927c321308112857d9de183c29eb885ffb3a6ee3af4f0ddddc70cc SHA512 16f3f9028bf9847d551e73f37b01e5b98ca63d82ad5e16cb3d77a1d4edc81f9ef863e1c10199a046a148bff865e107077b4420787f6c5dbd3795d26b004759a8 WHIRLPOOL e9dbd3907cb4a451ce3df21aa7864abc57bd2816de5b0c28e267a6f29a7cd901988b303c8efb615fe9a581b53f5f12d52595a00d734c3ae1c761381cc522ba2d
+MISC ChangeLog 2886 SHA256 2f182feeee69d679f02c08fb4db743ce3f33ab86a00d1d7fd412f0422e976bb7 SHA512 6b838ef215c529448d7d23956ba1ab561cbfc504ed78519a63a70a20c9c01c0b86e53f459d99042d793ba2401bbd66ea08d8fe14970d941005c59058f291ffa5 WHIRLPOOL 5c6b57f8247dc9eac6fb56e26329f21fcce9b3808625d72d5de7f76caa534366f7bad3415e0a3deeb8faaf2560a54a73a4f07c40578b4ec4280db740ec109b63
+MISC ChangeLog-2015 1532 SHA256 c403b7940cd51f2eb1d59f916218f66d1970c6a3668a2464232e405f88e4d2b0 SHA512 f73d6952485622dc0ddff935714225cf6f12205fccb68ee82a7de119c71b84899a9ba78f053715a7a0d8b2d2063133c4b6ed62b136c326bccacea6cfc9773bfa WHIRLPOOL 206230bc52ab7c319394504f4625cf7d7a9606d5160bee85dbb3147c2a4013c15b42cd3822d1e8f4928c24829c17926b990a8d66c4c06b0a05830d2a82346a35
+MISC metadata.xml 320 SHA256 71e862dec279c4288e1f0ff20d67ba2b7de0fd463fcb3343b7af1876f0e3c662 SHA512 6af904bec4c184c6f358b23ec08426cd5b0c1e670e559e21160b42fb5a9d3ab80f48974769cf38495df33bd7d8926bf1e46f8a3ace3124588b306f299997b5fd WHIRLPOOL 201b46dec3f34d98425b0212897cc598e622c89d1c5c5cca9c0e0b90cd61affb661894f6be7c374ff0f0cd3dacac48a53be66bc55a1a395691400b493d86fb85
diff --git a/net-irc/shadowircd/files/format-security.patch b/net-irc/shadowircd/files/format-security.patch
new file mode 100644
index 000000000000..bd6e26e28a59
--- /dev/null
+++ b/net-irc/shadowircd/files/format-security.patch
@@ -0,0 +1,384 @@
+From 6055fe3ee3b7b932e2a21160251fff0f0c6bcc39 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 24 Jul 2017 10:39:43 -0400
+Subject: [PATCH 1/1] Supply trivial format strings to fix format-security
+ warnings.
+
+This commit adds a trivial format string "%s" to a number of function
+calls that are otherwise missing them. This avoids GCC's
+format-security warnings, which cause compilation failures with
+-Werror=format-security.
+
+Gentoo-Bug: 520620
+---
+ bandb/bandb.c         |  2 +-
+ modules/core/m_kill.c |  4 ++--
+ modules/m_away.c      |  4 ++--
+ modules/m_challenge.c |  8 ++++----
+ modules/m_info.c      |  6 +++---
+ modules/m_map.c       |  4 ++--
+ modules/m_oper.c      |  6 +++---
+ modules/m_stats.c     | 22 +++++++++++-----------
+ src/chmode.c          |  4 ++--
+ src/parse.c           |  2 +-
+ src/s_auth.c          |  2 +-
+ src/sslproc.c         |  8 ++++----
+ 12 files changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/bandb/bandb.c b/bandb/bandb.c
+index 33166b1..2d272a1 100644
+--- a/bandb/bandb.c
++++ b/bandb/bandb.c
+@@ -289,7 +289,7 @@ db_error_cb(const char *errstr)
+ {
+ 	char buf[256];
+ 	rb_snprintf(buf, sizeof(buf), "! :%s", errstr);
+-	rb_helper_write(bandb_helper, buf);
++	rb_helper_write(bandb_helper, "%s", buf);
+ 	rb_sleep(2 << 30, 0);
+ 	exit(1);
+ }
+diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
+index 80df7df..2fa91da 100644
+--- a/modules/core/m_kill.c
++++ b/modules/core/m_kill.c
+@@ -97,7 +97,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
+ 		if((target_p = get_history(user, (long) KILLCHASETIMELIMIT)) == NULL)
+ 		{
+ 			if (strchr(user, '.'))
+-				sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
++				sendto_one_numeric(source_p, ERR_CANTKILLSERVER, "%s", form_str(ERR_CANTKILLSERVER));
+ 			else
+ 				sendto_one_numeric(source_p, ERR_NOSUCHNICK,
+ 						   form_str(ERR_NOSUCHNICK), user);
+@@ -216,7 +216,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
+ 
+ 	if(IsServer(target_p) || IsMe(target_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
++		sendto_one_numeric(source_p, ERR_CANTKILLSERVER, "%s", form_str(ERR_CANTKILLSERVER));
+ 		return 0;
+ 	}
+ 
+diff --git a/modules/m_away.c b/modules/m_away.c
+index 557371e..13c4c39 100644
+--- a/modules/m_away.c
++++ b/modules/m_away.c
+@@ -85,7 +85,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 			free_away(source_p);
+ 		}
+ 		if(MyConnect(source_p))
+-			sendto_one_numeric(source_p, RPL_UNAWAY, form_str(RPL_UNAWAY));
++			sendto_one_numeric(source_p, RPL_UNAWAY, "%s", form_str(RPL_UNAWAY));
+ 		return 0;
+ 	}
+ 
+@@ -99,7 +99,7 @@ m_away(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 	}
+ 	
+ 	if(MyConnect(source_p))
+-		sendto_one_numeric(source_p, RPL_NOWAWAY, form_str(RPL_NOWAWAY));
++		sendto_one_numeric(source_p, RPL_NOWAWAY, "%s", form_str(RPL_NOWAWAY));
+ 
+ 	return 0;
+ }
+diff --git a/modules/m_challenge.c b/modules/m_challenge.c
+index 2066095..b8514c4 100644
+--- a/modules/m_challenge.c
++++ b/modules/m_challenge.c
+@@ -172,7 +172,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
+ 
+ 		if(oper_p == NULL)
+ 		{
+-			sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++			sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 			ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
+ 			     source_p->localClient->opername, source_p->name,
+ 			     source_p->username, source_p->host,
+@@ -203,7 +203,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
+ 
+ 	if(oper_p == NULL)
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++		sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 		ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
+ 		     parv[1], source_p->name,
+ 		     source_p->username, source_p->host, source_p->sockhost);
+@@ -223,7 +223,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
+ 
+ 	if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++		sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 		ilog(L_FOPER, "FAILED CHALLENGE (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
+ 		     parv[1], source_p->name, source_p->username, source_p->host,
+ 		     source_p->sockhost);
+@@ -241,7 +241,7 @@ m_challenge(struct Client *client_p, struct Client *source_p, int parc, const ch
+ 	{
+ 		if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
+ 		{
+-			sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++			sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 			ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
+ 			     parv[1], source_p->name,
+ 			     source_p->username, source_p->host, source_p->sockhost);
+diff --git a/modules/m_info.c b/modules/m_info.c
+index dd14294..bab156f 100644
+--- a/modules/m_info.c
++++ b/modules/m_info.c
+@@ -722,7 +722,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 		/* safe enough to give this on a local connect only */
+ 		sendto_one(source_p, form_str(RPL_LOAD2HI),
+ 			   me.name, source_p->name, "INFO");
+-		sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
++		sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
+ 		return 0;
+ 	}
+ 	else
+@@ -736,7 +736,7 @@ m_info(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 	send_info_text(source_p);
+ 	send_birthdate_online_time(source_p);
+ 
+-	sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
++	sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
+ 	return 0;
+ }
+ 
+@@ -761,7 +761,7 @@ mo_info(struct Client *client_p, struct Client *source_p, int parc, const char *
+ 
+ 		send_birthdate_online_time(source_p);
+ 
+-		sendto_one_numeric(source_p, RPL_ENDOFINFO, form_str(RPL_ENDOFINFO));
++		sendto_one_numeric(source_p, RPL_ENDOFINFO, "%s", form_str(RPL_ENDOFINFO));
+ 	}
+ 
+ 	return 0;
+diff --git a/modules/m_map.c b/modules/m_map.c
+index 7a45140..baadc86 100644
+--- a/modules/m_map.c
++++ b/modules/m_map.c
+@@ -59,7 +59,7 @@ m_map(struct Client *client_p, struct Client *source_p, int parc, const char *pa
+ 	}
+ 
+ 	dump_map(client_p, &me, buf);
+-	sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
++	sendto_one_numeric(client_p, RPL_MAPEND, "%s", form_str(RPL_MAPEND));
+ 	return 0;
+ }
+ 
+@@ -71,7 +71,7 @@ mo_map(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ {
+ 	dump_map(client_p, &me, buf);
+ 	scache_send_missing(client_p);
+-	sendto_one_numeric(client_p, RPL_MAPEND, form_str(RPL_MAPEND));
++	sendto_one_numeric(client_p, RPL_MAPEND, "%s", form_str(RPL_MAPEND));
+ 
+ 	return 0;
+ }
+diff --git a/modules/m_oper.c b/modules/m_oper.c
+index b403b28..af1e008 100644
+--- a/modules/m_oper.c
++++ b/modules/m_oper.c
+@@ -83,7 +83,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 
+ 	if(oper_p == NULL)
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++		sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 		ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s)",
+ 		     name, source_p->name,
+ 		     source_p->username, source_p->host, source_p->sockhost);
+@@ -100,7 +100,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 
+ 	if(IsOperConfNeedSSL(oper_p) && !IsSSLClient(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++		sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 		ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- requires SSL/TLS",
+ 		     name, source_p->name,
+ 		     source_p->username, source_p->host, source_p->sockhost);
+@@ -118,7 +118,7 @@ m_oper(struct Client *client_p, struct Client *source_p, int parc, const char *p
+ 	{
+ 		if (source_p->certfp == NULL || strcasecmp(source_p->certfp, oper_p->certfp))
+ 		{
+-			sendto_one_numeric(source_p, ERR_NOOPERHOST, form_str(ERR_NOOPERHOST));
++			sendto_one_numeric(source_p, ERR_NOOPERHOST, "%s", form_str(ERR_NOOPERHOST));
+ 			ilog(L_FOPER, "FAILED OPER (%s) by (%s!%s@%s) (%s) -- client certificate fingerprint mismatch",
+ 			     name, source_p->name,
+ 			     source_p->username, source_p->host, source_p->sockhost);
+diff --git a/modules/m_stats.c b/modules/m_stats.c
+index dc826bc..51555b4 100644
+--- a/modules/m_stats.c
++++ b/modules/m_stats.c
+@@ -223,7 +223,7 @@ m_stats(struct Client *client_p, struct Client *source_p, int parc, const char *
+ 			if(stats_cmd_table[i].need_oper && !IsOper(source_p))
+ 			{
+ 				sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
+-						   form_str (ERR_NOPRIVILEGES));
++						   "%s", form_str (ERR_NOPRIVILEGES));
+ 				break;
+ 			}
+ 			if(stats_cmd_table[i].need_admin && !IsOperAdmin(source_p))
+@@ -285,7 +285,7 @@ stats_connect(struct Client *source_p)
+ 	    (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
+ 	    !IsOper(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str(ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+@@ -487,7 +487,7 @@ stats_hubleaf(struct Client *source_p)
+ 	    (ConfigServerHide.flatten_links && !IsExemptShide(source_p))) &&
+ 	    !IsOper(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+@@ -513,7 +513,7 @@ stats_auth (struct Client *source_p)
+ {
+ 	/* Oper only, if unopered, return ERR_NOPRIVS */
+ 	if((ConfigFileEntry.stats_i_oper_only == 2) && !IsOper (source_p))
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 
+ 	/* If unopered, Only return matching auth blocks */
+@@ -556,7 +556,7 @@ stats_tklines(struct Client *source_p)
+ {
+ 	/* Oper only, if unopered, return ERR_NOPRIVS */
+ 	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 
+ 	/* If unopered, Only return matching klines */
+@@ -621,7 +621,7 @@ stats_klines(struct Client *source_p)
+ {
+ 	/* Oper only, if unopered, return ERR_NOPRIVS */
+ 	if((ConfigFileEntry.stats_k_oper_only == 2) && !IsOper (source_p))
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 
+ 	/* If unopered, Only return matching klines */
+@@ -689,7 +689,7 @@ stats_oper(struct Client *source_p)
+ 
+ 	if(!IsOper(source_p) && ConfigFileEntry.stats_o_oper_only)
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+@@ -752,7 +752,7 @@ static void
+ stats_ports (struct Client *source_p)
+ {
+ 	if(!IsOper (source_p) && ConfigFileEntry.stats_P_oper_only)
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 	else
+ 		show_ports (source_p);
+@@ -1063,7 +1063,7 @@ stats_servers (struct Client *source_p)
+ 	if(ConfigServerHide.flatten_links && !IsOper(source_p) &&
+ 	   !IsExemptShide(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+@@ -1137,7 +1137,7 @@ static void
+ stats_class(struct Client *source_p)
+ {
+ 	if(ConfigFileEntry.stats_y_oper_only && !IsOper(source_p))
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 	else
+ 		report_classes(source_p);
+@@ -1411,7 +1411,7 @@ stats_servlinks (struct Client *source_p)
+ 	if(ConfigServerHide.flatten_links && !IsOper (source_p) &&
+ 	   !IsExemptShide(source_p))
+ 	{
+-		sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
++		sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s",
+ 				   form_str (ERR_NOPRIVILEGES));
+ 		return;
+ 	}
+diff --git a/src/chmode.c b/src/chmode.c
+index 0a43199..cd649d3 100644
+--- a/src/chmode.c
++++ b/src/chmode.c
+@@ -644,7 +644,7 @@ chm_hidden(struct Client *source_p, struct Channel *chptr,
+ 	if(!IsOper(source_p) && !IsServer(source_p))
+ 	{
+ 		if(!(*errors & SM_ERR_NOPRIVS))
+-			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
++			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
+ 		*errors |= SM_ERR_NOPRIVS;
+ 		return;
+ 	}
+@@ -734,7 +734,7 @@ chm_staff(struct Client *source_p, struct Channel *chptr,
+ 	if(!IsOper(source_p) && !IsServer(source_p))
+ 	{
+ 		if(!(*errors & SM_ERR_NOPRIVS))
+-			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
++			sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
+ 		*errors |= SM_ERR_NOPRIVS;
+ 		return;
+ 	}
+diff --git a/src/parse.c b/src/parse.c
+index a8ce091..9e17de4 100644
+--- a/src/parse.c
++++ b/src/parse.c
+@@ -719,7 +719,7 @@ static void do_alias(struct alias_entry *aptr, struct Client *source_p, char *te
+ int
+ m_not_oper(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+ {
+-	sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
++	sendto_one_numeric(source_p, ERR_NOPRIVILEGES, "%s", form_str(ERR_NOPRIVILEGES));
+ 	return 0;
+ }
+ 
+diff --git a/src/s_auth.c b/src/s_auth.c
+index 2644ff1..52e4633 100644
+--- a/src/s_auth.c
++++ b/src/s_auth.c
+@@ -116,7 +116,7 @@ typedef enum
+ }
+ ReportType;
+ 
+-#define sendheader(c, r) sendto_one_notice(c, HeaderMessages[(r)]) 
++#define sendheader(c, r) sendto_one_notice(c, "%s", HeaderMessages[(r)]) 
+ 
+ static rb_dlink_list auth_poll_list;
+ static rb_bh *auth_heap;
+diff --git a/src/sslproc.c b/src/sslproc.c
+index 11fadbb..51078fb 100644
+--- a/src/sslproc.c
++++ b/src/sslproc.c
+@@ -455,13 +455,13 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
+ 			break;
+ 		case 'I':
+ 			ssl_ok = 0;
+-			ilog(L_MAIN, cannot_setup_ssl);
+-			sendto_realops_snomask(SNO_GENERAL, L_ALL, cannot_setup_ssl);
++			ilog(L_MAIN, "%s", cannot_setup_ssl);
++			sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", cannot_setup_ssl);
+ 		case 'U':
+ 			zlib_ok = 0;
+ 			ssl_ok = 0;
+-			ilog(L_MAIN, no_ssl_or_zlib);
+-			sendto_realops_snomask(SNO_GENERAL, L_ALL, no_ssl_or_zlib);
++			ilog(L_MAIN, "%s", no_ssl_or_zlib);
++			sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", no_ssl_or_zlib);
+ 			ssl_killall();
+ 			break;
+ 		case 'z':
+-- 
+2.13.0
+
diff --git a/net-irc/shadowircd/files/shadowircd.confd b/net-irc/shadowircd/files/shadowircd.confd
new file mode 100644
index 000000000000..4712b525985d
--- /dev/null
+++ b/net-irc/shadowircd/files/shadowircd.confd
@@ -0,0 +1,6 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Specify any extra options to pass to shadowircd
+SHADOWIRCD_OPTS=""
diff --git a/net-irc/shadowircd/files/shadowircd.initd b/net-irc/shadowircd/files/shadowircd.initd
new file mode 100644
index 000000000000..5b01c2366de7
--- /dev/null
+++ b/net-irc/shadowircd/files/shadowircd.initd
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+depend() {
+	use dns net
+	provide ircd
+}
+
+start() {
+	if ! [ -d /var/run/shadowircd ]; then
+		ebegin "Creating /var/run/shadowircd for ${SVCNAME}"
+		mkdir /var/run/shadowircd \
+			&& chown :shadowircd /var/run/shadowircd \
+			&& chmod 770 /var/run/shadowircd
+		eend $?
+	fi
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --exec /usr/bin/shadowircd-ircd \
+		--user shadowircd --pidfile /var/run/shadowircd/ircd.pid \
+		${SHADOWIRCD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile /var/run/shadowircd/ircd.pid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile /var/run/shadowircd/ircd.pid
+	eend $?
+}
diff --git a/net-irc/shadowircd/files/shadowircd.initd-r1 b/net-irc/shadowircd/files/shadowircd.initd-r1
new file mode 100644
index 000000000000..38ccab8b3f3f
--- /dev/null
+++ b/net-irc/shadowircd/files/shadowircd.initd-r1
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/shadowircd-ircd"
+command_args="${SHADOWIRCD_OPTS}"
+command_user="shadowircd"
+extra_started_commands="reload"
+pidfile="/run/shadowircd/ircd.pid"
+
+depend() {
+	use dns net
+	provide ircd
+}
+
+start_pre() {
+    ebegin "Creating /run/shadowircd for ${SVCNAME}"
+    checkpath --directory --owner :shadowircd --mode 0770 /run/shadowircd
+    eend $?
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-irc/shadowircd/metadata.xml b/net-irc/shadowircd/metadata.xml
new file mode 100644
index 000000000000..d90bc3272748
--- /dev/null
+++ b/net-irc/shadowircd/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <use>
+    <flag name="largenet">Enable support/tweaks for large networks</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">shadowircd/shadowircd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild b/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild
new file mode 100644
index 000000000000..12883e6195db
--- /dev/null
+++ b/net-irc/shadowircd/shadowircd-6.3.3-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="An IRCd based on charybdis that adds several useful features"
+HOMEPAGE="http://shadowircd.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +ipv6 largenet ssl zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=( "${FILESDIR}/format-security.patch" )
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${EPREFIX}"/usr ${PN}
+}
+
+src_prepare() {
+	default
+
+	# Fill the example configuration file with proper paths.
+	sed -i \
+		-e "s:path =.*modules:path = \"$(get_libdir)/${PN}/modules:g" \
+		-e "s:etc/:../etc/${PN}/:g" \
+		-e "s:logs/:../var/log/shadowircd/:g" \
+		-e "s:test\.\(cert\|key\):ssl.\1:g" \
+		doc/example.conf \
+		doc/reference.conf \
+		|| die
+}
+
+src_configure() {
+	econf \
+		ac_cv_prog_cc_g=no \
+		--disable-gnutls \
+		$(use_enable debug assert soft) \
+		$(use_enable debug iodebug) \
+		$(use_enable ipv6) \
+		$(use_enable !largenet small-net) \
+		$(use_enable ssl openssl) \
+		$(use_enable zlib) \
+		--with-program-prefix=shadowircd- \
+		\
+		--enable-fhs-paths \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--libdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-moduledir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--with-rundir="${EPREFIX}"/run
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto etc/${PN}
+	newins doc/reference.conf ircd.conf
+
+	keepdir var/{lib,log}/${PN}
+
+	# The runtime directory will be created by the init script, so we
+	# kill this here to avoid a QA warning about it.
+	rm -rf "${D}"/run || die
+
+	# shadowircd needs writing to its state (bandb) and log directories
+	fowners :shadowircd /var/{lib,log}/${PN}
+	fperms 770 /var/{lib,log}/${PN}
+
+	# ensure that shadowircd can access but not modify its configuration
+	# while protecting it from others
+	fowners :shadowircd /etc/${PN}{,/ircd.conf}
+	fperms 750 /etc/${PN}
+	fperms 640 /etc/${PN}/ircd.conf
+}
+
+pkg_postinst() {
+	elog "All of the shadowircd binaries in PATH have been prefixed with"
+	elog "'shadowircd-' to prevent file collisions."
+}
diff --git a/net-irc/shadowircd/shadowircd-6.3.3.ebuild b/net-irc/shadowircd/shadowircd-6.3.3.ebuild
new file mode 100644
index 000000000000..422e14379dd0
--- /dev/null
+++ b/net-irc/shadowircd/shadowircd-6.3.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib user
+
+DESCRIPTION="An IRCd based on charybdis that adds several useful features"
+HOMEPAGE="http://shadowircd.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +ipv6 largenet ssl zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/yacc
+	sys-devel/flex"
+
+S="${WORKDIR}/${PN}-${P}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${EPREFIX}"/usr ${PN}
+}
+
+src_prepare() {
+	# Fill the example configuration file with proper paths.
+	sed -i \
+		-e "s:path =.*modules:path = \"$(get_libdir)/${PN}/modules:g" \
+		-e "s:etc/:../etc/${PN}/:g" \
+		-e "s:logs/:../var/log/shadowircd/:g" \
+		-e "s:test\.\(cert\|key\):ssl.\1:g" \
+		doc/example.conf \
+		doc/reference.conf \
+		|| die
+}
+
+src_configure() {
+	econf \
+		ac_cv_prog_cc_g=no \
+		--disable-gnutls \
+		$(use_enable debug assert soft) \
+		$(use_enable debug iodebug) \
+		$(use_enable ipv6) \
+		$(use_enable !largenet small-net) \
+		$(use_enable ssl openssl) \
+		$(use_enable zlib) \
+		--with-program-prefix=shadowircd- \
+		\
+		--enable-fhs-paths \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--libdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-moduledir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--with-rundir="${EPREFIX}"/var/run
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto etc/${PN}
+	newins doc/reference.conf ircd.conf
+
+	keepdir var/{lib,log}/${PN}
+
+	# Ensure that if `make install' created /var/run/${PN}, we still
+	# force the initscript to create that directory.
+	rm -rf "${D}"/var/run || die
+
+	# shadowircd needs writing to its state (bandb) and log directories
+	fowners :shadowircd /var/{lib,log}/${PN}
+	fperms 770 /var/{lib,log}/${PN}
+
+	# ensure that shadowircd can access but not modify its configuration
+	# while protecting it from others
+	fowners :shadowircd /etc/${PN}{,/ircd.conf}
+	fperms 750 /etc/${PN}
+	fperms 640 /etc/${PN}/ircd.conf
+}
+
+pkg_postinst() {
+	elog "All of the shadowircd binaries in PATH have been prefixed with"
+	elog "'shadowircd-' to prevent file collisions."
+}
diff --git a/net-irc/sic/Manifest b/net-irc/sic/Manifest
new file mode 100644
index 000000000000..0447081be0c0
--- /dev/null
+++ b/net-irc/sic/Manifest
@@ -0,0 +1,6 @@
+DIST sic-1.2.tar.gz 4563 SHA256 ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185 SHA512 5659ed9d8a5986dda90dbe1155c27a5fd0ab4b1fcad2c1a20997c530bf03864e6c08bdeffc025c728629ab11872af6a1250761160b91f148dc37d77a49046dc9 WHIRLPOOL 1fa1dd4caeff1122b954b1a54f131e2268cb805907746e5fad54467c6510d3e103c0e44b3f1716a4d7c27dae763580bbc95141c84011bd52d5b7a26be64a1268
+EBUILD sic-1.2-r1.ebuild 652 SHA256 01a6c2b3998c50446a2810c515ae8a5850b4de55a1aed10cee30f87ef912ae19 SHA512 38f27581bd4c2653197956c1489aeaa9d715bbaecf91bd37acf7b922de08ba763ca5fb075bc440e3c0acaa3d5224fb06d16f71aadc199c15b6c1a75426d5f76e WHIRLPOOL dcf2ab8ba687f240a7f9b4419750cce761d4a9c4eab27fe5817940e9979340c2d17c2703bc57732f5707a8bc5f00e672ee1db6c9c00523ec63ca02b7e5216b09
+EBUILD sic-1.2.ebuild 712 SHA256 9aa4e0bb5a5d7fd4e1e883899332fcccff258838835b0cc53d456176e6b8d3c6 SHA512 98ee2e764e6e74a3d87306b29a2ec71e22bc7ed4d603072be4ff52ddf2448c0ac995c6b3d64dae944b138efa22b8a6d9c73288a8c2356887ea4a17b4bc91f225 WHIRLPOOL 1ed475c80e92485aa2a7d33cfabc1fc7ab5b93b7cc5b0280d627b3480f231f45ac838ee4480a74fbeadb6d56b5884a82e355bf43384db4b71a6a828abb703e3b
+MISC ChangeLog 2479 SHA256 f4c45ec019a008e4731816096a41e1dbf062fecd8d687843013a447a88e12a9c SHA512 4839753478d3e66061e819910c5990b670b16bb399470c82564342570830348870a23fb5c98e00939c39b6f0703cac2ffd6a9a5ceddfe6240daa4b83d544edac WHIRLPOOL 70795b92f92eedb76bc720e800c23cf74da8aae6a4824e03b999c0e8e6e4003cfa32ecffdab60d99ffd33fa275f321f959332c7e36bb6b5808bcb9cd796692b0
+MISC ChangeLog-2015 1633 SHA256 f93d27990fad3d37a954b49d75f3286978c5c5b7d7a0e568aed87899605a95ba SHA512 809b7361bdce6f8b5921a5024115ab6b616c6d1c958f71c577a895ac6ac64591a3c659f57f73739f7590496be2285e9ecb39958fcbb08c50ff88b870b4e87447 WHIRLPOOL a6661469569809fa5fe46fe5903ea714aad71d163443444f8df8a670c22c3e3ff8fdaa787f5f9e4f55b5f75177d8d2105e02d3d5409a491fa18255731fbfe234
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/sic/metadata.xml b/net-irc/sic/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/sic/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/sic/sic-1.2-r1.ebuild b/net-irc/sic/sic-1.2-r1.ebuild
new file mode 100644
index 000000000000..2056ef616516
--- /dev/null
+++ b/net-irc/sic/sic-1.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="An extremly simple IRC client"
+HOMEPAGE="https://tools.suckless.org/sic"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \
+		-e '/^CC/d' \
+		-e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \
+		config.mk || die
+	sed -i \
+		-e 's|@${CC}|$(CC)|g' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/net-irc/sic/sic-1.2.ebuild b/net-irc/sic/sic-1.2.ebuild
new file mode 100644
index 000000000000..67faf284d4f9
--- /dev/null
+++ b/net-irc/sic/sic-1.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="An extremly simple IRC client"
+HOMEPAGE="https://tools.suckless.org/sic"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+	sed -i \
+		-e "s/CFLAGS =/CFLAGS +=/g" \
+		-e "s/-Os//" \
+		-e "s/LDFLAGS = -s/LDFLAGS +=/" \
+		-e "/^LIBS =/d" \
+		-e "s/= cc/= $(tc-getCC)/g" \
+		config.mk || die "sed failed"
+
+	# enable verbose build
+	sed -i 's/@${CC}/${CC}/' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest
new file mode 100644
index 000000000000..689b1b69a6c7
--- /dev/null
+++ b/net-irc/telepathy-idle/Manifest
@@ -0,0 +1,5 @@
+DIST telepathy-idle-0.2.0.tar.gz 566492 SHA256 3013ad4b38d14ee630b8cc8ada5e95ccaa849b9a6fe15d2eaf6d0717d76f2fab SHA512 f5e36afc3ab4b52eb865f2c1e6565b99011a7540fc1a7783d3bbd7bbf50bc671a2147df6bde646c82059a466cc1df9bdb10e2500db5b7bb06d57a989a75c261b WHIRLPOOL 3ffe7a8fd6b06533ea5fba40733fb42072639d13c084e536f5eacf2af3385bea39e3e0193cfd6a287a4437255acb43c6807121c0eda57a75d2eabd61bb3643fb
+EBUILD telepathy-idle-0.2.0.ebuild 979 SHA256 a67d8c23f41c7b57dcaa51a7f8886b7c3208db702416c415ee3364f619309d83 SHA512 b543a5faaf574081aa9ecfc5ea9fcc9339300f587eb6d0ff6beb32e096534d7d768843994f1b462f1612e9d8f0faa7f5c2428bd89acb0d5fc3432f107e4530ff WHIRLPOOL 0b142e66adeba335ed4cec676cf3468446aa4460149805446ce887decda3fd3b1702334784b96800da922d839725c01676b666bcd2b63e04b0f10a0da9134957
+MISC ChangeLog 3245 SHA256 4ec70320827db79bf537ab50f14aee22720adc42228630cdf084e45851305935 SHA512 5df79302c918020a9d3f911f118b6ebaec12658a52bbe8885ddc8213a14f8d4bf3b1510d8d8ffc33d353b5d89686bed0c52da6f860edb22c355e1d9a6a5cc64b WHIRLPOOL 3bde0bd3f909ecd370e29cbf04342d219a489de360feccf18d0961e5322bdf5f65169541392b8469c63a4b77fef0beb27fccab9c3b23eb4653355e19e601921b
+MISC ChangeLog-2015 9315 SHA256 4b4fc2b2d7422043112855fc82a8b58999c138fe0305537abc4d75e546436ede SHA512 b43b990fcc69015e6a6439798914887307216ee6f7a09ea55db718d1e1d4c052363a0072393b160a873cece739bb9f9a25985fbf06d52f89399a7afbdc5c5c5e WHIRLPOOL a8522ebc40b389cc9c92955eae5cd55e15e30effe49a8aceab8ae899deef98e80ed2de9496fe726687a0904f58f979716993ec64646732998bafd48570d96a38
+MISC metadata.xml 349 SHA256 7688291fef714900e6a703968379a07341f29b26ba27252d6e103b5a34eabd89 SHA512 f40f301daf4884299f797c2effeaaf6fec1f1a8cca1cd85cea1ff3e7853919c9803a9dfe0eea19a59e11a0e58f8686602708528d141434479708c485f2f8892a WHIRLPOOL 483a11d52ed710539ccf4854567ceac5b03d82d6e43e47ef9e4eb70f46845c1c02655d5ac334318cc2362b9360daf1a05fcf86b9cfb23b275b8e28b809cc3288
diff --git a/net-irc/telepathy-idle/metadata.xml b/net-irc/telepathy-idle/metadata.xml
new file mode 100644
index 000000000000..d8896381ac8b
--- /dev/null
+++ b/net-irc/telepathy-idle/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription>Telepathy connection manager featuring IRC protocol.</longdescription>
+</pkgmetadata>
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.0.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0.ebuild
new file mode 100644
index 000000000000..f6bba5853a74
--- /dev/null
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Full-featured IRC connection manager for Telepathy"
+HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-idle"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.51
+	>=dev-libs/glib-2.32:2
+	>=net-libs/telepathy-glib-0.21[${PYTHON_USEDEP}]
+	sys-apps/dbus
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/twisted-words )
+"
+
+src_prepare() {
+	# Failed in 0.1.16 and code has not moved since october
+	# Upstream is working on 1.0
+	sed -e 's:connect/server-quit-ignore.py::' \
+		-e 's:connect/server-quit-noclose.py::' \
+		-i tests/twisted/Makefile.{am,in} || die
+}
diff --git a/net-irc/ultimate/Manifest b/net-irc/ultimate/Manifest
new file mode 100644
index 000000000000..0f1d9d221b22
--- /dev/null
+++ b/net-irc/ultimate/Manifest
@@ -0,0 +1,14 @@
+AUX ultimate-3.0.2-config.patch.in 1390 SHA256 2e8b6c7782ec5c8af29467a704c8542691306987b1ceb699b9d27d9574f48d9d SHA512 73cbec361c5bd78481edbfdda84cd923d8c6fd39c5f952f66e52c80846184e61a5694714472956632efcbaf68470f4f2b52a9db9e55a3993e3cebddd787129b3 WHIRLPOOL 27a64ab08145e388df496715532272c0c7ae0103649b1b48c704901c828bbaa39dab31445c73518103cc4f121a59ddc597085a3abaafcae49f1a24931ddc8b57
+AUX ultimate-3.0.2-entropy-path.patch 1578 SHA256 41fc97b9817108f2288bd304a7c2e84707b68efe45c484c32f23892334f2fedc SHA512 430fceae45bae19eb0224461664c02a9e1a49ec26a40ff7032d7446e36bc1d9101a3aa70a1ad1a054fc38d25a775417ec55581057dfedc59ff5ba4046281b7ee WHIRLPOOL 3dc90dab7a1f6d4e73068958155da799f3d7fddb54f856e877a7f3248f69e15b20081f37951acda75c2833edd725ee87ee7b8d89eb4140b1bd4e8451d6d0a418
+AUX ultimate-3.0.2-make-failfast.patch 1693 SHA256 e07dab5efc3ea3ca5af4930775e96599ea1de660006d4d300b358f7b00a7c999 SHA512 8d5a40bdbb83504cf0d7ef56a4b31f4bbe205b6dbe9d86337dd2374fc216915f601bdeba5ba13c7eb9d8381c541d408606b4cc236a849f58210b0ded76668672 WHIRLPOOL 09028cfcbaa45f73d25a5b45f712a244982e80b608166979f4e811fad0f5f8072064e98a1042e5115ebe0ce7758d48d3aa47b3df6562e8d08e67df00dea5532c
+AUX ultimate-3.0.2-open-mode.patch 2758 SHA256 b31addc28d05c925ca34dd314435d3482a8b27a9be6300d1112bb592bdae638a SHA512 f1ffc168f8f3b51779cb45397428e7c010829960f7b466ca3027a49b9a5c6519c9eff52e750c31c642e86e3d59939f4419dc9394d9970198073ffb7ed0ad68ab WHIRLPOOL 21a451bc50af04b1f51e3574448968d1fa485b0c78590f5e40a5bde97f8cbe22aa2bf897c2c4e99b103def7066c4572a015ed94af3ea9f3c44b3eb37eed63f83
+AUX ultimate-3.0.2-system-zlib-r1.patch 1640 SHA256 305c10668d64fd856ed989ee8f03376dd20c9670df0e74a2c88b0bdf36c374c8 SHA512 f1f3c4f26449b648a81899803524fde4e14092e0b1aa9bf7a85e12a048e2b7fe64ef8a8ec33e13c60129f4875fdb4621c441f29804a917d4a137bb2e51a6a95d WHIRLPOOL 2956f3f4f1a166870e3201728441bc0f10a5f48ee1495f320dcf6f5a7c2e2b60d8614ccccbd19ba452238dac7fed6f9aca9402b4c12fc42f27a086d92bd2009b
+AUX ultimateircd.conf 166 SHA256 a57b9259ed268833948f7c93b3d766da86cbd56361031a2f667214d853a92569 SHA512 380c7975e7c41001af68f549adf6f7557e833408e0ff6867492304cbb86b6b12d17d6ec56d1a3c5929cade97f71c12ca88efed38c0e4940b9ad236114a55b0d4 WHIRLPOOL 5cb6bd9290b962f9d762c437da9189ce4ef7c88d0614136b93033f984ec946cff18600e9d9e9979f4997cae2591de2e45ba9014eb5e0aab95848cb7a880ae0f9
+AUX ultimateircd.conf.2 171 SHA256 8d95f76d26faa8763ec2b56c07fe8f293bf13276e5049b906a93503db2c77d19 SHA512 5a84ce6a81621113bfd12a7f356bf4d10619281e70398ff7de52b4279cf96001554e48b74deac40062c186babc4db9ea96aa9f52bb8927755169e457e0daec73 WHIRLPOOL 7a6094507a3e532ca0f27f8c1bdb1325d62fae117586cd3c2cf167636e239c58192dc4710f2b75d42bff87e02219f4362e8571885786d8f30a56eb0e8a96d59d
+AUX ultimateircd.rc 400 SHA256 e10b7c87d43a32cdb4d569f01d443560e77cd9b48222841555a95a7e395f0462 SHA512 1bf0612679ac161e0c68fd68d45b91949154a7c5cef67cabd0e3e6f4ca6ca6eb97a3e162dde04309c017da6f68be954675e0036d33ba8daa13eb93ecfb46f58c WHIRLPOOL b368ad44154d785773a464578a544276ef2087a08338b224f56c9d63bef5772a50e20765bd411919c916cf832036a4ff7d7f0068f7bd3284700c9d5f5190c415
+AUX ultimateircd.rc.2 426 SHA256 8a451b75ada2704398c9d595846fbc7f8597e8090709e9739e0b5102f27459c4 SHA512 09753fae82165dfa5faeaf98ee3378d4b15f7e9db9d807726fa275691891ff45c9e258dcb2a547371d2bb959b7ea10e5aeecc0848a502ab956a6b7bfea4411de WHIRLPOOL 304003374a53ec947eaee6f3ea4090e606a850e2765d6411dec9e78df252c55b2634ca535ab9d0fcf404a5855610aec9cb815ae333902f8161895d42db2905b2
+DIST Ultimate3.0.2.tar.bz2 615944 SHA256 b4564f76d074b3bafde6a7d2cdc8da177759949ed933979d801d107dc6fd8934 SHA512 ed79f7f63faaa08fc901cfe58df430a051a6e0cc15b7484851f659fe2b5f23bb4b0235d8cc131284d9b6373d2da1b5d1376908d59dd0fc73496ac2d4561170ed WHIRLPOOL 822bb5bb8e0117d3fe1776852ddcec24a5d1582af9e318010c5ecfdb183139d5f0468755b80aade5c1bbcefc94be6e87aaa191054030a6887aee8097d2f40b6a
+EBUILD ultimate-3.0.2-r2.ebuild 2452 SHA256 8c24c3177b5f4c58441637cf29135fd48556e9534e8fc8e28b8d38d210a5d8da SHA512 307e30025cccefba97694c02ee71d0e27aefae4d7f2ce2c9573a726ba7916c11c70d07a3744578265e6d2d0ee4e35cf8783cdff1d39465a082e52f3830c79aae WHIRLPOOL 1f6f79f3d33f43bc04669d9d8969e2855b975682abba24a86a75fc1ebcfdc042c14230c4a902698b28a2cc2ac86a95b9b9f58562b3fed261e9873bf5804d3807
+MISC ChangeLog 3148 SHA256 e8922bd088339741f3a8f46d060e800d5eccf440a46a547b099ad8c848df7b65 SHA512 9f59953b63087b451c91cf205e618208d4b77521b118c57bd16873d66eed9384a34dde4f3222fca9bf3d2c2e23574f1a101f30b37396df997090864bdf992b14 WHIRLPOOL 974e9861540619c72ba76633b0e4fe15633286c43bb4aa47e83ce3e832c804bf278471a57ca9d0fef99401bdcbbd9195257aad82b21b88476cc976febb5105f0
+MISC ChangeLog-2015 4470 SHA256 2892534f12ce72c25ae28ea9ff4f3054b195594728a41d63ce0d9679c7a03646 SHA512 e5c1fc3c892a1c9c54e43bc58f0186500f372f8bd28cadba999744867021bca37d836fc6b9829313729947ae9539af4f07f015cc4daf0b5f0ccaa98737803546 WHIRLPOOL 1a9eba910d2e0fd44ef46903b2af1f3b12376778575dc60959698d39dc08134b0f10091ea5c7b470a26419de410988115d788584ddf1f520784205eeffecf5ce
+MISC metadata.xml 221 SHA256 dd72b3ab795128cd1e7a2f159882cda07df9a86c29d83eaf6263e62f66449f12 SHA512 be16352d6b60adffe0c7459102ad6289db9380e31f7b5d2b4475d19496e7c91af4181b3a4d717a2473b754412d5a4eab3c62a9538c96fe272d6816c2b53252f3 WHIRLPOOL 3f70f915c6a2a68ddd1c647999a326ac515b18174cf76ee4b666c80d29d4f5f09f176f3702af6705b96bf24c7991ea95e3973ac6f39f15b92e463f76a007bc1b
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
new file mode 100644
index 000000000000..5cb512fe896c
--- /dev/null
+++ b/net-irc/ultimate/files/ultimate-3.0.2-config.patch.in
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000000..d99f29030723
--- /dev/null
+++ b/net-irc/ultimate/files/ultimate-3.0.2-entropy-path.patch
@@ -0,0 +1,58 @@
+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
new file mode 100644
index 000000000000..fa13f814de6e
--- /dev/null
+++ b/net-irc/ultimate/files/ultimate-3.0.2-make-failfast.patch
@@ -0,0 +1,76 @@
+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
new file mode 100644
index 000000000000..30ec6c96e5d7
--- /dev/null
+++ b/net-irc/ultimate/files/ultimate-3.0.2-open-mode.patch
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 000000000000..acbb71c73d42
--- /dev/null
+++ b/net-irc/ultimate/files/ultimate-3.0.2-system-zlib-r1.patch
@@ -0,0 +1,53 @@
+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
new file mode 100644
index 000000000000..9955829f28d7
--- /dev/null
+++ b/net-irc/ultimate/files/ultimateircd.conf
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 000000000000..8d2d2af3ab37
--- /dev/null
+++ b/net-irc/ultimate/files/ultimateircd.conf.2
@@ -0,0 +1,5 @@
+# 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
new file mode 100644
index 000000000000..8563d44ea412
--- /dev/null
+++ b/net-irc/ultimate/files/ultimateircd.rc
@@ -0,0 +1,20 @@
+#!/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
new file mode 100644
index 000000000000..327e5f3a5392
--- /dev/null
+++ b/net-irc/ultimate/files/ultimateircd.rc.2
@@ -0,0 +1,20 @@
+#!/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
new file mode 100644
index 000000000000..1f6e4b59748b
--- /dev/null
+++ b/net-irc/ultimate/metadata.xml
@@ -0,0 +1,7 @@
+<?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
new file mode 100644
index 000000000000..f2f46b267897
--- /dev/null
+++ b/net-irc/ultimate/ultimate-3.0.2-r2.ebuild
@@ -0,0 +1,94 @@
+# 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
new file mode 100644
index 000000000000..52b20ddf97e0
--- /dev/null
+++ b/net-irc/unrealircd/Manifest
@@ -0,0 +1,12 @@
+AUX unrealircd-4.0.12-without-privatelibdir.patch 3050 SHA256 b0443d36ed2766338ada74d019c8ed7d31dd3c6ecfe642d3732423d522a1a3a5 SHA512 f9bba46daa399bbcebc4b89ed129b270c1eaad3a7e2c573d20567b055fffd8185a987a6f394b35cb0f9e95288aacb73c201e9162b940fccf170c51e04bc72be7 WHIRLPOOL 15f5bb6d5e89366511252491d9b7b73fe5ec6137699f19fbc8f8765e6eefeeb0cb655f62e787fceb8215679406beb337075f23a0161bd53706f61c3646ac9e2b
+AUX unrealircd.confd-r1 1221 SHA256 564f7de762b2a2bc0d1e145378b8cc5aa9f3c35ad89438dcba5b8d333d477fbf SHA512 add347151035f8bef7fa77d8b675563c5308e39a7e1f6ce9c044fa1e38c5d2e662327d90b91fe9bb7e23fed3337db9c497c7275688048cbd12116f98e43ba94d WHIRLPOOL 2d704a6b050db7981c7a6bbb8fcde9686a4befab9d7bae41792e02b2bbd7c767e9a175a78f3274f9bb73cec02407d1b5b1c47d388153eb0bb06cfc870a5fe418
+AUX unrealircd.confd-r2 1366 SHA256 7e79ca209a70fae1cf795bfa92f23f18d24aa1af8b33e0c8b56332a5399d2cb1 SHA512 7282da5b2d07e139bd579ce0012dd4a02b02b88e8f12bdf83e6742f8d221ee78568c5652933a065642561fca5902b256b10c61d5add3e4c587d4b4ac089751a4 WHIRLPOOL db1a4d44cb71248b69761712e0916e909bcdb288632a3a86e9f13a09410508b68582d0c70dd251f958547bbfe926d765d139661c94f43f0d6fbefe3ce78e1cd9
+AUX unrealircd.initd 1139 SHA256 0bc94a8558f6cbdf946e7004367033820305db23d23d85caa2c823f6ccb1e7f1 SHA512 694230ad52450642d212aa88ad0d2c999a166b23bbbe44c07fd2574b29bc541cc727a75b8aeec41ca67bdb3125f04271bef9161ebaff409d161a2f47f15839da WHIRLPOOL 1fdf40f2402d630d7ef87b750840c0f9a18e8d2d7da25e8f95eed818d69aa94cf9f9d186fa0ae93dfa54f8cfe3760cc2880f59960801c9a126e3cdb0e2cef6d6
+AUX unrealircd.initd-r1 1180 SHA256 7726b05b21ffa533b5cad450b90acedaa7a5b363cc0b8b89a956ee3a9545a1d4 SHA512 108bfe0a79e7d25ee9d24980c9082d3ddf75d095d122576974319b68f5bebdcb088961276038ddfdb30aadbdfd5f7e247f61444675964604430c4092e517004f WHIRLPOOL 759514b98da183e26dee21359c4c9e25f8a62a4e1f0d08c218207d2eeb3424631c5faf0653d7c385b08ee78eb46236a9bdc6904e28344ecdbbafe891c00aa977
+DIST Unreal3.2.10.7.tar.gz 3539026 SHA256 472e12cd42d2e725a1795e2bead4786062775782bd015a07697c2edf400d4047 SHA512 7d5fd4729fdde56c6b3e38a93bc365857b5b4faf58cb39e844b43e87872623abc7527025247eeda8c8535576e2b1b8ef14d482c964ce940cafb5de77cc9e1667 WHIRLPOOL 48c578ba12a36ab8078b5569d5de05134699218a6265591aa9ce80614015d96c76624eda17c42b7301379ebbd48e1ea1a62360b624e1d482cbdae562905a95a2
+DIST unrealircd-4.0.12.tar.gz 5521686 SHA256 db82848fef9ccc2e97ee4decf0167118554d7d5ce396c8e2c902229e6b19ffe8 SHA512 3df18e07226673d76977771f91f0f6c2129955523f1330519e5cada7989c8987382d78770c95837d520737796cf4fa84f1de3eb0f08ef017c5c56f775cf45420 WHIRLPOOL 75a8a6a93dd82fdf3da5ff35b6c8554f1ec47b445714197b96ba49d3a3b09f2f995acb2c380e51434d84c681f92699d8227ebacfe6f6cdf72dc667c2ae612324
+EBUILD unrealircd-3.2.10.7.ebuild 6581 SHA256 7f902580144def026a04acd50261e8da317210bed95a21fcdc9be79f951938a0 SHA512 8bfbea36317e3984c4768e03f236d5a3bfbe5cc73d8d74798e80633cb9b4946489a8197bc7bacb1649f2d8cbea702c5cd6acb96645e97e89197d697f78eced89 WHIRLPOOL dd69a20c991c0dd2d2a955dfd29e7f5a41161debfc4e2f0d92928fa538cef3ae7ee713c07bf3423fdd7996d29c9e2c4e966fcea4e477e24ac9cbc89f164ddec9
+EBUILD unrealircd-4.0.12.ebuild 7879 SHA256 345a516e43c02b8b1e6c9ea7a855783b4c6a0df10c3477eb9970e1861b6f774c SHA512 c3b1cbb3276ae0e8a5601989b3c65d49f7628926616cb0806fc8b0cc9588a942ffd3b0740bd7380f784960ed36f9ee3e0a5674d60099ef4fc8aa0963428be2fc WHIRLPOOL 9a018f718eaf243f23e6e19c481b7fb31aef90752d3acd3708cae464e74b1ded37c8ce673796d77f86bc89ac75046c552b7514800b510832acb9f48d32f77fe2
+MISC ChangeLog 5872 SHA256 2f2f46c53043821f7cf6e0b0a26162712c76e496fd873e08f8f1e897e162d22b SHA512 8266a5a255addb0676f14058b58aa3d29bda68bbf6af327fa3d8b05d2eeae604e65dd48aa7cb265aea3595c9014fb3da91930a4cf806b0f79be23b838d263378 WHIRLPOOL 321916b64d5a946350f3e822366e94d0c0f86b50cbd5b1f2847809039ecbdf0441c7811e34cef130b03c5dc718f68fc4fd68d8d3dd7cfec17e322e3d61b11c44
+MISC ChangeLog-2015 18619 SHA256 63aae9569daf4d6cea99e1d764527df2c421e6ba0ea56f671fb14f5bd6606943 SHA512 4eaa21245bcc76a6ec5c5768f4601a34a0c8116caf7c03795b81fa93359495efab8ab47f982cca3553274eb2a15301f28da94ad84a26193c424a2d79d60318e6 WHIRLPOOL f20360ede3f0ed9505ba7401e87c0011061bd118658122f15dc435d15259a31ae79016d03bc12d22d65d953aa05f6f9de2cc972b142b80f60b9e3b959a74d4eb
+MISC metadata.xml 1164 SHA256 b0a17fb071c8859fc490e2e8f380ad24360c52927cce76ebb9c87f795baf94db SHA512 159dd553222a3ef8a9d50b11fe5e3489e9778ddc6ceec1b1381b833f6f0af32eefbf3314fd983b0bbd06bc949cbbdeeae94fa2dce97df556c0f20541df30dc4e WHIRLPOOL 2b42edb49e7822b58f82ebb2ae03f947c214c0bf4604d8f07de88b1d2a7cfca4c7f432bd39473c345c6bbe78b9a81ea6ccb2b9c79a5fa16e1aa4ed9263baefc6
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
new file mode 100644
index 000000000000..03b7a7a0eb2c
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd-4.0.12-without-privatelibdir.patch
@@ -0,0 +1,70 @@
+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
new file mode 100644
index 000000000000..9b4f7b632c27
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.confd-r1
@@ -0,0 +1,31 @@
+# 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
new file mode 100644
index 000000000000..ac7db3dbf000
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.confd-r2
@@ -0,0 +1,35 @@
+# 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
new file mode 100644
index 000000000000..cc4cd50e49db
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.initd
@@ -0,0 +1,43 @@
+#!/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
new file mode 100644
index 000000000000..0c54752779fe
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.initd-r1
@@ -0,0 +1,43 @@
+#!/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/metadata.xml b/net-irc/unrealircd/metadata.xml
new file mode 100644
index 000000000000..da5a1bf0ee91
--- /dev/null
+++ b/net-irc/unrealircd/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>binki@gentoo.org</email>
+		<name>Nathan Phillip Brink</name>
+	</maintainer>
+	<use>
+		<flag name="class-nofakelag">Enable an unsupported class::options flag called “nofakelag” allowing you to grant fakelag exemption to normal user (instead of just opers).</flag>
+		<flag name="extban-stacking">Enable extended channel bans (such as +b ~c: and +b ~n:) to contain other extended bans instead of just hostmasks.</flag>
+		<flag name="prefixaq">Enable chanadmin and chanowner prefixes</flag>
+		<flag name="showlistmodes">Display channel modes in /LIST (only configured at compiletime)</flag>
+		<flag name="operoverride-verify">Enable requiring opers to invite themselves to +s/+p channels</flag>
+		<flag name="operoverride">Enable OperOverride extension</flag>
+		<flag name="usermod">Enable /set* and /chg* commands</flag>
+		<flag name="shunnotices">Enable notifying a user when un-shunned</flag>
+		<flag name="topicisnuhost">Enable displaying nick!user@host as topic setter</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-irc/unrealircd/unrealircd-3.2.10.7.ebuild b/net-irc/unrealircd/unrealircd-3.2.10.7.ebuild
new file mode 100644
index 000000000000..e63246f588c2
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-3.2.10.7.ebuild
@@ -0,0 +1,212 @@
+# 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
new file mode 100644
index 000000000000..d5cab32b8f78
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-4.0.12.ebuild
@@ -0,0 +1,249 @@
+# 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/weechat/Manifest b/net-irc/weechat/Manifest
new file mode 100644
index 000000000000..f5f9b947a0ee
--- /dev/null
+++ b/net-irc/weechat/Manifest
@@ -0,0 +1,7 @@
+AUX weechat-1.2-tinfo.patch 874 SHA256 75c7f2b39585b319fb01a2bad37e5ca9e3fb57387fd00aff11fd10dce2961dd7 SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790 WHIRLPOOL ff68c8fa8d0b28272626511464fe76da10b80c69b440a181be6b9d8bb948fb3c8772eb87f1ef487877082ad2c873c94d5fabc95b2946d86079254860f0b154de
+DIST weechat-1.9.1.tar.xz 1877428 SHA256 c2991fc616a9b1ac155e7f2591922421b49924ea45e4e5b64622dcb7f38522fd SHA512 552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa WHIRLPOOL 01513b276a77cf6849c6dd96945ecc069e00094be6d00d83f8884943bb7dc29b66938b6a3c5d42ed338e31633c397e6ce0fd875d5365e6a2748ecb72c490fa79
+EBUILD weechat-1.9.1.ebuild 3901 SHA256 fc7de2bd05b151bd78b9e1016ae10da1a8ac3839678910e187d9c2a6683b4eba SHA512 ff6eb22e949c81e15b6b2de4304473fd9467249417e7948fc73011c98d395cb5b6c1ddf2202ef04e3fe4c0a8cb47da233acd9cd93f9bbd23ff6ac7bc63f23443 WHIRLPOOL 41d1e453013c7e2552f82602316ebf9eba88be7499fa05278d943ff34cabf974a795c2f459452d28ba5ec067ce62750ee0508951f4c71c7637ce65a474e35a5d
+EBUILD weechat-9999.ebuild 3614 SHA256 f3f31adbe14d01d6544f012827fc4b49fea6dfb33b7554ebfd760c08260699c5 SHA512 2da9dd41c9d70c41e9517cc3914eb2389e7273c01e3e57216bf556d87784c4ee0bc7e6c8082d033e38e9653895c3f87ff51de09a75b790276f8279093057f171 WHIRLPOOL 23930fca3f410c08530709ff4beea8915bf4f0d6baed9c416b829e5324ece1d67dd55b9b3b66eefc017d7fc0b0a9dcefc841b3970c7cbfb56891c797d1b3ff44
+MISC ChangeLog 4511 SHA256 1b1501d622c43762ce718973d5ee02dfeb765bf7e04ecec3e5ee8a9dd06dd47f SHA512 08ca30b499dba021cd4aeedb32bec5484e6908102dbae30474d7dad31c9b7cd1525db966aaac392a110f22c06567134a0133754fcd4744ac4449b7714fc294d6 WHIRLPOOL b55f18306aa53f4180a8194ed9590c7860e5228f542b53c51c0d2c586ffd3cc22e18fb0aff901c0028a015025b92fa3a765351c7d5c05dcd7b1aa8e2d7159643
+MISC ChangeLog-2015 22554 SHA256 6d256b324e4cc2f89aa3a95c8a17753743f100e33c0b9d7e7bcbf07be9ab507d SHA512 bba0f051c228db88709264319b58bd2b1557df64cb6ad07aae95e8db354f280636b88948b1c546dd33911b2477575b12b6cd5dc7bdda898b5843fcc7571e2c07 WHIRLPOOL d9e3a5e8450dcb6614f8f8575ab2972743b733d6e3db8d594cfc5fb80cd772f5119739aec4f919e830d3eab307391cbce4116c94712704a3cc26f80d105ce701
+MISC metadata.xml 863 SHA256 23ccc14ccf9052bebdb33ec0ecf47d4bea558e7e2063fa7a0c5935d2f113891b SHA512 6cf4ee3adf9c431508b28da64aeac1679eb30a16ce20cae401b84696b2d39715f2daaf7f6e9df7d505f32e9231cdf6243b8afd5c6e834603fbb36c482c05f603 WHIRLPOOL 2bffda24b709a5dac2d1ea630a139605e37ecc60b2b7755eb9e850fc112bbb840f8de447e89da5effe75598b4fdd3008f74499bab3d38e5624c4c39fa20740bc
diff --git a/net-irc/weechat/files/weechat-1.2-tinfo.patch b/net-irc/weechat/files/weechat-1.2-tinfo.patch
new file mode 100644
index 000000000000..e6ae9e0f205b
--- /dev/null
+++ b/net-irc/weechat/files/weechat-1.2-tinfo.patch
@@ -0,0 +1,32 @@
+ src/gui/curses/CMakeLists.txt | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
+index 284956f..492fc77 100644
+--- a/src/gui/curses/CMakeLists.txt
++++ b/src/gui/curses/CMakeLists.txt
+@@ -35,7 +35,14 @@ main.c)
+ 
+ set(EXECUTABLE weechat)
+ 
+-find_package(Ncurses)
++
++find_package(PkgConfig)
++pkg_search_module(NCURSES ncursesw ncurses)
++
++if(NOT NCURSES_FOUND)
++  find_package(Ncurses)
++endif(NCURSES_FOUND)
++
+ if(NCURSES_FOUND)
+   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
+   if(NCURSESW_HEADERS)
+@@ -46,7 +53,7 @@ if(NCURSES_FOUND)
+       add_definitions(-DHAVE_NCURSES_H)
+     endif()
+   endif()
+-  list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
++  list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES} )
+ endif()
+ 
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
new file mode 100644
index 000000000000..e04464bc80b1
--- /dev/null
+++ b/net-irc/weechat/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="alias">Enable plugin for alias control.</flag>
+		<flag name="buflist">Enable buflist plugin.</flag>
+		<flag name="charset">Enable encoding conversions.</flag>
+		<flag name="exec">Enable exec plugin.</flag>
+		<flag name="fifo">Enable FIFO support (sh pipes).</flag>
+		<flag name="logger">Enable support for logging.</flag>
+		<flag name="relay">Enable relay plugin (experimental)</flag>
+		<flag name="scripts">Build infrastructure for scripting.</flag>
+		<flag name="trigger">Enable trigger plugin.</flag>
+		<flag name="xfer">Enable xfer plugin support.</flag>
+		<flag name="irc">Enable IRC protocol support.</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-irc/weechat/weechat-1.9.1.ebuild b/net-irc/weechat/weechat-1.9.1.ebuild
new file mode 100644
index 000000000000..0597605d4a5e
--- /dev/null
+++ b/net-irc/weechat/weechat-1.9.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit python-single-r1 cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="amd64 x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
+IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-misc/curl[ssl]
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( dev-lang/lua:0[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-ruby/asciidoctor-1.5.4
+		dev-util/source-highlight
+	)
+	nls? ( >=sys-devel/gettext-0.15 )
+	test? ( dev-util/cpputest )
+"
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# fix libdir placement
+	sed -i \
+		-e "s:lib/:$(get_libdir)/:g" \
+		-e "s:lib\":$(get_libdir)\":g" \
+		CMakeLists.txt || die "sed failed"
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NCURSES=ON
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_ASPELL=$(usex spell)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	if use python; then
+		python_export PYTHON_LIBPATH
+		mycmakeargs+=(
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
new file mode 100644
index 000000000000..c1a51a62c1e6
--- /dev/null
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit python-single-r1 cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
+IUSE="doc nls +ssl test ${LANGS// / linguas_} ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-misc/curl[ssl]
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( dev-lang/lua:0[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		>=dev-ruby/asciidoctor-1.5.4
+		dev-util/source-highlight
+	)
+	nls? ( >=sys-devel/gettext-0.15 )
+	test? ( dev-util/cpputest )
+"
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# fix libdir placement
+	sed -i \
+		-e "s:lib/:$(get_libdir)/:g" \
+		-e "s:lib\":$(get_libdir)\":g" \
+		CMakeLists.txt || die "sed failed"
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NCURSES=ON
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_ASPELL=$(usex spell)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	if use python; then
+		python_export PYTHON_LIBPATH
+		mycmakeargs+=(
+			-DPYTHON_EXECUTABLE="${PYTHON}"
+			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/net-irc/xaric/Manifest b/net-irc/xaric/Manifest
new file mode 100644
index 000000000000..849c4efc969e
--- /dev/null
+++ b/net-irc/xaric/Manifest
@@ -0,0 +1,6 @@
+AUX xaric-0.13.6-tinfo.patch 740 SHA256 74497f9286f29c169d1e5eb2d1bfb0be7cdc11ed55822abb40d19ee8007f84b0 SHA512 bf74a17c714e38c84bdaefd2183928918c221e5bcbcf292ceb8427e719b148d0e0ebb7114d636ba42b0bcfc3a6a021613b4eb648c8d9ba137817f0700043b27a WHIRLPOOL ce2e7f33212df838010475f3c375513db8d1f826dd10bca6fe4f6803c05a170c250ea80923877e219c0b2b8d24b2d87d16ba19f8c7306af9354a906506b68bc4
+DIST xaric-0.13.6.tar.gz 479754 SHA256 dbed41ed43efcea05baac0af0fe87cca36eebd96e5b7d4838b38cca3da4518bb SHA512 1c52e30cfab49d82306cd0b4402175f68cfc411b7ef04156b2361fadeea01648476742015306a0c242c13f4ab29916e8ac48a59f481ecdb5475584ef6cdf028f WHIRLPOOL b76afdbaa6e0352af8bc6a9fc76fced02f9a8c6210b1e6092a3b31a160ca3bd3095bcc959837c1a0c7142d73a5c03d32a743626f638f7f4110b53028968efba9
+EBUILD xaric-0.13.6.ebuild 567 SHA256 1882a2f7a8906c67833a9b85e950102c05ea29794e06f99300b326925d8db61a SHA512 1619488708017dc78861ca344bd9126d921beed1956829ab39c66919ec7318bfe85d7ba5fcb42fa364cb928828749dc2bd2e9d7c69ad72e9da6309b5615be181 WHIRLPOOL 1c7fe629f02c0eed35f7bb54f826d4aa8271715e84a8ebf714da181d3fcb1d3fe304f879508f72f071e91707ce59ff11f9fa8a82935d354a78b49a9bd1a58cf5
+MISC ChangeLog 2484 SHA256 6a154738ca11aa61c9765cb0492973ea9b7605628f393e65ce91646b61aea049 SHA512 674c6abf018d372990b9680baeb179542a7663a0bf38f88d8678baea7c153a3043920cd5868bde5c9d3413d44e2f5fab11b295f301a3cf81117a0597cfc0f73d WHIRLPOOL 2d08f0abee1c793c467a476ff6c49fa3d997051b4fcae644ece7b8d947693c64fe22f131729be00921bd2501ec28d9f4d9345024e0f948d9b857b94aada880bb
+MISC ChangeLog-2015 616 SHA256 80f7d7f9309b8f3cb0388d0b68532811efe4d7a5090ff72c9f7c63e0d5f99487 SHA512 7ed6fd6a5fa72a4fb64615d015002cffdafbe3395774a20f125c8b7237221de6fb703d25f029a31af2b57ee429b2d8dfa13b01046d32b7bab0a23e16edd15348 WHIRLPOOL fed5405ce2e3853e5ba4d19220484202485959dd4134783fa62e5fdbcca58727dc1be738e478437994e6f39922887ba21bfbfcdda1653d8ba65c9fb1e71b9852
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/net-irc/xaric/files/xaric-0.13.6-tinfo.patch b/net-irc/xaric/files/xaric-0.13.6-tinfo.patch
new file mode 100644
index 000000000000..0fcfe3aa1846
--- /dev/null
+++ b/net-irc/xaric/files/xaric-0.13.6-tinfo.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -279,9 +279,10 @@
+   olibs="$LIBS"
+   AC_CHECK_LIB(termcap, tgetent, LIBS="-ltermcap $olibs",
+     AC_CHECK_LIB(termlib, tgetent, LIBS="-ltermlib $olibs",
+-      AC_CHECK_LIB(curses, tgetent, LIBS="-lcurses $olibs",
+-        AC_CHECK_LIB(xtermcap, tgetent, LIBS="-lxtermcap $olibs",
+-          AC_MSG_ERROR([i can not find tgetent.  you need to help me])))))
++      AC_CHECK_LIB(tinfo, tgetent, LIBS="-ltinfo $olibs",
++        AC_CHECK_LIB(curses, tgetent, LIBS="-lcurses $olibs",
++          AC_CHECK_LIB(xtermcap, tgetent, LIBS="-lxtermcap $olibs",
++            AC_MSG_ERROR([i can not find tgetent.  you need to help me]))))))
+ fi
+ 
+ dnl ----------------------------------------------------------
diff --git a/net-irc/xaric/metadata.xml b/net-irc/xaric/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/net-irc/xaric/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/net-irc/xaric/xaric-0.13.6.ebuild b/net-irc/xaric/xaric-0.13.6.ebuild
new file mode 100644
index 000000000000..07620a7f34e0
--- /dev/null
+++ b/net-irc/xaric/xaric-0.13.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="An IRC client similar to ircII, BitchX, or ircII EPIC"
+HOMEPAGE="http://xaric.org/"
+SRC_URI="http://xaric.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+	doicon xaric.xpm
+}
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
new file mode 100644
index 000000000000..6f4b18342eb7
--- /dev/null
+++ b/net-irc/znc/Manifest
@@ -0,0 +1,19 @@
+AUX README.gentoo 768 SHA256 25d0f479a4965198416422a8116685fe06c5890f0a337b5931f820082369352b SHA512 627d3a8291e228fbeb783e61f46fe82f45ebc2a3647962c9bda150651d9bcadef699b6318083fc2396e6acc988ddf0ae1c01694e618d099591fa0db0258879d6 WHIRLPOOL e4121b7199b9e1da0f138cb66b3ab932c01afa999cc908f86b3dbe360969db37645d86a5f8f00623f6d0f110e428d6608c4e7fbed08737eb14979f0bb8be7025
+AUX README.gentoo-r1 524 SHA256 bda95cf309c7bc431a8d8f33769d1b81ff6090b2bc4388367a6432574483e661 SHA512 522956f11a2579f163879e18aeea31b4f74a092e056cceed3526948f511c545d12a5411932cdb94b547f240522691a13fad89fe065d431c11922eeee232a09be WHIRLPOOL cf96e5691d923366e28d91d6c6db39c8a27f78dc06ecd70e929a59e40883c209c7187ab3b92d3fcf0e113798e64ddc3f2929b87f96b09458eb49749ffd7bc493
+AUX znc-1.0-systemwideconfig.patch 4252 SHA256 1ddd5e95b299ef3c2293ce89829bae290a5c8fdc8e260ff09ae7f22264b8fbc9 SHA512 4527317f8b45c77e329167cedd792eb7886b85eeb9cb0b39f7bb117edff9bdde406d3fc4aa81410a3b1f9f7957e8ac312cdd168469fdaefd234ddbbae279341e WHIRLPOOL 3556fef6a5a840657ed50e5e283d913ab441c73b3becdfd5e05661dd312cf9670677407734ec5ba8d4254a1e22a6d3274563ab8ff81b04b16fadc9c16029e933
+AUX znc-1.6.1-create-pidfile-per-default.patch 650 SHA256 93159ca75c7ce935e2ec584ba69339f1ee36cf2bdff94ade3d5f86b0262f3e25 SHA512 2e2342c8f87a58cd1703f19d3d76f58ac4c92a049de5b342dd46c2476a1344cbb9f85743fe387713a2465006f71f1379951d7f3770019f1867544b6705e0e8ec WHIRLPOOL 3cf437d127faefa652a2edb1def54422c4f2f12220bff8c89fa50f9693e174c5276e4f092ee8ebfb65ef8cdcecb3c4ddd05feb035cb162819429351cf96fee13
+AUX znc-1.6.1-systemwideconfig.patch 8079 SHA256 2d9b9de9ec22b2a12daea9837c5f68aa15e37a42dfcf2e1a5f053e54d4c0fc27 SHA512 295a08dd5ce43b217e816148e272b722dff1a956ccdb5e58b0d337b7929a2bdae4e017ec686e820f89e53b310dd86ea8668095134d9618e5552ec323b83e624d WHIRLPOOL 2aa82c90da795a1e7e66adf1187ffaca0aa44e5deb55e8019f3974b7170a17757b61f0091c65e4fd20699f121249cf69b33983c78f535b603b66cf6df3422365
+AUX znc.confd 123 SHA256 be3155e79e6ed13be88fbf9d99f6889b3ee8425837120c448c827b8302672063 SHA512 352f18d64cbfbd5970c859f2ae2290c0ddafcbd8f1bb5d74f33976bc8388f65a75f8a9a73a093fbac12f2d243d4bcf74380bbb3aaab8d68f7bf4eab7ce3bea46 WHIRLPOOL 24e8272f1d94ff39cb748c9c280761437e2f6527ffa26e4972d83c99cde62e2f70d0c99639f4a8aabb4464fd85ee4856eb8086d3196e12286e3989d8e19c544b
+AUX znc.confd-r1 720 SHA256 69238e187b86c4c15d0751a28d6710e3b21fdd19627b28d5ee09009dc1d95b01 SHA512 3ab102f64ea0572350c8595fd3739874da591c43a3dbc3a740c72c53bd7418fded721d478d1fb92de0c0d18131313ba6679e842a135dfe239ea3f42821d8e468 WHIRLPOOL d949cdccf3a3f5263584b3371afb5c6804593ce4cc635a1e90278d8330e57fe138c1d7ce7014fc2b7cc542e95c2d993c569bff0ad4988e74ad995c6b7c559929
+AUX znc.initd 810 SHA256 b49aebd8864b0ba156e61ed67c8d505e875cbd1d9f0d1b330c4862db528c7e9b SHA512 909bf953cbb583754b516ddaada1f8f2362866e601a9fdc52ed563c0f0012776a0066e81b8bb6d72562557e6736b7d4f014eac7b700882ce43db9299594b5e32 WHIRLPOOL 159b7846247b698c040d7d552b2456a55e556f8e26ea65c0822cc97cafe46add299bd9887fa34de3ba3bdd43ad7989a53cf59c9812e3c50d69e3d1787bfbc0c8
+AUX znc.initd-r1 914 SHA256 ad19b0de6bd3616b6396b97eeddb4620d57de5aa5a399a3004bef78266140645 SHA512 01f44ab51f6fa29383b4a4bc6e5f19928ebac6b32f73fb96906113596a904324dd53ef9dbb895a8dd29028f3523e6f7285d2d5b2ee43058fc017f0b47ae788c1 WHIRLPOOL 5e9580aeaa79601b538ed527e5d8f959e7751dd9cd765a46f034981f2decd09b71ac0fcf335948a29a5d467da630fc9ebbd7e884d98c8d7cc5241a4edaacbe88
+AUX znc.initd-r2 952 SHA256 4a42672dd7a2ae45d18497d14d4b730d56f71d891b3d6176766cae47decf5ae6 SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f WHIRLPOOL e3e68e4f20385c9548d40d454f14873074824557144f9df05d18f6cc265fbaa67e58e4db95b2443f270ddbdf7cd708b2802cc67ff2782be7ba75a1144f56d4e6
+DIST googletest-release-1.7.0.tar.gz 468653 SHA256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc WHIRLPOOL e59e6aede05fd882c64586de7d204ed97fd02ec0f53abeb3130dcd18940ecefb59a43592ac5bd14dd28a8825845bd11359f637e28671554852573a4a43f8cd9c
+DIST znc-1.6.3.tar.gz 1464200 SHA256 631c46de76fe601a41ef7676bc974958e9a302b72b25fc92b4a603a25d89b827 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b WHIRLPOOL 2a41e0ac90038a8cc8f289d4ffc0494d29eda75450f650b8870c076fb809eb9c5829720bb39eb43d38ee4ac7f9bea6000ad90fcdd8c0eea461bf04f88cc17b52
+DIST znc-1.6.5.tar.gz 1470681 SHA256 2f0225d49c53a01f8d94feea4619a6fe92857792bb3401a4eb1edd65f0342aca SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626 WHIRLPOOL b72585a2f11754bedb667ac078a617195aa718f9864e7e33b962d75387e7bc4c8c6c1465844f27b65a5af2d50cec7006ae325a43eb2ef930fc9c218bbaae60a1
+EBUILD znc-1.6.3-r1.ebuild 3385 SHA256 b2cb1fdddd4468a48fe56eb7cdabe1b68c5957cb29411670008c15c5dac1fe31 SHA512 e5e74f8903c17f83c7d1380a8e8abb94e62ded858c01b8ad47a464f4273688bb26f8f5a38e428e9c8e984492fa1b6cd7f6281de99c0690ea0d96fb3a1ddbc2da WHIRLPOOL f17fda6a7cc7791c7e29beb687e1996ff20aa855c7eb2ac2498b927439effa3f19d575907a99d14301918f6bc0d7bbb15e01c2ad5aae247ab6c6365c9afe838d
+EBUILD znc-1.6.5.ebuild 3473 SHA256 edd357754ee7c9d0a334c5465c298b61f40f88939693fc4b9c9b974e0cb7b3d7 SHA512 5360728c9eed15ecf686128fc9553627615dbb8b5db1662a39fc0d7da4587cb4980b617de2660efa5b0bdfe7cdbcd7e0defccc7359c4f27b4be0dd82d8cf3672 WHIRLPOOL 91fe50ea134f12aafc9bf99fa723271e04e9cf04d5346cccef3218f95366026f8c5ddd225ec126fadefe4d2ccce684b5dea72343c8323381dec8832db4c0d0dd
+EBUILD znc-9999.ebuild 4483 SHA256 883973c52afe750a50f029777b3577f4df717515b1eb683337d946962c249e07 SHA512 25f27e37e99f48ace063cf9bba92ebeb60562dd1e0782756320f7294b1773bc7235f22dc8ed0deb31be0f5e9c3012bfa65a61f2cf072400f52741d3bf7269a5e WHIRLPOOL 070045749cbbf423550fcf3bca139885b3535f3166dd35efc81970dcb4c218d80882cd368c50d24ccbd7642438a7b32cba276aee4176625916e69b866cf7c890
+MISC ChangeLog 7932 SHA256 7b50fa2f64eab48f0f5f1ff06cf9f0e01f16c6e38b7d10827e1b999efccd3aea SHA512 1bdd5791f9e33f96bfb8c4429f1a0ccf966f4807cd88076c1092df83966c59fb30aed20dd9586727078a414650b33270001150b3fa11901f72cb99529a2be27e WHIRLPOOL 3f575c7494e10eaf3ffa2805bc977ed1bbd85204014482dd85892edb2dca443109fa8d80a7bd8851bc2583cbc4bbcc555c5ed01b47b7a6ccb79ed274a67271a1
+MISC ChangeLog-2015 11832 SHA256 3417c88d6573e992d4429ca8a7d3c815d698cccb9438b744021414b06f4b87db SHA512 da72275af15996010fed8f466bb5f7f00b67e95f0c1469f9d03b809ef106aa92651057dad1174bff486a0b6c172f00900cd6bb97bca07bc516c54029bf705325 WHIRLPOOL 11940fb5a342df64a088b0d93d9ec98bab6eaf2e75df11394e09abd37ffeaef71034c1bd8e9aa436e3cfaeec052395ebb5642f6ca334f4ddc131894301b9d96e
+MISC metadata.xml 757 SHA256 9d8b5e885040de4a150a9cc309d59a3d0214414bc572d0e71e8704e05b211dfc SHA512 fd055b958ea544d901a15bdf9f8af9ab437896f97d7fa76f84cb6eebfdf7b1de2e8f13d85757d8d4c7098fd6f2102b505084a8beb58156258aaa73367c479eaf WHIRLPOOL abd7357485ee057b08dbb9d607976525dc097c8b0df247c14005627d5fdbdddd0e0d4c9d4a826388668f9b9ba517875aa031abad92d8a1c14d4963484a9ec5e5
diff --git a/net-irc/znc/files/README.gentoo b/net-irc/znc/files/README.gentoo
new file mode 100644
index 000000000000..5b222a24f589
--- /dev/null
+++ b/net-irc/znc/files/README.gentoo
@@ -0,0 +1,22 @@
+To run znc as a user, run 'znc --makeconf' to create a configuration file.
+
+If znc was compiled with the 'daemon' use flag, you may run
+    emerge --config znc
+to configure it.
+
+To generate a new SSL certificate, run:
+    znc --system-wide-config-as znc --makepem -d /var/lib/znc
+as root.
+
+If migrating from a user-based install, you can copy the existing
+configuration files:
+     mkdir /var/lib/znc
+     mv /home/$USER/.znc/* /var/lib/znc
+     rm -rf /home/$USER/.znc
+     chown -R znc:znc /var/lib/znc
+You may also adjust the location of the files and the user running znc
+in /etc/conf.d/znc instead.
+
+To run as a daemon, please make sure that your configuration contains
+    PidFile = /run/znc/znc.pid
+or that the PidFile value matches the one in /etc/conf.d/znc.
diff --git a/net-irc/znc/files/README.gentoo-r1 b/net-irc/znc/files/README.gentoo-r1
new file mode 100644
index 000000000000..cbd565d3d964
--- /dev/null
+++ b/net-irc/znc/files/README.gentoo-r1
@@ -0,0 +1,15 @@
+To run znc as a user, run 'znc --makeconf' to create a configuration file.
+
+To configure the system-wide daemon, you may run 'emerge --config znc'.
+
+If migrating from a user-based install, you can copy the existing
+configuration files:
+
+  # mkdir /var/lib/znc
+  # mv /home/$USER/.znc/* /var/lib/znc
+  # rm -rf /home/$USER/.znc
+  # chown -R znc:znc /var/lib/znc
+
+OpenRC user may also adjust the location of the files and the user running
+znc in /etc/conf.d/znc instead. Systemd user may have to overwrite
+existing unit file.
diff --git a/net-irc/znc/files/znc-1.0-systemwideconfig.patch b/net-irc/znc/files/znc-1.0-systemwideconfig.patch
new file mode 100644
index 000000000000..336163dd6a0c
--- /dev/null
+++ b/net-irc/znc/files/znc-1.0-systemwideconfig.patch
@@ -0,0 +1,147 @@
+diff --git a/include/znc/znc.h b/include/znc/znc.h
+index 03be646..f493c83 100644
+--- a/include/znc/znc.h
++++ b/include/znc/znc.h
+@@ -169,6 +169,8 @@ public:
+ 
+ 	static void DumpConfig(const CConfig* Config);
+ 
++	void SetSystemWideConfig(bool systemWideConfig);
++
+ private:
+ 	CFile* InitPidFile();
+ 	bool DoRehash(CString& sError);
+@@ -209,6 +211,7 @@ protected:
+ 	unsigned int           m_uiConnectPaused;
+ 	TCacheMap<CString>     m_sConnectThrottle;
+ 	bool                   m_bProtectWebSessions;
++	bool                   m_bSystemWideConfig;
+ };
+ 
+ #endif // !_ZNC_H
+diff --git a/src/main.cpp b/src/main.cpp
+index a1f3904..4950911 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -10,6 +10,9 @@
+ #include <znc/FileUtils.h>
+ #include <sys/wait.h>
+ #include <signal.h>
++#include <sys/types.h>
++#include <pwd.h>
++#include <grp.h>
+ 
+ using std::cout;
+ using std::endl;
+@@ -46,6 +49,7 @@ static const struct option g_LongOpts[] = {
+ 	{ "makepass",    no_argument,       0, 's' },
+ 	{ "makepem",     no_argument,       0, 'p' },
+ 	{ "datadir",     required_argument, 0, 'd' },
++	{ "system-wide-config-as",      required_argument, 0, 'S' },
+ 	{ 0, 0, 0, 0 }
+ };
+ 
+@@ -127,6 +131,8 @@ int main(int argc, char** argv) {
+ 	bool bMakeConf = false;
+ 	bool bMakePass = false;
+ 	bool bAllowRoot = false;
++	bool bSystemWideConfig = false;
++	CString sSystemWideConfigUser = "znc";
+ 	bool bForeground = false;
+ #ifdef ALWAYS_RUN_IN_FOREGROUND
+ 	bForeground = true;
+@@ -135,7 +141,7 @@ int main(int argc, char** argv) {
+ 	bool bMakePem = false;
+ #endif
+ 
+-	while ((iArg = getopt_long(argc, argv, "hvnrcspd:Df", g_LongOpts, &iOptIndex)) != -1) {
++	while ((iArg = getopt_long(argc, argv, "hvnrcspd:DfS:", g_LongOpts, &iOptIndex)) != -1) {
+ 		switch (iArg) {
+ 		case 'h':
+ 			GenerateHelp(argv[0]);
+@@ -153,6 +159,10 @@ int main(int argc, char** argv) {
+ 		case 'c':
+ 			bMakeConf = true;
+ 			break;
++		case 'S':
++			bSystemWideConfig = true;
++			sSystemWideConfigUser = optarg;
++			break;
+ 		case 's':
+ 			bMakePass = true;
+ 			break;
+@@ -187,8 +197,36 @@ int main(int argc, char** argv) {
+ 		return 1;
+ 	}
+ 
++	if (bSystemWideConfig && getuid() == 0) {
++		struct passwd *pwd;
++
++		pwd = getpwnam(sSystemWideConfigUser.c_str());
++		if (pwd == NULL) {
++			CUtils::PrintError("Daemon user not found.");
++			return 1;
++		}
++
++		if ((long) pwd->pw_uid == 0) {
++			CUtils::PrintError("Please define a daemon user other than root.");
++			return 1;
++		}
++		if (setgroups(0, NULL) != 0) {
++			CUtils::PrintError("setgroups: Unable to clear supplementary group IDs");
++			return 1;
++		}
++		if (setgid((long) pwd->pw_gid) != 0) {
++			CUtils::PrintError("setgid: Unable to drop group privileges");
++			return 1;
++		}
++		if (setuid((long) pwd->pw_uid) != 0) {
++			CUtils::PrintError("setuid: Unable to drop user privileges");
++			return 1;
++		}
++	}
++
+ 	CZNC* pZNC = &CZNC::Get();
+ 	pZNC->InitDirs(((argc) ? argv[0] : ""), sDataDir);
++	pZNC->SetSystemWideConfig(bSystemWideConfig);
+ 
+ #ifdef HAVE_LIBSSL
+ 	if (bMakePem) {
+@@ -229,7 +267,7 @@ int main(int argc, char** argv) {
+ 		CUtils::PrintStatus(true, "");
+ 	}
+ 
+-	if (isRoot()) {
++	if (isRoot() && !bSystemWideConfig) {
+ 		CUtils::PrintError("You are running ZNC as root! Don't do that! There are not many valid");
+ 		CUtils::PrintError("reasons for this and it can, in theory, cause great damage!");
+ 		if (!bAllowRoot) {
+diff --git a/src/znc.cpp b/src/znc.cpp
+index 9469790..297b021 100644
+--- a/src/znc.cpp
++++ b/src/znc.cpp
+@@ -47,6 +47,7 @@ CZNC::CZNC() {
+ 	m_sConnectThrottle.SetTTL(30000);
+ 	m_pLockFile = NULL;
+ 	m_bProtectWebSessions = true;
++	m_bSystemWideConfig = false;
+ }
+ 
+ CZNC::~CZNC() {
+@@ -952,7 +953,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
+ 	CUtils::PrintMessage("");
+ 
+ 	File.UnLock();
+-	return bFileOpen && CUtils::GetBoolInput("Launch ZNC now?", true);
++	return bFileOpen && !m_bSystemWideConfig && CUtils::GetBoolInput("Launch ZNC now?", true);
+ }
+ 
+ size_t CZNC::FilterUncommonModules(set<CModInfo>& ssModules) {
+@@ -1971,3 +1972,7 @@ void CZNC::LeakConnectQueueTimer(CConnectQueueTimer *pTimer) {
+ bool CZNC::WaitForChildLock() {
+ 	return m_pLockFile && m_pLockFile->ExLock();
+ }
++
++void CZNC::SetSystemWideConfig(bool systemWideConfig) {
++	m_bSystemWideConfig = systemWideConfig;
++}
diff --git a/net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch b/net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch
new file mode 100644
index 000000000000..8419e9344bf2
--- /dev/null
+++ b/net-irc/znc/files/znc-1.6.1-create-pidfile-per-default.patch
@@ -0,0 +1,23 @@
+Add PidFile option to new configurations per default
+
+Our runscript requires that ZNC creates a pidfile. This patch will add
+the PidFile directive to ZNC's default configuration.
+---
+ src/znc.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/znc.cpp b/src/znc.cpp
+index b33e860..4a02568 100644
+--- a/src/znc.cpp
++++ b/src/znc.cpp
+@@ -575,6 +575,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
+ 	VCString vsLines;
+ 
+ 	vsLines.push_back(MakeConfigHeader());
++	vsLines.push_back("PidFile = /run/znc/znc.pid");
+ 	vsLines.push_back("Version = " + CString(VERSION_STR));
+ 
+ 	m_sConfigFile = ExpandConfigPath(sConfigFile);
+-- 
+2.5.0
+
diff --git a/net-irc/znc/files/znc-1.6.1-systemwideconfig.patch b/net-irc/znc/files/znc-1.6.1-systemwideconfig.patch
new file mode 100644
index 000000000000..d28fa30c219d
--- /dev/null
+++ b/net-irc/znc/files/znc-1.6.1-systemwideconfig.patch
@@ -0,0 +1,215 @@
+Add system-wide daemon support.
+
+This patch adds system-wide daemon support to ZNC so that you can run
+one ZNC instance system-wide using the new "--system-wide-config-as"
+option.
+
+Patch is based on @mrueg version from 2012.
+
+X-Gentoo-Bug: 438430
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=438430
+---
+ include/znc/znc.h |  3 ++
+ src/main.cpp      | 83 ++++++++++++++++++++++++++++++++++++++++---------------
+ src/znc.cpp       |  7 ++++-
+ 3 files changed, 70 insertions(+), 23 deletions(-)
+
+diff --git a/include/znc/znc.h b/include/znc/znc.h
+index cf2326e..16394f9 100644
+--- a/include/znc/znc.h
++++ b/include/znc/znc.h
+@@ -187,6 +187,8 @@ public:
+ 
+ 	static void DumpConfig(const CConfig* Config);
+ 
++	void SetSystemWideConfig(bool systemWideConfig);
++
+ private:
+ 	CFile* InitPidFile();
+ 	bool DoRehash(CString& sError);
+@@ -231,6 +233,7 @@ protected:
+ 	unsigned int           m_uiConnectPaused;
+ 	TCacheMap<CString>     m_sConnectThrottle;
+ 	bool                   m_bProtectWebSessions;
++	bool                   m_bSystemWideConfig;
+ 	bool                   m_bHideVersion;
+ };
+ 
+diff --git a/src/main.cpp b/src/main.cpp
+index 09b2c9c..bd5cca6 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -16,6 +16,9 @@
+ 
+ #include <znc/znc.h>
+ #include <signal.h>
++#include <sys/types.h>
++#include <pwd.h>
++#include <grp.h>
+ 
+ #if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD)
+ #include <znc/Threads.h>
+@@ -99,34 +102,36 @@ static inline int getopt_long(int argc, char * const argv[], const char *optstri
+ #endif
+ 
+ static const struct option g_LongOpts[] = {
+-	{ "help",        no_argument,       0, 'h' },
+-	{ "version",     no_argument,       0, 'v' },
+-	{ "debug",       no_argument,       0, 'D' },
+-	{ "foreground",  no_argument,       0, 'f' },
+-	{ "no-color",    no_argument,       0, 'n' },
+-	{ "allow-root",  no_argument,       0, 'r' },
+-	{ "makeconf",    no_argument,       0, 'c' },
+-	{ "makepass",    no_argument,       0, 's' },
+-	{ "makepem",     no_argument,       0, 'p' },
+-	{ "datadir",     required_argument, 0, 'd' },
++	{ "help",                  no_argument,       0, 'h' },
++	{ "version",               no_argument,       0, 'v' },
++	{ "debug",                 no_argument,       0, 'D' },
++	{ "foreground",            no_argument,       0, 'f' },
++	{ "no-color",              no_argument,       0, 'n' },
++	{ "allow-root",            no_argument,       0, 'r' },
++	{ "makeconf",              no_argument,       0, 'c' },
++	{ "makepass",              no_argument,       0, 's' },
++	{ "makepem",               no_argument,       0, 'p' },
++	{ "datadir",               required_argument, 0, 'd' },
++	{ "system-wide-config-as", required_argument, 0, 'S' },
+ 	{ 0, 0, 0, 0 }
+ };
+ 
+ static void GenerateHelp(const char *appname) {
+ 	CUtils::PrintMessage("USAGE: " + CString(appname) + " [options]");
+ 	CUtils::PrintMessage("Options are:");
+-	CUtils::PrintMessage("\t-h, --help         List available command line options (this page)");
+-	CUtils::PrintMessage("\t-v, --version      Output version information and exit");
+-	CUtils::PrintMessage("\t-f, --foreground   Don't fork into the background");
+-	CUtils::PrintMessage("\t-D, --debug        Output debugging information (Implies -f)");
+-	CUtils::PrintMessage("\t-n, --no-color     Don't use escape sequences in the output");
+-	CUtils::PrintMessage("\t-r, --allow-root   Don't complain if ZNC is run as root");
+-	CUtils::PrintMessage("\t-c, --makeconf     Interactively create a new config");
+-	CUtils::PrintMessage("\t-s, --makepass     Generates a password for use in config");
++	CUtils::PrintMessage("\t-h, --help                    List available command line options (this page)");
++	CUtils::PrintMessage("\t-v, --version                 Output version information and exit");
++	CUtils::PrintMessage("\t-f, --foreground              Don't fork into the background");
++	CUtils::PrintMessage("\t-D, --debug                   Output debugging information (Implies -f)");
++	CUtils::PrintMessage("\t-n, --no-color                Don't use escape sequences in the output");
++	CUtils::PrintMessage("\t-r, --allow-root              Don't complain if ZNC is run as root");
++	CUtils::PrintMessage("\t-c, --makeconf                Interactively create a new config");
++	CUtils::PrintMessage("\t-s, --makepass                Generates a password for use in config");
+ #ifdef HAVE_LIBSSL
+-	CUtils::PrintMessage("\t-p, --makepem      Generates a pemfile for use with SSL");
++	CUtils::PrintMessage("\t-p, --makepem                 Generates a pemfile for use with SSL");
+ #endif /* HAVE_LIBSSL */
+-	CUtils::PrintMessage("\t-d, --datadir      Set a different ZNC repository (default is ~/.znc)");
++	CUtils::PrintMessage("\t-d, --datadir                 Set a different ZNC repository (default is ~/.znc)");
++	CUtils::PrintMessage("\t-S, --system-wide-config-as   Create a system-wide ZNC daemon configuration");
+ }
+ 
+ static void die(int sig) {
+@@ -192,6 +197,8 @@ int main(int argc, char** argv) {
+ 	bool bMakeConf = false;
+ 	bool bMakePass = false;
+ 	bool bAllowRoot = false;
++	bool bSystemWideConfig = false;
++	CString sSystemWideConfigUser = "znc";
+ 	bool bForeground = false;
+ #ifdef ALWAYS_RUN_IN_FOREGROUND
+ 	bForeground = true;
+@@ -201,7 +208,7 @@ int main(int argc, char** argv) {
+ #endif
+ 	CZNC::CreateInstance();
+ 
+-	while ((iArg = getopt_long(argc, argv, "hvnrcspd:Df", g_LongOpts, &iOptIndex)) != -1) {
++	while ((iArg = getopt_long(argc, argv, "hvnrcspd:DfS:", g_LongOpts, &iOptIndex)) != -1) {
+ 		switch (iArg) {
+ 		case 'h':
+ 			GenerateHelp(argv[0]);
+@@ -219,6 +226,10 @@ int main(int argc, char** argv) {
+ 		case 'c':
+ 			bMakeConf = true;
+ 			break;
++		case 'S':
++			bSystemWideConfig = true;
++			sSystemWideConfigUser = optarg;
++			break;
+ 		case 's':
+ 			bMakePass = true;
+ 			break;
+@@ -254,8 +265,36 @@ int main(int argc, char** argv) {
+ 		return 1;
+ 	}
+ 
++	if (bSystemWideConfig && getuid() == 0) {
++		struct passwd *pwd;
++
++		pwd = getpwnam(sSystemWideConfigUser.c_str());
++		if (pwd == NULL) {
++			CUtils::PrintError("Daemon user not found.");
++			return 1;
++		}
++
++		if ((long) pwd->pw_uid == 0) {
++			CUtils::PrintError("Please define a daemon user other than root.");
++			return 1;
++		}
++		if (setgroups(0, NULL) != 0) {
++			CUtils::PrintError("setgroups: Unable to clear supplementary group IDs");
++			return 1;
++		}
++		if (setgid((long) pwd->pw_gid) != 0) {
++			CUtils::PrintError("setgid: Unable to drop group privileges");
++			return 1;
++		}
++		if (setuid((long) pwd->pw_uid) != 0) {
++			CUtils::PrintError("setuid: Unable to drop user privileges");
++			return 1;
++		}
++	}
++
+ 	CZNC* pZNC = &CZNC::Get();
+ 	pZNC->InitDirs(((argc) ? argv[0] : ""), sDataDir);
++	pZNC->SetSystemWideConfig(bSystemWideConfig);
+ 
+ #ifdef HAVE_LIBSSL
+ 	if (bMakePem) {
+@@ -304,7 +343,7 @@ int main(int argc, char** argv) {
+ 		CUtils::PrintStatus(true, "");
+ 	}
+ 
+-	if (isRoot()) {
++	if (isRoot() && !bSystemWideConfig) {
+ 		CUtils::PrintError("You are running ZNC as root! Don't do that! There are not many valid");
+ 		CUtils::PrintError("reasons for this and it can, in theory, cause great damage!");
+ 		if (!bAllowRoot) {
+diff --git a/src/znc.cpp b/src/znc.cpp
+index 78cda1a..b33e860 100644
+--- a/src/znc.cpp
++++ b/src/znc.cpp
+@@ -55,6 +55,7 @@ CZNC::CZNC() {
+ 	m_sConnectThrottle.SetTTL(30000);
+ 	m_pLockFile = NULL;
+ 	m_bProtectWebSessions = true;
++	m_bSystemWideConfig = false;
+ 	m_bHideVersion = false;
+ 	m_uDisabledSSLProtocols = Csock::EDP_SSL;
+ 	m_sSSLProtocols = "";
+@@ -861,7 +862,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
+ 	CUtils::PrintMessage("");
+ 
+ 	File.UnLock();
+-	return bFileOpen && CUtils::GetBoolInput("Launch ZNC now?", true);
++	return bFileOpen && !m_bSystemWideConfig && CUtils::GetBoolInput("Launch ZNC now?", true);
+ }
+ 
+ void CZNC::BackupConfigOnce(const CString& sSuffix) {
+@@ -1973,3 +1974,7 @@ void CZNC::LeakConnectQueueTimer(CConnectQueueTimer *pTimer) {
+ bool CZNC::WaitForChildLock() {
+ 	return m_pLockFile && m_pLockFile->ExLock();
+ }
++
++void CZNC::SetSystemWideConfig(bool systemWideConfig) {
++	m_bSystemWideConfig = systemWideConfig;
++}
+-- 
+2.5.0
+
diff --git a/net-irc/znc/files/znc.confd b/net-irc/znc/files/znc.confd
new file mode 100644
index 000000000000..9681f8d792fb
--- /dev/null
+++ b/net-irc/znc/files/znc.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/znc
+
+# Location of the znc configuration folder
+ZNC_CONF="/var/lib/znc"
+
+# User to run znc as
+ZNC_USER="znc"
diff --git a/net-irc/znc/files/znc.confd-r1 b/net-irc/znc/files/znc.confd-r1
new file mode 100644
index 000000000000..b78e0534b33a
--- /dev/null
+++ b/net-irc/znc/files/znc.confd-r1
@@ -0,0 +1,24 @@
+# /etc/conf.d/znc
+
+# Location of the znc configuration folder
+ZNC_DATADIR="/var/lib/znc"
+
+# User to run znc as
+ZNC_USER="znc"
+
+# Group to run znc as
+ZNC_GROUP="znc"
+
+# PID file
+ZNC_PIDFILE="/run/znc/znc.pid"
+
+# You can use this configuration option to pass additional options to the
+# start-stop-daemon, see start-stop-daemon(8) for more details.
+# Per default we wait 1000ms after we have started the service to ensure
+# that the daemon is really up and running.
+ZNC_SSDARGS="--wait 1000"
+
+# The termination timeout (start-stop-daemon parameter "retry") ensures
+# that the service will be terminated within a given time (30 + 5 seconds
+# per default) when you are stopping the service.
+ZNC_TERMTIMEOUT="TERM/30/KILL/5"
diff --git a/net-irc/znc/files/znc.initd b/net-irc/znc/files/znc.initd
new file mode 100644
index 000000000000..16af8b64c687
--- /dev/null
+++ b/net-irc/znc/files/znc.initd
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="config"
+extra_started_commands="reload save"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting ZNC"
+	start-stop-daemon --start --user ${ZNC_USER} --name znc \
+		--exec /usr/bin/znc -- -d ${ZNC_CONF}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ZNC"
+	start-stop-daemon --signal SIGINT --name znc \
+		--exec /usr/bin/znc -- -d ${ZNC_CONF}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ZNC Configuration File from Disk"
+	start-stop-daemon --signal SIGHUP --name znc \
+		--exec /usr/bin/znc -- -d ${ZNC_CONF}
+	eend $?
+}
+
+save() {
+	ebegin "Saving ZNC Configuration File to Disk"
+	start-stop-daemon --signal SIGUSR1 --name znc \
+		--exec /usr/bin/znc -- -d ${ZNC_CONF}
+	eend $?
+}
diff --git a/net-irc/znc/files/znc.initd-r1 b/net-irc/znc/files/znc.initd-r1
new file mode 100644
index 000000000000..dedb44b1362f
--- /dev/null
+++ b/net-irc/znc/files/znc.initd-r1
@@ -0,0 +1,39 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="config"
+extra_started_commands="reload save"
+command="/usr/bin/znc"
+command_args="--datadir \"${ZNC_DATADIR}\""
+pidfile="${ZNC_PIDFILE:-/run/znc/znc.pid}"
+user=${ZNC_USER:-znc}
+group=${ZNC_GROUP:-znc}
+start_stop_daemon_args="--chdir \"${ZNC_DATADIR}\" --user ${user} --group ${group} ${ZNC_SSDARGS}"
+retry="${ZNC_TERMTIMEOUT}"
+
+required_dirs="${ZNC_DATADIR}"
+
+depend() {
+	use dns logger
+}
+
+start_pre() {
+	checkpath -d -m 0770 -o ${user}:${group} "$(dirname ${pidfile})"
+}
+
+stop_post() {
+	rm -f "${pidfile}"
+}
+
+reload() {
+	ebegin "Reloading ZNC Configuration File from Disk"
+	start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+	eend $?
+}
+
+save() {
+	ebegin "Saving ZNC Configuration File to Disk"
+	start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-irc/znc/files/znc.initd-r2 b/net-irc/znc/files/znc.initd-r2
new file mode 100644
index 000000000000..72834a80da9b
--- /dev/null
+++ b/net-irc/znc/files/znc.initd-r2
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="config"
+extra_started_commands="reload save"
+command="/usr/bin/znc"
+command_args="--datadir \"${ZNC_DATADIR}\" --foreground"
+command_background="yes"
+pidfile="${ZNC_PIDFILE:-/run/znc/znc.pid}"
+user=${ZNC_USER:-znc}
+group=${ZNC_GROUP:-znc}
+start_stop_daemon_args="--chdir \"${ZNC_DATADIR}\" --user ${user} --group ${group} ${ZNC_SSDARGS}"
+retry="${ZNC_TERMTIMEOUT}"
+
+required_dirs="${ZNC_DATADIR}"
+
+depend() {
+	use dns logger
+}
+
+start_pre() {
+	checkpath -d -m 0770 -o ${user}:${group} "$(dirname ${pidfile})"
+}
+
+stop_post() {
+	rm -f "${pidfile}"
+}
+
+reload() {
+	ebegin "Reloading ZNC Configuration File from Disk"
+	start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+	eend $?
+}
+
+save() {
+	ebegin "Saving ZNC Configuration File to Disk"
+	start-stop-daemon --signal SIGUSR1 --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-irc/znc/metadata.xml b/net-irc/znc/metadata.xml
new file mode 100644
index 000000000000..51954559918c
--- /dev/null
+++ b/net-irc/znc/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sautier.louis@gmail.com</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="daemon">Allow znc to run as a system-wide service. Installs an init script and creates a znc user:group.</flag>
+		<flag name="zlib">Enable mod_deflate-like gzip support for znc's web interface using <pkg>sys-libs/zlib</pkg>.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">znc/znc</remote-id>
+		<bugs-to>https://github.com/znc/znc/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/net-irc/znc/znc-1.6.3-r1.ebuild b/net-irc/znc/znc-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..80dcbf2099d1
--- /dev/null
+++ b/net-irc/znc/znc-1.6.3-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+inherit eutils python-single-r1 readme.gentoo-r1 systemd user
+
+MY_PV=${PV/_/-}
+GTEST_VER="1.7.0"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+SRC_URI="
+	http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
+	test? ( ${GTEST_URL} )
+"
+KEYWORDS="amd64 arm x86"
+
+HOMEPAGE="http://znc.in"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/icu:=
+	sys-libs/zlib
+	perl? ( >=dev-lang/perl-5.10:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
+	"${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
+)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+	if use daemon; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+		# The home directory was previously set to /dev/null
+		# This caused a bug with the systemd unit
+		# https://bugs.gentoo.org/521916
+		esethome ${PN} /var/lib/${PN}
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable sasl cyrus) \
+		$(use_enable ssl openssl) \
+		$(use_enable tcl tcl) \
+		$(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
+}
+
+src_install() {
+	default
+	dodoc NOTICE
+	if use daemon; then
+		newinitd "${FILESDIR}"/znc.initd-r1 znc
+		newconfd "${FILESDIR}"/znc.confd-r1 znc
+	fi
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo")
+	DISABLE_AUTOFORMATTING=1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	if [[ -d "${EROOT%/}"/etc/znc ]]; then
+		ewarn "/etc/znc exists on your system."
+		ewarn "Due to the nature of the contents of that folder,"
+		ewarn "we have changed the default configuration to use"
+		ewarn "	/var/lib/znc"
+		ewarn "please move /etc/znc to /var/lib/znc"
+		ewarn "or adjust /etc/conf.d/znc"
+	fi
+}
+
+pkg_config() {
+	if use daemon; then
+		if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
+			ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
+			ewarn "any existing configuration. If you are sure you want"
+			ewarn "to generate a new configuration, remove the folder"
+			ewarn "and try again."
+		else
+			einfo "Press any key to interactively create a new configuration file"
+			einfo "for znc."
+			einfo "To abort, press Control-C"
+			read
+			mkdir -p "${EROOT%/}/var/lib/znc" || die
+			chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+				die "Setting permissions failed"
+			"${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
+				die "Config failed"
+			echo
+			einfo "To start znc, run '/etc/init.d/znc start'"
+			einfo "or add znc to a runlevel:"
+			einfo "  rc-update add znc default"
+		fi
+	else
+		ewarn "To configure znc as a system-wide daemon you have to"
+		ewarn "enable the 'daemon' use flag."
+	fi
+}
diff --git a/net-irc/znc/znc-1.6.5.ebuild b/net-irc/znc/znc-1.6.5.ebuild
new file mode 100644
index 000000000000..23d86965db2e
--- /dev/null
+++ b/net-irc/znc/znc-1.6.5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit eutils python-single-r1 readme.gentoo-r1 systemd user
+
+MY_PV=${PV/_/-}
+GTEST_VER="1.7.0"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+SRC_URI="
+	http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
+	test? ( ${GTEST_URL} )
+"
+KEYWORDS="amd64 arm x86"
+
+HOMEPAGE="http://znc.in"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	icu? ( dev-libs/icu:= )
+	perl? ( >=dev-lang/perl-5.10:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tcl? ( dev-lang/tcl:0= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-systemwideconfig.patch
+	"${FILESDIR}"/${PN}-1.6.1-create-pidfile-per-default.patch
+)
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+	if use daemon; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+		# The home directory was previously set to /dev/null
+		# This caused a bug with the systemd unit
+		# https://bugs.gentoo.org/521916
+		esethome ${PN} /var/lib/${PN}
+	fi
+}
+
+src_configure() {
+	econf \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable debug) \
+		$(use_enable icu charset) \
+		$(use_enable ipv6) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable sasl cyrus) \
+		$(use_enable ssl openssl) \
+		$(use_enable tcl) \
+		$(use_enable zlib) \
+		$(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
+}
+
+src_install() {
+	default
+	dodoc NOTICE
+	if use daemon; then
+		newinitd "${FILESDIR}"/znc.initd-r1 znc
+		newconfd "${FILESDIR}"/znc.confd-r1 znc
+	fi
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
+	DISABLE_AUTOFORMATTING=1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	if [[ -d "${EROOT%/}"/etc/znc ]]; then
+		ewarn "/etc/znc exists on your system."
+		ewarn "Due to the nature of the contents of that folder,"
+		ewarn "we have changed the default configuration to use"
+		ewarn "	/var/lib/znc"
+		ewarn "please move /etc/znc to /var/lib/znc"
+		ewarn "or adjust /etc/conf.d/znc"
+	fi
+}
+
+pkg_config() {
+	if use daemon; then
+		if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
+			ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
+			ewarn "any existing configuration. If you are sure you want"
+			ewarn "to generate a new configuration, remove the folder"
+			ewarn "and try again."
+		else
+			einfo "Press any key to interactively create a new configuration file"
+			einfo "for znc."
+			einfo "To abort, press Control-C"
+			read
+			mkdir -p "${EROOT%/}/var/lib/znc" || die
+			chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+				die "Setting permissions failed"
+			"${EROOT%/}"/usr/bin/znc --system-wide-config-as ${PN} -c -r -d "${EROOT%/}/var/lib/znc" ||
+				die "Config failed"
+			echo
+			einfo "To start znc, run '/etc/init.d/znc start'"
+			einfo "or add znc to a runlevel:"
+			einfo "  rc-update add znc default"
+		fi
+	else
+		ewarn "To configure znc as a system-wide daemon you have to"
+		ewarn "enable the 'daemon' use flag."
+	fi
+}
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
new file mode 100644
index 000000000000..a0794296fcc8
--- /dev/null
+++ b/net-irc/znc/znc-9999.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5} )
+PLOCALES="ru"
+
+inherit cmake-utils l10n python-single-r1 readme.gentoo-r1 systemd user
+
+GTEST_VER="1.8.0"
+GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> gtest-${GTEST_VER}.tar.gz"
+DESCRIPTION="An advanced IRC Bouncer"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
+	SRC_URI=""
+else
+	SRC_URI="
+		http://znc.in/releases/archive/${P}.tar.gz
+		test? ( ${GTEST_URL} )
+	"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+HOMEPAGE="http://znc.in"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
+
+RDEPEND="
+	icu? ( dev-libs/icu:= )
+	nls? ( dev-libs/boost:=[nls] )
+	perl? ( >=dev-lang/perl-5.10:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tcl? ( dev-lang/tcl:0= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+	perl? ( >=dev-lang/swig-3.0.0 )
+	python? ( >=dev-lang/swig-3.0.0 )
+"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	# The home directory was previously set to /dev/null
+	# This caused a bug with the systemd unit
+	# https://bugs.gentoo.org/521916
+	esethome ${PN} /var/lib/${PN}
+}
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/src/po" "${PN}." '.po'
+
+	remove_locale() {
+		# Some language/module pairs can be missing
+		rm -f src/po/${PN}.${1}.po modules/po/*.${1}.po || die
+	}
+	l10n_for_each_disabled_locale_do remove_locale
+
+	# Let SWIG rebuild modperl/modpython to make user patching easier.
+	if [[ ${PV} != *9999* ]]; then
+		rm modules/modperl/generated.tar.gz || die
+		rm modules/modpython/generated.tar.gz || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_SYSTEMD=yes  # Causes -DSYSTEMD_DIR to be used.
+		-DSYSTEMD_DIR="$(systemd_get_systemunitdir)"
+		-DWANT_ICU="$(usex icu)"
+		-DWANT_IPV6="$(usex ipv6)"
+		-DWANT_I18N="$(usex nls)"
+		-DWANT_PERL="$(usex perl)"
+		-DWANT_PYTHON="$(usex python)"
+		-DWANT_CYRUS="$(usex sasl)"
+		-DWANT_OPENSSL="$(usex ssl)"
+		-DWANT_TCL="$(usex tcl)"
+		-DWANT_ZLIB="$(usex zlib)"
+	)
+
+	if [[ ${PV} != *9999* ]] && use test; then
+		export GTEST_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googletest"
+		export GMOCK_ROOT="${WORKDIR}/googletest-release-${GTEST_VER}/googlemock"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	${CMAKE_MAKEFILE_GENERATOR} unittest || die "Unit test failed"
+	popd > /dev/null || die
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc NOTICE
+	newinitd "${FILESDIR}"/znc.initd-r2 znc
+	newconfd "${FILESDIR}"/znc.confd-r1 znc
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r1") || die
+	DISABLE_AUTOFORMATTING=1
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		readme.gentoo_print_elog
+	fi
+
+	if [[ -d "${EROOT%/}"/etc/znc ]]; then
+		ewarn "${EROOT%/}/etc/znc exists on your system."
+		ewarn "Due to the nature of the contents of that folder,"
+		ewarn "we have changed the default configuration to use"
+		ewarn "	${EROOT%/}/var/lib/znc"
+		ewarn "please move ${EROOT%/}/etc/znc to ${EROOT%/}/var/lib/znc"
+		ewarn "or adjust your service configuration."
+	fi
+}
+
+pkg_config() {
+	if [[ -e "${EROOT%/}/var/lib/znc" ]]; then
+		ewarn "${EROOT%/}/var/lib/znc already exists, aborting to avoid damaging"
+		ewarn "any existing configuration. If you are sure you want"
+		ewarn "to generate a new configuration, remove the folder"
+		ewarn "and try again."
+	else
+		einfo "Press any key to interactively create a new configuration file"
+		einfo "for znc."
+		einfo "To abort, press Control-C"
+		read
+		mkdir -p "${EROOT%/}/var/lib/znc" || die
+		chown -R ${PN}:${PN} "${EROOT%/}/var/lib/znc" ||
+			die "Setting permissions failed"
+		start-stop-daemon --start --user ${PN}:${PN} --env ZNC_NO_LAUNCH_AFTER_MAKECONF=1 \
+			"${EROOT%/}"/usr/bin/znc -- --makeconf --datadir "${EROOT%/}/var/lib/znc" ||
+			die "Config failed"
+		einfo
+		einfo "Now you can start znc service using the init system of your choice."
+		einfo "Don't forget to enable znc service if you want to use znc on boot."
+	fi
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-09 18:53:29 +0100
commit	4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
tree	ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-irc