Fix for ncurses[tinfo], bug #507170

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

5 files changed, 70 insertions, 17 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/Manifest b/net-irc/weechat/Manifest
index 786c983f6867..be074a64ee7d 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,21 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX weechat-1.2-tinfo.patch 874 SHA256 75c7f2b39585b319fb01a2bad37e5ca9e3fb57387fd00aff11fd10dce2961dd7 SHA512 89b5689654a6bcb41c5ca9c0f579a1619ada2bf5a1f46ec7d9e8755786499fadff2ce30469d169a295692889c421aa365919a3a7b4c5092e0889def2564b1790 WHIRLPOOL ff68c8fa8d0b28272626511464fe76da10b80c69b440a181be6b9d8bb948fb3c8772eb87f1ef487877082ad2c873c94d5fabc95b2946d86079254860f0b154de
 DIST weechat-1.1.1.tar.bz2 2305377 SHA256 810bf0584fd5888246797fc7f1bbc4facb064a4d1c5d91627a9c8c01cbce97b5 SHA512 710cb8badeb2734cbe6430e1c5f7fc91d8ec5c9ef85d2c6cc2206ffdf915fab083027a04d25ba23a17515e767d3b482f85b3b3e8fc445cbf1d05db941ca13dfd WHIRLPOOL d445db9a42e6ac8a58bf17a6a905bc769ea3da005d29f4c8dd703c859ae475dea0302ba471662ae52ff7c4961f35b09942757ccf657d1d419edc50416dde6002
 DIST weechat-1.2.tar.bz2 2367277 SHA256 7c4501401f3794d551331b3cede354895962858acc50437567ffd40fa7af684d SHA512 dd806c1e63e5abab8fcc2f84a615eae8769fc9271f89abb19fae9ef4489e86e132a8d6a4843714a3c772c064c9060e4b63f7433fe6beddd3e675ba08a744a1f9 WHIRLPOOL 8d9d5db2f3628e41f7b186ae80189113645f64dff407b5b64f602deefcf821b2457225d57d2cb1dee6b4c014704013c48fbc26423f6a39b762a0c55439bfb908
 EBUILD weechat-1.1.1.ebuild 3456 SHA256 941797c359947141eea26484f993884a2c7442cf86fc47f6e4d1010200e00b5a SHA512 7b7e62219178fc36b82aa6ca5e7186fca0d6b65f8487bc1fd953e59c6e25fd30a9be569bdb747b26ed9b1b8bf5b07d1690018d032170c01bf101a77b30214046 WHIRLPOOL eeaf448dfea806b2411cb8d6eacc291384693a8e8027bcb1a79e643d88341f8eb67426fb3d814dc995aa01a50e9dd47ba7b598617031574b5edb74781afaf74f
-EBUILD weechat-1.2.ebuild 3666 SHA256 06f1393eee7302228f8f7da4e16d79df27ea17ec2ffd5a58b3deade2eaae46cc SHA512 2da466c6a05987808d5624bc46958e191b627a30cf21901ef288732b85bf5c95a6a16216a0e824047a09a8b2f6580e1c69dabbeb7cad4c6e65768fa7ff51ac8d WHIRLPOOL 053daee4939bfba83130c7a2fbff8447bc1d3a27f68c483f9a4f292796db9e5bcc40c8fb5f0b19d140c8f73ca9689fa8aa63393d9b13128e012bf79d2a5bd7be
-EBUILD weechat-9999.ebuild 3691 SHA256 a95770679a39ca141096df6f39056466981983af3ebde576655f60d17a7b29c4 SHA512 e1d1a25928b1c05f20fc5cf9e4f3537d7b113d4d2238f19a501eab6f41ec5028a7c0fd140505d7291e5fa8edd75e60e91d521e14f7fd2d525d3fda60cbf574c7 WHIRLPOOL 4d51d30d6bacc54367e2155ec4d68002fa824ee83626cc18a42e43f7f86625868aff7812c174d6f8071db8a8a44b21b5fe2fdae106186a801e022cf2ba694d8d
-MISC ChangeLog 22398 SHA256 2aa5e9f8db88b32ed9ce26faf1f64966a419fac1b2587f8a52fe2ef9eed58908 SHA512 b1a80a07cd7fef441479f68249d41f64cebb4242879d2b80b39a76d7b3a1c2ed6066a5ac24e2bf1be5d43969f09cbcfda9e30c77dce3aaec430f0503a057afb6 WHIRLPOOL 58bd9e37db656971194092c6b598062a97e80e6d060b3dc10d5b7e73bead698f99d3200d7cbcd7fd6a3f7a7e5b7d6f6c6845964333a5f9928ad50e850fd2d417
+EBUILD weechat-1.2.ebuild 3737 SHA256 f3c28594ea8c5f57442fb4cde4d7d86d3d4a922fffa313eb443405297d90e534 SHA512 d5d7274457ef6fe8aec4a7d7649172fcd5c1f7d7b0640d30bbe6df4f8ca6b098a7a50c9c7c6f4bf015b8ec82cae85cd469c0e8a4226766e36e8e318714c9dc43 WHIRLPOOL 000ba59f886482e072ae41165a1cc83e6655bb73d17b9a5a946546798b41172197804adc78665549ddd188c41557fc36cd0eb4d89537ad1936866ff3ef2c8613
+EBUILD weechat-9999.ebuild 3767 SHA256 378974b320fd7ba40c29582dfce6f42fa9bb56de2b20108a04819a04b7c6dbf9 SHA512 6ddc6a23403ee45ed1e0c303b542e647e654aa9c4fb6d29643dbaf0f09c93d37a724249e9e4605a121fc32f9a14a335b51e7543ff577e32b83836df32ec0f83e WHIRLPOOL 127a26f5db319923d4c48f8fcf7c36efc3575f5929b06bd1db92a8a61b2bf4c77241b67922ccd681e3a3190b8ccb9efce25508544cb538a5ad88f28140470dfc
+MISC ChangeLog 22554 SHA256 6d256b324e4cc2f89aa3a95c8a17753743f100e33c0b9d7e7bcbf07be9ab507d SHA512 bba0f051c228db88709264319b58bd2b1557df64cb6ad07aae95e8db354f280636b88948b1c546dd33911b2477575b12b6cd5dc7bdda898b5843fcc7571e2c07 WHIRLPOOL d9e3a5e8450dcb6614f8f8575ab2972743b733d6e3db8d594cfc5fb80cd772f5119739aec4f919e830d3eab307391cbce4116c94712704a3cc26f80d105ce701
 MISC metadata.xml 885 SHA256 a49a79b26ae835270b6c6ef598772cd5dbc5ef9216d38cb088edad9a053dc0c5 SHA512 5381a96b4d7db67c3448cb0c346ef2523cdf6060bca7217d3d4be4a9c2d48a6ef1dfa9a90914f53291ce1569f8619aec3d12f46ed3958ec4a314f6f9ae14213b WHIRLPOOL f505bb051206c015902d6cb15bf4b1b91881732708914aab10bfbc6694b3eec92cc203c3b6346062953beba0e805421bee7d2d503df9495e55a104031ab73cb1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQEcBAEBCAAGBQJVZII6AAoJEEqz6FtPBkyjY8AH/jdEddSsRImwP5KSc9uRyRw4
-AF/O0zKTwM1ljeoEXhM/BOyxLhNca/Dv5pXBtFkjB0p/pyGONTA4GCxnh84TUluN
-yQn92Q4nxV4GJuh9gNjvtaEg3WSaT6jyDBlalPKumqIZUX2QuXyEXLg7/fMlrWtG
-VT/pWMTiJTEFdraOGE5xwlsHCnAuHrlrbAj0WzK1CZSELWpQh9kb25hgerZ2+2Mm
-bYj7XKkG74icbMkBGPx6HTTm5VcdBVJLwsFKmFeNPIyBNNf23Mqb7NEwEZ7/xUUU
-NxsjUDpxmDVIfV05b0x8+flcfVbjbaTuov28owLOsoIs1UldswYJ6LGmZd1mNOg=
-=9hQj
+iQJ8BAEBCgBmBQJVthkgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiy1sP/i+d7aQxoIY5e25wNq+rvxCO
+1XzrJGxGEh165kSIDWczC0OXXzdGh+I6cj4xxMbjCxc/bkth5HHEBfb2aW+6THva
+9XzLJ4p2vxlO/4XfsMIVKP8/ho6OxjO3j4j1AAWJsym/134ozyFjU5PFl+NSDjSt
+xbm+LG/BdIL+Phra08YXAUn4HZPx1mqncM0lstkdx7ueRf3f9L6TbsAbXoXmxCPo
+58GK+QVjbKZG+s9u7NCRLxl/vrRI1H+4ypFGksMjrBtYWg40fCSn7Irm/Xm5tQbH
+Li3FDdUfgZSmfaO3aEZPzm94eb3SAUBPNYWWyOigNP/ZHoEeimC44WAzRvEtTJpa
+uoNhn5xtnUNr8FvzyxXkUymnymBzGFxZGU3+DumVrs6pSbz8RoMC3tyhVSy1NKY3
+t+kX26K24RIkI1ogS/d3A92mdzL0Ma6xp2WDQ8Y/yuUb/xbqjRQ9uEDneGdWNR8T
+9nV5p5N+aK/9MoTbBf173Mb6Bo6LzMFdjGcxpd2ecarcWNPrjj55OncCH34dDLu6
+YBQdhvK6o+7r0P6NOHRBnmskBgW1zD3ctQC9pGD3RATtcdcDxmBYaFIASCbiKkSJ
+oo0e3tLLovV8QGz5D1WktMxWdJjrkIryM1TrnvBuvbYbBOor8XPZ9Np1ow/E7Y80
+s8ahdAW8KrTzqCfDzDcc
+=3W8q
 -----END PGP SIGNATURE-----
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" \