Fix for ncurses[tinfo], bug #507170

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)

4 files changed, 49 insertions, 5 deletions

diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 447eb11cb739..0447d7033f0c 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.160 2015/05/26 14:25:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.161 2015/07/27 11:42:47 jlec Exp $
+
+  27 Jul 2015; Justin Lecher <jlec@gentoo.org> +files/weechat-1.2-tinfo.patch,
+  weechat-1.2.ebuild, weechat-9999.ebuild:
+  Fix for ncurses[tinfo], bug #507170
 
   26 May 2015; Tim Harder <radhermit@gentoo.org> weechat-1.2.ebuild:
   Explicitly disable javascript plugin support (bug #550220).
diff --git a/net-irc/weechat/files/weechat-1.2-tinfo.patch b/net-irc/weechat/files/weechat-1.2-tinfo.patch
new file mode 100644
index 000000000000..e6ae9e0f205b
--- /dev/null
+++ b/net-irc/weechat/files/weechat-1.2-tinfo.patch
@@ -0,0 +1,32 @@
+ src/gui/curses/CMakeLists.txt | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
+index 284956f..492fc77 100644
+--- a/src/gui/curses/CMakeLists.txt
++++ b/src/gui/curses/CMakeLists.txt
+@@ -35,7 +35,14 @@ main.c)
+ 
+ set(EXECUTABLE weechat)
+ 
+-find_package(Ncurses)
++
++find_package(PkgConfig)
++pkg_search_module(NCURSES ncursesw ncurses)
++
++if(NOT NCURSES_FOUND)
++  find_package(Ncurses)
++endif(NCURSES_FOUND)
++
+ if(NCURSES_FOUND)
+   check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
+   if(NCURSESW_HEADERS)
+@@ -46,7 +53,7 @@ if(NCURSES_FOUND)
+       add_definitions(-DHAVE_NCURSES_H)
+     endif()
+   endif()
+-  list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
++  list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES} )
+ endif()
+ 
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
diff --git a/net-irc/weechat/weechat-1.2.ebuild b/net-irc/weechat/weechat-1.2.ebuild
index f2ec36a95193..ee184c4f900e 100644
--- a/net-irc/weechat/weechat-1.2.ebuild
+++ b/net-irc/weechat/weechat-1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-1.2.ebuild,v 1.2 2015/05/26 14:25:14 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-1.2.ebuild,v 1.3 2015/07/27 11:42:47 jlec Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit python-single-r1 multilib cmake-utils
+inherit eutils python-single-r1 multilib cmake-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -61,6 +61,8 @@ DOCS="AUTHORS.asciidoc ChangeLog.asciidoc ReleaseNotes.asciidoc README.asciidoc"
 # tests need to be fixed to not use system plugins if weechat is already installed
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -68,6 +70,8 @@ pkg_setup() {
 src_prepare() {
 	local i
 
+	epatch "${PATCHES[@]}"
+
 	# fix libdir placement
 	sed -i \
 		-e "s:lib/:$(get_libdir)/:g" \
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 6e96884e5cc8..6fa908e277e5 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.40 2015/05/16 19:19:32 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-9999.ebuild,v 1.41 2015/07/27 11:42:47 jlec Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit python-single-r1 multilib cmake-utils
+inherit eutils python-single-r1 multilib cmake-utils
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
@@ -61,6 +61,8 @@ DOCS="AUTHORS.asciidoc ChangeLog.asciidoc ReleaseNotes.asciidoc README.asciidoc"
 # 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
 }
@@ -68,6 +70,8 @@ pkg_setup() {
 src_prepare() {
 	local i
 
+	epatch "${PATCHES[@]}"
+
 	# fix libdir placement
 	sed -i \
 		-e "s:lib/:$(get_libdir)/:g" \