[gentoo-commits] repo/gentoo:master commit in: mail-client/etpan-ng/, mail-client/etpan-ng/files/

[gentoo-commits] repo/gentoo:master commit in: mail-client/etpan-ng/, mail-client/etpan-ng/files/

[Jeroen Roovers]

commit:     4bbf1dc67f8d5a0f9eead229155bcf65db1b8ca1
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 16:59:20 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 17:06:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bbf1dc6

mail-client/etpan-ng: Check for curs_set in libtinfo (bug #647018).

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild         | 15 +++++++++------
 mail-client/etpan-ng/files/etpan-ng-0.7.1-tinfo.patch | 10 ++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild b/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
index 5dfd3fa457d..f4fc23d2434 100644
--- a/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
+++ b/mail-client/etpan-ng/etpan-ng-0.7.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils autotools
+EAPI=6
+inherit autotools
 
 DESCRIPTION="etPan is a console mail client that is based on libEtPan"
 HOMEPAGE="http://www.etpan.org/other.html"
@@ -16,11 +17,13 @@ RDEPEND=">=net-libs/libetpan-0.35
 	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
 	virtual/yacc"
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
+src_prepare() {
+	default
 	eautoreconf
 }
 

diff --git a/mail-client/etpan-ng/files/etpan-ng-0.7.1-tinfo.patch b/mail-client/etpan-ng/files/etpan-ng-0.7.1-tinfo.patch
new file mode 100644
index 00000000000..2f62659b906
--- /dev/null
+++ b/mail-client/etpan-ng/files/etpan-ng-0.7.1-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -125,6 +125,7 @@
+ AC_CHECK_HEADER(ncurses.h, [ncurses=yes])
+ test "x$ncurses" = "xyes" && AC_CHECK_LIB(ncurses, initscr, [LIBS="$LIBS -lncurses"; ncurses=yes], [ncurses=no])
+ test "x$ncurses" = "xno" && AC_MSG_ERROR([ncurses support required])
++AC_SEARCH_LIBS(curs_set, ncurses tinfo)
+ 
+ dnl Libetpan
+ libetpan=no