| 1 |
commit: d381ac05a62802104385f955708720a588a0054c |
| 2 |
Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> |
| 3 |
AuthorDate: Tue Nov 3 16:14:53 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 3 07:59:20 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d381ac05 |
| 7 |
|
| 8 |
app-editors/vis: Add lua support |
| 9 |
|
| 10 |
Mostly based on prior work comitted into ::lua repository |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/752540 |
| 13 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/18120 |
| 15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 16 |
|
| 17 |
app-editors/vis/vis-0.6.ebuild | 10 +++++++--- |
| 18 |
app-editors/vis/vis-9999.ebuild | 11 +++++++---- |
| 19 |
profiles/base/package.use.mask | 4 ++++ |
| 20 |
3 files changed, 18 insertions(+), 7 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-editors/vis/vis-0.6.ebuild b/app-editors/vis/vis-0.6.ebuild |
| 23 |
index 7a2ce6eaaa6..b624dd79c35 100644 |
| 24 |
--- a/app-editors/vis/vis-0.6.ebuild |
| 25 |
+++ b/app-editors/vis/vis-0.6.ebuild |
| 26 |
@@ -4,6 +4,9 @@ |
| 27 |
EAPI=7 |
| 28 |
|
| 29 |
MY_PTV=0.4 |
| 30 |
+LUA_COMPAT=( lua5-2 lua5-3 ) |
| 31 |
+ |
| 32 |
+inherit lua-single eutils |
| 33 |
|
| 34 |
DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" |
| 35 |
HOMEPAGE="https://github.com/martanne/vis" |
| 36 |
@@ -12,14 +15,13 @@ SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz |
| 37 |
LICENSE="ISC" |
| 38 |
SLOT="0" |
| 39 |
KEYWORDS="~amd64 ~arm ~x86" |
| 40 |
-IUSE="+ncurses selinux test tre" |
| 41 |
+IUSE="+ncurses +lua selinux test tre" |
| 42 |
RESTRICT="!test? ( test )" |
| 43 |
|
| 44 |
# - Known to also work with NetBSD curses |
| 45 |
-# - ::lua package done for using >=dev-lang/lua-5.2 |
| 46 |
-# which is needed for syntax highlighting and settings but masked in ::gentoo |
| 47 |
DEPEND="dev-libs/libtermkey |
| 48 |
ncurses? ( sys-libs/ncurses:0= ) |
| 49 |
+ lua? ( ${LUA_DEPS} ) |
| 50 |
tre? ( dev-libs/tre:= )" |
| 51 |
RDEPEND="${DEPEND} |
| 52 |
app-eselect/eselect-vi" |
| 53 |
@@ -44,6 +46,7 @@ src_configure() { |
| 54 |
./configure \ |
| 55 |
--prefix="${EPREFIX}"/usr \ |
| 56 |
--docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
| 57 |
+ $(use_enable lua) \ |
| 58 |
$(use_enable ncurses curses) \ |
| 59 |
$(use_enable selinux) \ |
| 60 |
$(use_enable tre) || die |
| 61 |
@@ -60,4 +63,5 @@ pkg_postrm() { |
| 62 |
|
| 63 |
pkg_postinst() { |
| 64 |
update_symlinks |
| 65 |
+ optfeature "syntax highlighting support" dev-lua/lpeg |
| 66 |
} |
| 67 |
|
| 68 |
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild |
| 69 |
index 600b5efb057..7af054d1607 100644 |
| 70 |
--- a/app-editors/vis/vis-9999.ebuild |
| 71 |
+++ b/app-editors/vis/vis-9999.ebuild |
| 72 |
@@ -2,7 +2,9 @@ |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
|
| 75 |
EAPI=7 |
| 76 |
-inherit git-r3 |
| 77 |
+LUA_COMPAT=( lua5-2 lua5-3 ) |
| 78 |
+ |
| 79 |
+inherit lua-single git-r3 eutils |
| 80 |
|
| 81 |
DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" |
| 82 |
HOMEPAGE="https://github.com/martanne/vis" |
| 83 |
@@ -10,14 +12,13 @@ EGIT_REPO_URI="https://github.com/martanne/vis.git" |
| 84 |
LICENSE="ISC" |
| 85 |
SLOT="0" |
| 86 |
KEYWORDS="" |
| 87 |
-IUSE="+ncurses selinux test tre" |
| 88 |
+IUSE="+ncurses +lua selinux test tre" |
| 89 |
RESTRICT="!test? ( test )" |
| 90 |
|
| 91 |
# - Known to also work with NetBSD curses |
| 92 |
-# - ::lua package done for using >=dev-lang/lua-5.2 |
| 93 |
-# which is needed for syntax highlighting and settings but masked in ::gentoo |
| 94 |
DEPEND="dev-libs/libtermkey |
| 95 |
ncurses? ( sys-libs/ncurses:0= ) |
| 96 |
+ lua? ( ${LUA_DEPS} ) |
| 97 |
tre? ( dev-libs/tre:= )" |
| 98 |
RDEPEND="${DEPEND} |
| 99 |
app-eselect/eselect-vi" |
| 100 |
@@ -34,6 +35,7 @@ src_configure() { |
| 101 |
./configure \ |
| 102 |
--prefix="${EPREFIX}"/usr \ |
| 103 |
--docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
| 104 |
+ $(use_enable lua) \ |
| 105 |
$(use_enable ncurses curses) \ |
| 106 |
$(use_enable selinux) \ |
| 107 |
$(use_enable tre) || die |
| 108 |
@@ -50,4 +52,5 @@ pkg_postrm() { |
| 109 |
|
| 110 |
pkg_postinst() { |
| 111 |
update_symlinks |
| 112 |
+ optfeature "syntax highlighting support" dev-lua/lpeg |
| 113 |
} |
| 114 |
|
| 115 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 116 |
index 6c2057de852..1a6df6d45e4 100644 |
| 117 |
--- a/profiles/base/package.use.mask |
| 118 |
+++ b/profiles/base/package.use.mask |
| 119 |
@@ -35,6 +35,10 @@ kde-apps/kipi-plugins vkontakte |
| 120 |
# waiting for lua to be slotted |
| 121 |
media-gfx/exact-image lua |
| 122 |
|
| 123 |
+# Haelwenn (lanodan) Monnier <contact@×××××××××.me> (2020-11-03) |
| 124 |
+# Requires >=dev-lang/lua-5.2, which is still masked. |
| 125 |
+app-editors/vis lua |
| 126 |
+ |
| 127 |
# Marek Szuba <marecki@g.o> (2020-10-12) |
| 128 |
# Requires slotted Lua, which is still masked. |
| 129 |
media-gfx/darktable system-lua |
Archives