commit: 85c7c741e7461c68d823afdf3c016364bbbe7e3a
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 23:59:17 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 00:01:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85c7c741
net-irc/weechat: version bump to 2.1
net-irc/weechat/Manifest | 1 +
net-irc/weechat/files/weechat-2.1-tinfo.patch | 28 ++++++++++++++++++++++
.../{weechat-9999.ebuild => weechat-2.1.ebuild} | 4 ++--
net-irc/weechat/weechat-9999.ebuild | 4 ++--
4 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 37538138995..6fef94b7027 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,3 +1,4 @@
DIST weechat-1.9.1.tar.xz 1877428 BLAKE2B
e7595735547699cfb20f653bbe515555b5d7e772e1bc1aecb4e95f1f4fd402a315698790e961305daf7d0bd6c5f9f7889c00efdf115f7182287965428b79d469
SHA512
552e9248e86db7fe53cd6539084e6c5e8548b8858b27c02326d04925d81ef09e123225af5c1f5550b262be5a1249fd8750fdda8d9877c3df918cc30b5e0953fa
DIST weechat-2.0.1.tar.xz 1967336 BLAKE2B
256f4bab45834ed2798490234c9417b8b8e4d06d0ed09f5779ad9d32321ab9aec58c38f4b048de319e4f46809313186462208258ca2d78d1e0470fa2014e7472
SHA512
3947e79a0ac8dce7605905c39039bedf9ba2af4778ee6905f12ca75786b62f3081568ce9426be251e65bad2837ddcf0664cbb08059f898d4ac60171325a94e74
DIST weechat-2.0.tar.xz 1967636 BLAKE2B
b4ee37a7c8da4cd724ada44f454979326ec1186254d197c538de13c148b52988ddeff23d432240404516c8f81d8588347c6ea5313572b4815d716f80e82f85a4
SHA512
771618c09fb24182f86304af8c12e158e3d97afbc51219d1f4c5f9ec102aac15c4511a6301141d47f67e385f41bf0ba91e3df795ffdd78a19d1f6a5b1121e951
+DIST weechat-2.1.tar.xz 1990748 BLAKE2B
5f417e282fe0bc10f1625e16fc173c09781284c27cf321e219c73fcfb3bac4118403598d6e5d06ed9852b1bdb1e645d7f43999a113101aebe6bd626e2278b661
SHA512
4bea8c0c4467b81e2241d68e5c6425274f0fe15d853ddac46ddf3cce481e03549660d6083277719d462ec5d0dea4b31d89f6b3f51f92f12908213232d2d807df
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 00000000000..e44e06e61f9
--- /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-9999.ebuild
b/net-irc/weechat/weechat-2.1.ebuild
similarity index 96%
copy from net-irc/weechat/weechat-9999.ebuild
copy to net-irc/weechat/weechat-2.1.ebuild
index dd1313a0c73..0c7c645e9a4 100644
--- a/net-irc/weechat/weechat-9999.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 dd1313a0c73..0c7c645e9a4 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
