From b3a7ba62e60163c5d63b376ec23711fd7626ecb0 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Fri, 2 Mar 2018 10:52:54 +0100
Subject: [PATCH] media-sound/ecasound: Fix building against
 sys-libs/ncurses[tinfo] (bug #609776).

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 media-sound/ecasound/ecasound-2.9.1-r1.ebuild |  9 +++++---
 .../ecasound/files/ecasound-2.9.1-tinfo.patch | 21 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch

diff --git a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
index 5485c1404a08..52575e945b5c 100644
--- a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.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
@@ -34,14 +34,17 @@ RDEPEND="sys-libs/readline:0=
 	sndfile? ( media-libs/libsndfile:= )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.1-ldflags.patch
+	"${FILESDIR}"/${PN}-2.9.1-tinfo.patch
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	eapply "${FILESDIR}"/${PN}-2.8.1-ldflags.patch
-	eapply_user
+	default
 
 #	if use python ; then
 #		sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \
diff --git a/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch b/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch
new file mode 100644
index 000000000000..c4953420b18c
--- /dev/null
+++ b/media-sound/ecasound/files/ecasound-2.9.1-tinfo.patch
@@ -0,0 +1,21 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -810,7 +810,9 @@
+ dnl switch to C for testing
+ AC_LANG_C
+ 
+-AC_CHECK_LIB(ncurses, main, termcap_library=ncurses,
++AC_CHECK_LIB(ncurses, main,
++	[termcap_library=ncurses]
++	AC_SEARCH_LIBS(tigetstr, tinfo),
+ 	AC_CHECK_LIB(termcap, main, termcap_library=termcap,
+ 		termcap_library=none))
+ 
+@@ -821,6 +823,7 @@
+ 	        y | yes)
+ 		  AC_MSG_RESULT(yes)
+ 		  termcap_library=ncurses
++
+ 		;;
+ 
+ 		n | no)
-- 
2.26.2