gentoo resync : 14.12.2020

3 files changed, 26 insertions, 9 deletions

diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 619b83c0e480..4a4e6e6317f8 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -3,6 +3,6 @@ DIST vis-0.6.tar.gz 397707 BLAKE2B 9768f3d5586afd261f3e82721c08bdfddcd1c51a4f76d
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
 DIST vis-test-0.4.tar.gz 98703 BLAKE2B dc9df00ae97ecd58022f885b25cb8163dd8b86f93d95cf93bbe1bd1efcc7690393efc4d47e3dccedc5f0ac6c33519136e6f13e6b9b9707f870b421aa3101537e SHA512 446eea2fdb7b15fd4962901e2076649964981217b9cf47112f16d1404da7cc024ba4b13164df0afa763363cef4f82db4ad9d7283a7554aead2165f29ca0bc9a5
 EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
-EBUILD vis-0.6.ebuild 1696 BLAKE2B 651e46d6a9f8c2ba06b337dbdef90a796b8095f77a94baab2c1b9bd3b706223bb6abbab2e74eaeea791c2e4b12a86952a7ca19c3e6a31e1000ee0dac17a8e336 SHA512 ab68ff1949715e39a7df18a729b16b4dbad829ed94cd3ef6a787039b065dddca47de1c4175c83994d47fcdbe450feb6f1e1be6924fcf9b864aa1236a77471906
-EBUILD vis-9999.ebuild 1271 BLAKE2B 7cc5f74cdd5322bcfa8458bb4e2820466f54ffa1631a636925d79ab1b0568079434e31307df6f6251801b4fee7686b185b9aa5f30c45855eeda3d4c47fb34c66 SHA512 e0196ba4a01430415e6ec3cd0b6daa430486b7c5b2a9cfffc7bc99baa953e3f6465175a0fd2eeeb00ae46f6c70b3222e45537a1a05e314661e53e455406189a7
+EBUILD vis-0.6.ebuild 1824 BLAKE2B 18aa9ce42e49017d27d5f8e6cbf23637b1b8b6a7898de585ad9207cce202ba654cd1dfb820ca75094bab3bb788e163b640bb06437374da14ee60fc6e8d7fad33 SHA512 08e3396687189cc71665b96e64017fa0eec55b6354aedb4a8c6ecaea47d9a5fb846f8670aad4fcabb124c914b1751d93e6e16da181322a011d50d10f596a0025
+EBUILD vis-9999.ebuild 1391 BLAKE2B c5184f951e9d5504f46a2d1230b5b6152520846d2de9d0369365d3cf08a7fbf7eb62698c51b11d931af4d6c739e456288b7ce4f810467247ca0e68c20b591425 SHA512 a36953764bd71e88cf4378c4d63c805fef4f1de2c0601503f9c56a9865fce852168b81f915745b28b0327b9c84fb4a87ecc63aeba4ba12fcdf573d46f60bb1b8
 MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.6.ebuild b/app-editors/vis/vis-0.6.ebuild
index 7a2ce6eaaa69..722f5a71fc9c 100644
--- a/app-editors/vis/vis-0.6.ebuild
+++ b/app-editors/vis/vis-0.6.ebuild
@@ -4,6 +4,9 @@
 EAPI=7
 
 MY_PTV=0.4
+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"
@@ -12,18 +15,22 @@ SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+ncurses selinux test tre"
+IUSE="+ncurses +lua selinux test tre"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # - Known to also work with NetBSD curses
-# - ::lua package done for using >=dev-lang/lua-5.2
-# which is needed for syntax highlighting and settings but masked in ::gentoo
 DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
+	lua? ( ${LUA_DEPS} )
 	tre? ( dev-libs/tre:= )"
 RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	if use test; then
 		rm -r test || die
@@ -44,6 +51,7 @@ 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
@@ -60,4 +68,5 @@ pkg_postrm() {
 
 pkg_postinst() {
 	update_symlinks
+	optfeature "syntax highlighting support" dev-lua/lpeg
 }
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 600b5efb0576..38ea0ff6ecd6 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3
+LUA_COMPAT=( lua5-2 lua5-3 )
+
+inherit lua-single git-r3 optfeature
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
 HOMEPAGE="https://github.com/martanne/vis"
@@ -10,18 +12,22 @@ EGIT_REPO_URI="https://github.com/martanne/vis.git"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS=""
-IUSE="+ncurses selinux test tre"
+IUSE="+ncurses +lua selinux test tre"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 # - Known to also work with NetBSD curses
-# - ::lua package done for using >=dev-lang/lua-5.2
-# which is needed for syntax highlighting and settings but masked in ::gentoo
 DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
+	lua? ( ${LUA_DEPS} )
 	tre? ( dev-libs/tre:= )"
 RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
 
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
 src_prepare() {
 	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
 	sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
@@ -34,6 +40,7 @@ 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
@@ -50,4 +57,5 @@ pkg_postrm() {
 
 pkg_postinst() {
 	update_symlinks
+	optfeature "syntax highlighting support" dev-lua/lpeg
 }