gentoo resync : 22.10.2018

27 files changed, 339 insertions, 273 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 863b0bb00f80..0a72ad06041f 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 3fc347bba7e7..e7837a7b33a8 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -5,5 +5,5 @@ DIST eggdrop-1.6.21-patches-1.0.tar.bz2 322608 BLAKE2B 5589b4c826b6144b2c5b68df4
 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 2465 BLAKE2B 03701c6e050130c794db1ed6283a7088e57d54cae32cade79a3e070db13503d133a63daf444ea6046441ee407782ec21e060379906b95614e4efd03c220322de SHA512 19bdab29fa8becca0031e6156366a81b2b940da499284cfe4dfc6bfaf00a861a09aa4e5cfd4542c37f2ada8327b36800f901104d0db95cd2ec2ed0adc76dce16
-EBUILD eggdrop-1.8.3.ebuild 1718 BLAKE2B a2b4807d2dace8984f9020af5430db187d499e3bbe5dc41770108113fec48d41f56a3378268980503f6c3cacb00a8f2022d79cd925aac006cabf451cb6e5943f SHA512 01511150cfac095d7ef762a890e0dbc85d8f223346ad87f26c9828f8487a3633c1af2db85026f8ed441deaf0a0872764fdc9ca7fa06cafbc8c1ef98030588743
+EBUILD eggdrop-1.8.3.ebuild 1717 BLAKE2B b485a0aed5e0955b012cb72a4a9b0d077efe74ac5180006d4c5f6f068b5b7b05a963db1e548f8e63b17be869f5342f4d498ad02665c521f723d2f8c5338269f8 SHA512 38df420deb37f962a53795853abfdd50a83237d1220bf5b66c1c21887dbd7a61a6e62b9db6a93cf0abf0c646a09b56a50943405660021037b50579d3049ee26a
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
index 3abb84aa61fa..45e57088d8b5 100644
--- a/net-irc/eggdrop/eggdrop-1.8.3.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="alpha ~amd64 ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 07fb5c6cf296..92c140791aaa 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,8 +1,7 @@
 DIST irssi-1.0.7.tar.xz 1034188 BLAKE2B 738ac8c09bb70a1a4f2fea880cf745d38145637ba7afb02dca13be9ee8df1dc5f39eaedd9245a0511446d9ca3cac0a2729d818fa50ce8c2af1825aedc2d52e76 SHA512 f5593ffdbb15c815e1445d15379245a3dba7935a82a6caca0ca2b720e03000df06e6515f5f5d78eaec3923aafccea7396baf12ac945ecddd02664c5f10611bc5
 DIST irssi-1.1.1.tar.xz 1080992 BLAKE2B a7f7f2004958d9b71d0bba3dea2ee09ebd7f99246d9b6e950a36ae772e4e8c49e4f6be6b18b7cd05ec50397fef2b3c4d16dba41637773b149eff8f7755610df4 SHA512 b2fc0805d6213c31bc34c48237baf2e33ac509c0fa09c483fd39f1473e32eee227ff4532efc60fb495c2ec263c05290578bca7ad6d39149e0594f864da5986c0
 EBUILD irssi-1.0.7-r1.ebuild 1285 BLAKE2B 1f53752f6f47bfeebd6750603b7091ceaf1205e42fb08cb693968de1ec6e8df63a832384aca83f798e42b9a3894b8f9f495d83bbecbeeb4f2d6b509ebe86218b SHA512 86bc0b025697adc86cb4abe1bed602b1d3c5d7a3dc7cd05893a6b441b65c42af70d64ab657df1ffb1118931dffbe6712cf7dce3138e0eddac2d2d986e92620e4
-EBUILD irssi-1.0.7.ebuild 1247 BLAKE2B 7d76be7959bc79be57025d6b7219a97c9cbbd44a73cfa4cf7e47e15e5d077786f826c9caf34cdb64f998bb20abbaa2e4f45e9f1d73f31ba5ab64d1abd0a04409 SHA512 4c3a1a408c0bc2825a392abfc001b993d330ba695e586285770ba177b3f6f41eb8e826550f148f4b7323f9755f4ee572fc48a2f4ed3f17c3435bdc3671a9498a
-EBUILD irssi-1.1.1-r1.ebuild 1285 BLAKE2B 1f53752f6f47bfeebd6750603b7091ceaf1205e42fb08cb693968de1ec6e8df63a832384aca83f798e42b9a3894b8f9f495d83bbecbeeb4f2d6b509ebe86218b SHA512 86bc0b025697adc86cb4abe1bed602b1d3c5d7a3dc7cd05893a6b441b65c42af70d64ab657df1ffb1118931dffbe6712cf7dce3138e0eddac2d2d986e92620e4
-EBUILD irssi-1.1.1.ebuild 1256 BLAKE2B 443e8c17a0656108d92f747a6957c5592066a3de21ac7e1684b5f523b569828f37df772662986ca195c0a042c15aa75d9bfab62b96272371ffc295776f5a0422 SHA512 7248fcf3cf33a9603c1148fea6d97e2116b9a5f8de4f169978d933021590def7fd782f5f93014a419e31f19c92efecc046a718a64fbd729ea20ad8db7a713da2
-EBUILD irssi-9999.ebuild 1230 BLAKE2B 12e008f400099b7133c96edc8b702935b34526ff2b575aec5069532ef1acb11333dd78221a46517c9da5fa1210ef87257935387a56d3b4b4a6a498e77827ac41 SHA512 f10ba8f0ae8719c158d39eafae23b96d4105c0705f1dbe3d438d52d37959d803fdab2f196ea43215fcdbe3d67ae2dfd1851c63113c297ad6b1b87c994531cb40
+EBUILD irssi-1.0.7.ebuild 1245 BLAKE2B 32fa87796dbf411b5049432d30b90f81ff9f50e8191bdb7800226e2560c4c453d7e849860b8ceafb0f1e4c1b45f82a29fdb0e4e5e50ef5b2b0c7fb21d1c52e5c SHA512 81ddf2fc815a1233c38c0e701ab4ea3d0dd789b2fad8cc177372bbcf58e738b9d52c828ac3bf46ad6e4555a76365abe8abd32ef3c2deb27bbcd28ae14390c8e8
+EBUILD irssi-1.1.1-r1.ebuild 1274 BLAKE2B 718de0e5242f074832e73b2c3a345e75984901d94c75a5cdd45d4e0b02d46e19328df59e79b0d3982e34da6c0a5b5a8af9bdafabceb5dcc4fc0c059e012d1ef0 SHA512 1ff6aeeed105211b78be6047ad282e53fe111fe7aa52531ab26d1d740b22b1a78f96c5210b8ea7616621e56765db5dedfd7f99dd96d58c6c7be5d8a2404fed84
+EBUILD irssi-9999.ebuild 1227 BLAKE2B 05d2bdb2a2dfad06afb4951b4a489dbfc451fd97e40c6123c6b8bc8a4daa0f2a7fb772198da000da7a7db8fcc1deb59944df5742fdc773697815fd6deafbbcc3 SHA512 8bea8381bd09c5f4fc7bad261564eee950210a830f431bd3520e511f189d10fe2d4934fb4d0e0a7a5ed60049e53ffebf6ec1ba760970880988310e9dc3b5eb18
 MISC metadata.xml 631 BLAKE2B 1ed4dcb701f0884e365891d63aa8ae33d14bbc4b343703ea1ce446c3028ee115f4760fe42583c94e89f829f26dc0abf71192d216af4e6c241bc9a21ed1ab0cc6 SHA512 b3fbbd3085bf6e39d62373b9ac4eeaf423a019276d83319e2e72484763e3e1588c9060864cbb36c080847b6f46e299a17b61acfccea1dacdfdd0709f6c142543
diff --git a/net-irc/irssi/irssi-1.0.7.ebuild b/net-irc/irssi/irssi-1.0.7.ebuild
index 45a67e3e5fe2..3f6899b5e5d9 100644
--- a/net-irc/irssi/irssi-1.0.7.ebuild
+++ b/net-irc/irssi/irssi-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 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"
+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="
diff --git a/net-irc/irssi/irssi-1.1.1-r1.ebuild b/net-irc/irssi/irssi-1.1.1-r1.ebuild
index 5dfd52eed6e2..34f3518a7679 100644
--- a/net-irc/irssi/irssi-1.1.1-r1.ebuild
+++ b/net-irc/irssi/irssi-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 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"
+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="
diff --git a/net-irc/irssi/irssi-1.1.1.ebuild b/net-irc/irssi/irssi-1.1.1.ebuild
deleted file mode 100644
index 17380b8dfb18..000000000000
--- a/net-irc/irssi/irssi-1.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 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
-}
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 127644c7dd8b..615a7053a1c8 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-irc/irssistats/Manifest b/net-irc/irssistats/Manifest
index d703db8ed9ef..7ef0e4eda404 100644
--- a/net-irc/irssistats/Manifest
+++ b/net-irc/irssistats/Manifest
@@ -1,3 +1,4 @@
 DIST irssistats-0.75.tar.gz 54434 BLAKE2B 1bd35158bea9f24b8013834a876cbc3a3f285cea1802e6699f6e10af33dde1a648ec717b031819a999c0beb2cac394130da7a31b5bc877d32abb0a706142d972 SHA512 d7ac167d64c850f3803e6192f1fbf98e13cf296902b92bc3c5847f5f97a678938e7bff41b3195d2845c5ddb92f0557fea1b3a82b61d18b6a307b94ceae1c62f6
+EBUILD irssistats-0.75-r1.ebuild 574 BLAKE2B d9c49c3c008993299a2fb173748ce02f6f508281c8cb4aabf3aba14f22065d68fd7e28240fc6431a85427380fbc3b1505296af6b342ceca77739bb99a8138e3e SHA512 586f66d264675b9ad0d6e7da66054f03ae210930de956e02cce64a65a48212fd7fd010c86e035b116ee907470e7f9620a86d95a1871d6b3d833edec0a2a25dfa
 EBUILD irssistats-0.75.ebuild 622 BLAKE2B afd7a0819661ee7d80df38b8d57be616cb85c38391c604c03275aaa4415752833413862a97002b29d4fd5e6b01a82e588bf3454c9bf57a9c1e5e251c09193227 SHA512 62884d3bc57a926c148e7dfc27686098126796320cb2bcb36354784cce5b4a759fc8b78f56bf883676c735517da624dcdc798afdf6fc3ecede7e50e32cd20a8a
 MISC metadata.xml 247 BLAKE2B ad7649194ba47fd592d8a94cedd1132e472d7173de56a4e5d1b7af591a4063e27b4a196bef97c2aff4e5026ba2b22562c9d156bc93b1820b926151c205a696e6 SHA512 6b67bcfd1c47571c43f484d58c9132df98bb173dc939307124e0bacf8178a281d404b903954a5d23761a54b07123b0c0a83f999fa3cd578dcac141a5a6df661c
diff --git a/net-irc/irssistats/irssistats-0.75-r1.ebuild b/net-irc/irssistats/irssistats-0.75-r1.ebuild
new file mode 100644
index 000000000000..15a1faa17b14
--- /dev/null
+++ b/net-irc/irssistats/irssistats-0.75-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+DEPEND="net-irc/irssi"
+
+src_compile() {
+	$(tc-getCC) -o irssistats ${CFLAGS} ${LDFLAGS} irssistats.c
+}
+
+src_install() {
+	emake \
+		PRE="${D}"/usr \
+		DOC="${D}"/usr/share/doc/${PF} \
+		install
+}
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 8bab47d92547..9722741d6b2a 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,8 +1,6 @@
-DIST kvirc-5.0_pre20180401054732.tar.gz 6040980 BLAKE2B fa023ef84f5c84e92b11ed043be0a2e52316fc92f206c41bcb7216760e0473e13e118398445137aeafd657c856cdccfa2f5202f9534904771d8a049d5139f41a SHA512 6d3a9bb06018e2d54369139bbf0a768d3c4e39754b908c1e4294c79707c8b5b751141ae10bdf8456465bd9bf6e4e426a91bc6bef5a1c3563bf32adecc10582eb
-DIST kvirc-5.0_pre20180605072059.tar.gz 6048634 BLAKE2B db2a7a5ff0fa10a1eea6f011b6ea83301d434b08ba3ee61656ddd136ca027c8ce57a2565b491a69f6f1dff138e984ba76f81dc30ed25b6a0e54bb27821448f05 SHA512 f0da384990fc4a9cdf2727abdcc68cfc9c35e925379635acf02e91dc7d83d5ed584798a3d6ac41d259724993b48a67f8bfdae5e0a8d869f0189fbec3c6a652cf
 DIST kvirc-5.0_pre20180819121252.tar.gz 6049652 BLAKE2B b4712e089a26498a7a3e4df10fe0def377814a9cc4082f55c2177da4929bc2fb02fbc947ee0603b62175a5cee657f6316ca246a275e96df71bd9d938453d4604 SHA512 de7ccb0f698488599ba3f58ca46ef2427632bdf1870d576baea8634e530cbe7654f60d4cdd58447301c4401941ef8b4e810f4d3eb4d6468a2899b80484380ea7
-EBUILD kvirc-5.0_pre20180401054732.ebuild 3837 BLAKE2B 46f2db335a4cdefd2da23c4a13be5cbe87e098450e457862d2a6017210ad3dd89cad2e82d245de5fce97f3b3209c60b21123226f0b266667f5f6e2552df5875f SHA512 2bc026d32a22d75396c4921efdcaa4e35dad27ae0cc6cde18ac965a0cabd556ef68557a691467c88b3ac637d6a1dbf6ca4f1501772255a96be6d0d0311b46175
-EBUILD kvirc-5.0_pre20180605072059.ebuild 3820 BLAKE2B ff7e9906b1239cf16c321e9ee4bcad4854671ac0c7a5a742f4b484b5079bf3c53b626980d3c0e4a08210b1a541b5aa93f61b53ec641c866325343cc41f04cde5 SHA512 79ce480e00deb9406d8416a60039e7fa4a621df2d97e4cf69b3ca9e84e2061616b605e2020bbb3e8b93a11760033e437f87232ecc6cdb18024784015dda51ae5
-EBUILD kvirc-5.0_pre20180819121252.ebuild 3822 BLAKE2B afe6090471b1c252b85dfeb45533bd338e8b2fd0306cc3505bd59e547a0e71378d5dbae59696098925d7d644f419a6a01b2f7eb5927f69ef5a248a47705dc963 SHA512 19ee1d7ddf04617955ce5d97e18312fa7b5ef6e760c3fd11f502554b35e24b1de1e4f205bed2b7d564b489538adc9ebb776064df54a7b94d53151db3a5dbcd85
-EBUILD kvirc-9999.ebuild 3759 BLAKE2B 3d8b72265f6f531fa139b64073f864efb70e0aa9725d43904e5e91dd27118917cdaa4ff775840d8f3e63dd4e00a32d060d5dc20128aeaede9b2eb8230c8d1850 SHA512 2875b8b78685e66c343213f9f82ba59107fc0082fc0fcfd410478beef315700a0cf250b1fc88212b6bfdb3d00ac3300ea835f7bc9afc5a33971acd5432eea18a
+DIST kvirc-5.0_pre20181013192652.tar.gz 5961689 BLAKE2B 9ee5536688e5e193b88e6425591d309396cd1c135622fd682fcc86e832ee72010493877d33bddd3a86bf6c18d34b252e6a4689f7001252e149eefbfd100da977 SHA512 1856f3fab772f04e01e6a367e101bdde0732c4439399f821cd50ffd4173b89de023e1da20327692387b3f002bda0f0880737a6f5f001e0112ae45e1257b0db24
+EBUILD kvirc-5.0_pre20180819121252.ebuild 3838 BLAKE2B c2bbe3f8ae2479d18b887207ab70cc2799004987052232e2e1e23674b0539fc90fdbb3854b9169d3f770561e9e75340caf280bc8515a2668d69c9b46607b6d8f SHA512 d34667e43f9efee5b9d835afb8f2aab0376d80bd9b2d4bd055b2af3886effaaf62d5ec1b98e723c318db539d1068012047b7b7ffe1d463a917ace14f96eee13d
+EBUILD kvirc-5.0_pre20181013192652.ebuild 3840 BLAKE2B 38fabc5eda639501c33dcf455936378c7418bd1d1c60662cbb65fc71881de81389afc71d6989a18e97e593ef65c795d2e947cd1b3eaa82650326a59928b696f5 SHA512 f2734739c7e64efe0adf79b6440cc31c2544a51f016cf68725494894898ee4ff13d469b5a1de76a34baaaffee0efd4980e65a7e8e78926bdb7a8c119c7525395
+EBUILD kvirc-9999.ebuild 3777 BLAKE2B 1fd03974614fb4b6c2bdec28d7a836ad8cbc242741ae143be2db1915b3f5724c5cb0f62e61ac5b55501fd1252b88f11aaff3115e5a58800bb1434d274eff8193 SHA512 e666615ce16b7a42fc9a638fe95decb92fa0a26c2abe78ed8264802123de090a46095d6770b98fa18ecd3d2e5dbae6b4187a8d4b641269713a9c6f0140a886f1
 MISC metadata.xml 618 BLAKE2B 5a6a28876a22cedbca154051a389fed0e7ef25039319786ed2303b580b1e421b648038237e0157678fb96e1b45839e725299e56584bcb770593f60f305932145 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
deleted file mode 100644
index 56f9b6a0dd6c..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python2_7)
-
-inherit cmake-utils flag-o-matic gnome2-utils 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="e6915e5ed77aef19080aeab5ca76a61faf1d4e41"
-	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_pre20180819121252.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
index 0957c93760ac..2ae7426292a4 100644
--- a/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
+++ b/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2009-2018 Arfrever Frehtes Taifersar Arahesis
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -30,7 +30,7 @@ fi
 
 LICENSE="kvirc"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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} )"
 
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild b/net-irc/kvirc/kvirc-5.0_pre20181013192652.ebuild
index 67faa87dff73..a2c478a772c0 100644
--- a/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild
+++ b/net-irc/kvirc/kvirc-5.0_pre20181013192652.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2009-2018 Arfrever Frehtes Taifersar Arahesis
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	inherit vcs-snapshot
 
-	KVIRC_GIT_REVISION="8db61929facd9bfed245752c538b51d0242c3e2e"
+	KVIRC_GIT_REVISION="c7eea2406bf70a77a127b6bf472f422f2dbd9de9"
 	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
@@ -30,7 +30,7 @@ fi
 
 LICENSE="kvirc"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+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} )"
 
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index ddcaa318794f..543e5042b440 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2009-2018 Arfrever Frehtes Taifersar Arahesis
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index f25c62a9d2bb..a968aae15ebe 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,8 +4,8 @@ AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
-DIST quassel-0.13-rc1.tar.bz2 4114806 BLAKE2B 609d994c676b9e930884e738fb008a35e603e03fa0890b5119ffe91d7fbfd8d593eeefc903610309f360ca4c5cc985895e0e532c45d5eeafe1700f9de6735c9e SHA512 13cbaeae83673fc476b8e1f59ca1b6eb929b9bb6dddf15ca248d0fc9535cc8d98a02d194dc16e5c18197c9bacbe7142d1a4712d79133226f979fa9aa7a7813aa
+DIST quassel-0.13-rc2.tar.bz2 4260661 BLAKE2B 083fb6b832dc7297405fb5cb4e36b1d831ff000ef302627f798944bf242c87d4c9a78a797f0997fe1a8db9def23633af27de0c7c571c4051d039431043cb4363 SHA512 3444cf03250a1b0fd26563575e1b3fbabff382b6307e122a933b7f892250222d7277f5aaf0ceb7f53fb0924076d09a328f15e81b0fd7ff7483b54b8d0dac302c
 EBUILD quassel-0.12.5-r2.ebuild 4943 BLAKE2B 5f996b57334d498c9311e1df249fe6f6ca5703ff1b6d5cfc5d64cd82e08298a098b03f23f763f0580c8e328cea3fe49599f390476c8bf372e71d526f8ce90a32 SHA512 cda2554d2e63d4f600b82293e04dbd8e2d90be8ded0749ee95cd98c9b0363a33147b05fd05acb7b3e872742d54e9eca04daf1eed5a44d4285db815c401714255
-EBUILD quassel-0.13_rc1.ebuild 4979 BLAKE2B 6b39a3322e17ebc86a7897d8031a20385a38fa9815e458fd2297d7b10846da6b3a63b0520d20423151a7b6556de8ec8a1f39f6c09a77de088485d79854313ce8 SHA512 e2af4521ffd8f87d332ea82d66f405fa46c5ed141ecd83c930b31cffc011c922d63bc69843419e5e909e073ee48739a81b0d767fded91ba83fa1f259bad64cf0
-EBUILD quassel-9999.ebuild 4984 BLAKE2B 5c9a7134ead3008d6eefedc8007a03a216df0a49ff861c5da11f37a57e1e70fab57a8d87b8f54e1a27930202ae0d5cb2a23c53a4e4634208a899939b5d6a1519 SHA512 40d62c134fea0c93fc1f197a5f40f4333c70fa3acfd908c151fafe96e9227a0fcf2400200638029ea85e16f4c186fe2456ef555adb97aa7e3a7632dc16b981cd
+EBUILD quassel-0.13_rc2.ebuild 5038 BLAKE2B 14feb3ded40746e260a1f602fd81753442f422feef06017ac206844cf999388efcac9879567d87f3bf882797a6c1c4e524f5f21a8c00b61dfa6986a39336b876 SHA512 a581ca0cd4f3f20fb1ecc7c4c196dfb89d77af1bdd92a8673389e2b2b8d397c28f40d283da60e85983752277572b61cc8ca8b6cd08259402dc457ad0ea498f89
+EBUILD quassel-9999.ebuild 5043 BLAKE2B 5d6a0efe97940221762488df12448639fe4928e2401c583c1333c6df237d2e3ef0de84ba576e3bdc1d69e7725c34da6b1f7be91d3de09d12ed3a7b028a671434 SHA512 158bab31c9cc60aafc6e800b76a4b5deee011f0218e068a5a65214337a6af3166d14befdffe217af255b7ad29125cc76fafb0e19be4c5aeb62d2c90945a49ae7
 MISC metadata.xml 1960 BLAKE2B a7e329fb44a58cf74d1964b426cc75b7697160478d62d2c4216d93defb62fd6d9e018ab29689b7a8652571db62a2a2a00f22dda6fb697feb9a381c37cc4a6ac6 SHA512 17931d04330ce51f30dd77579ebed36c04050d150db1faa793fd65307f3808ee2cdfb807a40e3881ebd879c75a583434367e46963a90c99c1a1724659946a8ca
diff --git a/net-irc/quassel/quassel-0.13_rc1.ebuild b/net-irc/quassel/quassel-0.13_rc2.ebuild
index ed2efb5c8b9f..f6ff727068b4 100644
--- a/net-irc/quassel/quassel-0.13_rc1.ebuild
+++ b/net-irc/quassel/quassel-0.13_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -106,7 +106,6 @@ src_configure() {
 		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
 		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake-utils_use_find_package crypt QCA2-QT5)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
 		$(cmake-utils_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
@@ -119,6 +118,10 @@ src_configure() {
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
+	if use server || use monolithic; then
+		mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
+	fi
+
 	cmake-utils_src_configure
 }
 
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 5db02b583e65..e80faf93513f 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -106,7 +106,6 @@ src_configure() {
 		-DEMBED_DATA=OFF
 		-DWITH_WEBKIT=OFF
 		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
-		$(cmake-utils_use_find_package crypt QCA2-QT5)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
 		$(cmake-utils_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
@@ -119,6 +118,10 @@ src_configure() {
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
+	if use server || use monolithic; then
+		mycmakeargs+=(  $(cmake-utils_use_find_package crypt QCA2-QT5) )
+	fi
+
 	cmake-utils_src_configure
 }
 
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index a6fcb4adbeb9..cfc537656d96 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,8 +1,10 @@
 AUX unrealircd-4.0.12-without-privatelibdir.patch 3050 BLAKE2B 8574bbd006253c824ef3a693248404c01ea8f3f856d0cd7d110a76664f809b7ede56181595ff5e0fba60bf738573396e64308a8f31bf762ef28d23177726b4d7 SHA512 f9bba46daa399bbcebc4b89ed129b270c1eaad3a7e2c573d20567b055fffd8185a987a6f394b35cb0f9e95288aacb73c201e9162b940fccf170c51e04bc72be7
 AUX unrealircd.confd-r1 1221 BLAKE2B 65c29bce13d54a3d87c89ff4fe124172a8237640c9cde8a7566a8e88e5dfd51099bfc1991779bd2b0f9770f065782a52505c7ba2b45efb2d02bfacbf89d3a9b4 SHA512 add347151035f8bef7fa77d8b675563c5308e39a7e1f6ce9c044fa1e38c5d2e662327d90b91fe9bb7e23fed3337db9c497c7275688048cbd12116f98e43ba94d
 AUX unrealircd.confd-r2 1366 BLAKE2B 093a1f6fbdf2015d170c0244d9870ca415b4f0e5b57d2bcd14539d901c45de3f0d66de6ff57fb6aaa0f0128f998516616418e0636fe177e31bd6bc949b70c5fc SHA512 7282da5b2d07e139bd579ce0012dd4a02b02b88e8f12bdf83e6742f8d221ee78568c5652933a065642561fca5902b256b10c61d5add3e4c587d4b4ac089751a4
+AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd 1139 BLAKE2B 8d401a42efe11a464e6b3cf482e44fa86ce66b71dcd68eebf7d49b1ac35d97f07afe35e28ff5ff316e989f5f9b4234a8c4d32dedd917f02418c7fae02d89ee41 SHA512 694230ad52450642d212aa88ad0d2c999a166b23bbbe44c07fd2574b29bc541cc727a75b8aeec41ca67bdb3125f04271bef9161ebaff409d161a2f47f15839da
 AUX unrealircd.initd-r1 1180 BLAKE2B bcc078dbe9d5cde47c230ba0b0d17ac3584a97a3d3b79943da2691147416179ba5ad73180b703981759d1f451577ff2f5f4738004ac7de86d80125797bc49a35 SHA512 108bfe0a79e7d25ee9d24980c9082d3ddf75d095d122576974319b68f5bebdcb088961276038ddfdb30aadbdfd5f7e247f61444675964604430c4092e517004f
+AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 DIST Unreal3.2.10.7.tar.gz 3539026 BLAKE2B a61fcd7cd4329c6b0991219a331482ca84aecfa37638762aa1c20166ab2ce0d4facb2a51b2010a9dd2fbc32278de91acaf8fd209ce5b8a2d4232dce154880904 SHA512 7d5fd4729fdde56c6b3e38a93bc365857b5b4faf58cb39e844b43e87872623abc7527025247eeda8c8535576e2b1b8ef14d482c964ce940cafb5de77cc9e1667
 DIST unrealircd-4.0.12.tar.gz 5521686 BLAKE2B d55973387f58cabd80156e1113491adec623a56d83e0043dcd89457b00cc6519ab37459eb2c0a10176b5d5bb1518a81fa288bdea43f0e4b9303f629103c5ea1d SHA512 3df18e07226673d76977771f91f0f6c2129955523f1330519e5cada7989c8987382d78770c95837d520737796cf4fa84f1de3eb0f08ef017c5c56f775cf45420
 DIST unrealircd-4.0.17.tar.gz 5325068 BLAKE2B d6d1c05234ee5921e65e0a7a4223152bd729878a5d8b40dfb4b1b2d066a891564b8cd66097e03a8a47f84878aeeadb7356ff222dd4d8efece69a9f1df5fe3542 SHA512 e02684ba7b61747f6d0edb8105c3d9cb1f383c79b9ff563b374fefe1ed5224c168d8f9e3e482a122acd7a2af12ee8595812e4c46654e651cde7115656fb3d36e
@@ -10,5 +12,6 @@ DIST unrealircd-4.0.18.tar.gz 5317767 BLAKE2B cb71144ce0fce7f719b3081f2da9f85c99
 EBUILD unrealircd-3.2.10.7.ebuild 6581 BLAKE2B c7c638865b036386c16ffb257632389e31b277bc9406ee081e7aa149b303af8ff02efcc5cbedea60eb6b7c76b5dfededae083f415dd392c022039401840fb677 SHA512 8bfbea36317e3984c4768e03f236d5a3bfbe5cc73d8d74798e80633cb9b4946489a8197bc7bacb1649f2d8cbea702c5cd6acb96645e97e89197d697f78eced89
 EBUILD unrealircd-4.0.12.ebuild 7879 BLAKE2B 272c2e142cfa449d307d48a009551e22025236eaf7c8b3c045c4e1908110a11be5add1a646b1ec83e6057e35dc75e2be1b0e8b785c912841a60c7b6dd0f1af38 SHA512 c3b1cbb3276ae0e8a5601989b3c65d49f7628926616cb0806fc8b0cc9588a942ffd3b0740bd7380f784960ed36f9ee3e0a5674d60099ef4fc8aa0963428be2fc
 EBUILD unrealircd-4.0.17.ebuild 7805 BLAKE2B a05eb46b95c093eaa26167291cd5e17c9413248e9db470ebcfd26344ad01bbeaf7c842bd71c79f12d3e2c59f8cfe9815bb62effeec2ede8960a92d94b5c0df6a SHA512 b2a7c952d9a957a77d11cabd0f72fcc29c056fcc5fa4f4f1c35e5d29237da97838c0af95b563bf89fffc2247dd808db703dce2b3429b996dd04ef8a9df444369
+EBUILD unrealircd-4.0.18-r1.ebuild 5413 BLAKE2B ee2940e61d56907d1830e0bec218d69d7ee183820ae77f5953b3a00d0e05a87186e963d51d82570455b19c84423459312ca99622bfed717569eaea27a9b29dce SHA512 135f5c9e0db38345f85f0dbe3c73feaa29516b2f5fcb06fb89df37ffbf276dbca88765200e794cd1a24482646f242440e4c8ea26efe0d645b8f873b5bb0b3bb8
 EBUILD unrealircd-4.0.18.ebuild 5413 BLAKE2B b13e7cba8238465aebb69ce2533773062cdecc01e87878c3fb11f3cb572157ac0b5dfb75b810c5fb1bd6ef28e74b663f56b95f5c3fae731f5849c4ea078e4720 SHA512 6a86677f08ad11732f74636992483e2c3c606db63263cab962c432a625811676606f58988ddff903d7f5ae48dde8d6708ea1b621f82d21f1270467a673f14470
 MISC metadata.xml 1133 BLAKE2B 28a4ad6235e9a0ec31202822149d2cdc68ddacc49130b14f960639eaed019654a0d90548201e7e312b33422762a23678f7e3e2c76cc9e004296c93309ebf3f29 SHA512 6066d46bce08535445ff400ded0a93ca6a0bb879771a512e05bc896a85ebaf98a0b80875f3cc4bac5eddb99c28bb7c855da0f577d603fb39d61e517ef69373a7
diff --git a/net-irc/unrealircd/files/unrealircd.confd-r3 b/net-irc/unrealircd/files/unrealircd.confd-r3
new file mode 100644
index 000000000000..66d9878f014c
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.confd-r3
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# 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="/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-r2 b/net-irc/unrealircd/files/unrealircd.initd-r2
new file mode 100644
index 000000000000..7d733a6e185a
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd.initd-r2
@@ -0,0 +1,38 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Defaults
+: ${UNREALIRCD_CONF:=/etc/unrealircd/${SVCNAME}.conf}
+: ${UNREALIRCD_PIDFILE:=/run/unrealircd/${SVCNAME#unreal}.pid}
+
+command="/usr/bin/unrealircd"
+# Run the daemon in the foreground and let OpenRC background it.
+# This way the PID file is created securely, as root.
+command_args="-F -f ${UNREALIRCD_CONF} ${UNREALIRCD_OPTS}"
+command_user=unrealircd
+command_background=true
+pidfile="${UNREALIRCD_PIDFILE}"
+start_stop_daemon_args="${UNREALIRCD_SSD_OPTS}"
+extra_started_commands="reload"
+
+depend() {
+	use dns net
+	provide ircd
+}
+
+# It is unsafe for the unrealircd user to be able to write to its own
+# PID file, since root will be sending e.g. kill signals to the PID
+# listed in that file. Ensure that we overwrite the ownership and
+# permissions on /run/unrealircd from previous init scripts.
+start_pre() {
+	checkpath --directory --owner root:root --mode 0700 /run/unrealircd
+}
+
+reload() {
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP \
+			  --pidfile "${pidfile}" \
+			  ${UNREALIRCD_SSD_OPTS}
+	eend $?
+}
diff --git a/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild b/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
new file mode 100644
index 000000000000..5c496d96d303
--- /dev/null
+++ b/net-irc/unrealircd/unrealircd-4.0.18-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+inherit ssl-cert user versionator
+
+DESCRIPTION="An advanced Internet Relay Chat daemon"
+HOMEPAGE="https://www.unrealircd.org/"
+SRC_URI="https://www.unrealircd.org/${PN}$(get_version_component_range 1)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
+IUSE="class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq
+	showlistmodes shunnotices topicisnuhost +usermod"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-libs/libpcre2
+	dev-libs/tre
+	>=net-dns/c-ares-1.7:=
+	sys-libs/zlib
+	curl? ( net-misc/curl[adns] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( doc/{Authors,Donation,RELEASE-NOTES{,.old},tao.of.irc,technical/,translations.txt} )
+
+pkg_pretend() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		version_is_at_least 4 "${v}" && continue
+		ewarn "The configuration file format has changed since ${v}."
+		ewarn "Please be prepared to manually update them and visit:"
+		ewarn "https://www.unrealircd.org/docs/Upgrading_from_3.2.x"
+		break
+	done
+}
+
+pkg_setup() {
+	enewuser unrealircd
+}
+
+src_prepare() {
+	# QA check against bundled pkgs
+	rm -r extras || die
+
+	if use class-nofakelag; then
+		sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
+	fi
+
+	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
+	# that to look for ca-certificates-provided file instead. %s is
+	# CONFDIR. #618066
+	sed -i -e 's:%s/ssl/curl-ca-bundle.crt:%s/../ssl/certs/ca-certificates.crt:' src/s_conf.c || die
+
+	eapply_user
+}
+
+src_configure() {
+	# Default value for privatelibdir adds a build path to -Wl,-rpath.
+	econf \
+		--with-bindir="${EPREFIX}"/usr/bin \
+		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
+		--with-confdir="${EPREFIX}"/etc/${PN} \
+		--with-datadir="${EPREFIX}"/var/lib/${PN} \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-logdir="${EPREFIX}"/var/log/${PN} \
+		--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
+		--without-privatelibdir \
+		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
+		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
+		--with-nick-history=2000 \
+		--with-sendq=3000000 \
+		--with-permissions=0640 \
+		--with-fd-setsize=1024 \
+		--with-system-cares \
+		--with-system-pcre2 \
+		--with-system-tre \
+		--enable-dynamic-linking \
+		--enable-ssl="${EPREFIX}"/usr \
+		$(use_enable curl libcurl "${EPREFIX}"/usr) \
+		$(use_enable prefixaq) \
+		$(use_with showlistmodes) \
+		$(use_with topicisnuhost) \
+		$(use_with shunnotices) \
+		$(use_with !operoverride no-operoverride) \
+		$(use_with operoverride-verify) \
+		$(use_with !usermod disableusermod) \
+		$(use_with !extban-stacking disable-extendedban-stacking)
+}
+
+src_install() {
+	keepdir /var/log/${PN}
+	keepdir /var/lib/${PN}/tmp
+
+	newbin src/ircd ${PN}
+
+	(
+		cd src/modules || die
+		for subdir in $(find . -type d -print); do
+			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
+				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
+				doexe "${subdir}"/*.so
+			fi
+		done
+	)
+
+	insinto /etc/${PN}
+	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
+	# is redundant with app-misc/ca-certificates and examples will all
+	# be in docs anyway.
+	doins -r doc/conf/{aliases,help}
+	doins doc/conf/*.conf
+	newins doc/conf/examples/example.conf ${PN}.conf
+	keepdir /etc/${PN}/ssl
+
+	einstalldocs
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
+
+	# config should be read-only
+	fperms -R 0640 /etc/${PN}
+	fperms 0750 /etc/${PN}{,/aliases,/help}
+	fperms 0750 /etc/${PN}/ssl
+	# state is editable but not owned by unrealircd directly
+	fperms 0770 /var/log/${PN}
+	fperms 0770 /var/lib/${PN}{,/tmp}
+	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
+}
+
+pkg_postinst() {
+	# Move docert call from src_install() to install_cert in pkg_postinst for
+	# bug #201682
+	if [[ ! -f "${EROOT}"etc/${PN}/ssl/server.cert.key ]]; then
+		if [[ -f "${EROOT}"etc/${PN}/server.cert.key ]]; then
+			ewarn "The location ${PN} looks for SSL certificates has changed"
+			ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
+			ewarn "Please move your existing certificates."
+		else
+			(
+				umask 0037
+				install_cert /etc/${PN}/ssl/server.cert
+				chown unrealircd "${EROOT}"etc/${PN}/ssl/server.cert.*
+				ln -snf server.cert.key "${EROOT}"etc/${PN}/ssl/server.key.pem
+			)
+		fi
+	fi
+
+	local unrealircd_conf="${EROOT}"etc/${PN}/${PN}.conf
+	# Fix up the default cloak keys.
+	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
+		ebegin "Generating cloak-keys"
+		local keys=(
+			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
+		)
+		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
+		eend $?
+
+		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
+		sed -i \
+			-e '/cloak-keys/ {
+n
+s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
+n
+s/"and another one";/"'"${keys[1]}"'";/
+n
+s/"and another one";/"'"${keys[2]}"'";/
+}' \
+			"${unrealircd_conf}"
+		eend $?
+	fi
+
+	elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
+	elog
+	elog "You can also configure ${PN} start at boot with rc-update(1)."
+	elog "It is recommended to run unrealircd as an unprivileged user."
+	elog "The provided init.d script does this for you."
+}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 3979c06ce714..19c7b1aac98b 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,11 +1,10 @@
 AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790
-AUX weechat-2.1-tinfo.patch 910 BLAKE2B 706949f07bac5e191e045bc6dfbb6e6b1dc4ec2e7347ff7c3f8b3f8af67e5d50b27a31368bf3d2a143eb7b0ec0dc0902fd787d803da8b604793d2b1b912e1dee SHA512 a1df83dc71c75047a8d898401551adc727df581b6e2a0fca366b67b380e688f95a375cdd9246cc4fff7a1cce22bf50e2bc3022a843e8994f8ee8660c7be77a15
 AUX weechat-2.2-tinfo.patch 910 BLAKE2B 37a02f7c56d6bdc42c01a5a9b622c79501d4ffb73152f7eb4c14182bf507319d9667fc2b64ebe33992fe6a1a88712ee37844278c802712412048ea6d6ba9d4fe SHA512 46ea2b0b6f03c3656d062a68e2d80edd2566dd8edc7ba6f3df0f29ae3222b8c1702378ff7d3b8cbcab917ec4310b7f2699e3f0f113671af778ad1e1f681c4c52
 DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B 256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472 SHA512 3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
-DIST weechat-2.1.tar.xz 1990748 BLAKE2B 5f417e282fe0bc10f1625e16fc173c09781284c27cf321e219c73fcfb3bac4118403598d6e5d06ed9852b1bdb1e645d7f43999a113101aebe6bd626e2278b661 SHA512 4bea8c0c4467b81e2241d68e5c6425274f0fe15d853ddac46ddf3cce481e03549660d6083277719d462ec5d0dea4b31d89f6b3f51f92f12908213232d2d807df
 DIST weechat-2.2.tar.xz 2007944 BLAKE2B 2892e50fcccf64fa34e4c7bd476323ad7a98d6b5d483254ffbed659a5997d3077a7347a1a9c006f50d52daf7808fe61cf5b396416d62da7f9260f717191b2a86 SHA512 bb5103c266f6e6850250a5e0602ff26be06289ea1e13511b111f975eb492a0bbe508b2a6088b15e5bfd5278341e9dd5ee0facfb08d23ff7335c5c18bc21e4b02
+DIST weechat-2.3.tar.xz 2025652 BLAKE2B 74c5d81a77f164c51bee01ff1be5731455ad85178005a360269ffa4ac59554c58dc97175fcb3fa62841b79e7711c1dc41876a839a9d1e4a1f4ce359bac1d6689 SHA512 0de827850de5c70c528e1a8cfa44220c3d48d6767df61a8a6283123173ba63b4c8554d5334a8b14976d19602c36bbc27d89ebbd201ccd8c048d50edc3a4ea19b
 EBUILD weechat-2.0.1.ebuild 3990 BLAKE2B da9076276439f03b616f711cd2af8189d0d131d1eefd2411e21a4aa917ce588cd3eb55a4e3fbf1346e6979f860ce013752450c39e8b342a7b1bba70161f13370 SHA512 4ec868198c7578d54247ae7e47cd2b9d12d50a99b2479b84b011298245107d5a4d8a3b0a38dc0973ed02d508619efc502db3af28538fd25f79ff0d2f0c12bd74
-EBUILD weechat-2.1.ebuild 4010 BLAKE2B b6c5ef8285055540e65fbd5e4c2e883c0b3aa72b0859a577a82af5dbbf6942a0b1271a14ee4e3602c3a7d1b07647156d4084f442ab86e8d3ef3d7e81bb0ae513 SHA512 eff92a3a9f57e8ab8e573b9709ba5257203cf4762355ff7d1927bcacbeceac88f0747e42cfcb870c8b09213b7bebba3f0119e564f3906a443cc9c8b42358bd8b
-EBUILD weechat-2.2-r1.ebuild 4113 BLAKE2B 7f3d07bb3af9b755942a4a3fbb4272fb3b82499b11cc809e435ce72f094b61591a2159db0df34ff8d7d3effc2029e23cd8ecc09feb0f2f5fe8650540252be6d8 SHA512 3679416b2ef023a96b8da814320fbfeab2237a5d03023210ca2a2aacbb4424218488958f86128474620203984fc4c09cae31e956c92d880441891441a06f916e
-EBUILD weechat-9999.ebuild 4113 BLAKE2B 7f3d07bb3af9b755942a4a3fbb4272fb3b82499b11cc809e435ce72f094b61591a2159db0df34ff8d7d3effc2029e23cd8ecc09feb0f2f5fe8650540252be6d8 SHA512 3679416b2ef023a96b8da814320fbfeab2237a5d03023210ca2a2aacbb4424218488958f86128474620203984fc4c09cae31e956c92d880441891441a06f916e
+EBUILD weechat-2.2-r1.ebuild 4109 BLAKE2B 9cc7833f623b3fa71b09713b9fc7b5d4fba1a64c9766685b7ef3047954f308c3772e61b410f02ced660ee0d2004aaffc2adba7d529366fbace1384224b3b126d SHA512 4ecdd4951b0d7aac80e2b62489e3b3ecf465b64f416e9bae5257555d39d350caf70392325047ccd61389d1f39122efa068350f2caf525cc4cd1df90b59c6d7e9
+EBUILD weechat-2.3.ebuild 4114 BLAKE2B f0bda2865c5789bcc7de775271a6d5825df188a1aad4cf307b6d07ff93724da96dd4005a750eb97989514ebe0b38092fcf80a51e7d3ae2be70b197a1ac333dbb SHA512 631f33448a4d8e57ff2f49c6c270dac5664fc73771538a982261be4fb7feb815936dd34c4186900a1cebcda89aa4027f9d982de6be84dfd03087e900f034baff
+EBUILD weechat-9999.ebuild 4114 BLAKE2B f0bda2865c5789bcc7de775271a6d5825df188a1aad4cf307b6d07ff93724da96dd4005a750eb97989514ebe0b38092fcf80a51e7d3ae2be70b197a1ac333dbb SHA512 631f33448a4d8e57ff2f49c6c270dac5664fc73771538a982261be4fb7feb815936dd34c4186900a1cebcda89aa4027f9d982de6be84dfd03087e900f034baff
 MISC metadata.xml 1015 BLAKE2B 84a29d39ade6afecbd613413d0dbd13decd292efe54882122b46c48e8ba33ebcd63ccf0ba0301716618054ce7dbcc30dc0649f8202612d2ccbbc3ef04e4cc135 SHA512 d63b0302cf3a026ab007a9d4bc9d2aec5e11587cdf736be871fc63431725cdc471cdc23ea58cdd30b74cb9d522e478c6e88dfa17ce4ecc5cbc1b0e2dcf3eb5fc
diff --git a/net-irc/weechat/files/weechat-2.1-tinfo.patch b/net-irc/weechat/files/weechat-2.1-tinfo.patch
deleted file mode 100644
index e44e06e61f99..000000000000
--- a/net-irc/weechat/files/weechat-2.1-tinfo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Use pkgconfig to find ncurses libs in order to support separate libtinfo.
-
---- weechat-2.1/src/gui/curses/normal/CMakeLists.txt
-+++ weechat-2.1/src/gui/curses/normal/CMakeLists.txt
-@@ -29,7 +29,13 @@
-   ../gui-curses-window.c
- )
- 
--find_package(Ncurses)
-+find_package(PkgConfig)
-+pkg_search_module(NCURSES ncursesw ncurses)
-+
-+if(NOT NCURSES_FOUND)
-+  find_package(Ncurses)
-+endif(NOT NCURSES_FOUND)
-+
- if(NCURSES_FOUND)
-   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
-   if(NCURSESW_HEADERS)
-@@ -54,7 +60,7 @@
- 
- add_dependencies(${EXECUTABLE} weechat_gui_curses_normal)
- 
--list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
-+list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES})
- 
- # Due to circular references, we must link two times with libweechat_core.a and libweechat_gui_common.a
- target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} weechat_gui_curses_normal ${EXTRA_LIBS} ${STATIC_LIBS})
diff --git a/net-irc/weechat/weechat-2.2-r1.ebuild b/net-irc/weechat/weechat-2.2-r1.ebuild
index ee7ec6e3f6b6..53ed8873347e 100644
--- a/net-irc/weechat/weechat-2.2-r1.ebuild
+++ b/net-irc/weechat/weechat-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	KEYWORDS="amd64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-irc/weechat/weechat-2.1.ebuild b/net-irc/weechat/weechat-2.3.ebuild
index b975945b6839..f7ef20c9a4be 100644
--- a/net-irc/weechat/weechat-2.1.ebuild
+++ b/net-irc/weechat/weechat-2.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 CMAKE_MAKEFILE_GENERATOR=emake
-inherit python-single-r1 cmake-utils
+inherit cmake-utils gnome2-utils python-single-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -59,7 +59,7 @@ DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.ado
 # tests need to be fixed to not use system plugins if weechat is already installed
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.1-tinfo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.2-tinfo.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -149,3 +149,11 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index ee7ec6e3f6b6..f7ef20c9a4be 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 CMAKE_MAKEFILE_GENERATOR=emake
 inherit cmake-utils gnome2-utils python-single-r1