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

[José María Alonso]

commit:     1c91a15ba84512dbd9d0a1236a0ede17b842069e
Author:     Viacheslav Ostroukh <slava <AT> ostroukh <DOT> me>
AuthorDate: Tue Apr 24 11:06:51 2018 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 11:08:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c91a15b

app-misc/vifm: Fix ncurses linking

Closes: https://bugs.gentoo.org/651914
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/vifm-0.9.1-fix-ncurses-linking.patch     | 60 ++++++++++++++++++++++
 app-misc/vifm/vifm-0.9.1.ebuild                    |  6 ++-
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch b/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
new file mode 100644
index 00000000000..40d41dcc8f1
--- /dev/null
+++ b/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
@@ -0,0 +1,60 @@
+From 8196704a5dafa4c8e194f1643728ed45b4b55df6 Mon Sep 17 00:00:00 2001
+From: xaizek <xaizek@××××××.net>
+Date: Mon, 9 Apr 2018 19:31:06 +0300
+Subject: [PATCH] fix ncurses linking
+
+---
+ THANKS       | 2 ++
+ configure    | 2 +-
+ configure.ac | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/THANKS b/THANKS
+index e708f4d3..faab4f8a 100644
+--- a/THANKS
++++ b/THANKS
+@@ -25,6 +25,7 @@ c02y
+ Carl Mueller (carlmuller)
+ Carlos Pita
+ Charles Kauffman
++Chema Alonso Josa (nimiux)
+ Christian Fillion (cfillion)
+ Christian Herdtweck
+ Christoph (informationen)
+@@ -128,6 +129,7 @@ Richard Benson
+ Robert Sarkozi
+ Roger Bongers
+ Ross Hadden (rosshadden)
++Ruslan Osmanov (rosmanov)
+ Russell Urquhart
+ SanLe
+ santhoshr
+diff --git a/configure b/configure
+index 0054dbde..a3c9bd43 100755
+--- a/configure
++++ b/configure
+@@ -8707,7 +8707,7 @@ return curs_set ();
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' tinfo; do
++for ac_lib in '' tinfow; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
+diff --git a/configure.ac b/configure.ac
+index 61b3ed5d..65e550a2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -437,7 +437,7 @@ AC_CHECK_LIB(${curses_lib_name}, initscr,
+         CPPFLAGS="$CPPFLAGS -I/usr/include/${curses_lib_name}"
+     fi
+     ncurses_found=yes]
+-    AC_SEARCH_LIBS([curs_set], [tinfo],,
++    AC_SEARCH_LIBS([curs_set], [tinfow],,
+         AC_MSG_ERROR(could not find a library providing curs_set)))
+ dnl If libncursesw is not found on OS X, check for libncurses.  On OS X it has
+ dnl support of wide characters.
+-- 
+2.16.1
+

diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
index 283cc2139c3..fc8ca7c795a 100644
--- a/app-misc/vifm/vifm-0.9.1.ebuild
+++ b/app-misc/vifm/vifm-0.9.1.ebuild
@@ -28,14 +28,18 @@ RDEPEND="
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-ncurses-linking.patch"
+)
+
 DOCS="AUTHORS FAQ NEWS README TODO"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
 		|| die
-	eapply_user
 	eautoreconf
 }