From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 84DDB15ACFC for ; Fri, 5 May 2023 04:39:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C62CFE096A; Fri, 5 May 2023 04:39:38 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99AE9E096A for ; Fri, 5 May 2023 04:39:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA34533F6A5 for ; Fri, 5 May 2023 04:39:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2360FA63 for ; Fri, 5 May 2023 04:39:35 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1683261075.5e88f0cf4dc43a37f8d580204d722d39b2f6e69a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/vifm/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/vifm/vifm-0.13.ebuild app-misc/vifm/vifm-9999.ebuild X-VCS-Directories: app-misc/vifm/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5e88f0cf4dc43a37f8d580204d722d39b2f6e69a X-VCS-Branch: master Date: Fri, 5 May 2023 04:39:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5fb97fce-edc7-4da7-a4bb-de2a713777cf X-Archives-Hash: 84991f2ae1851b9673f0a0e6a2b816c9 commit: 5e88f0cf4dc43a37f8d580204d722d39b2f6e69a Author: Sam James gentoo org> AuthorDate: Fri May 5 04:31:15 2023 +0000 Commit: Sam James gentoo 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 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) \