17 files changed, 281 insertions, 14 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 72bbca71d398..e7c1400772a7 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index e6155009e428..6a2c221e1436 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -2,6 +2,8 @@ AUX eggdrop-1.6.21-fix-gcc5-remove-inline.patch 1551 BLAKE2B f94634c58ea761152e4
 AUX eggdrop-1.6.21-fix-memset.patch 323 BLAKE2B d51ac90bd22751528ba1d0b57e41e14b1f801bd468ce3b225a8d4248896b3d3fde493357a03e3bf14fc640908f4916b4665b9b39e9d140b02ca00e0aba921667 SHA512 91f422c7af4d3f5dd11d770eb6f6495f321fa8be2d51bbcb7b39756e8e3137a397175a997ea8fdcd74783b72bebcac052866f297c2ae70a4f649c5fb9b4b6c04
 AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715
 DIST eggdrop-1.6.21-patches-1.0.tar.bz2 322608 BLAKE2B 5589b4c826b6144b2c5b68df485dfc361edf699d4cd6cf2760f410716664d34cc3dd7f22f2b5af67264ec5f4071e9a17907fa9796bd2712a9a86cbd6122a9c27 SHA512 d7d5d740c68997101f360096612700919c890c4254708102e962427de5929ce98f0f2eb5ad8dc8a56de60e8b610d502edeae7de2ac762fe0981134da379b6e64
+DIST eggdrop-1.8.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3
 DIST eggdrop1.6.21.tar.bz2 999211 BLAKE2B f804ebe4f06176a6de7331d409f97ed1c3159cc32a8a06cb8c5c6e6a83bf181c7b9624a2a4aaee4d36361903a21b7ee1c052466faeebda357bb0675052e3a5da SHA512 9fd9a86c1c4b59a47a5eed4e2306e829a01bac2ad29e990ca9c0ec630d5814fd649a9216dae9ce49f734e3ac1728beb4f479ca10af583bd513f43bbbea23a653
-EBUILD eggdrop-1.6.21-r1.ebuild 2464 BLAKE2B 5a40cc3bb38a13c1c1ca344019ad535ec01c244ffdb7c26d6b83945634f597e9143cd03f6ad1cfdb7929f9f00e4513ff7f59d0a364083671ba1fc6e2740b0db1 SHA512 509f82d3d4ce3a1c9762f212d254e488d501f358172df9fc2982b1f8b1cd69436494d02815940059aaa2b3e9c25b6c2b2878666af74bb2684557a55c92b6364e
+EBUILD eggdrop-1.6.21-r1.ebuild 2465 BLAKE2B 03701c6e050130c794db1ed6283a7088e57d54cae32cade79a3e070db13503d133a63daf444ea6046441ee407782ec21e060379906b95614e4efd03c220322de SHA512 19bdab29fa8becca0031e6156366a81b2b940da499284cfe4dfc6bfaf00a861a09aa4e5cfd4542c37f2ada8327b36800f901104d0db95cd2ec2ed0adc76dce16
+EBUILD eggdrop-1.8.3.ebuild 1722 BLAKE2B 43844eef97f44a92f683ec91a3f86262e493afc2fed194d164ef602e95cbb4b4aba4749e4566572b422b5e94fedea8936c1e270d56b193335664323b24c11eb0 SHA512 aad08f18d7b804d9a2091dac85e4c9a5a7a9c64bdb31e72581f64001d31c9c6924e30ff676cd6b02fa4a4d489896211f57e5ca64d6fde6b5b5016daca7cfdce2
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
index b9e9aed74280..f2f6d79bb71f 100644
--- a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ MY_P="eggdrop${PV}"
 PATCHSET_V="1.0"
 
 DESCRIPTION="An IRC bot extensible with C or TCL"
-HOMEPAGE="http://www.eggheads.org/"
+HOMEPAGE="https://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"
diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
new file mode 100644
index 000000000000..86d8765154b1
--- /dev/null
+++ b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="An IRC bot extensible with C or TCL"
+HOMEPAGE="https://www.eggheads.org/"
+SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="debug doc ipv6 ssl static"
+
+DEPEND="
+	dev-lang/tcl:0=
+	ssl? ( dev-libs/openssl:0= )
+"
+RDEPEND="
+	sys-apps/gentoo-functions
+	${DEPEND}
+"
+
+DOCS=( AUTHORS FEATURES INSTALL NEWS README THANKS UPGRADING )
+
+src_prepare() {
+	# https://bugs.gentoo.org/335230
+	# https://github.com/eggheads/eggdrop/issues/526
+	sed -i \
+		-e '/\$(LD)/s/-o/$(CFLAGS) $(LDFLAGS) &/' \
+		src/mod/*.mod/Makefile* src/Makefile.in || die
+	default
+}
+
+src_configure() {
+	econf $(use_enable ssl tls) \
+		$(use_enable ipv6 ipv6)
+
+	# https://github.com/eggheads/eggdrop/issues/527
+	emake -j1 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 ${target}
+}
+
+src_install() {
+	# https://github.com/eggheads/eggdrop/issues/527
+	emake -j1 DEST="${D}"/opt/eggdrop install
+
+	use doc && HTML_DOCS=( doc/html/. )
+	rm -r "${D}"/opt/eggdrop/doc/html || die
+	DOC_CONTENTS="
+		Additional documentation can be found
+		in ${EPREFIX}/opt/eggdrop/doc
+	"
+	readme.gentoo_create_doc
+	einstalldocs
+
+	dobin "${FILESDIR}"/eggdrop-installer
+	doman doc/man1/eggdrop.1
+}
+
+pkg_postinst() {
+	# Only display this for new installs
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please run ${EPREFIX}/usr/bin/eggdrop-installer to install your eggdrop bot."
+	fi
+}
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index ca6ff7da43fc..1b506a9198eb 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -4,7 +4,7 @@ AUX hexchat-2.12.4-libressl.patch 1040 BLAKE2B ee063f1ce4ea2d355959df5ec3b0271e6
 DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d5e3cc3c12815faa7e515d00b803bde0bbf30e1ca5c0b69fe954dd30a6f69e5094dabe1dc641ae4f0742ad1965b4 SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40
 DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
 EBUILD hexchat-2.12.4-r1.ebuild 3609 BLAKE2B f1d3828bb8e4a9c1315fe2ad0e4abd2e3da682ee95882ccbfb5bbe546df994208750a8d628b55198d281678a61da583a938423561145a10a1cf08d622877befb SHA512 84c8fb88e9cfe25ac42f255c5fd1dd73d096ebb6e1f50ccd0bcff394b5c3f90791cf2d8841ae1ae2192422f0658d0825c01cee8a83a8583c590ddafaa6365c87
-EBUILD hexchat-2.12.4-r2.ebuild 3408 BLAKE2B ecaf76967360e6720de5018b2a8b8d354db06ead38bda2559871a87e15d2afa945580c226fafd32cc39c8ec3743d2eae972dbdecb7e5ea98e5a9a7f1de51e61b SHA512 9c93c3e0d39d911af72af03d9156b1f13dec40e22881ed8913db3b276ed3888472cfca59c0ec51ba779b58fecb49bf7c84f3e936a8dd1cc3e31257aa5ef9281e
+EBUILD hexchat-2.12.4-r2.ebuild 3403 BLAKE2B b60c5ac2b8667feeb2df41fa7acfafd32986af5dd06c994d704e4021fb60f843e7a2e1fd29a0a01d477fdd1f7113b4122506f68c5ea219f787682acd309e46bc SHA512 55e5a9af8261d63a49d55ed49f14978b6a8f70edea5f00447d1c79a86586ebf0e3c2b83d5464cd2e569d158f08bac7afba4841676793b1a26cca7762c90e0bd2
 EBUILD hexchat-2.14.1.ebuild 3435 BLAKE2B f052fd4f3669d2b6c338d1beba29d1fcfa9c2fbdd6ebf132e7f9b0c671aa7c196d1165647d20ee1ae40dc1c80d9ad73001afff22ad0f572c120d75e7287ae0ce SHA512 e4a263fedce93d34f9bfee8e270c8dca04108ea08272628462124a7e13feb54e038747522cc70b322976da0e599aa79de90478602f4081b7713c0d3ca770b8bb
 EBUILD hexchat-9999.ebuild 3435 BLAKE2B f052fd4f3669d2b6c338d1beba29d1fcfa9c2fbdd6ebf132e7f9b0c671aa7c196d1165647d20ee1ae40dc1c80d9ad73001afff22ad0f572c120d75e7287ae0ce SHA512 e4a263fedce93d34f9bfee8e270c8dca04108ea08272628462124a7e13feb54e038747522cc70b322976da0e599aa79de90478602f4081b7713c0d3ca770b8bb
 MISC metadata.xml 1270 BLAKE2B e7fa8f9ec799b0448b1b1746dc8e076050cc057a04234dc1aa45e77632d0e466443a3bfe0cc2f537fc1bbba91cbb11117377778336e520255120fed3498cdabe SHA512 bf21e165f0b91ee73edf979e59149723d62e7032a8087ec3ea164c1075bf7d7ebc658d15d44e05f682bef26b85ca24b27143446c9e8cf40dc97a6b29ef3932ea
diff --git a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
index 1311a5c72562..6c9dda82872a 100644
--- a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
+++ b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	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"
+	KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ppc64 ~sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
diff --git a/net-irc/ircii/Manifest b/net-irc/ircii/Manifest
index c6a81d1cb2cf..381049c70b92 100644
--- a/net-irc/ircii/Manifest
+++ b/net-irc/ircii/Manifest
@@ -1,6 +1,9 @@
 AUX ircii-20110228-glibc.patch 799 BLAKE2B b4c5e80d42c5a633c3f31bbf29a2f68e0a4d5ff0a7f06042ed6901c3cadc7c418c10ffe461d5c31d41b3956e7faa44b86abb7092b1fc40690821fa7e677ebf93 SHA512 41d897753266acf205236d108b740d34a898ed13be2657a7314d1bbf3fd6f9a556f01b8dabb3b293c69606047bc03c6ef69cd35e5d0cab9d958ee173ab3744e3
+AUX ircii-manpage-path.patch 514 BLAKE2B 09723e9e2d80654c9ca05535b8e14e833af7ed423bad9a32cc8b8200b3263129d85cc614db4a2f77d5778464fc28d2663675a909b7e2b16e570128cb7264cbdf SHA512 ef19be0ac1b5794da5d761131100b85d5d928f6a204fbce1c32b2deedf638cdaf8fe3a92cd06ac9ca0ddcb0b4f918b56ab298731201d54b94550287cddb4d693
 DIST ircii-20110228.tar.bz2 558483 BLAKE2B 52c83503bf258aaf27635d5ac525da61894486681069f7ff56d571f387567ba964976770b1a1e647aae1b0b18416ccc37c7498bc7cfca5c1c26247796638654e SHA512 df27f098ad9c134335b7d97a25a07ef5fd9d14063b2e079a707a472d2582a1451d7697f3123508296c76afdb78257ad6dc358a2ec5af584ab53872c765b01782
 DIST ircii-20111115.tar.bz2 555731 BLAKE2B 8715b5d84cbca98005b3c3bf426f632737be2f4a121f673c3d7d76a5f4204c603594779c15a9fe5e886fb33b96cfc149f690508b546752cd4f7c4f9ad8aaf36a SHA512 6f282debbd27865414a2ef9148b23373f83a051b2917432d9fdc2f153c111f8e592286d42a5ad34fd0cdc155e39938094e140910fbf38be494e3ed3da4cd0b6e
+DIST ircii-20170704.tar.bz2 596535 BLAKE2B 780b9bc74e80d622df3686d3234ce69c62c0d9ae43322addfc545de76854ba30ec25546921cff449556f9e6b14b7dc00f3b15437789bea8bfa9b3df44d5b7e6c SHA512 a0cdc5603fab040fa2f7d2b3d7a564e9eeac4b402329cba5c6f1a97aa6e587a53ffc4141420dde97dc2cadf22581e74058a0357c6b4b0d0b03f5dea7fa8cbc3a
 EBUILD ircii-20110228.ebuild 888 BLAKE2B c29034ccfbfe54ce2cd8a359a8e183f9d227c9f6ed5af79dcf0ad7f7129b19be749df82398bbcab88694935ab8f10db202c582cbe8f65dd1817254b054ac3c0e SHA512 91465b9c564e7f7b978e46cb73e10c837bc77823c3451e117bb34bf112296ec11c2b2e079dec0b01a08b816d92858b701b3ea22cd307593a971b82682ef2d13c
 EBUILD ircii-20111115.ebuild 837 BLAKE2B 9d74447a3a83019a40c731a323b4e77c911250126b693d8cd05b001c01c6ae8637f1813fcba324a6fb7c1892d7976d1d405d32c50e64cc9c59ffadd6b6aa3b60 SHA512 5914ab46ca20f9f5b7db8b26163ac43c62b941f782ad03fe6eba5b5b68968e794116a31ca18b48115ece1df42369c57d4a826b4dee08f6fac72cd38e61af04d7
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD ircii-20170704.ebuild 870 BLAKE2B 06f2ae579c3a2f0b9f347b546c80d893a6b850cb62fa3aec9e2a2ee93c4933ece8e190fa107f032828ebf233919841be74551fb5cb1182f986ba382c6be236db SHA512 9a756069168dff3cf1b53301ade184b0cabe7c6e8f24450f7e136b62ad66181efcf87f45b68d26c33cd0817405b53c97ba7a8e502f5382d147e010df9bb6bbe6
+MISC metadata.xml 245 BLAKE2B 5323e1eec795a67d15f768c9c6dea0f5501b8f0350586558ad25708a6b13398fc55b6afa97e621e5895a879bdf1594b8323d98a31e39735e2338a6e938288668 SHA512 1b915771c263fd188289f5f3c0168e44a651d52d173dbd35f9dc94795a3227fd1133f2c08a0f30341b42a0cba6f5b0d0ce68dcd6dfc66ff3e225c98b443eb00c
diff --git a/net-irc/ircii/files/ircii-manpage-path.patch b/net-irc/ircii/files/ircii-manpage-path.patch
new file mode 100644
index 000000000000..62a55c29e0a1
--- /dev/null
+++ b/net-irc/ircii/files/ircii-manpage-path.patch
@@ -0,0 +1,12 @@
+diff -ur ircii-20151120/Makefile.in ircii-20151120.new/Makefile.in
+--- ircii-20151120/Makefile.in	2015-11-11 17:01:46.000000000 -0600
++++ ircii-20151120.new/Makefile.in	2016-04-12 13:11:58.553493486 -0500
+@@ -64,7 +64,7 @@
+ libdir = $(DESTDIR)@libdir@
+ libexecdir = $(DESTDIR)@libexecdir@
+ # @mandir@ tends to be $datarootdir which already has $DESTDIR.
+-mandir = @mandir@/man1
++mandir = $(DESTDIR)@mandir@/man1
+ 
+ # Where the ircII binary will be installed.
+ # 'make install' will compile and install the program
diff --git a/net-irc/ircii/ircii-20170704.ebuild b/net-irc/ircii/ircii-20170704.ebuild
new file mode 100644
index 000000000000..4cd24ccd3829
--- /dev/null
+++ b/net-irc/ircii/ircii-20170704.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="An IRC and ICB client that runs under most UNIX platforms"
+SRC_URI="https://ircii.warped.com/${P}.tar.bz2
+	https://ircii.warped.com/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:0=
+	virtual/libiconv"
+# This and irc-client both install /usr/bin/irc #247987
+RDEPEND="${DEPEND}
+	!net-irc/irc-client"
+
+PATCHES=( "${FILESDIR}/${PN}-manpage-path.patch" )
+
+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
index 6f49eba8f496..ee9a82ac4170 100644
--- a/net-irc/ircii/metadata.xml
+++ b/net-irc/ircii/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
 </pkgmetadata>
+
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index c22892834a9c..b22bb2722ef0 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -14,6 +14,7 @@ EBUILD irker-2.12.ebuild 1251 BLAKE2B 56c3d2631c44198adc69b8ff18c0d78cb81b5c541e
 EBUILD irker-2.13.ebuild 1251 BLAKE2B 56c3d2631c44198adc69b8ff18c0d78cb81b5c541eaafd16079509ef9583d3c49ac8bb83198a943179bb83edbae7e84e04e8899c7ddcdec78912bf42dfa63616 SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d
 EBUILD irker-2.15.ebuild 1417 BLAKE2B 9af7105677b7997cf8f93431484553a65606ee20003827487bf1fa49b0b95a2c9925b09d71c4a3ab37b2a99ca7f9aad0176d95854264d2a77fce95ea18a3efe9 SHA512 9618bcb3630c42443bfdd5dc1143bce97b7145d66fd75cae92a5e6379886e509e934a5ccbfd9ba04cd3494cef25d353629f378f4104ffe66b308980ba7cef265
 EBUILD irker-2.16.ebuild 1428 BLAKE2B 2d63f46eb2e69f0547d2eff838da8df755683a34ec320b0a5a3e064e9647398e88f4856202cfc11bc9696007368f85abdab00273112d25ca181ef080b2ef746f SHA512 20e3d44eae5179f03fe1ca8fd71cd0bac431cf2a41de025e903632e2b8ce816ea55fda83b48ac2aab03de309887c78a68cec43dc1f9b8d07362553dcedf9122f
+EBUILD irker-2.18-r1.ebuild 1307 BLAKE2B 041e6a611d5b0afaad38f38a7a6f49b0d15b0b7cc2712c726c93460550aa6c9f7e5ce3265249e592bdd3943bf881f2284f0740031e21372126739f0a9e34b72c SHA512 5408c1fcbc4bdee662c61fdab9f0eb4cc8264770e4389d919c7b7d77f5887abb9dd4e421bf9e693639dcd8fa67528847ab3a4f99609e70962bd3121504907ba4
 EBUILD irker-2.18.ebuild 1277 BLAKE2B 1a655da610852f06a55e3a81a0b264a5ae8f75bc9ef56354b94d60a0c55ee505a43ec2f6226e3dd1dd793fae03c8c0d40e9c0e6d0f275eefc4ec8c6b7e780ca6 SHA512 23b6117fbe84aa87cf95a6a0732c8c3504a7c8557af395ce5232dba859fd92902208135e06fe4142fbad94cb1229290f128c1c568ead6e4e3ae0cd84e6dd85bf
 EBUILD irker-2.9.ebuild 1251 BLAKE2B 56c3d2631c44198adc69b8ff18c0d78cb81b5c541eaafd16079509ef9583d3c49ac8bb83198a943179bb83edbae7e84e04e8899c7ddcdec78912bf42dfa63616 SHA512 ad2750d93a565c575657afcf47424af5ecf8719f53748c2e6abbf4bcdf81790e0f67598b5f448863ee0c324ea61a1ec1db471b565026aca94bb8d929967a553d
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/net-irc/irker/irker-2.18-r1.ebuild b/net-irc/irker/irker-2.18-r1.ebuild
new file mode 100644
index 000000000000..62f36d076cfc
--- /dev/null
+++ b/net-irc/irker/irker-2.18-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 ) # Doesn't work with python3 bug #619700
+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/konversation/Manifest b/net-irc/konversation/Manifest
index 845fbab33b3b..0d0827772c83 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,5 +1,7 @@
 AUX konversation-1.7.4-qt-5.11.patch 766 BLAKE2B 1293fcd2bc9e7936ce7d181ae4282a4a475a7203dc2114000f76286d17c0c087d3d05582298b9104550ce42639e3f19a836e01ef49111cdd99e467f0519548ca SHA512 aac2d523c42a2578ddb202e34592bbb8371eebf603a60902ba4a8dd3f4973eba41ee89ca8a85996231a94a7b5a1eaaac2f44d2bd03c38a872addcdef0161afcb
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.4.tar.xz 3737732 BLAKE2B 585ce998bba94fe928c40c41e360d2dbdf5b5f2be586f8dcbf543c4e4c9a6ff8df428c325d638e21c0b54ae2d82875d2cc53e38f8abb01827428652b138ff600 SHA512 8d30fc0c0e533f1fa3268f8360eb5b9321b505fca3103ce189f707247345b2b2c409f590ce45d6fb129a76fc642a4e9f6a802c244a0a3e56aded422ddf4ed19a
+DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
 EBUILD konversation-1.7.4-r1.ebuild 1806 BLAKE2B 633fbbf53552962518ba9200a7b42f9c9aac1ee82efc7578b31b5fa0b9fce17c15239e2c02606b91a2a8b6824c81341b7c275ed244bed130c0c8e7fc7aca4b8f SHA512 bd938ea0ca5df8c615319b5e3ba0b36ffb2e0283ccac6b1a2fbc6198d307350b5592d98c93418840e96f32b9e220621d5ec285750dc8459ba6cf32a8c8890b40
+EBUILD konversation-1.7.5.ebuild 1762 BLAKE2B 4a9dc92bf657480e0643e7fd1d5a9724fd4b194ad0ff144177e81f7fc1d60cddaa6ef97d293395f014a89c70c2fec4d025437c2f8e85009dde5ef7fb6092fccc SHA512 a7a8d0003aa601ef3972e07c3eda5c05fe56fae66666e2a531777939306f32d168901e33f7096354a4d5ea72ce270465fdb788be74bcdfeb13d2d5fd165285ff
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-1.7.5.ebuild b/net-irc/konversation/konversation-1.7.5.ebuild
new file mode 100644
index 000000000000..9b24e2c65001
--- /dev/null
+++ b/net-irc/konversation/konversation-1.7.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 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/limnoria/Manifest b/net-irc/limnoria/Manifest
index 43ba55c0ad04..8533ca7eecbf 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -3,6 +3,6 @@ DIST limnoria-20150829.tar.gz 939733 BLAKE2B 606284c5fb5d05e8c932a3c092a0a18a75f
 DIST limnoria-20171025.tar.gz 957078 BLAKE2B 74c1f7cb2ab9123706f265e471533dac4224848ba9a78a79749ca5cac7e9f67c33a884cef30706f3c36440b385ae2e1d5748f4b7aedaf9bfd8e38839d13e4865 SHA512 513a04b860e1fc1788de41238c858fa487899988111d9f5bfaa4acde6506dbd4bdf4dd26e48d268f6ca2f1b301b3e8d9aad8a2733013c09db69ffb4f925a7c12
 EBUILD limnoria-20150523.ebuild 2627 BLAKE2B 60ec81c753aea07528819c42e3a3044e8d6ff6ecf4479de22f38629f784a61243c02e060244247d88c5c82aa3a7f9764399413e6326d66e0e94fb6800df94f0d SHA512 3240cd36ff12d0222dae15945970c07103494b2d874df34b64b72850dc2657ca5272046c4da67f4c5cbe32bad564052aae4c568dfbd7f499d37be8110eedb4e3
 EBUILD limnoria-20150829.ebuild 2631 BLAKE2B e39458856bd38924610a4d4723e76c02cedf762d80fcc2128a8fefedb1536f857a61a982e605485dd1e1655bd513208f5133dd577b03fad439d4aa24dbccf7d9 SHA512 75c82036fa8488f5c2f63f193bddc73b970530601ac5d572ae41efc2e20a63dc13e3424fdd7b4d32832dd40c357cecf360e65a69c1fc76b4f2c1c971a119ee4f
-EBUILD limnoria-20171025.ebuild 2631 BLAKE2B e39458856bd38924610a4d4723e76c02cedf762d80fcc2128a8fefedb1536f857a61a982e605485dd1e1655bd513208f5133dd577b03fad439d4aa24dbccf7d9 SHA512 75c82036fa8488f5c2f63f193bddc73b970530601ac5d572ae41efc2e20a63dc13e3424fdd7b4d32832dd40c357cecf360e65a69c1fc76b4f2c1c971a119ee4f
-EBUILD limnoria-99999999.ebuild 2631 BLAKE2B e39458856bd38924610a4d4723e76c02cedf762d80fcc2128a8fefedb1536f857a61a982e605485dd1e1655bd513208f5133dd577b03fad439d4aa24dbccf7d9 SHA512 75c82036fa8488f5c2f63f193bddc73b970530601ac5d572ae41efc2e20a63dc13e3424fdd7b4d32832dd40c357cecf360e65a69c1fc76b4f2c1c971a119ee4f
+EBUILD limnoria-20171025.ebuild 2635 BLAKE2B f75ea775cb29bfe5a860974402741321e9810c4dae438afff1e43a6c87b7f273a9d764725c16b6afda92f02de600ecd132e40fa050ab624ac93e8bd47d85dbc2 SHA512 eeb10ce41756fb302a17fe9a3e858869947e7186e7df20c8d25140b28bbb09dd4e2fba2ec88db757403a70292a2e36498f1149ab51a14513aeb9a620c13f68af
+EBUILD limnoria-99999999.ebuild 2635 BLAKE2B f75ea775cb29bfe5a860974402741321e9810c4dae438afff1e43a6c87b7f273a9d764725c16b6afda92f02de600ecd132e40fa050ab624ac93e8bd47d85dbc2 SHA512 eeb10ce41756fb302a17fe9a3e858869947e7186e7df20c8d25140b28bbb09dd4e2fba2ec88db757403a70292a2e36498f1149ab51a14513aeb9a620c13f68af
 MISC metadata.xml 408 BLAKE2B 5328f97d256c4e5dc340d7ce1c6090983c84948326bff34ee0a94c6dd644fb72b5bf348a10e841e520ccf80d1238f159af64e5a3dc1991b9646da17baf3ff0d0 SHA512 6be6681e4b0f8555cd0e769937580068315acae5b1d1c722c354748b8c0a16c0146950b716a1b7b46f0230623580b2576f53c757b13125577698f458f824732e
diff --git a/net-irc/limnoria/limnoria-20171025.ebuild b/net-irc/limnoria/limnoria-20171025.ebuild
index 0280102ac95c..e90b31d93097 100644
--- a/net-irc/limnoria/limnoria-20171025.ebuild
+++ b/net-irc/limnoria/limnoria-20171025.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/net-irc/limnoria/limnoria-99999999.ebuild b/net-irc/limnoria/limnoria-99999999.ebuild
index 0280102ac95c..e90b31d93097 100644
--- a/net-irc/limnoria/limnoria-99999999.ebuild
+++ b/net-irc/limnoria/limnoria-99999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1