gentoo resync : 28.04.2018

3 files changed, 67 insertions, 2 deletions

diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 33bc747a88c9..fd5114ce532d 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,7 +1,8 @@
+AUX vifm-0.9.1-fix-ncurses-linking.patch 1562 BLAKE2B 415cd5421a7bf74cc48ec77919181e0fb0b101b455dee470ceb8875c861b14a8835b5f912c517efd9f1f1a8b3db93d633b6b4b68462fae66ec7a2ff0ced2521b SHA512 4b6dc0945f5afd2d0395775ceef94c007e604b30184e86653bc8c2f306b7d726d1a1a7273c4601502e6602fdff86b8b3f596409cf2e55f2e4c2691d342e7088a
 DIST vifm-0.7.2.tar.bz2 468086 BLAKE2B a83b1f43eb3f6e47afd5a7c810741468857c602b80cad5c91d2033eea9e1f1efb09e19ca7b02f39e93f8f7186b4cb6fb0627f98a30c054a0d7d71d1b454698d8 SHA512 24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
 DIST vifm-0.9.tar.bz2 971539 BLAKE2B 5d6dd8c399e38886ab3e2d548b93492bf31b464e5661c6f6d54504701bf1eab8338155a9ddc9b220c4cb2a67417d5622094e9ffb717ddf594984fe475214af60 SHA512 5ae2b03e672bd9a7f95a5c59141dabac8bc7946a4e307d6a3df70bdb52e1f7665b960a3d20709c811cbfbcf76f7836d23b5edb191968e5277fb705a291ab3a9a
 EBUILD vifm-0.7.2.ebuild 1471 BLAKE2B 0172539787d0e577b30b4ebfcf260012c3861a2ea0e27821671e981b785ccb0dbc9817e06d8f72164606566efdbcce8082a75627c7a8132f74256abe4dc432e6 SHA512 97f60228c3d17c96913abc074e02f3a67687e82b2b6b961bee0d82d3bebf5079115ebca7cc3bb9d901c0291aeeb91e722f083aac8947fc86947d6259966f18f0
-EBUILD vifm-0.9.1.ebuild 2118 BLAKE2B 84175b7297d3c40ff1cba09b8313b5ababd4de00e2a1359e2c7585ec4d22c9554a2d3fe2c0cf36d7707e02a831798bd34cee0a739f9e166fb21f15486f1c40bd SHA512 7db7685b9d5cad5183c5f62d9bf7370e186ce9c2ec5544e77ef9cdbfee7e840923d7b19c4d91a4474182b8c560af705270592880ae78982469277e5ef263c62b
+EBUILD vifm-0.9.1.ebuild 2173 BLAKE2B 939527bd16cca8e0d9722e7ea7f4492d91554790edb3cea0f3ff4e01ecf4008f51c7a3141d7045c46056cb42ae5cac85c855485540a5fdf58713bf57a4645df8 SHA512 8534dc62784f526eb3f5e99536f983a6f3d15459f8935057905c1e545e4ba81792529771b8bdafa209a704ec814f5a7e2176ff9db729c9fbe4903397445d8a70
 EBUILD vifm-0.9.ebuild 1974 BLAKE2B eb32205afdb5c4dfb84934a6875764549495b38341b719ca01b7cf86c8e7ccbab0b1fd5854e5509e88ba3cb3789d281c887e57fbce4545aa5088b9d5a6551ebf SHA512 7469278aeafedd5ae109fc4062a449c074f8750b23dfc99ffee47a7279e2258825214ba5f67c60ead14e87c49e547ed406e24650acd9962ff0724e2db415c5a0
 MISC metadata.xml 1457 BLAKE2B 0728b3f566cb00a2e3e48d84eff80de83629d026de506863a34a283de41cc80b99021da88b81e4332682b79176526cf65378d6b18142ec026c0dfe23447ecec1 SHA512 ea9d05e36d616a6d9588549317307e28acfe19f66493c870dca9767027124ba1ff45369e5f413dcac5697895f854baf148ef0afc687a801157bba40ce1be5f9a
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 000000000000..40d41dcc8f17
--- /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@posteo.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 283cc2139c34..fc8ca7c795a7 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
 }