gentoo resync : 20.05.2018

5 files changed, 6 insertions, 74 deletions

diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index fd5114ce532d..01b5081dd6dc 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,8 +1,6 @@
 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 2173 BLAKE2B 939527bd16cca8e0d9722e7ea7f4492d91554790edb3cea0f3ff4e01ecf4008f51c7a3141d7045c46056cb42ae5cac85c855485540a5fdf58713bf57a4645df8 SHA512 8534dc62784f526eb3f5e99536f983a6f3d15459f8935057905c1e545e4ba81792529771b8bdafa209a704ec814f5a7e2176ff9db729c9fbe4903397445d8a70
-EBUILD vifm-0.9.ebuild 1974 BLAKE2B eb32205afdb5c4dfb84934a6875764549495b38341b719ca01b7cf86c8e7ccbab0b1fd5854e5509e88ba3cb3789d281c887e57fbce4545aa5088b9d5a6551ebf SHA512 7469278aeafedd5ae109fc4062a449c074f8750b23dfc99ffee47a7279e2258825214ba5f67c60ead14e87c49e547ed406e24650acd9962ff0724e2db415c5a0
-MISC metadata.xml 1457 BLAKE2B 0728b3f566cb00a2e3e48d84eff80de83629d026de506863a34a283de41cc80b99021da88b81e4332682b79176526cf65378d6b18142ec026c0dfe23447ecec1 SHA512 ea9d05e36d616a6d9588549317307e28acfe19f66493c870dca9767027124ba1ff45369e5f413dcac5697895f854baf148ef0afc687a801157bba40ce1be5f9a
+EBUILD vifm-0.9.1.ebuild 2174 BLAKE2B a492b40b76d029c62dab72a14fdfba7508c04d38a513ee0913f2b0ada8b74f2359865f8a3c5839d9f11ecff904b36c3e84b027c36ba087e3501096edb54c6153 SHA512 55d7d1755318427e3fd3d6020be3c0cdd5c2e77d2c1bdbd471e00a949db729b3dddeefbe575e5d21aa143f11670015b6b1865691a7bcd0c792ac384907a504ca
+EBUILD vifm-0.9.ebuild 1975 BLAKE2B 109e5ed44f8297e6283ecb2443bbb89f8c4da9170e8e5d5cdb50d26d8bb44db2b84461c06cd8a5711271f76d405f5522a31ae86218a98878ee6083ded5bfd6d5 SHA512 f6e33c5c1fbc1990c0aab33a191071ae79de4ffc7034d1c8c0feab3ab0cb32476c8a826983319c677191f8e3713db7a5be6ff657a5cd85873fb33a8ef6250bb5
+MISC metadata.xml 1315 BLAKE2B 2e31d51dfdd5df5d84edbb860f2b981513490ff58d776d3c75669e961da6d8eceb55e9957f7ad65e428645e0d39983fbde164940a679f5931ade43397fcec1ea SHA512 09965612c0613b994ea1b5780fdf79d4eddbb2464225132375390980b8bf29e2a2622dc3dd2c43a8650d1f90f888db9d30e9449e37b0311d1abc1cf9fca82812
diff --git a/app-misc/vifm/metadata.xml b/app-misc/vifm/metadata.xml
index 3ed17ddd9fc2..564dc1b9462e 100644
--- a/app-misc/vifm/metadata.xml
+++ b/app-misc/vifm/metadata.xml
@@ -17,13 +17,11 @@
 	conjunto de órdenes.
 	</longdescription>
 	<use>
-		<flag name="compatibility">Compatibility with previous versions of vifm</flag>
 		<flag name="developer">Enable features of interest to developers</flag>
 		<flag name="extended-keys">Support for extended keys (arrows, home etc)</flag>
 		<flag name="gtk">Use gtk+ to determine mimetypes</flag>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
 		<flag name="vim">Install the vifm vim plugin and vim-compatible documentation</flag>
-		<flag name="vim-plugin">Install the vifm vim plugin</flag>
 		<flag name="vim-syntax">Pulls in related vim syntax scripts</flag>
 		<flag name="X">Add support for X11</flag>
 	</use>
diff --git a/app-misc/vifm/vifm-0.7.2.ebuild b/app-misc/vifm/vifm-0.7.2.ebuild
deleted file mode 100644
index 1d2fab2e4b8e..000000000000
--- a/app-misc/vifm/vifm-0.7.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit base
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="http://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc s390 x86"
-IUSE="+compatibility +extended-keys +magic vim-plugin vim-syntax"
-
-DEPEND="
-	>=sys-libs/ncurses-5.7-r7
-	magic? ( sys-apps/file )
-"
-RDEPEND="
-	${DEPEND}
-	vim-plugin? ( >=app-editors/vim-7.3 )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-DOCS=( AUTHORS FAQ NEWS README TODO )
-
-S="${WORKDIR}"
-
-src_configure() {
-	econf \
-		$(use_enable compatibility compatibility-mode) \
-		$(use_enable extended-keys) \
-		$(use_with magic libmagic)
-}
-
-src_install() {
-	base_src_install
-
-	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
-	if use vim-plugin; then
-		local t
-		for t in doc plugin; do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/data/vim/"${t}"/"${PN}".*
-		done
-	fi
-}
-
-pkg_postinst() {
-	elog "To use vim to view the vifm help, copy /usr/share/${P}/vifm.txt"
-	elog "	to ~/.vim/doc/ and run ':helptags ~/.vim/doc' in vim,"
-	elog "then edit ~/.vifm/vifmrc${PV/a/} and set USE_VIM_HELP=1"
-	elog ""
-	elog "To use the vifm plugin in vim, copy /usr/share/${P}/vifm.vim to"
-	elog "	/usr/share/vim/vimXX/"
-}
diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
index fc8ca7c795a7..45d4ab19e904 100644
--- a/app-misc/vifm/vifm-0.9.1.ebuild
+++ b/app-misc/vifm/vifm-0.9.1.ebuild
@@ -8,7 +8,7 @@ inherit autotools vim-doc versionator xdg-utils
 MY_P=$(replace_version_separator 4 '-' ${PF})
 
 DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="http://vifm.info/"
+HOMEPAGE="https://vifm.info/"
 SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-misc/vifm/vifm-0.9.ebuild b/app-misc/vifm/vifm-0.9.ebuild
index b9c6e0eb2907..9621f77ac8d4 100644
--- a/app-misc/vifm/vifm-0.9.ebuild
+++ b/app-misc/vifm/vifm-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools vim-doc versionator
 
 DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="http://vifm.info/"
+HOMEPAGE="https://vifm.info/"
 SRC_URI="mirror://sourceforge/vifm/${PF}.tar.bz2"
 
 LICENSE="GPL-2"