gentoo resync : 25.08.2018

13 files changed, 460 insertions, 8 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ac7a88242a0f..4d47be78feeb 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 847e5d322684..37a7d38e8d2d 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,6 +1,8 @@
 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 1202 BLAKE2B 6fdefbaa5021802fc8326b0a633c3ad666f226070972a34936dc02f26f8cb68eb6036ee7e94b2940c6952e49cd2d151c590aa1badbef35e1817df2fceb7996c9 SHA512 fc9126562591b6df88a71b2c3beb4d99a91f62f65f3df46da2808b63eee490f988291b6271de857ea430fcc3c4e1cedb9bc1e00248877bc22d5414f408943954
+EBUILD irssi-9999.ebuild 1230 BLAKE2B 12e008f400099b7133c96edc8b702935b34526ff2b575aec5069532ef1acb11333dd78221a46517c9da5fa1210ef87257935387a56d3b4b4a6a498e77827ac41 SHA512 f10ba8f0ae8719c158d39eafae23b96d4105c0705f1dbe3d438d52d37959d803fdab2f196ea43215fcdbe3d67ae2dfd1851c63113c297ad6b1b87c994531cb40
 MISC metadata.xml 523 BLAKE2B 2404ab7a08a1b96eb2ac70718b1616b957d2a5ad9e0042a1b558a6f58a461c35f790ac8189016356e34650852b9dc639bb4b87b8c59e7f18ffbe3e80eb91852d SHA512 9f14c9163ffb8c47df6ce3e5661c6c94dcca783937e59c609edf7636d0e2932f9584d83f44e1852d51041542cd1a3b86f20edcb98f981b055b61f68fdd65b922
diff --git a/net-irc/irssi/irssi-1.0.7-r1.ebuild b/net-irc/irssi/irssi-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..5dfd52eed6e2
--- /dev/null
+++ b/net-irc/irssi/irssi-1.0.7-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit ltprune 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-1.1.1-r1.ebuild b/net-irc/irssi/irssi-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..5dfd52eed6e2
--- /dev/null
+++ b/net-irc/irssi/irssi-1.1.1-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit ltprune 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 7c30d8608ca7..127644c7dd8b 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
+GENTOO_DEPEND_ON_PERL="no"
+
 inherit autotools perl-module git-r3
 
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index cf395534b86e..8bab47d92547 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,8 @@
 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 3822 BLAKE2B 907021ee297d4ed5f3e96d4faefc63a62af0fb4f0029cb7b8240f432453fda5fda861b4b9affb25108d6765f2b832abd53cf94eb78b5f1af2dc9f3cb18302cd4 SHA512 867ecc6d23d19248af13ec236c07c9814fd8001c843e54560734fd955ecc51e9f5077e702d9b47399f1c405bdde380805cf8ff18b2f3d9223f0f725be12a3dfd
+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
 MISC metadata.xml 618 BLAKE2B 5a6a28876a22cedbca154051a389fed0e7ef25039319786ed2303b580b1e421b648038237e0157678fb96e1b45839e725299e56584bcb770593f60f305932145 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild
index cf4358a57af0..67faa87dff73 100644
--- a/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild
+++ b/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild
@@ -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_pre20180819121252.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
new file mode 100644
index 000000000000..0957c93760ac
--- /dev/null
+++ b/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
@@ -0,0 +1,148 @@
+# 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="abc7a305d16d5ff939959164cff856af8f6d6ca1"
+	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=()
+
+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/weechat/Manifest b/net-irc/weechat/Manifest
index 708138909c0c..0dafd25c3ee1 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,8 +1,11 @@
 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
 EBUILD weechat-2.0.1.ebuild 4008 BLAKE2B beeaa3a84bb98dc38ab099ab913c2897d14084460236dabb11314dad58d5a067a3ae9bb89df6bc0aa8be5200c334da308f63b01d6abf5e0df1aa222f4286b111 SHA512 42a7e08348d804d9f46ffe3274335510cf2b4d56303e706e2f73eae26ffa97804f52af8d29737cf5ddb7a7f299665aa7c661f0299f64d0bc7e2bc01556048c94
 EBUILD weechat-2.1.ebuild 4028 BLAKE2B e7958320fdec8faf91bfab3f11f33a58d97bbe28b0efd3f31a9e1bbf357f0c34b4c689a1a8d0781c67365051c6c04e291261674d01744ecebe8e7aaa3b977c2e SHA512 d2394b65e7e6836f9c50f431fa1d827574f20dddd89c6f1cd454d5dc3bcf98fee319655d426f61d67717062845bd9e434e94df74f3e5e4e44c7252c422865b43
-EBUILD weechat-9999.ebuild 4028 BLAKE2B e7958320fdec8faf91bfab3f11f33a58d97bbe28b0efd3f31a9e1bbf357f0c34b4c689a1a8d0781c67365051c6c04e291261674d01744ecebe8e7aaa3b977c2e SHA512 d2394b65e7e6836f9c50f431fa1d827574f20dddd89c6f1cd454d5dc3bcf98fee319655d426f61d67717062845bd9e434e94df74f3e5e4e44c7252c422865b43
-MISC metadata.xml 903 BLAKE2B 74f1e6930fb209c9d74ca9ff7a8c0b82900c8aac369612ef4c16cc4393fabe24770bc1734d20b261dfcfc021259e1df9e555e1d53605296e0847939d3ce41c40 SHA512 26d85549cc0b0e61cb576a50740cd289432dca90ff92e0d0162a430ff89959233aa002dee0018780e51607cdae85a866ac6db77fe22d2c8631590a33a05ff5d5
+EBUILD weechat-2.2.ebuild 4010 BLAKE2B 638e56b0e898c2ff90dbde2e38687808efff2d6cdb1ae933928cae53d1ce353d4255f57da7cfa1415c3f2850bc85a5d5e47cee2d0839d40c6e77489a82ee0392 SHA512 131c65d47244265ca82b4922bcdc44e279f1ee3e43cebb1b07a0d4cbbde9ec4a954a770589b4e7464249db196334ff809d1ca603bb150ee20d825e59ce955d2e
+EBUILD weechat-9999.ebuild 4010 BLAKE2B 638e56b0e898c2ff90dbde2e38687808efff2d6cdb1ae933928cae53d1ce353d4255f57da7cfa1415c3f2850bc85a5d5e47cee2d0839d40c6e77489a82ee0392 SHA512 131c65d47244265ca82b4922bcdc44e279f1ee3e43cebb1b07a0d4cbbde9ec4a954a770589b4e7464249db196334ff809d1ca603bb150ee20d825e59ce955d2e
+MISC metadata.xml 1015 BLAKE2B 84a29d39ade6afecbd613413d0dbd13decd292efe54882122b46c48e8ba33ebcd63ccf0ba0301716618054ce7dbcc30dc0649f8202612d2ccbbc3ef04e4cc135 SHA512 d63b0302cf3a026ab007a9d4bc9d2aec5e11587cdf736be871fc63431725cdc471cdc23ea58cdd30b74cb9d522e478c6e88dfa17ce4ecc5cbc1b0e2dcf3eb5fc
diff --git a/net-irc/weechat/files/weechat-2.2-tinfo.patch b/net-irc/weechat/files/weechat-2.2-tinfo.patch
new file mode 100644
index 000000000000..aee651911ce7
--- /dev/null
+++ b/net-irc/weechat/files/weechat-2.2-tinfo.patch
@@ -0,0 +1,28 @@
+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/metadata.xml b/net-irc/weechat/metadata.xml
index 39474809b461..1e3fcd3c4088 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>radhermit@gentoo.org</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<use>
 		<flag name="alias">Enable plugin for alias control</flag>
 		<flag name="buflist">Enable buflist plugin</flag>
diff --git a/net-irc/weechat/weechat-2.2.ebuild b/net-irc/weechat/weechat-2.2.ebuild
new file mode 100644
index 000000000000..af107a8fe6bc
--- /dev/null
+++ b/net-irc/weechat/weechat-2.2.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit python-single-r1 cmake-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +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
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 0c7c645e9a4c..af107a8fe6bc 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	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 dev-lang/ruby:2.2 ) )
+	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= )
@@ -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