[gentoo-commits] repo/gentoo:master commit in: games-board/ccgo/, games-board/ccgo/files/

[gentoo-commits] repo/gentoo:master commit in: games-board/ccgo/, games-board/ccgo/files/

[Lars Wendler]

commit:     d1fd0846fa55f34ed1ed4825ec2a1a70fe159f04
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 15:44:01 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 15:44:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1fd0846

games-board/ccgo: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/687278
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 games-board/ccgo/ccgo-0.3.6.5-r1.ebuild         |  3 ++-
 games-board/ccgo/files/ccgo-0.3.6.5-tinfo.patch | 35 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild b/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild
index 9f19d9aa9e4..fd69f9b4f47 100644
--- a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild
+++ b/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-tinfo.patch
 )
 
 src_prepare() {

diff --git a/games-board/ccgo/files/ccgo-0.3.6.5-tinfo.patch b/games-board/ccgo/files/ccgo-0.3.6.5-tinfo.patch
new file mode 100644
index 00000000000..aaa8b5ae0f9
--- /dev/null
+++ b/games-board/ccgo/files/ccgo-0.3.6.5-tinfo.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/687278
+
+--- ccgo-0.3.6.5/configure.ac
++++ ccgo-0.3.6.5/configure.ac
+@@ -30,7 +30,7 @@
+ PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 gconfmm-2.6)
+ AC_SUBST(GTKMM_CFLAGS)
+ AC_SUBST(GTKMM_LIBS)
+-AC_CHECK_HEADERS(ncurses.h, [have_ncurses=true], [have_ncurses=false])
++PKG_CHECK_MODULES(NCURSES, ncurses, [have_ncurses=true], [have_ncurses=false])
+ AM_CONDITIONAL([HAVE_NCURSES], [test x$have_ncurses = xtrue])
+ 
+ AM_GNU_GETTEXT([external])
+--- ccgo-0.3.6.5/Makefile.am
++++ ccgo-0.3.6.5/Makefile.am
+@@ -53,7 +53,7 @@
+ nctest_SOURCES = \
+ 	nctest.cc \
+ 	nc.cc nc.hh
+-nctest_LDADD = arg.o debug.o ui/libui.a go/libgo.a -lncurses
++nctest_LDADD = arg.o debug.o ui/libui.a go/libgo.a $(NCURSES_LIBS)
+ endif
+ 
+ gtktest_SOURCES = gtktest.cc
+--- ccgo-0.3.6.5/nc/Makefile.am
++++ ccgo-0.3.6.5/nc/Makefile.am
+@@ -8,7 +8,7 @@
+ 	misc.cc misc.hh \
+ 	editor.cc editor.hh
+ 
+-LDADD = libnc.a -lncurses
++LDADD = libnc.a $(NCURSES_LIBS)
+ noinst_PROGRAMS =
+ 
+ noinst_PROGRAMS += test-entry