gentoo resync : 11.02.2018

4 files changed, 32 insertions, 23 deletions

diff --git a/mail-client/etpan-ng/Manifest b/mail-client/etpan-ng/Manifest
index 92d965e5d792..cf926dd9f487 100644
--- a/mail-client/etpan-ng/Manifest
+++ b/mail-client/etpan-ng/Manifest
@@ -1,4 +1,5 @@
-AUX etpan-ng-0.7.1-as-needed.patch 2032 BLAKE2B 393adfb03e22c3b938f47fc8cd501d69735393665b2579007a600de74d874a862515c46bae3a11c46ac505f1d29947b29f9c30e92f78c3565174e55d155f2bb3 SHA512 5dbbfb54704f3cac4197a243bd90f273bd6417e7c6129394f4d769db7ea4dec97a33e0bcec81101928fca2c1a8b24efb1b65bd4b744836b93a4c6215cf01b664
+AUX etpan-ng-0.7.1-as-needed.patch 1929 BLAKE2B 49893c45212c297f29f0f6f9238bd2c371b819fdf1566574042b1f18cc5e0bc16b26a3047bf6710a29641fc5e47cd9739d42ac0ae7b382bfc596e378939aa434 SHA512 9a2e7f7f8017881af6767acc6900817cd0d9120141a938d1b500c2ae30329928972f0d441fc6c6df39736065766af47fbd10ec4480f3b42213e4fd96d01107d7
+AUX etpan-ng-0.7.1-tinfo.patch 355 BLAKE2B be2ea9432583ae6d28e371357667652e1fcd81bfcf1b046ef3557c5f104b84f7f5022ac1dc3c9f4bc075fa37068dbc289c1a0a138f329f533ac79d68e73d28db SHA512 dc26d6a64768ed3d168af06c8c80f33406ad25603116a72b090b21704fbfc175d073cf01b329b40055dd87f1297ad9fe6aecbaa3f15edbd9d3beca03c3e67f01
 DIST etpan-ng-0.7.1.tar.gz 364394 BLAKE2B 7ed1de331a85dbebf133af25a36ee312d9fe021c36c1625a4807ab38ffc056803672b322e3d28b926f44ce51d679b0e7fa9f3130660c4742282a651011ed3c73 SHA512 e56ca50030516a0a35d2471505ce2c2ef94abb8f640a896bac0bc2cdaac65af38f69efd5f52219576df0a50d8bea92716c6dae5f4cf06fbd2a722bf768681493
-EBUILD etpan-ng-0.7.1-r1.ebuild 861 BLAKE2B a0bb0f419262b674bb39131fe90b5a1be40fbac52a0c7ed2204555095b726e5d2c834a4df645295f93388dece190e11f97f50b44d7879375b6aa8baac3ab943a SHA512 9eb5658df116ca68e04f0a3ef26d14c34942d2af09b43b3c7c77b1c54c5fe187f829298aeb10b9c121e75bb7096262cbf4a2e28b181710be03c9c718dec1891e
+EBUILD etpan-ng-0.7.1-r1.ebuild 798 BLAKE2B a1d9ee06932f9ae269e8ae077e27d7e009bed7fa64cce03d2533fc91bf8b2acd49b0533d597dc07012074e034bea086a77fe3160dc8a61529d67c7c42b16a583 SHA512 ceda1be861b384222cbc3b6fb4f4647dc82f8c406df96ca632cbd530fee982d753fd57877019237827cc34aebc13808241b9bb0192b10b567f71df7ffa2ec453
 MISC metadata.xml 416 BLAKE2B dc9bef264916302d08186c9f0388a0b338d1b75a686f4935721e55e6c5234261cee159dcefdab37df4232e419c009999d030b91f8bbdab22452d3f6121c6f6ac SHA512 2dfc8c728e2614d743beb01d9b691365803e77baa50f8bb3e5c2a34fb8e2ba8a2e463c772926a17338b515f7b9a4bacc458a27c52fec52198a712a0b5136d1fc
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 5dfd3fa457d6..507b0eabece4 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"
@@ -12,28 +13,25 @@ KEYWORDS="~amd64 x86"
 IUSE="debug ldap"
 
 RDEPEND=">=net-libs/libetpan-0.35
-	sys-libs/ncurses
+	sys-libs/ncurses:=
 	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
 	virtual/yacc"
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+DOCS=(
+	Changelog NEWS README TODO contrib/etpan-make-vtree.pl doc/CONFIG
+	doc/INTERNAL
+)
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
+src_prepare() {
+	default
+	sed -i -e "s:@bindir@:${D}/@bindir@:" src/Makefile.in || die
 	eautoreconf
 }
 
-src_compile() {
-	sed -i -e "s:@bindir@:${D}/@bindir@:" src/Makefile.in
-
-	econf \
-		`use_enable debug` \
-			|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc Changelog NEWS README TODO contrib/etpan-make-vtree.pl doc/*
+src_configure() {
+	econf --disable-debug
 }
diff --git a/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch b/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch
index 146f25e678fa..c17cc10cea9f 100644
--- a/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch
+++ b/mail-client/etpan-ng/files/etpan-ng-0.7.1-as-needed.patch
@@ -1,5 +1,5 @@
---- etpan-ng-0.7.1.orig/configure.in	2006-01-09 11:44:20.000000000 +0100
-+++ etpan-ng-0.7.1/configure.in	2010-01-10 14:51:40.788046570 +0100
+--- a/configure.in
++++ b/configure.in
 @@ -11,18 +11,25 @@
  libetpan_major_required=0
  libetpan_minor_required=42
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 000000000000..2f62659b906a
--- /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