[gentoo-commits] repo/gentoo:master commit in: sys-apps/duc/, sys-apps/duc/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/duc/, sys-apps/duc/files/

[Jeroen Roovers]

commit:     08f0d6898403dd54888aac2c573235e90409b9a6
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 16:02:08 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 16:03:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08f0d689

sys-apps/duc: Fix compiling against sys-libs/ncurses[tinfo] (bug #636958).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/duc/duc-9999.ebuild             |  7 +++++--
 sys-apps/duc/files/duc-1.4.1-tinfo.patch | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild
index b063305e8b8..55fa313bfe3 100644
--- a/sys-apps/duc/duc-9999.ebuild
+++ b/sys-apps/duc/duc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit autotools
 
@@ -42,6 +42,9 @@ DEPEND="
 	tokyocabinet? ( dev-db/tokyocabinet )
 "
 RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.1-tinfo.patch
+)
 
 src_unpack() {
 	if [[ "${PV}" == "9999" ]]; then

diff --git a/sys-apps/duc/files/duc-1.4.1-tinfo.patch b/sys-apps/duc/files/duc-1.4.1-tinfo.patch
new file mode 100644
index 00000000000..74f0529d674
--- /dev/null
+++ b/sys-apps/duc/files/duc-1.4.1-tinfo.patch
@@ -0,0 +1,23 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -138,8 +138,8 @@
+ if test "${enable_ui}" = "yes"; then
+         AC_DEFINE([ENABLE_UI], [1], [Enable ui])
+ 
+-	AC_CHECK_LIB([ncursesw], [tputs],, [
+-		AC_CHECK_LIB([ncurses], [tputs],, [
++	AC_CHECK_LIB([ncursesw], [touchwin],, [
++		AC_CHECK_LIB([ncurses], [touchwin],, [
+ 			AC_MSG_ERROR([
+ The ncurses library was not found, which is needed for ui support. Either install
+ the ncurses development libraries, or compile without ui support (--disable-ui)
+@@ -148,6 +148,9 @@
+ 	])
+ fi
+ 
++AC_SEARCH_LIBS([tputs], [tinfo],, [
++	AC_MSG_ERROR([No library was found providing tputs])
++])
+ 
+ if test "${enable_x11}" = "yes"; then
+         test "${enable_cairo}" != "yes" && AC_MSG_ERROR([cairo must be enabled for x11])