gentoo auto-resync : 05:05:2023 - 11:30:40

3 files changed, 117 insertions, 10 deletions

diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 3f398531339f..52f688186b61 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,6 +1,8 @@
 DIST vifm-0.11.tar.gz 1525791 BLAKE2B c2aa6d3ddd0304ce1e3a0d1c9ac3218a783bc6dd8eebf7b3346ca262811f63dac75597913ad4883c62680cb77036c2985ca4ce88989a0dd0212dce975d8ec8b8 SHA512 15ace460da6d5f9bb7a016d8bb3f3d9cba47a608da5a39defbf7d09ff9de64c90a63a44264d695fe005f2f6d27ecb07dcec8f4ed5aef15e9d8728b52f1168dbd
 DIST vifm-0.12.tar.gz 1913398 BLAKE2B 6a1933e5a70a61402ae52259ee9e03515916e9d6df57285726ec6062257d85966a32173142e730fbc35b48250c585a5e66cadba788e2029e5dcd620544341c4f SHA512 9491b1932535daa0ce6bd33ef955bfaedf995da27f049b36bdb0de9aa87a9a4dd6d2e22c8bf79e343febee16ae0fb87edfa8bde9c2d115b92c768e87bc0a8a7d
+DIST vifm-0.13.tar.gz 2218099 BLAKE2B 99661dd0defcb434abdc397855feac5c6da55a783cf8ad6afe333e208c431b9d10f05928fcf5a9f8e28ed4d602f66414162b14a872ce8881526f679e6e66259a SHA512 bd5e9f84cfb176e220e798dcdfc62e2ae3e89dbebd08cf4cce73eb843b85060c2df05f04f4db994d406baf2e0f90a04f5cb871beaf00fb04174464c81dd85938
 EBUILD vifm-0.11.ebuild 1808 BLAKE2B f2f849555c24d2a7f08bca670a181d06e357d81ce9e69c1ae089efe8586f7c48f3d64697e3f075f68dd8c8837f59869a7618e2d48b4b58492ddb9fc036a0c2e6 SHA512 b9231330bf7e547139126ffce08fbadcacf97c92b9add66ae601d2b1312e2e564f4b1033d56439632831019f1183b54b1c98fa657201f1b23a16976d480d5210
 EBUILD vifm-0.12.ebuild 1878 BLAKE2B 3a4cab72b0b581ffb36e5f591a69dbccff41bb3b03f8730fedd9e056c0c19e8a8a2309ed05d50110a7da3d3600814841d08271c5f6bd41bb26d6dfa989adf9c4 SHA512 b0a21cf4349bef2a694c786f3732210265789401deb57e8491989d0ec88490365e8324363280c18ff9ab5d018e4e09852978f21f8c083349fb3a5f751942aede
-EBUILD vifm-9999.ebuild 1850 BLAKE2B c0a73cf9bc861e8c8d2f17cb8f8ec42ff963c76253d078537ce298ee901d2238e2e8712d82c7078dceb04aad663da3a3c5c69562dda21c10117ea039893c3040 SHA512 07b395a7c825cad8a768e9f53f6fb8fc658fc6ececa77610ba4c84514897f9db6b265769677e0893ad4f3ba22f80e884920dc7d69faa069521e64377c9f65dcc
+EBUILD vifm-0.13.ebuild 2133 BLAKE2B fddade233455e3cb7b05a3a7ecd698b652756bb4ed2e5d7fb43458c1d3ce901bacd99e39149ee671b703f006a654eb8f789f2a429e659739ced72e8193d42518 SHA512 77e89bdd10b395495aeb670a81cb5814fcb0ea5389e3207052bd98ee04c184628b1adef72834a8511db33279e38e5dfa1aa9114a2f5dc11626bcb52d14f499a4
+EBUILD vifm-9999.ebuild 2133 BLAKE2B fddade233455e3cb7b05a3a7ecd698b652756bb4ed2e5d7fb43458c1d3ce901bacd99e39149ee671b703f006a654eb8f789f2a429e659739ced72e8193d42518 SHA512 77e89bdd10b395495aeb670a81cb5814fcb0ea5389e3207052bd98ee04c184628b1adef72834a8511db33279e38e5dfa1aa9114a2f5dc11626bcb52d14f499a4
 MISC metadata.xml 1194 BLAKE2B b75d73ea7563e04bc26ba68a1ae2307f6b00a7043b2b4f1d8b42c58ca829bbb4db048fa5c72d6863c3847c0d2ecc9426dbb48087e2a938f8f57124fa65a2105c SHA512 c157535a37e9f3396509612ca61e09ce0ab573fdd38efd96a3dd3d9d4a24e875e98412c7ba7b4406cc3e3e1e11075928760227421b0205b829602060b2b075a5
diff --git a/app-misc/vifm/vifm-0.13.ebuild b/app-misc/vifm/vifm-0.13.ebuild
new file mode 100644
index 000000000000..760751eb0f82
--- /dev/null
+++ b/app-misc/vifm/vifm-0.13.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools vim-doc xdg
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="https://vifm.info/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/vifm/vifm"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+extended-keys gtk +magic +vim +vim-syntax X"
+
+DEPEND="
+	>=sys-libs/ncurses-5.9-r3:=
+	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 ) )
+"
+# "Either perl or Vim is necessary to generate tags for documentation in Vim's format." from configure
+BDEPEND="|| ( dev-lang/perl app-editors/vim )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# developer just turns off optimisations and adds -Werror again
+	# bug #855386
+	econf \
+		--disable-developer \
+		--disable-werror \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_install() {
+	default
+
+	if use vim; then
+		local t
+		for t in app plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins -r 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 -r data/vim/${t}/${PN}*
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	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_pkg_postrm
+	use vim && update_vim_helptags
+}
diff --git a/app-misc/vifm/vifm-9999.ebuild b/app-misc/vifm/vifm-9999.ebuild
index 62ffacf6433d..760751eb0f82 100644
--- a/app-misc/vifm/vifm-9999.ebuild
+++ b/app-misc/vifm/vifm-9999.ebuild
@@ -1,26 +1,37 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit git-r3 autotools vim-doc xdg
+inherit autotools vim-doc xdg
 
 DESCRIPTION="Console file manager with vi(m)-like keybindings"
 HOMEPAGE="https://vifm.info/"
-EGIT_REPO_URI="https://github.com/vifm/vifm.git"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/vifm/vifm"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+extended-keys gtk +magic +vim +vim-syntax X"
 
 DEPEND="
-	>=sys-libs/ncurses-5.9-r3:0
+	>=sys-libs/ncurses-5.9-r3:=
 	magic? ( sys-apps/file )
 	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="
+	${DEPEND}
 	vim? ( || ( app-editors/vim app-editors/gvim ) )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+# "Either perl or Vim is necessary to generate tags for documentation in Vim's format." from configure
+BDEPEND="|| ( dev-lang/perl app-editors/vim )"
 
 src_prepare() {
 	default
@@ -33,7 +44,6 @@ src_configure() {
 	econf \
 		--disable-developer \
 		--disable-werror \
-		$(use_enable developer) \
 		$(use_enable extended-keys) \
 		$(use_with magic libmagic) \
 		$(use_with gtk) \