gentoo resync : 23.03.2018

6 files changed, 38 insertions, 159 deletions

diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 95798233beb8..708138909c0c 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,9 +1,8 @@
 AUX weechat-1.2-tinfo.patch 874 BLAKE2B 5b720aaf45d1ff7f7792ca21ff79919b258fe16cdb19c7c7892abd3d702c86911a2c46519b84d7d71db40d89158b3662c93327e382a342bd2146dab98f4cbaed SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790
-DIST weechat-1.9.1.tar.xz 1877428 BLAKE2B e7595735547699cfb20f653bbe515555b5d7e772e1bc1aecb4e95f1f4fd402a315698790e961305daf7d0bd6c5f9f7889c00efdf115f7182287965428b79d469 SHA512 552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa
+AUX weechat-2.1-tinfo.patch 910 BLAKE2B 706949f07bac5e191e045bc6dfbb6e6b1dc4ec2e7347ff7c3f8b3f8af67e5d50b27a31368bf3d2a143eb7b0ec0dc0902fd787d803da8b604793d2b1b912e1dee SHA512 a1df83dc71c75047a8d898401551adc727df581b6e2a0fca366b67b380e688f95a375cdd9246cc4fff7a1cce22bf50e2bc3022a843e8994f8ee8660c7be77a15
 DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B 256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472 SHA512 3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
-DIST weechat-2.0.tar.xz 1967636 BLAKE2B b4ee37a7c8da4cd724ada44f454979326ec1186254d197c538de13c148b52988ddeff23d432240404516c8f81d8588347c6ea5313572b4815d716f80e82f85a4 SHA512 771618c09fb24182f86304af8c12e158e3d97afbc51219d1f4c5f9ec102aac15c4511a6301141d47f67e385f41bf0ba91e3df795ffdd78a19d1f6a5b1121e951
-EBUILD weechat-1.9.1.ebuild 3911 BLAKE2B cba02d1251dd464f059c096bba8aef464b6f767adea67b84bb364c5c95fc7947f601bfd7f048d232288db7930820079e739ba9943fe16a78f8c69a155eb43f6f SHA512 6683148f66aba87e8e662f607e76dacec46c28dbd76ce598a8c881fc9581bf8f92ae1e752656553479e96de5de870f4e9ebcd5b0059b06cf36ae41419f68d7f4
-EBUILD weechat-2.0.1.ebuild 4010 BLAKE2B 8e08f9a541cd0466342804f27bcd73fe3be1087dc2e2bbca7014ff55c16844ee1259df371598a6b96f2e77b13473c83f367e787101aa45fa8ac3e092f59f843c SHA512 4fff7e01f110cb1dfffa62365e877d62a8330b1d56a8f5bd23213d548d908f250b4db824305d85e0647f1659642d169f4e512a3abed5f412201ef9279f8dfadb
-EBUILD weechat-2.0.ebuild 4010 BLAKE2B 8e08f9a541cd0466342804f27bcd73fe3be1087dc2e2bbca7014ff55c16844ee1259df371598a6b96f2e77b13473c83f367e787101aa45fa8ac3e092f59f843c SHA512 4fff7e01f110cb1dfffa62365e877d62a8330b1d56a8f5bd23213d548d908f250b4db824305d85e0647f1659642d169f4e512a3abed5f412201ef9279f8dfadb
-EBUILD weechat-9999.ebuild 4010 BLAKE2B 8e08f9a541cd0466342804f27bcd73fe3be1087dc2e2bbca7014ff55c16844ee1259df371598a6b96f2e77b13473c83f367e787101aa45fa8ac3e092f59f843c SHA512 4fff7e01f110cb1dfffa62365e877d62a8330b1d56a8f5bd23213d548d908f250b4db824305d85e0647f1659642d169f4e512a3abed5f412201ef9279f8dfadb
+DIST weechat-2.1.tar.xz 1990748 BLAKE2B 5f417e282fe0bc10f1625e16fc173c09781284c27cf321e219c73fcfb3bac4118403598d6e5d06ed9852b1bdb1e645d7f43999a113101aebe6bd626e2278b661 SHA512 4bea8c0c4467b81e2241d68e5c6425274f0fe15d853ddac46ddf3cce481e03549660d6083277719d462ec5d0dea4b31d89f6b3f51f92f12908213232d2d807df
+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
diff --git a/net-irc/weechat/files/weechat-2.1-tinfo.patch b/net-irc/weechat/files/weechat-2.1-tinfo.patch
new file mode 100644
index 000000000000..e44e06e61f99
--- /dev/null
+++ b/net-irc/weechat/files/weechat-2.1-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
+@@ -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-1.9.1.ebuild b/net-irc/weechat/weechat-1.9.1.ebuild
deleted file mode 100644
index 39521532b3fc..000000000000
--- a/net-irc/weechat/weechat-1.9.1.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=( python{2_7,3_4,3_5,3_6} )
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit python-single-r1 cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
-else
-	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86 ~x64-macos"
-fi
-
-DESCRIPTION="Portable and multi-interface IRC client"
-HOMEPAGE="https://weechat.org/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-NETWORKS="+irc"
-PLUGINS="+alias +buflist +charset +exec +fifo +logger +relay +scripts +spell +trigger +xfer"
-# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
-SCRIPT_LANGS="guile lua +perl +python ruby tcl"
-LANGS=" cs de es fr hu it ja pl pt pt_BR ru tr"
-IUSE="doc nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	net-misc/curl[ssl]
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	charset? ( virtual/libiconv )
-	guile? ( >=dev-scheme/guile-2.0 )
-	lua? ( dev-lang/lua:0[deprecated] )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
-	ssl? ( net-libs/gnutls )
-	spell? ( app-text/aspell )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-"
-DEPEND="${RDEPEND}
-	doc? (
-		>=dev-ruby/asciidoctor-1.5.4
-		dev-util/source-highlight
-	)
-	nls? ( >=sys-devel/gettext-0.15 )
-	test? ( dev-util/cpputest )
-"
-
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
-
-# tests need to be fixed to not use system plugins if weechat is already installed
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2-tinfo.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	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_FIFO=$(usex fifo)
-		-DENABLE_IRC=$(usex irc)
-		-DENABLE_LOGGER=$(usex logger)
-		-DENABLE_RELAY=$(usex relay)
-		-DENABLE_SCRIPT=$(usex scripts)
-		-DENABLE_SCRIPTS=$(usex scripts)
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_TCL=$(usex tcl)
-		-DENABLE_GUILE=$(usex guile)
-		-DENABLE_JAVASCRIPT=OFF
-		-DENABLE_TRIGGER=$(usex trigger)
-		-DENABLE_XFER=$(usex xfer)
-		-DENABLE_DOC=$(usex doc)
-		-DENABLE_TESTS=$(usex test)
-	)
-
-	if use python; then
-		python_export PYTHON_LIBPATH
-		mycmakeargs+=(
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/net-irc/weechat/weechat-2.0.1.ebuild b/net-irc/weechat/weechat-2.0.1.ebuild
index dd1313a0c730..7aa8c2cf35ac 100644
--- a/net-irc/weechat/weechat-2.0.1.ebuild
+++ b/net-irc/weechat/weechat-2.0.1.ebuild
@@ -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.0.ebuild b/net-irc/weechat/weechat-2.1.ebuild
index dd1313a0c730..0c7c645e9a4c 100644
--- a/net-irc/weechat/weechat-2.0.ebuild
+++ b/net-irc/weechat/weechat-2.1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	perl? ( dev-lang/perl:= )
 	php? ( >=dev-lang/php-7.0:* )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( 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 dev-lang/ruby:2.2 ) )
 	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}-1.2-tinfo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.1-tinfo.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index dd1313a0c730..0c7c645e9a4c 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.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 dev-lang/ruby:2.2 ) )
 	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}-1.2-tinfo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.1-tinfo.patch )
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup