[gentoo-commits] repo/gentoo:master commit in: app-misc/abook/, app-misc/abook/files/

[Jeroen Roovers]

commit:     693c7eae47ff7bee2bd2a0eb1fe5dfaa4a3c6fd6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  2 10:14:16 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 10:14:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693c7eae

app-misc/abook: Fix building against sys-libs/ncurses[tinfo] (bug #606478).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-misc/abook/abook-0.6.1-r1.ebuild         |  7 ++++---
 app-misc/abook/files/abook-0.6.1-tinfo.patch | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app-misc/abook/abook-0.6.1-r1.ebuild b/app-misc/abook/abook-0.6.1-r1.ebuild
index 4d1dccd13b8..37e0289c6c3 100644
--- a/app-misc/abook/abook-0.6.1-r1.ebuild
+++ b/app-misc/abook/abook-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,11 +26,12 @@ DEPEND="nls? ( sys-devel/gettext )"
 S="${WORKDIR}/${MY_P}"
 
 DOCS=( BUGS ChangeLog FAQ README TODO sample.abookrc )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.1-tinfo.patch
+)
 
 src_prepare() {
 	default
-
-	# TODO: do the right thing and find out whats wrong with Makefile.in
 	eautoreconf
 }
 

diff --git a/app-misc/abook/files/abook-0.6.1-tinfo.patch b/app-misc/abook/files/abook-0.6.1-tinfo.patch
new file mode 100644
index 00000000000..e8c4585dbcb
--- /dev/null
+++ b/app-misc/abook/files/abook-0.6.1-tinfo.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,6 +86,7 @@
+ 
+ AC_CHECK_LIB(ncursesw, initscr,
+ 	[LIBS="$LIBS -lncursesw"
++	AC_SEARCH_LIBS(cbreak, tinfo)
+ 	if test x$abook_cv_curses = x/usr -a -d /usr/include/ncursesw; then
+ 		CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+ 	fi
+@@ -93,6 +94,7 @@
+ 	ac_widec_possible=no
+ 	AC_CHECK_LIB(ncurses, initscr,
+ 		[LIBS="$LIBS -lncurses"
++		AC_SEARCH_LIBS(cbreak, tinfo)
+ 		if test x$abook_cv_curses = x/usr -a -d /usr/include/ncurses; then
+ 			CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+ 		fi