gentoo auto-resync : 26:07:2023 - 10:30:48

4 files changed, 4 insertions, 173 deletions

diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 33e4221e3d03..5b669c0eab1f 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,8 +1,5 @@
-DIST vis-0.7.tar.gz 403918 BLAKE2B 5e4930fdb14ed42a2daf6682a99107ee6eb59e99e348abab5262bdbc53956dd9ccd094695d7f53c6770d10e46b2812b0e07ff90184ff920790f5b95f4091a610 SHA512 ccc6a054fea6917e7751882468a74c30c712f7ec400a913c95c0084691f706e2bee54efb86b75be8b121c9a209c7e587e72e5474c55271d9943e91fc8aaf9bac
 DIST vis-0.8.tar.gz 404496 BLAKE2B eafb7098a6c8e0d8f277be66984d5fd298ac86d524a4219a7d7730599157ca68c040615622cd1680b101e1cd003eba03343496762d0d4dc2766a079116f21eea SHA512 ab4eda075034955411bdbc0ade2fe9149a48c644fa2f70add8d3b9d749f86b98a4e429745b5cae7fdbc0a1e07c8587539a055cd1c6734bb59e43c580c949e0aa
 DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1
-EBUILD vis-0.7-r1.ebuild 2439 BLAKE2B 967fb45aabc2be3ccf54e4fe9e7425f2708a8d0426b9dc8941d66700aa3d75d2dee3433576b4090b4e9979d9cc62e1151486876f47a8d83b8301df48bd6fc6c0 SHA512 e64da5441a4cf5f1543f37b7af010cd5d585a13aa0c9b8bea4bb9feaa8df90788f937906a49fb68b8ebf168fc4a6078a9a0a3c3c566656de1b8bc10f80fdbb38
-EBUILD vis-0.7.ebuild 2093 BLAKE2B 0cf24049368f6498137e1783f33befa5c93f30fd4a03a1d8a3d7d9d28d35ff77e3bc883775e20774b261b6d05c1b38c5c60a65ac68ab0e387c8a241e74e7b61e SHA512 c57dd8e95d573f1f62f81ad3f6b0283e0104504bc85ce5437158a2f5399e5216f5a7c4eec5d7907d1f8c90bb613904d6f2ab0ad78fe9caa1b33f5ce1fe6f44bb
 EBUILD vis-0.8.ebuild 2436 BLAKE2B 09be5fd7ef0a9f508dad901ae30551aaad0656de622e3f891479ee06cbbfd1b78de67a4d437a00cfa06cffd2c7b0c1d5e6002053af6bcd6691295f61434d6e10 SHA512 d51a0296a2c99a03c10da49dc11c4da0cc0dfeab605fef7e43724cd18bc4a607992f7365cbef13a35cc95994ea11978e29e45ae957b9ae1e8156aa1785b6f7f9
 EBUILD vis-9999.ebuild 2439 BLAKE2B 52ba2a22d49d88c1ed01c59fe9eb59eb74a10d4a9e76af1ec0cbd29fc09aeaba46d4b90f809f79f6861635bfcadbdbede83f1e0920dd6cff21ad9eff67de1e38 SHA512 57202fab886d7907a168a7354e90a18a92217a40341d07eb0dae87e52dd82c5d6e8b455f27aea933860b1ad2c80c737f334fd4a275fa72ddb737544a8e896692
-MISC metadata.xml 624 BLAKE2B 5a95ae9ee2534eaccfccfc71f92ba0b978fe6794a42eeb6015812443c0b9ad30bfc604e183c8707e0b6594ef14df6ab499553e0495503768c5807327aa1f09ea SHA512 e052254e86f089107f9bc0b0cc6fa326aa10209d02a7ac1eeeeab040a0d197da3429a6a289ec8c92de64fdd4452f3752d73905c409b1970767ec4ca00c132a69
+MISC metadata.xml 698 BLAKE2B d09b6b1784d0845c80f097b0a3d27ed58a6ff4193c424ee856e1ec815aedecac8a480507e17046d4145cd0e20213b2165a8986c54bd4b3614f7cb30136e37508 SHA512 16134efe8760a57af6fcdd8adc93173d2a65e3f88d7b701b12a691b9899aaee341716fe29e2d7a89f3dc48ef127c736e63df7bdd586363023ce6a00f048f8864
diff --git a/app-editors/vis/metadata.xml b/app-editors/vis/metadata.xml
index 07e6ce2a8cbd..9bc3451307bd 100644
--- a/app-editors/vis/metadata.xml
+++ b/app-editors/vis/metadata.xml
@@ -14,4 +14,7 @@ Vis aims to be a modern, legacy free, simple yet efficient editor combining the
 <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>
 </pkgmetadata>
diff --git a/app-editors/vis/vis-0.7-r1.ebuild b/app-editors/vis/vis-0.7-r1.ebuild
deleted file mode 100644
index 8f1fe78c20dd..000000000000
--- a/app-editors/vis/vis-0.7-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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
deleted file mode 100644
index 0638ef99f5fc..000000000000
--- a/app-editors/vis/vis-0.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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 )
-
-inherit lua-single optfeature
-
-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 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~riscv x86"
-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
-	ncurses? ( sys-libs/ncurses:0= )
-	lua? ( ${LUA_DEPS} )
-	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}]') )"
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	if use test; then
-		rm -r test || die
-		mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
-
-		# 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/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
-}