From 564687d289b862b8b079569a45a2d39d7b8c3585 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 22 Jan 2025 06:42:31 +0000
Subject: gentoo auto-resync : 22:01:2025 - 06:42:31
---
app-editors/Manifest.gz | Bin 14109 -> 14112 bytes
app-editors/vis/Manifest | 8 ++-
app-editors/vis/metadata.xml | 35 +++++++------
app-editors/vis/vis-0.8-r1.ebuild | 96 ----------------------------------
app-editors/vis/vis-0.9-r1.ebuild | 105 ++++++++++++++++++++++++++++++++++++++
app-editors/vis/vis-9999.ebuild | 50 ++++++++++--------
6 files changed, 157 insertions(+), 137 deletions(-)
delete mode 100644 app-editors/vis/vis-0.8-r1.ebuild
create mode 100644 app-editors/vis/vis-0.9-r1.ebuild
(limited to 'app-editors')
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e1fee75cef42..f3aba85295d8 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 01b38f702199..d8020d022418 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,8 +1,6 @@
-DIST vis-0.8.tar.gz 404496 BLAKE2B eafb7098a6c8e0d8f277be66984d5fd298ac86d524a4219a7d7730599157ca68c040615622cd1680b101e1cd003eba03343496762d0d4dc2766a079116f21eea SHA512 ab4eda075034955411bdbc0ade2fe9149a48c644fa2f70add8d3b9d749f86b98a4e429745b5cae7fdbc0a1e07c8587539a055cd1c6734bb59e43c580c949e0aa
DIST vis-0.9.tar.gz 456713 BLAKE2B 3e812e054c8d7f88e8866882500fb107cfaccd4f2680dd3ff3f68820bf4c76495dcc591e78916d0faef8390eb23cc14ead7ba4e35d2068bfc04964ad46acb3ce SHA512 64025569f6feb1a3b5aa8aaa79af319cdf8fc1fd5d1f5b29a6838ff00ea950cade1efb366d0a95d77e516f5605048bcb557fd7aa52b3a9510a15e69acaee147c
-DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1
DIST vis-test-783b7ef67aa360f0b9bd44fa5ea47e644bc49d69.tar.gz 102134 BLAKE2B c9c32cd7c01027853810b18eb418173d3e04947039bb5c103607602838a143bbff52754dcf806c35bb247c8c6be8b8bf86c3a73daa13a54894df525e6f2c0905 SHA512 dd86561e1eaf196c5b2d27e628eaababa721d26f7fab623ef7dd41e0d30352f5f9eb0e5006cdb1a896c5888304ea40f7fd291f3789d312a201403990bfbaf824
-EBUILD vis-0.8-r1.ebuild 2467 BLAKE2B 3aafb010f214b74cbbcad32c98ca2f0bf188b966ef9bc7f596dd1c603eff3dde9f64893b9d17e8e100657d8c1ae44d51feeef072e4869d5cf09a31eca47bb468 SHA512 aa24f0845370483d0f80102733cfbfad64a1a3ab27642156038cdf0be0042352f87350637e5217f211ec7b050a40d45ff051089defef787036bf79fb5d831682
+EBUILD vis-0.9-r1.ebuild 2365 BLAKE2B cc5636379fd7a3dd89c0321636bfa689a6a7e1b2558606bdcd365b99e7bc3cf143b342a106945a443f63e5b179cb1405802fed9e07f0e6692826c6d4c2ec7b5e SHA512 a9995a85de390cade9786facd07cc7cc7971099fe338357d24d79ec9c9e232eb2c2a356ef27c0f6a1ddcb1201239c8ac522e948a261cf783e48448527ce70fde
EBUILD vis-0.9.ebuild 2262 BLAKE2B 9dec9801feee115b6f01e465f754d3f508066790063eb3c398532f42245f459a07945088fff8beac44b93b0b87d9d62f7fabc3308e0157f3a6882671b0cfc4a1 SHA512 94411dd7bddf55a4633b5453d3db5e6a76f5d390987cdfd297440c8613521cb09fe34d16c5b0176b3e3e01885bfadf3be46a9db934d420d01bf64d65d1bbea41
-EBUILD vis-9999.ebuild 2258 BLAKE2B 37d676f4921d940896c38a537ee64d2d46bae7d6d3311bc384fd32e7468d2e077aefe5aa3612b87e9fb839210d2fe749560c268383781857763cb081f753ee05 SHA512 d39a7e787381bf8641c202c2a4f70f55fc387fa7676f64fb23035c14c56d462be07c023f9d277547817540579e5d8605e8c58ffb9414c9599d4b1726942d48b9
-MISC metadata.xml 698 BLAKE2B d09b6b1784d0845c80f097b0a3d27ed58a6ff4193c424ee856e1ec815aedecac8a480507e17046d4145cd0e20213b2165a8986c54bd4b3614f7cb30136e37508 SHA512 16134efe8760a57af6fcdd8adc93173d2a65e3f88d7b701b12a691b9899aaee341716fe29e2d7a89f3dc48ef127c736e63df7bdd586363023ce6a00f048f8864
+EBUILD vis-9999.ebuild 2365 BLAKE2B cc5636379fd7a3dd89c0321636bfa689a6a7e1b2558606bdcd365b99e7bc3cf143b342a106945a443f63e5b179cb1405802fed9e07f0e6692826c6d4c2ec7b5e SHA512 a9995a85de390cade9786facd07cc7cc7971099fe338357d24d79ec9c9e232eb2c2a356ef27c0f6a1ddcb1201239c8ac522e948a261cf783e48448527ce70fde
+MISC metadata.xml 897 BLAKE2B 1aa35f4a9d3e83d5b969688acdfcc7f05be25deb3b3e743db296d4cc0e365897375b90909c5451254036d7a6e209b3005722434a00617bfd909ece0ea1f1d15e SHA512 af7229bce7bdac78affac29f1e2baeece6bcd648bb0111693be9d2637e716fa6dfa3b22ebfb789b17545e625ada42eb2df13f082b7515199ab66b19c688ba29f
diff --git a/app-editors/vis/metadata.xml b/app-editors/vis/metadata.xml
index 9bc3451307bd..e7891e2ef535 100644
--- a/app-editors/vis/metadata.xml
+++ b/app-editors/vis/metadata.xml
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person" proxied="yes">
- <email>contact@hacktivis.me</email>
-</maintainer>
-<maintainer type="project" proxied="proxy">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
-</maintainer>
-<longdescription lang="en">
-Vis aims to be a modern, legacy free, simple yet efficient editor combining the strengths of both vi(m) and sam.
-</longdescription>
-<use>
- <flag name="tre">more memory efficient regex search using <pkg>dev-libs/tre</pkg></flag>
-</use>
-<upstream>
- <remote-id type="github">martanne/vis</remote-id>
-</upstream>
+ <maintainer type="person" proxied="yes">
+ <email>contact@hacktivis.me</email>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Vis aims to be a modern, legacy free, simple yet efficient editor combining the strengths of both vi(m) and sam.
+ </longdescription>
+ <use>
+ <flag name="tre">More memory efficient regex search using <pkg>dev-libs/tre</pkg></flag>
+ </use>
+ <upstream>
+ <bugs-to>https://github.com/martanne/vis/issues</bugs-to>
+ <changelog>https://github.com/martanne/vis/blob/master/CHANGELOG.md</changelog>
+ <doc>https://github.com/martanne/vis/wiki</doc>
+ <remote-id type="github">martanne/vis</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-editors/vis/vis-0.8-r1.ebuild b/app-editors/vis/vis-0.8-r1.ebuild
deleted file mode 100644
index 4d51439d30ad..000000000000
--- a/app-editors/vis/vis-0.8-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PTV=0.5
-LUA_COMPAT=( lua5-2 lua5-3 lua5-4 )
-
-inherit lua-single
-
-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 ~arm64 ~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
- lua? (
- $(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
-
- default
-}
-
-src_configure() {
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --disable-lpeg-static \
- $(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
-}
diff --git a/app-editors/vis/vis-0.9-r1.ebuild b/app-editors/vis/vis-0.9-r1.ebuild
new file mode 100644
index 000000000000..5aea5da84fd0
--- /dev/null
+++ b/app-editors/vis/vis-0.9-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VIS_TEST_COMMIT="783b7ef67aa360f0b9bd44fa5ea47e644bc49d69"
+LUA_COMPAT=( lua5-{2..4} )
+
+inherit lua-single
+
+if [ "${PV}" == "9999" ]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/martanne/vis.git"
+else
+ SRC_URI="
+ https://github.com/martanne/vis/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( https://github.com/martanne/vis-test/archive/${VIS_TEST_COMMIT}.tar.gz
+ -> vis-test-${VIS_TEST_COMMIT}.tar.gz
+ )
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~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="+acl +lua +ncurses selinux test tre"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# - Known to also work with NetBSD curses
+DEPEND="
+ dev-libs/libtermkey
+ acl? ( sys-apps/acl )
+ lua? ( ${LUA_DEPS} )
+ ncurses? ( sys-libs/ncurses:0= )
+ tre? ( dev-libs/tre )
+"
+RDEPEND="
+ ${DEPEND}
+ app-eselect/eselect-vi
+ lua? (
+ $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]')
+ )
+"
+# lpeg: https://github.com/martanne/vis-test/issues/28
+BDEPEND="
+ virtual/pkgconfig
+ 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-${VIS_TEST_COMMIT}" test || die
+ fi
+
+ # 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() {
+ local myconfargs=(
+ --prefix="${EPREFIX}"/usr
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ --disable-lpeg-static
+ $(use_enable acl)
+ $(use_enable lua)
+ $(use_enable ncurses curses)
+ $(use_enable selinux)
+ $(use_enable tre)
+ )
+
+ # shell script
+ ./configure "${myconfargs[@]}" || die
+}
+
+update_symlinks() {
+ einfo "Calling eselect vi update --if-unset"
+ eselect vi update --if-unset
+}
+
+pkg_postrm() {
+ update_symlinks
+}
+
+pkg_postinst() {
+ update_symlinks
+}
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 7887e2ae1f55..5aea5da84fd0 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
VIS_TEST_COMMIT="783b7ef67aa360f0b9bd44fa5ea47e644bc49d69"
-LUA_COMPAT=( lua5-2 lua5-3 lua5-4 )
+LUA_COMPAT=( lua5-{2..4} )
inherit lua-single
@@ -14,25 +14,27 @@ if [ "${PV}" == "9999" ]; then
else
SRC_URI="
https://github.com/martanne/vis/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( https://github.com/martanne/vis-test/archive/${VIS_TEST_COMMIT}.tar.gz -> vis-test-${VIS_TEST_COMMIT}.tar.gz )
+ test? ( https://github.com/martanne/vis-test/archive/${VIS_TEST_COMMIT}.tar.gz
+ -> vis-test-${VIS_TEST_COMMIT}.tar.gz
+ )
"
- KEYWORDS="~amd64 ~arm ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
fi
-DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
+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"
+IUSE="+acl +lua +ncurses 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= )
+ acl? ( sys-apps/acl )
lua? ( ${LUA_DEPS} )
+ ncurses? ( sys-libs/ncurses:0= )
tre? ( dev-libs/tre )
"
RDEPEND="
@@ -43,10 +45,13 @@ RDEPEND="
)
"
# 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}]')
-)"
+BDEPEND="
+ virtual/pkgconfig
+ 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
@@ -71,14 +76,19 @@ src_prepare() {
}
src_configure() {
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --disable-lpeg-static \
- $(use_enable lua) \
- $(use_enable ncurses curses) \
- $(use_enable selinux) \
- $(use_enable tre) || die
+ local myconfargs=(
+ --prefix="${EPREFIX}"/usr
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ --disable-lpeg-static
+ $(use_enable acl)
+ $(use_enable lua)
+ $(use_enable ncurses curses)
+ $(use_enable selinux)
+ $(use_enable tre)
+ )
+
+ # shell script
+ ./configure "${myconfargs[@]}" || die
}
update_symlinks() {
--
cgit v1.2.3