gentoo resync : 18.08.2019

25 files changed, 294 insertions, 612 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 53987004b7b1..9e8ff1dfc57a 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index f7d0b67f6a57..655861c721d1 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -2,5 +2,5 @@ AUX anope-conf.d-v2 352 BLAKE2B 38bacb495ff0be9e8f8cc635bdd9eb1927b6d120bcb65ddf
 AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f9352f2ada8ba5bc90fc1a8b5e4779bd132606d9297c19fd418db02d8a26b6629da675f6fc0d8c SHA512 e058ccfb4a44238cd1540704f130207236be71799d0a5f4678638d313d958b10dfc5de9cd515f18ccdd9faf41dc93eaf33b5f4013f534efec00adc401a2cb97c
 AUX pid-patch.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
 DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
-EBUILD anope-2.0.6.ebuild 5472 BLAKE2B 9eb30e33b088cc841ead1f0678da659dc34eefa949105bff0ae1736dd2569d6a14c8ed31908ab4bf864b40b1664e7688d12b12ab884922a4b7c44f6b89cce259 SHA512 8ab01aac403162946f3cae74b07c128bf04fd63b1ec7ae5f8491cc52575caa5abe4380ba05e2f644f493effe6de15bfbea6e7494893ad5c6ee6ba08b37930948
+EBUILD anope-2.0.6.ebuild 5474 BLAKE2B 284b8b3b271448fb98e1058fe170ab73fcae0db52a4ca28dcb7cc306fd5bcdbd778ce2483b2c288f243ed161916d78266033d0412c7ce8eb03f1f9b9fa61cd1f SHA512 76eb76cd3225f4bc2f287def2f89ff8081006eec45bbb9f655a93082bf3f071c896b9bca58ec3303d2e77de17cef63e0fdb0cc77de5b908a9e208758cc60a1f6
 MISC metadata.xml 1331 BLAKE2B 2c87bdde31c173b08fb14714c279b060854876b5f5d2920efc6510dc3c084d3f1ee9dc620a3cd5958a593a9e1b12c6bfdaf2038ed5409a5f5b5e5196fdf8da37 SHA512 aa6aa50a0d55c886e29d57c53cbb6d7976ad36fd497475319fb60506b81da24bd2eb21d244737edd9c35dea767f0364af59c804bbabe912fc0fd80c6155af3c4
diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild
index dfdba26b54f7..aba8b1f9d11f 100644
--- a/net-irc/anope/anope-2.0.6.ebuild
+++ b/net-irc/anope/anope-2.0.6.ebuild
@@ -53,8 +53,8 @@ pkg_pretend() {
 			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"
+			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
diff --git a/net-irc/ircmap/Manifest b/net-irc/ircmap/Manifest
index 46dbd4855b44..36f18028ffaf 100644
--- a/net-irc/ircmap/Manifest
+++ b/net-irc/ircmap/Manifest
@@ -1,3 +1,3 @@
-DIST ircmap.tar.gz 27944 BLAKE2B 8f8d04c64e250383d36c88e3c0d1f76ef961081a526b60e624da74f9cbac2fe04e9bc680e750703240c75a794ecfbd4f5e9b387b04db3752c172d3c704156421 SHA512 52ce62d7846e5e50525800af86b4296d427da21d129f68b83cd30daa75fdd9fe78c6615771e729c4ad5f8afe75f20b1cab0b6d4b01be4a7c2889524676b60ac9
-EBUILD ircmap-0.99.ebuild 1199 BLAKE2B af7ad4773f4c4552f32d14795fe9be1ca61b3890887c9c3d551150540e0cb4152a1305bb481fc990f95dd6a84351fd2db41deda22f5396c1be4751dbb5c87f8d SHA512 8c0e20c1873b35c7fe798b451f10370b30adebda146dba750d3bf0a8350bcdbd3ee7c68279d8009f416d6d462eefe2d3e59d5dd0f5b736b94f099aad46373378
+DIST ircmap-0.99.tar.gz 27944 BLAKE2B 8f8d04c64e250383d36c88e3c0d1f76ef961081a526b60e624da74f9cbac2fe04e9bc680e750703240c75a794ecfbd4f5e9b387b04db3752c172d3c704156421 SHA512 52ce62d7846e5e50525800af86b4296d427da21d129f68b83cd30daa75fdd9fe78c6615771e729c4ad5f8afe75f20b1cab0b6d4b01be4a7c2889524676b60ac9
+EBUILD ircmap-0.99-r1.ebuild 1116 BLAKE2B 35313669e28affcbe1753edd4b3ade869cd5daacdc6bb89343e759ca55464574ccb90c9ddc6165b7129efdd360a60e0d5fcc6eb4859887111d6e60fc6ab93458 SHA512 2c4a79560d41f32b37d768b034a72486b0ed86abe672b953a165ebe58f4c6a2302df708b1857511670a4ca749c2317942a85e1705bdd368753aee6c5ef2f7fab
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ircmap/ircmap-0.99.ebuild b/net-irc/ircmap/ircmap-0.99-r1.ebuild
index 61a38d5469ed..05d3f133fb3d 100644
--- a/net-irc/ircmap/ircmap-0.99.ebuild
+++ b/net-irc/ircmap/ircmap-0.99-r1.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 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"
+HOMEPAGE="http://pasky.or.cz/irc/"
+SRC_URI="http://pasky.or.cz/irc/${PN}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND="dev-lang/perl"
-RDEPEND="${RDEPEND}
-	media-gfx/graphviz"
-DEPEND="${DEPEND}
-		>=sys-apps/sed-4"
+RDEPEND="
+	media-gfx/graphviz
+	dev-lang/perl
+"
+BDEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+"
+DEPEND=""
 
 S="${WORKDIR}"/${PN}
 
 src_compile() {
-	eval $(perl -V:installprivlib)
-
 	sed -i \
-		-e "s:/home/pasky/ircmap:${installprivlib}/ircmap:" \
+		-e "s:/home/pasky/ircmap:/usr/share/ircmap:" \
 		{ircmapC,ircmapR-aa,ircmapR-gvdot,ircmapR-ircnet,ircmapS}.pl
 }
 
@@ -31,9 +32,7 @@ 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
+	insinto /usr/share/ircmap
 	doins IHash.pm
 }
 
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 3b751df9cc2e..a720782671e2 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,4 +1,6 @@
+AUX konversation-1.7.5-fix-regex-for-cap-ack.patch 1040 BLAKE2B fb0e34812623079fcfaff022734f340b02bf1ee81cdf1819f034e203584fae922db1a8b7401942ea64df0c9dbdedb641c58d9c3688c9b7b47ca43b7ef64cf4de SHA512 e8f945919f21bbcb7ce9575fbb8b17e14b4c72fa736865bd7ed48c6806aa0be2778f63b9fbc05aa4580467587cba26b52ff7fea6e816208dd5048439dd8c9bbd
+AUX konversation-1.7.5-missing-header.patch 574 BLAKE2B a2a88b4d071685301fcf071f676eac814ab21ce4dcdcd9af7ced5ea2e595d0335f73a36011393fa7c54ae26d60486d9b4319d2e197bee79adda79c6158b1a0d5 SHA512 b9b1b2e4b231d2a4beb63a6e757467ec0d32bfc9005dd990d7649cc6ac9c34d106b0b15bc3918490ef4ded81699e5d84161b3a1d8541aa6232ba485124b65386
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
-EBUILD konversation-1.7.5.ebuild 1760 BLAKE2B b158ed541854a14524eeb4309578d8ffce9805f2315ed8422de413b9fb8f1988666c63b850a26cbc34b2fbac263a00ffa750a5f5cbc29c670a78a04778308ce6 SHA512 56517f2248c40d5f486c3f40eba3888e84abf32aba95887ea7c08cafa01b4b0b39699df0ebdb83247d6cd383fad98cae3e4f01a08a56aafe34505961338d2e56
+EBUILD konversation-1.7.5-r1.ebuild 1837 BLAKE2B 772a337adf4236626228f97292dce4d0c82727ced7190055c4c7083ee4a8b586417493aacce2427791aae92c8b0a1bcefc52236a60d41187e96d237d5ce59022 SHA512 78d40daed9100b0195c6e45605c71e288c5c9876f2f8b68b47aab61ea07afad2e7532187c3ff2fc4b04c65e0ceaaaedf34f13dbe6a94035bfb788d7600e23c52
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
new file mode 100644
index 000000000000..f351dd00134f
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-fix-regex-for-cap-ack.patch
@@ -0,0 +1,25 @@
+From 6d896b4efc93c18246ce4db7c788929b0ce75559 Mon Sep 17 00:00:00 2001
+From: Peter Simonsson <peter.simonsson@gmail.com>
+Date: Sun, 23 Sep 2018 08:29:43 +0200
+Subject: Fix regex for cap ack
+
+Seems to have worked despite being broken
+---
+ src/irc/inputfilter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/irc/inputfilter.cpp b/src/irc/inputfilter.cpp
+index fbd268b..45d4f88 100644
+--- a/src/irc/inputfilter.cpp
++++ b/src/irc/inputfilter.cpp
+@@ -795,7 +795,7 @@ void InputFilter::parseServerCommand(const QString &prefix, const QString &comma
+ 
+                 foreach(const QString& capability, capabilities)
+                 {
+-                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9"), Qt::CaseInsensitive));
++                    int nameStart = capability.indexOf(QRegExp(QStringLiteral("[a-z0-9]"), Qt::CaseInsensitive));
+                     QString modifierString = capability.left(nameStart);
+                     QString name = capability.mid(nameStart);
+ 
+-- 
+cgit v1.1
diff --git a/net-irc/konversation/files/konversation-1.7.5-missing-header.patch b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
new file mode 100644
index 000000000000..1ff14b81ec58
--- /dev/null
+++ b/net-irc/konversation/files/konversation-1.7.5-missing-header.patch
@@ -0,0 +1,23 @@
+From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:14:32 +0200
+Subject: Fix build with Qt 5.13
+
+---
+ src/irc/outputfilter.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
+index f9e6253..45d11fb 100644
+--- a/src/irc/outputfilter.cpp
++++ b/src/irc/outputfilter.cpp
+@@ -32,6 +32,7 @@
+ 
+ #include <QStringList>
+ #include <QFile>
++#include <QMetaMethod>
+ #include <QRegExp>
+ #include <QTextCodec>
+ #include <QByteArray>
+-- 
+cgit v1.1
diff --git a/net-irc/konversation/konversation-1.7.5.ebuild b/net-irc/konversation/konversation-1.7.5-r1.ebuild
index 412eb10ff27c..c53563084a21 100644
--- a/net-irc/konversation/konversation-1.7.5.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r1.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
-DESCRIPTION="A user friendly IRC Client"
-HOMEPAGE="https://www.kde.org/applications/internet/konversation/ https://konversation.kde.org"
+DESCRIPTION="User friendly IRC Client"
+HOMEPAGE="https://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"
 
+BDEPEND="sys-devel/gettext"
 DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kbookmarks)
@@ -46,14 +47,17 @@ DEPEND="
 	$(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] )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch
+	"${FILESDIR}"/${P}-missing-header.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package crypt Qca-qt5)
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 279c2c6121f8..9342a6b75011 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,5 @@
-DIST kvirc-5.0_pre20181205184837.tar.gz 5968276 BLAKE2B eb1c2a38cedbae3f7e7951bdd4250e349d8c6745a24df30f81ccebf8fa0ac9bdca27f835b0d2bda261baff81d018eae58c5169656791f4436ff221cba7890e85 SHA512 fbfcf1b1bcd9dfb1207669ee61a7fa8023ceeb2b679e95c378ed1224020c901fb4a6b68b7505704874e935df2228be4ccfd36121a87aafc5ace41c5392058132
+AUX kvirc-5.2_pre20190628041642-python-3.patch 2036 BLAKE2B 71de965fcd6d3ff6ec74c52662d894b60ff15d7b9dd895f18a6c31d4404291c227ae0f15362b0eebd86c377adce5ebd1a6a65975c40d2a391c928748dcb144d1 SHA512 3dcdf021f9c78df31031f25a86dea332996d489e482ba3da867856f262fd001c7858da51f5cb9dc0a3c208674a60105e484c3426d73816c61f0fbdca0a88b3cb
 DIST kvirc-5.2_pre20190628041642.tar.gz 5967194 BLAKE2B b1a2e2775056e2db058f82656ac90e43828d497019e9c6ae0431a1092423425558c6eb91a3a8301616cc4cdc7ef1acbab3729702484d703e00dc8e09f7cf243f SHA512 5f532739d9837f357a36fa1df67db0fbf8d8eddb990e686224e53c5678d26ba18c6c7c60422cef4e08ee587156638b278f534b1be1d49251fdeea19858227a5f
-EBUILD kvirc-5.0_pre20181205184837.ebuild 3897 BLAKE2B 1f2c4069b0c79999878f0a0546cdbc3e0629b9937b46f8cd790c1ba1532cb177a0abe56da66278304bde9a3f8aff8d56fdc2bf25f05d88c631a092ebd59689d2 SHA512 ffddf67f93ed062d2e148a1f40bd01a96a31dbf1e4e5812ad23cf8a34bf7a0f571c4342ddc7775f153437215aacc9390e28b4fc27d1ef7d08effbaa844a3cbe6
-EBUILD kvirc-5.2_pre20190628041642.ebuild 3899 BLAKE2B 97c75c0a45a6bb736fdd858f0457340ae3d9d0177caabe9037be884fe84dd00807dfb58b20dc628b07718cbed83e72cd83c3fa1b3dc2d63dca792b8ebae9bc76 SHA512 8818afaa7a3aa38f2ea8d98955d79e409dfa903d3c026b6e8e11ded3b9a75c4af70e766a87e944112c11259a9a8d84c81be1c3fdfd13e308bc985445afb97c07
-EBUILD kvirc-9999.ebuild 3836 BLAKE2B b664572608e41d7bb66e9efbda369a54f81259ab14dad0a673d32f9e94f448934bdc9385d1f769b6b13dde4263c8ea6572c9ce6f3d9dd5d6c1890f218736cd44 SHA512 2496d4f0d8a4e7f3c82cf8ab4922eb7a96104c47c8b772912a049d96ce0e61106eba96b3a348ae5a1987989b518b8777ebd5eec44a7f8fde459d6a919892f5e6
-MISC metadata.xml 618 BLAKE2B 5a6a28876a22cedbca154051a389fed0e7ef25039319786ed2303b580b1e421b648038237e0157678fb96e1b45839e725299e56584bcb770593f60f305932145 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae
+EBUILD kvirc-5.2_pre20190628041642.ebuild 4322 BLAKE2B 1ffc73c27abbcb7a101829cf4a8197713e48d5bb3bdba3584beee23ba57c5f4c8cde9df6da004b7885b617929d88cc04aa72e7ed94474ef691eea74a582741da SHA512 cbb66d43ce0c829f82edecd611f7fcdfa27863a67d89d053a53f4529985c3b822c663eb93df023ae59feab7339bdf71926f94a4c2fdf5b9a51a56fbc789d7340
+EBUILD kvirc-9999.ebuild 4261 BLAKE2B 796cbac383831084f9b9677d7888b02a394b9ab1d9d5720b3660193d9f3accb2a6c44d850ee4f1756fb75640cc85f08bec8d237da8c1901c0fce3fefb893f4cf SHA512 6136cbaf6f4dd7d1c4effb3fabe341d69a2cee6e802e44f46d3ad400c920860e631d1a12b6ca1a5c900a220334ab182a096d3f20a0d8195c7bb9e23f2e132918
+MISC metadata.xml 501 BLAKE2B f8d9ac4c9a0a596f619716b2df66a95367d6599b9651fdbc5fb9d933c986d0079903cf097ce824c6d43786937b8cd478380723c578f5f96af0931ed6604da561 SHA512 36053b960a07fdf5e1307ce1097d77620b8bc48864568244e011371f459dcd7fbf4e7fcc2cfc0331183fdd681765a1aa017d3a6c4fbc1259834ba88d2e44be03
diff --git a/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch b/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
new file mode 100644
index 000000000000..14e9e6f795c7
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
@@ -0,0 +1,53 @@
+https://github.com/kvirc/KVIrc/pull/2269
+
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -67,9 +67,6 @@
+ set(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER})
+ set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS})
+ 
+-# Prefer Python 2.7 over 3.x (which is currently incompatible) - GitHub issue #2020
+-set(Python_ADDITIONAL_VERSIONS "2.7")
+-
+ # Suffix for GNU/Linux
+ set(LIB_SUFFIX
+ 	CACHE STRING "Define suffix of directory name (32/64)"
+@@ -751,10 +748,10 @@
+ # Check for Python support
+ option(WANT_PYTHON "Compile Python support" ON)
+ if(WANT_PYTHON)
+-	find_package(PythonLibs 2.7)
++	find_package(PythonLibs)
+ 	if(PYTHONLIBS_FOUND)
+ 		set(COMPILE_PYTHON_SUPPORT 1)
+-		set(CMAKE_STATUS_PYTHON_SUPPORT "Yes")
++		set(CMAKE_STATUS_PYTHON_SUPPORT "Yes, Python ${PYTHONLIBS_VERSION_STRING}")
+ 		list(APPEND LIBS ${PYTHON_LIBRARIES})
+ 		include_directories(${PYTHON_INCLUDE_DIRS})
+ 	else()
+--- /src/modules/pythoncore/kvircmodule.cpp
++++ /src/modules/pythoncore/kvircmodule.cpp
+@@ -413,7 +413,7 @@
+ 	else
+ 	{
+ 		// Create a CObject containing the API pointer array's address
+-		PyObject * pC_API_Object = PyCObject_FromVoidPtr(PyKVIrc_API, nullptr);
++		PyObject * pC_API_Object = PyCapsule_New((void *)PyKVIrc_API, "kvirc._C_API", nullptr);
+ 		if(pC_API_Object)
+ 			PyModule_AddObject(pModule, "_C_API", pC_API_Object);
+ 	}
+--- /src/modules/pythoncore/pythonheaderwrapper.h
++++ /src/modules/pythoncore/pythonheaderwrapper.h
+@@ -1,6 +1,12 @@
+ #ifndef _PYTHONHEADERWRAPPER_H_
+ #define _PYTHONHEADERWRAPPER_H_
+ 
++// As of Python 3, something inside <Python.h> defines a struct with a member
++// called "slots" which conflicts with the builtin Qt keyword. But since we
++// include stuff from KVIrc itself back into the python module, we can't just
++// use QT_NO_KEYWORDS.
++#undef slots
++
+ // See http://stackoverflow.com/questions/16200997/why-doesnt-include-python-h-work and http://stackoverflow.com/questions/19716859/puzzling-dependency-of-boost-python-1-54-debug-build-to-python27-lib-on-window
+ 
+ #if defined(_DEBUG) && defined(_MSC_VER)
diff --git a/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild b/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild
deleted file mode 100644
index c5e59822e5e2..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 2009-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# True Authors: Arfrever Frehtes Taifersar Arahesis
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-inherit cmake-utils flag-o-matic 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
-	KVIRC_GIT_REVISION="f06b4f0397fa7feb23713e4fe4c00759d2cced71"
-	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="GPL-2+"
-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} )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-DEPEND="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 )"
-RDEPEND="${DEPEND}
-	gsm? ( media-sound/gsm )"
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
-fi
-
-DOCS=()
-
-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() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
index 69f50a2969a3..7e84f4e5ca9b 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
@@ -1,10 +1,9 @@
 # Copyright 2009-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# True Authors: Arfrever Frehtes Taifersar Arahesis
-
 EAPI="7"
-PYTHON_COMPAT=(python2_7)
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
 
@@ -30,11 +29,12 @@ fi
 
 LICENSE="GPL-2+"
 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} )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="dev-lang/perl:0
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	kde? ( kde-frameworks/extra-cmake-modules:5 )
 	nls? ( sys-devel/gettext )"
@@ -79,6 +79,10 @@ if [[ "${PV}" != "9999" ]]; then
 	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
 fi
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
+)
+
 DOCS=()
 
 pkg_setup() {
@@ -106,40 +110,59 @@ src_configure() {
 		-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)
+		-DWANT_ENV_FLAGS=ON
+		-DWANT_VERBOSE=ON
+
+		-DWANT_CRYPT=ON
+		-DWANT_DCC_VOICE=ON
+		-DWANT_IPC=ON
+		-DWANT_IPV6=ON
+		-DWANT_TRANSPARENCY=ON
+
+		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
+		-DWANT_DCC_VIDEO=$(usex dcc_video ON OFF)
+		-DWANT_DEBUG=$(usex debug ON OFF)
+		-DWANT_DOXYGEN=$(usex doc ON OFF)
+		-DWANT_GETTEXT=$(usex nls ON OFF)
+		-DWANT_GSM=$(usex gsm ON OFF)
+		-DWANT_KDE=$(usex kde ON OFF)
+		-DWANT_MEMORY_PROFILE=$(usex profile ON OFF)
+		-DWANT_OGG_THEORA=$(usex theora ON OFF)
+		-DWANT_OPENSSL=$(usex ssl ON OFF)
+		-DWANT_OSS=$(usex oss ON OFF)
+		-DWANT_PERL=$(usex perl ON OFF)
+		-DWANT_PHONON=$(usex phonon ON OFF)
+		-DWANT_PYTHON=$(usex python ON OFF)
+		-DWANT_QTDBUS=$(usex dbus ON OFF)
+		-DWANT_QTWEBKIT=$(usex webkit ON OFF)
+		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
 
 		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
+		-DWANT_QTSVG=OFF
 	)
 
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		cmake-utils_src_compile devdocs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		(
+			docinto html
+			dodoc -r "${BUILD_DIR}/doc/api/html/"*
+		)
+	fi
+}
+
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index b37c64f007b3..46a0772c2758 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 2009-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# True Authors: Arfrever Frehtes Taifersar Arahesis
-
 EAPI="7"
-PYTHON_COMPAT=(python2_7)
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
 
@@ -34,7 +33,8 @@ 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} )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="dev-lang/perl:0
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	kde? ( kde-frameworks/extra-cmake-modules:5 )
 	nls? ( sys-devel/gettext )"
@@ -79,6 +79,10 @@ if [[ "${PV}" != "9999" ]]; then
 	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
 fi
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
+)
+
 DOCS=()
 
 pkg_setup() {
@@ -106,40 +110,59 @@ src_configure() {
 		-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)
+		-DWANT_ENV_FLAGS=ON
+		-DWANT_VERBOSE=ON
+
+		-DWANT_CRYPT=ON
+		-DWANT_DCC_VOICE=ON
+		-DWANT_IPC=ON
+		-DWANT_IPV6=ON
+		-DWANT_TRANSPARENCY=ON
+
+		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
+		-DWANT_DCC_VIDEO=$(usex dcc_video ON OFF)
+		-DWANT_DEBUG=$(usex debug ON OFF)
+		-DWANT_DOXYGEN=$(usex doc ON OFF)
+		-DWANT_GETTEXT=$(usex nls ON OFF)
+		-DWANT_GSM=$(usex gsm ON OFF)
+		-DWANT_KDE=$(usex kde ON OFF)
+		-DWANT_MEMORY_PROFILE=$(usex profile ON OFF)
+		-DWANT_OGG_THEORA=$(usex theora ON OFF)
+		-DWANT_OPENSSL=$(usex ssl ON OFF)
+		-DWANT_OSS=$(usex oss ON OFF)
+		-DWANT_PERL=$(usex perl ON OFF)
+		-DWANT_PHONON=$(usex phonon ON OFF)
+		-DWANT_PYTHON=$(usex python ON OFF)
+		-DWANT_QTDBUS=$(usex dbus ON OFF)
+		-DWANT_QTWEBKIT=$(usex webkit ON OFF)
+		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
 
 		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
+		-DWANT_QTSVG=OFF
 	)
 
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		cmake-utils_src_compile devdocs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		(
+			docinto html
+			dodoc -r "${BUILD_DIR}/doc/api/html/"*
+		)
+	fi
+}
+
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 0bd31948cd6d..3ef850bff6bd 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -5,10 +5,6 @@
 		<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>
diff --git a/net-irc/quasselgrep/Manifest b/net-irc/quasselgrep/Manifest
index 19700d834366..cc7c17d20d50 100644
--- a/net-irc/quasselgrep/Manifest
+++ b/net-irc/quasselgrep/Manifest
@@ -1,4 +1,6 @@
 DIST quasselgrep-0_p20170411.tar.gz 29117 BLAKE2B e55ef14015d1139dd967d1855a2994d47f189cb02b0b89dc1130a8d0756b137ddd58366c3cb87927cb6400b715efafe042ec929978a71d527ad640129d50cb71 SHA512 b216c49e340cddfeb4fe28046c698a5517a873602a4303c7c6976d6d7f0bfffbb78f170a33126a16089e239a67e1624410f8e727b5ed6ab977f78745362db0e2
+DIST quasselgrep-0_p20190211.tar.gz 29954 BLAKE2B 33862b642d6a24bd7ab8cc4f3628e19cf332feb24e0dba17849f4ee85af4d1d17a641e6ccaef89bcb44c47f28a674ab620610b8b624f9de71b8460b197953e27 SHA512 0d2bfccb87b7463ba032b9515c4a089518a3ca57f9ef6cbb0f00db9c5d0404cc9fe128329b12e1dbe022cbddeb6a3db473564ee734ddc30be56d4c1da5036f56
 EBUILD quasselgrep-0_p20170411.ebuild 896 BLAKE2B 138a77936b0a4c3111e4f7711f449ea421b7af520774fe065f49b7308eb443892df2e53f52f04da9477f06f3d3a02553e0be89547688e7a4240aec0a9b4b3305 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050
+EBUILD quasselgrep-0_p20190211.ebuild 905 BLAKE2B 8f359eeb4bec8ac8c675e1ff2431f0806a6b87f2623f9f4dd6f54325c4265a1cbecbc0506dcebeb5a3056f5e8aaa16e7d417ca34d1a55d07fa649674c30c58db SHA512 6881a85b6653c48941e0b55ff21e8db73b79d6c7b83003115a0e3cf0002259084b8dc3230aa8c263fafc25b110a91105c9a79f886db6c6b1739bede9f46841ea
 EBUILD quasselgrep-9999.ebuild 896 BLAKE2B 138a77936b0a4c3111e4f7711f449ea421b7af520774fe065f49b7308eb443892df2e53f52f04da9477f06f3d3a02553e0be89547688e7a4240aec0a9b4b3305 SHA512 b3a7f851099f7b8d061058c25e5a39091936d3e96e97b3bb54d47631f97d95cbdf9ae9eaa0f37580a9df79bf7408b84f69722f28162f0bdda8a3b601a8a03050
-MISC metadata.xml 471 BLAKE2B e0fa79ae5e3c0fc62e730734fbcaf375843ab2bef63a8158d6183c129fd11b85a0e9378cae08f62b7b59e130690ada8c337458c7852e718f8bb8a255e00c49a4 SHA512 7f98316bf30d230ea931fe88e2f0b976f68a195a22ffd6069c3c68e06de855fcda658dd46d443de73dcb1c676fa987d05013e1d0047bbd2154ccd239c87c69bb
+MISC metadata.xml 540 BLAKE2B 21eee2edee345166e7191d71bfa727b2154d34bf0d7f839b1e6eca4ce5b65380ce96e25a35bf614a64a0e29edf30a4c860ec1b4ca364ffdc1563515e0169278a SHA512 67258ac5217d9338c963a9970eb556497643eac6b743c033d964164127bad7411918b870d63885863ce09bbbd2fe5a0623a58eba1dc68d9432401e5dd971ceef
diff --git a/net-irc/quasselgrep/metadata.xml b/net-irc/quasselgrep/metadata.xml
index 23dc8ab4748e..d238c6f6507a 100644
--- a/net-irc/quasselgrep/metadata.xml
+++ b/net-irc/quasselgrep/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
+		<bugs-to>https://github.com/fish-face/quasselgrep/issues</bugs-to>
 		<doc>https://github.com/fish-face/quasselgrep/blob/master/README.md</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
new file mode 100644
index 000000000000..b4bd7c876391
--- /dev/null
+++ b/net-irc/quasselgrep/quasselgrep-0_p20190211.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_REQ_USE=( sqlite )
+
+inherit distutils-r1 eutils
+
+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/65278/quasselgrep.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	MY_COMMIT=9b6b0bc1252daa6e574363d87d04eebd981215a5
+	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/future[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+	optfeature "access postgres db" dev-python/psycopg:2
+}
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 4c5e54467ac6..c33d7dae6be2 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,7 +1,7 @@
 AUX unrealircd.confd-r3 1301 BLAKE2B 36246c5d0ce324907e9d077d0b1c1e186eb95705f453c42c5be710f936ddb420ed25d575658d2d1f0efcb8aa5c221414dc106cd8f85197ee32a66d585ec55c27 SHA512 ca4c315815dd11b2ccfcf407e6801078326b627862c3553453e30f965ed8fab8833e556e383219aaab6f580c393542e798bf400464be496016130ffd15668fa3
 AUX unrealircd.initd-r2 1162 BLAKE2B f4b073662d6428122b91e89350bca346daa71af00708830f627c288157241b505e34662f5262cebb3aa397436b1f584d5e92a6accc8b63746f6040ea784554d5 SHA512 97219aac646ba2a2e7fab81dcb013f6e078807baddfefeea93942242a02cd7c5c8c08cbceebd649e12400b86fe44222f8f22a3fb1f8a7cf9fdd18152268e03c1
 DIST unrealircd-4.2.2.tar.gz 6060272 BLAKE2B f45cae6aa85b478e7f667e379b557314fa509c17f150941f84ee80fb328b01de099235b69d3e2710afef01578f5898ba12f21245d6ce5370e7aa7ffdfa49d1f0 SHA512 961947e2286e10cd6032320d57cf3a99d4354f46ae28ad3142d11a0d423f7a0be915f8c09e8fe7b5816829752e4a03776907bb491366f418afc319fd8efb14ad
-DIST unrealircd-4.2.3.tar.gz 6086716 BLAKE2B 26eae482b8b5ce599a3672981c5cf32725f0cf7d9dae16cf48c73dfcabbd4b897d8308be0eb1a6b7b44c657dfb66c42115e67c29eefc791da5fc01fc53e22323 SHA512 d71550d71d24f808141d235248600476167b82de089173f0c1814638df636bf999c931827e5952f0233932b2d5412bf2e26573c62cc8a0720f91bd8723867b0a
+DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
 EBUILD unrealircd-4.2.2.ebuild 5474 BLAKE2B 9bd2f057b44d155f1347ebd4953f4d047ebee669bd1db35b08065826b31812f17595da7ef1414517e6c313363365fa32b8d6cf81117ef1922cf28c2b2b427c21 SHA512 6486c17f73c3e9c42bad4e587047ba15145f755c5721e4d6699b704877aa940e82f9e672761dcadf4ed411cd01c2dfdcfb5d715a1ff24dcd5c8af15c009f5a8b
-EBUILD unrealircd-4.2.3-r1.ebuild 5463 BLAKE2B e2bd7d6874e2c981f4d7e515c27c938a862aacb26df6ee07a4bacbc217b68e76d348bf382ae42a27726a72cf23b6f7880e997e13961159672307d0bed622b48d SHA512 05f628e511835eb4fa103f4de297abae3bc97b712c8a0f644391167836022d4f12915a49d163c6c23063b11dfe9d0df770fd7c3d4b4fffb07472e50c3b007271
+EBUILD unrealircd-4.2.4.1.ebuild 5465 BLAKE2B 1acdf0b8a30a3ed3b8b8a4b64b1818aa82c00b891c38387a106e49d5258130680705bf006018b1b5bfdf14af747bbb68eca5320d765fd4e35ceebbc78caea421 SHA512 b86cb3f43e4330395050fe9ef767414a46cf01e113a48204c15958ffb09386ad3d0cc737f34494ba969d46020d16c439d5f951aa62a55c0bc6ac2c7cdea93ef4
 MISC metadata.xml 1048 BLAKE2B 23fc4e5fd19084a8cb4157d14318d00952b61914d1d26137ee93ee866b394ac8bc0471110903806bb94f60141ef5a12c436816ce1cac55ab2e84db30ebdb1a36 SHA512 6f87be3568418355d74b9f8839f5640fe6299e8ee2b1de2ea0f83ac1a93ec9ab150b437e327d8543a815761389773dd8e8149cba023395893c9313d8b3d46102
diff --git a/net-irc/unrealircd/unrealircd-4.2.3-r1.ebuild b/net-irc/unrealircd/unrealircd-4.2.4.1.ebuild
index 1cca46256153..97c9a805e818 100644
--- a/net-irc/unrealircd/unrealircd-4.2.3-r1.ebuild
+++ b/net-irc/unrealircd/unrealircd-4.2.4.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 SSL_CERT_MANDATORY=1
-inherit eapi7-ver ssl-cert user
+inherit eapi7-ver ssl-cert
 
 DESCRIPTION="An advanced Internet Relay Chat daemon"
 HOMEPAGE="https://www.unrealircd.org/"
@@ -17,13 +17,15 @@ IUSE="class-nofakelag curl +extban-stacking libressl +operoverride operoverride-
 	+prefixaq showlistmodes shunnotices +usermod"
 
 RDEPEND="
+	acct-group/unrealircd
+	acct-user/unrealircd
 	>=app-crypt/argon2-20171227-r1:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
 	dev-libs/libpcre2
 	>=net-dns/c-ares-1.7:=
 	net-libs/libnsl:=
 	sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
 	curl? ( net-misc/curl[adns] )
 "
 DEPEND="${RDEPEND}
@@ -43,10 +45,6 @@ pkg_pretend() {
 	done
 }
 
-pkg_setup() {
-	enewuser unrealircd
-}
-
 src_prepare() {
 	# QA check against bundled pkgs
 	rm -r extras || die
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index bfb861af8cef..a9f6df87e3ce 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,9 +1,4 @@
-AUX weechat-2.2-tinfo.patch 910 BLAKE2B 37a02f7c56d6bdc42c01a5a9b622c79501d4ffb73152f7eb4c14182bf507319d9667fc2b64ebe33992fe6a1a88712ee37844278c802712412048ea6d6ba9d4fe SHA512 46ea2b0b6f03c3656d062a68e2d80edd2566dd8edc7ba6f3df0f29ae3222b8c1702378ff7d3b8cbcab917ec4310b7f2699e3f0f113671af778ad1e1f681c4c52
-DIST weechat-2.3.tar.xz 2025652 BLAKE2B 74c5d81a77f164c51bee01ff1be5731455ad85178005a360269ffa4ac59554c58dc97175fcb3fa62841b79e7711c1dc41876a839a9d1e4a1f4ce359bac1d6689 SHA512 0de827850de5c70c528e1a8cfa44220c3d48d6767df61a8a6283123173ba63b4c8554d5334a8b14976d19602c36bbc27d89ebbd201ccd8c048d50edc3a4ea19b
-DIST weechat-2.4.tar.xz 2044448 BLAKE2B d1893de3465f8d19ae5faea0638454839e640a7480f8cae4ee517c090aab68789224865ce2c371a0e8f4f8a44fb86382ab53f51b50042db3488efbf10d62de05 SHA512 012eca03e56eea64b3e50ee1e8b7c1cc636ad779be01268b3c9ee05e3bd149bc58b09eb6952e965061782da5f9d33d7a835056c6bb43c1fdca998cfc463fd068
 DIST weechat-2.5.tar.xz 2067180 BLAKE2B 5ef2a20d0f4e72958f8523c46eac4acf8223d70efbadc78a1a5623b0e63e11acbe1c8e5ec739f56764c6825393902626e234269646031971a0f58fbd314f8918 SHA512 af0135009b799d40790c09da5419c950a6c750264a556de418b0ba4f396ecbde2aadeae5cbea3f2e98fc9926f07439e28beac00cb0019dc6752c1a5640a9834e
-EBUILD weechat-2.3.ebuild 4113 BLAKE2B 7367838a1c9c601d406930ed6bdcd8675dbbfebe1fd8991e2c7a777171381d9247486991037a016dfbee53af8e200132c2afd1f1e9f8f851241ef31479a3e102 SHA512 396a7428c0502b50726d82c3066f0c3e1d2d1c91fa5fa9d0826b985ebafb61e8e3cd46be4eb85c851187724a2953bbffa739a5bf7bf5d3fd800fc56c300449c6
-EBUILD weechat-2.4.ebuild 4084 BLAKE2B 57de88b27059f72c824e2468fc8e11edb7ccc77777212488a0cfc08be632ff69695ddb221bbde119f509025b8440cd00ac76fc5a629186ccbaefa9db833dce7f SHA512 ce59aace9799101e1db02c94c90253e21e20504ba113eb10fa40e143381ec486b5f26fb5d868fdb3983b09b34d8bb55a2bcb77e803d926223ac946af285710be
-EBUILD weechat-2.5-r1.ebuild 3954 BLAKE2B 71baeb44920f8f18568c85833777c3e929a8a22926cb04cdcc247bd507fc14c039e453e364c7f7305db04bd68010d391032ff778cdf93cb676051c257b5b3e85 SHA512 c5bdab50fd43f20e21a2a6b78afba834604248f00b7439c4457ac0d21e71f633e2e135610900373fa9775eb7adb98c0dce50c52de1578be073bd11552898b83e
+EBUILD weechat-2.5-r1.ebuild 3952 BLAKE2B 26b66730ee624a14b9e13b7573021cc1101128565c763320f2475400288dbba0492510644c315505f5c2334de780ce1476cec0f9332c98c8348d9552edec7ce3 SHA512 bae88576c77f741460eb394febcaea23163911d02c40111bd4b5d530ce48b86d6512d6f1358bd0316dcd91bd4876154e2b67bb5a46cfb7115fcfd75e7e7a41df
 EBUILD weechat-9999.ebuild 3954 BLAKE2B 71baeb44920f8f18568c85833777c3e929a8a22926cb04cdcc247bd507fc14c039e453e364c7f7305db04bd68010d391032ff778cdf93cb676051c257b5b3e85 SHA512 c5bdab50fd43f20e21a2a6b78afba834604248f00b7439c4457ac0d21e71f633e2e135610900373fa9775eb7adb98c0dce50c52de1578be073bd11552898b83e
 MISC metadata.xml 1069 BLAKE2B 4a71fbd264555e8439f6797370163ae05c3111e589d513ade407ebb5eb3b2c302d2afc46cd37d3707c85fc981ed26bfd23762b5f6f635b9f85b70d821919e2ed SHA512 dfb08a4660736e409b31088217bca60adc46c88b7e0b6e4a1b905de69262ae0cef172638f30b502e01fcb772a6d3cbb471805959ba8c6d78cb598b18640fe20f
diff --git a/net-irc/weechat/files/weechat-2.2-tinfo.patch b/net-irc/weechat/files/weechat-2.2-tinfo.patch
deleted file mode 100644
index aee651911ce7..000000000000
--- a/net-irc/weechat/files/weechat-2.2-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
-@@ -32,7 +32,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)
-@@ -57,7 +63,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.3.ebuild b/net-irc/weechat/weechat-2.3.ebuild
deleted file mode 100644
index ed36a3b4b4d3..000000000000
--- a/net-irc/weechat/weechat-2.3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils gnome2-utils python-single-r1
-
-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 ~arm 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 +fset +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 php +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${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:= )
-	php? ( >=dev-lang/php-7.0:* )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
-	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}-2.2-tinfo.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# 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 ! has ${i} ${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 ! has ${i} ${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_FSET=$(usex fset)
-		-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_PHP=$(usex php)
-		-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
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-irc/weechat/weechat-2.4.ebuild b/net-irc/weechat/weechat-2.4.ebuild
deleted file mode 100644
index e6d1b3a6fb22..000000000000
--- a/net-irc/weechat/weechat-2.4.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit cmake-utils python-single-r1 xdg-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 ~arm ~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 +fset +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 php +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc man nls +ssl test ${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:= )
-	php? ( >=dev-lang/php-7.0:* )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
-	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 )
-	man? ( >=dev-ruby/asciidoctor-1.5.4 )
-	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"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# 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 ! has ${i} ${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 ! has ${i} ${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_JAVASCRIPT=OFF
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_NCURSES=ON
-		-DENABLE_ALIAS=$(usex alias)
-		-DENABLE_ASPELL=$(usex spell)
-		-DENABLE_BUFLIST=$(usex buflist)
-		-DENABLE_CHARSET=$(usex charset)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_EXEC=$(usex exec)
-		-DENABLE_FIFO=$(usex fifo)
-		-DENABLE_FSET=$(usex fset)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_MAN=$(usex man)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PHP=$(usex php)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-	)
-
-	if use python; then
-		python_export PYTHON_LIBPATH
-		mycmakeargs+=(
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-irc/weechat/weechat-2.5-r1.ebuild b/net-irc/weechat/weechat-2.5-r1.ebuild
index 9ff15b1d86c5..de58c93e68cd 100644
--- a/net-irc/weechat/weechat-2.5-r1.ebuild
+++ b/net-irc/weechat/weechat-2.5-r1.ebuild
@@ -12,7 +12,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 ~arm ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"