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

["Sam James" <sam@gentoo.org>]

commit:     5e88f0cf4dc43a37f8d580204d722d39b2f6e69a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May  5 04:31:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  5 04:31:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e88f0cf

app-misc/vifm: update EAPI 7 -> 8, sync live, tweak dependencies

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-misc/vifm/vifm-0.13.ebuild | 25 +++++++++++++++++--------
 app-misc/vifm/vifm-9999.ebuild | 28 +++++++++++++++++++---------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/app-misc/vifm/vifm-0.13.ebuild b/app-misc/vifm/vifm-0.13.ebuild
index 7dcd62687730..760751eb0f82 100644
--- a/app-misc/vifm/vifm-0.13.ebuild
+++ b/app-misc/vifm/vifm-0.13.ebuild
@@ -1,28 +1,37 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools vim-doc xdg
 
 DESCRIPTION="Console file manager with vi(m)-like keybindings"
 HOMEPAGE="https://vifm.info/"
-SRC_URI="https://github.com/vifm/vifm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+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"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
 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

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) \