From b426a5cef3f0ebe3389686a1c145a834d3a1e120 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 9 Sep 2022 10:40:04 +0100 Subject: gentoo auto-resync : 09:09:2022 - 10:40:04 --- app-editors/vis/Manifest | 5 ++- app-editors/vis/vis-0.7-r1.ebuild | 92 +++++++++++++++++++++++++++++++++++++++ app-editors/vis/vis-0.7.ebuild | 4 +- app-editors/vis/vis-9999.ebuild | 47 ++++++++++++++++---- 4 files changed, 135 insertions(+), 13 deletions(-) create mode 100644 app-editors/vis/vis-0.7-r1.ebuild (limited to 'app-editors/vis') diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest index 33d726cf129b..7310f37a0088 100644 --- a/app-editors/vis/Manifest +++ b/app-editors/vis/Manifest @@ -1,5 +1,6 @@ DIST vis-0.7.tar.gz 403918 BLAKE2B 5e4930fdb14ed42a2daf6682a99107ee6eb59e99e348abab5262bdbc53956dd9ccd094695d7f53c6770d10e46b2812b0e07ff90184ff920790f5b95f4091a610 SHA512 ccc6a054fea6917e7751882468a74c30c712f7ec400a913c95c0084691f706e2bee54efb86b75be8b121c9a209c7e587e72e5474c55271d9943e91fc8aaf9bac DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1 -EBUILD vis-0.7.ebuild 2089 BLAKE2B 6f162ce08ee3df3ccc361c72e95dfd0736629a8970cccef34f389896cd40cf3a34c13f05704603609f53d062c9ec26a25323fa467dce631cdee4475a8bcee76c SHA512 4b7810d5ec4780f639fc52372a2d031ab791abcc06f88887fd69eb883f0a5d82b394501625f0393b06a5235ebeca4346b4795798ea2d733a15426f7506ec8a83 -EBUILD vis-9999.ebuild 1510 BLAKE2B 261b5b6a5f68755c365c6d5ba76950069d7d7cd86f0cf459e2a08d5351195bd62fee18a8808d6834709b6753055581f0e2af8bc92b3bf3880ce324d9a2eeec3b SHA512 248809889b2e225a29e5511f5f337e9b002a32230859526bd90e026127f59970a4368c7afce0fda76359960ccb9bc1189709a3278d225f2717b454840e54552f +EBUILD vis-0.7-r1.ebuild 2439 BLAKE2B 967fb45aabc2be3ccf54e4fe9e7425f2708a8d0426b9dc8941d66700aa3d75d2dee3433576b4090b4e9979d9cc62e1151486876f47a8d83b8301df48bd6fc6c0 SHA512 e64da5441a4cf5f1543f37b7af010cd5d585a13aa0c9b8bea4bb9feaa8df90788f937906a49fb68b8ebf168fc4a6078a9a0a3c3c566656de1b8bc10f80fdbb38 +EBUILD vis-0.7.ebuild 2093 BLAKE2B 0cf24049368f6498137e1783f33befa5c93f30fd4a03a1d8a3d7d9d28d35ff77e3bc883775e20774b261b6d05c1b38c5c60a65ac68ab0e387c8a241e74e7b61e SHA512 c57dd8e95d573f1f62f81ad3f6b0283e0104504bc85ce5437158a2f5399e5216f5a7c4eec5d7907d1f8c90bb613904d6f2ab0ad78fe9caa1b33f5ce1fe6f44bb +EBUILD vis-9999.ebuild 2439 BLAKE2B 967fb45aabc2be3ccf54e4fe9e7425f2708a8d0426b9dc8941d66700aa3d75d2dee3433576b4090b4e9979d9cc62e1151486876f47a8d83b8301df48bd6fc6c0 SHA512 e64da5441a4cf5f1543f37b7af010cd5d585a13aa0c9b8bea4bb9feaa8df90788f937906a49fb68b8ebf168fc4a6078a9a0a3c3c566656de1b8bc10f80fdbb38 MISC metadata.xml 624 BLAKE2B 5a95ae9ee2534eaccfccfc71f92ba0b978fe6794a42eeb6015812443c0b9ad30bfc604e183c8707e0b6594ef14df6ab499553e0495503768c5807327aa1f09ea SHA512 e052254e86f089107f9bc0b0cc6fa326aa10209d02a7ac1eeeeab040a0d197da3429a6a289ec8c92de64fdd4452f3752d73905c409b1970767ec4ca00c132a69 diff --git a/app-editors/vis/vis-0.7-r1.ebuild b/app-editors/vis/vis-0.7-r1.ebuild new file mode 100644 index 000000000000..8f1fe78c20dd --- /dev/null +++ b/app-editors/vis/vis-0.7-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" +LICENSE="ISC MIT" +SLOT="0" +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 )" +RDEPEND="${DEPEND} + app-eselect/eselect-vi" +# 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 + + default +} + +src_configure() { + ./configure \ + --prefix="${EPREFIX}"/usr \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_enable lua) \ + $(use_enable ncurses curses) \ + $(use_enable selinux) \ + $(use_enable tre) || die +} + +update_symlinks() { + einfo "Calling eselect vi update --if-unset" + eselect vi update --if-unset +} + +pkg_postrm() { + update_symlinks +} + +pkg_postinst() { + update_symlinks + optfeature "syntax highlighting support" dev-lua/lpeg +} diff --git a/app-editors/vis/vis-0.7.ebuild b/app-editors/vis/vis-0.7.ebuild index 775cdeed1fce..0638ef99f5fc 100644 --- a/app-editors/vis/vis-0.7.ebuild +++ b/app-editors/vis/vis-0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" HOMEPAGE="https://github.com/martanne/vis" 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 )" -LICENSE="ISC" +LICENSE="ISC MIT" SLOT="0" KEYWORDS="amd64 arm ~riscv x86" IUSE="+ncurses +lua selinux test tre" 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 -- cgit v1.2.3