gentoo resync : 15.12.2019

5 files changed, 2 insertions, 275 deletions

diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index a049679042af..9ca32264904b 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,8 +1,3 @@
-AUX vifm-0.9.1-fix-ncurses-linking.patch 1562 BLAKE2B 415cd5421a7bf74cc48ec77919181e0fb0b101b455dee470ceb8875c861b14a8835b5f912c517efd9f1f1a8b3db93d633b6b4b68462fae66ec7a2ff0ced2521b SHA512 4b6dc0945f5afd2d0395775ceef94c007e604b30184e86653bc8c2f306b7d726d1a1a7273c4601502e6602fdff86b8b3f596409cf2e55f2e4c2691d342e7088a
 DIST vifm-0.10.1.tar.bz2 1097998 BLAKE2B b9712d61a00761986aa54d9bc561a5125ae96f751e8ba2844adae91577ba093b1a4860071b57ab81dbed3eb52c2c91ce3316831fa44a06436ef5fa81d2739f3a SHA512 8116c4c31b01a9453684a90b26b87a33e5ec2cd2930162869507f673319d231f44e464d1056239f647531c3be5bc9bcf92045c79e5d545f9c75be11c7fe03ea2
-DIST vifm-0.10.tar.bz2 1054361 BLAKE2B 81ec964b3bf236764976bcedb84c922eca0da650922b71fc1d6ef107ce51af9a4b1155fb699f800cca452e644345568af4cf17170dc15509393df529336b3959 SHA512 53f45824ffdbd987fecd3a7f7b6d6c5da036aeb3ddbb219d7665a63cae55d68db608239055b18b88a721b39002fcf57cbfd88aa366cffb02ca5f2eb94a206eb2
-DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
-EBUILD vifm-0.10.1.ebuild 2112 BLAKE2B 1f7c763cd3953780b6324a1b7daa4ba70395f9f9e44e7b2271f42c62227c6b8fbaf1db08ba096398609b2524773355af5c2c7404f0844b487a290caa6f41c8c9 SHA512 79bbbb31db8361dd7fff1d33f0bdd691547d5f64481bd5109e8485abb03cdb59891cf66629682448d03243adc28201b073d60ae1f116d507aeb4d5833a3f05fb
-EBUILD vifm-0.10.ebuild 2115 BLAKE2B 2c4af2cdd610d10cebb29815f3c1c0d840593339eeb8165d32bc21a0f33c2bcaa8a88c86760620dd4000eee87b6807f37db30fc611a9824a3eb10e2fd713b102 SHA512 97af2e063f33030d81a8013d47cd905c981413f87052588d776351d63c17964590af64ace4ac17b42554bd778c7336d558928f35373b6c332410bfdc52ac1c4e
-EBUILD vifm-0.9.1.ebuild 2171 BLAKE2B a21fb0c2f78322b2fff57396ee4b7a0e8177b5b8a9249cba884ce98062e9aa63d5bed314f53709dd125377e58701558bab58d4ad64693387d6e0cb51ab8f4d80 SHA512 3018627eea8ad64162a8239ddf84d5054f8639fb0771b2ad9eaedc2d4b46f2c467cc0c0947b890f3b6494146903b7db573a765a652b817e607816024f1efe2c7
+EBUILD vifm-0.10.1.ebuild 2109 BLAKE2B aad52868d392db5234ca53c2694afdbb5626afc61b277b5031e76f08d859af76b26813eb689820c2f2d54c751935721515083f3cf7be35c94527eed736cdd4f7 SHA512 7f2ca99051e8e0dcfcb9bdbe1783e783cdf9c02f2f6b9f4434e16701cc9cacab77cc19014f202c56c3a22f5cfab1dc4163266cac51249f4c17a63c93bc3d2846
 MISC metadata.xml 1144 BLAKE2B 7fb3843c66347b41788014325145c08b79ab3d2ce4845501ca33a6e0a62454298351636a21a712528fe5ea3ff99b24fdaea4d27936024710866a50bf6370ebef SHA512 ceaa84abce6268f7ea54edef793d5f0df4586e2902059fa9c06fecd20f2b562740a8993c5248558fc85fe68fc2d70794b89e75400bad8868f7e8f1a51f897fbe
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
deleted file mode 100644
index 40d41dcc8f17..000000000000
--- a/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-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.10.1.ebuild b/app-misc/vifm/vifm-0.10.1.ebuild
index 721045586d7a..0b697df0c6e7 100644
--- a/app-misc/vifm/vifm-0.10.1.ebuild
+++ b/app-misc/vifm/vifm-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
 
 DEPEND="
diff --git a/app-misc/vifm/vifm-0.10.ebuild b/app-misc/vifm/vifm-0.10.ebuild
deleted file mode 100644
index 24a2c7f576dd..000000000000
--- a/app-misc/vifm/vifm-0.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vim-doc versionator xdg-utils
-
-MY_P=$(replace_version_separator 4 '-' ${PF})
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="https://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
-
-DEPEND="
-	>=sys-libs/ncurses-5.9-r3:0
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="
-	${DEPEND}
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-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
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable developer) \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ${DOCS}
-
-	if use vim; then
-		local t
-		for t in app plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
-		done
-	fi
-
-	if use vim-syntax; then
-		local t
-		for t in ftdetect ftplugin syntax; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/"${t}"/"${PN}".vim
-		done
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	if use vim; then
-		update_vim_helptags
-
-		if [[ -n ${REPLACING_VERSIONS} ]]; then
-			elog
-			elog "You don't need to copy or link any files for"
-			elog "  the vim plugin and documentation to work anymore."
-			elog "If you copied any vifm files to ~/.vim/ manually"
-			elog "  in earlier vifm versions, please delete them."
-		fi
-		elog
-		elog "To use vim in vifm to view the documentation"
-		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	use vim && update_vim_helptags
-}
diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
deleted file mode 100644
index 6d971785f150..000000000000
--- a/app-misc/vifm/vifm-0.9.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vim-doc versionator xdg-utils
-
-MY_P=$(replace_version_separator 4 '-' ${PF})
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="https://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
-
-DEPEND="
-	>=sys-libs/ncurses-5.9-r3:0
-	magic? ( sys-apps/file )
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="
-	${DEPEND}
-	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	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
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable developer) \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic) \
-		$(use_with gtk) \
-		$(use_with X X11)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ${DOCS}
-
-	if use vim; then
-		local t
-		for t in app plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
-		done
-	fi
-
-	if use vim-syntax; then
-		local t
-		for t in ftdetect ftplugin syntax; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/"${t}"/"${PN}".vim
-		done
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	if use vim; then
-		update_vim_helptags
-
-		if [[ -n ${REPLACING_VERSIONS} ]]; then
-			elog
-			elog "You don't need to copy or link any files for"
-			elog "  the vim plugin and documentation to work anymore."
-			elog "If you copied any vifm files to ~/.vim/ manually"
-			elog "  in earlier vifm versions, please delete them."
-		fi
-		elog
-		elog "To use vim in vifm to view the documentation"
-		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	use vim && update_vim_helptags
-}