games-misc/robotfindskitten: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/690114
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch b/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch
index 6f5aa29a9f5123d1e6305bf0ab9a12ba08d6471a..07e801e2d76586681f5ea8b55f72ed6c199743f7 100644 (file)
--- a/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch
+++ b/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch
@@ -1,24 +1,20 @@
---- robotfindskitten-2.7182818.701.orig/nki/Makefile.in
-+++ robotfindskitten-2.7182818.701/nki/Makefile.in
-@@ -197,7 +197,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+--- robotfindskitten-2.7182818.701/nki/Makefile.am
++++ robotfindskitten-2.7182818.701/nki/Makefile.am
+@@ -1,4 +1,4 @@
 -nkidir = $(datadir)/games/robotfindskitten
 +nkidir = $(datadir)/robotfindskitten
  nki_DATA = vanilla.nki
- all: all-am
  
---- robotfindskitten-2.7182818.701.orig/src/Makefile.in
-+++ robotfindskitten-2.7182818.701/src/Makefile.in
-@@ -199,8 +199,8 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--execgamesdir = $(prefix)/games
+ uninstall:
+--- robotfindskitten-2.7182818.701/src/Makefile.am
++++ robotfindskitten-2.7182818.701/src/Makefile.am
+@@ -1,7 +1,7 @@
+-execgamesdir= $(prefix)/games
++execgamesdir= $(bindir)
+ execgames_PROGRAMS=robotfindskitten
+ 
 -AM_CPPFLAGS = -DSYSTEM_NKI_DIR=\"$(datadir)/games/robotfindskitten\"
-+execgamesdir = $(bindir)
 +AM_CPPFLAGS = -DSYSTEM_NKI_DIR=\"$(datadir)/robotfindskitten\"
- robotfindskitten_SOURCES = robotfindskitten.c 
- SPLINT_SUPPRESSIONS = +charintliteral +charindex
- all: all-am
+ 
+ robotfindskitten_SOURCES= robotfindskitten.c 
+ #robotfindskitten_LDADD= -lncurses 

diff --git a/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-tinfo.patch b/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-tinfo.patch
new file mode 100644 (file)
index 0000000..4ceef27
--- /dev/null
+++ b/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-tinfo.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/690114
+
+--- robotfindskitten-2.7182818.701/configure.in
++++ robotfindskitten-2.7182818.701/configure.in
+@@ -11,9 +11,14 @@
+ AC_PROG_CC
+ AM_PROG_LIBTOOL
+ AC_PROG_INSTALL
++PKG_PROG_PKG_CONFIG
+ 
+ dnl Checks for libraries.
+-AC_CHECK_LIB(ncurses, initscr, ,curses)
++PKG_CHECK_MODULES(NCURSES, ncurses, [
++                LIBS="$LIBS $NCURSES_LIBS"
++               ],[
++                AC_MSG_ERROR([Cannot find ncurses lib])
++               ])
+ 
+ dnl Checks for header files.
+ AC_CHECK_HEADERS(signal.h)

diff --git a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild
index a6195c2f7a8ae272959e2d6e4bbc80fff147fddc..66f4a379e6ed005e6fc69475e01d306d46b2a059 100644 (file)
--- a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild
+++ b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Help robot find kitten"
 HOMEPAGE="http://robotfindskitten.org/"
@@ -13,13 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
        "${FILESDIR}"/${P}-gentoo.patch
+       "${FILESDIR}"/${P}-tinfo.patch
 )
 
+src_prepare() {
+       default
+       eautoreconf
+}
+
 src_install() {
        DOCS="AUTHORS BUGS ChangeLog NEWS" \
                default