gentoo auto-resync : 09:09:2022 - 10:40:04

1 files changed, 38 insertions, 9 deletions

diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 9f919a60fc33..8f1fe78c20dd 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -1,36 +1,65 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LUA_COMPAT=( lua5-2 lua5-3 )
 
-inherit lua-single git-r3 optfeature
+MY_PTV=0.5
+LUA_COMPAT=( lua5-2 lua5-3 lua5-4 )
+
+inherit lua-single optfeature
+
+if [ "${PV}" == "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/martanne/vis.git"
+else
+	SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz
+		test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
 HOMEPAGE="https://github.com/martanne/vis"
-EGIT_REPO_URI="https://github.com/martanne/vis.git"
-LICENSE="ISC"
+LICENSE="ISC MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="+ncurses +lua selinux test tre"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # - Known to also work with NetBSD curses
 DEPEND="dev-libs/libtermkey
+	sys-apps/acl
 	ncurses? ( sys-libs/ncurses:0= )
 	lua? ( ${LUA_DEPS} )
-	tre? ( dev-libs/tre:= )"
+	tre? ( dev-libs/tre )"
 RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
-# https://github.com/martanne/vis-test/issues/28
-BDEPEND="test? ( $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') )"
+# lpeg: https://github.com/martanne/vis-test/issues/28
+BDEPEND="test? (
+	$(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]')
+	$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+)"
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
 
 src_prepare() {
+	if use test; then
+		if [ ! "${PV}" == "9999" ]; then
+			rm -r test || die
+			mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
+		fi
+
+		# https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22
+		sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die
+
+		# https://github.com/martanne/vis-test/pull/29
+		sed -i 's;cpp -P;${CPP:-cpp} -P;' test/vim/test.sh || die
+
+		# https://github.com/martanne/vis-test/issues/27 a Werror clone
+		sed -i 's;|| strstr(output, "warning");;' test/core/ccan-config.c || die
+	fi
+
 	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
 	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
 	sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die