1 |
Signed-off-by: Haelwenn (lanodan) Monnier <contact@×××××××××.me> |
2 |
--- |
3 |
app-editors/vis/Manifest | 2 ++ |
4 |
app-editors/vis/vis-0.6.ebuild | 63 +++++++++++++++++++++++++++++++++ |
5 |
app-editors/vis/vis-9999.ebuild | 11 +++--- |
6 |
3 files changed, 69 insertions(+), 7 deletions(-) |
7 |
create mode 100644 app-editors/vis/vis-0.6.ebuild |
8 |
|
9 |
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest |
10 |
index 54cce819aac..6258f1a7c75 100644 |
11 |
--- a/app-editors/vis/Manifest |
12 |
+++ b/app-editors/vis/Manifest |
13 |
@@ -1,2 +1,4 @@ |
14 |
DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780 |
15 |
+DIST vis-0.6.tar.gz 397707 BLAKE2B 9768f3d5586afd261f3e82721c08bdfddcd1c51a4f76d45c2f75eb954feed49d1ebeb1ee2cb31675cf68b356a0d32bcc33454aa2fbf0fd5c77afeea0a73465cd SHA512 3809b40f75816e03e47e0c2c16d2681cc1c01ad50a3d051285d5f1e9ff0a333160e668228a129a1596109aa079dc8364d3ad060b88e9dba33bb1d60a15eaf4e2 |
16 |
DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5 |
17 |
+DIST vis-test-0.4.tar.gz 98703 BLAKE2B dc9df00ae97ecd58022f885b25cb8163dd8b86f93d95cf93bbe1bd1efcc7690393efc4d47e3dccedc5f0ac6c33519136e6f13e6b9b9707f870b421aa3101537e SHA512 446eea2fdb7b15fd4962901e2076649964981217b9cf47112f16d1404da7cc024ba4b13164df0afa763363cef4f82db4ad9d7283a7554aead2165f29ca0bc9a5 |
18 |
diff --git a/app-editors/vis/vis-0.6.ebuild b/app-editors/vis/vis-0.6.ebuild |
19 |
new file mode 100644 |
20 |
index 00000000000..7a2ce6eaaa6 |
21 |
--- /dev/null |
22 |
+++ b/app-editors/vis/vis-0.6.ebuild |
23 |
@@ -0,0 +1,63 @@ |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
+# Distributed under the terms of the GNU General Public License v2 |
26 |
+ |
27 |
+EAPI=7 |
28 |
+ |
29 |
+MY_PTV=0.4 |
30 |
+ |
31 |
+DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" |
32 |
+HOMEPAGE="https://github.com/martanne/vis" |
33 |
+SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz |
34 |
+ test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )" |
35 |
+LICENSE="ISC" |
36 |
+SLOT="0" |
37 |
+KEYWORDS="~amd64 ~arm ~x86" |
38 |
+IUSE="+ncurses selinux test tre" |
39 |
+RESTRICT="!test? ( test )" |
40 |
+ |
41 |
+# - Known to also work with NetBSD curses |
42 |
+# - ::lua package done for using >=dev-lang/lua-5.2 |
43 |
+# which is needed for syntax highlighting and settings but masked in ::gentoo |
44 |
+DEPEND="dev-libs/libtermkey |
45 |
+ ncurses? ( sys-libs/ncurses:0= ) |
46 |
+ tre? ( dev-libs/tre:= )" |
47 |
+RDEPEND="${DEPEND} |
48 |
+ app-eselect/eselect-vi" |
49 |
+ |
50 |
+src_prepare() { |
51 |
+ if use test; then |
52 |
+ rm -r test || die |
53 |
+ mv "${WORKDIR}/vis-test-${MY_PTV}" test || die |
54 |
+ |
55 |
+ # https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22 |
56 |
+ sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die |
57 |
+ fi |
58 |
+ |
59 |
+ sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die |
60 |
+ sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die |
61 |
+ sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die |
62 |
+ |
63 |
+ default |
64 |
+} |
65 |
+ |
66 |
+src_configure() { |
67 |
+ ./configure \ |
68 |
+ --prefix="${EPREFIX}"/usr \ |
69 |
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
70 |
+ $(use_enable ncurses curses) \ |
71 |
+ $(use_enable selinux) \ |
72 |
+ $(use_enable tre) || die |
73 |
+} |
74 |
+ |
75 |
+update_symlinks() { |
76 |
+ einfo "Calling eselect vi update --if-unset" |
77 |
+ eselect vi update --if-unset |
78 |
+} |
79 |
+ |
80 |
+pkg_postrm() { |
81 |
+ update_symlinks |
82 |
+} |
83 |
+ |
84 |
+pkg_postinst() { |
85 |
+ update_symlinks |
86 |
+} |
87 |
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild |
88 |
index 72ff783c840..600b5efb057 100644 |
89 |
--- a/app-editors/vis/vis-9999.ebuild |
90 |
+++ b/app-editors/vis/vis-9999.ebuild |
91 |
@@ -1,7 +1,7 @@ |
92 |
# Copyright 1999-2020 Gentoo Authors |
93 |
# Distributed under the terms of the GNU General Public License v2 |
94 |
|
95 |
-EAPI=6 |
96 |
+EAPI=7 |
97 |
inherit git-r3 |
98 |
|
99 |
DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" |
100 |
@@ -13,8 +13,9 @@ KEYWORDS="" |
101 |
IUSE="+ncurses selinux test tre" |
102 |
RESTRICT="!test? ( test )" |
103 |
|
104 |
-#Note: vis is reported to also work with NetBSD curses |
105 |
-#TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings) |
106 |
+# - Known to also work with NetBSD curses |
107 |
+# - ::lua package done for using >=dev-lang/lua-5.2 |
108 |
+# which is needed for syntax highlighting and settings but masked in ::gentoo |
109 |
DEPEND="dev-libs/libtermkey |
110 |
ncurses? ( sys-libs/ncurses:0= ) |
111 |
tre? ( dev-libs/tre:= )" |
112 |
@@ -22,10 +23,6 @@ RDEPEND="${DEPEND} |
113 |
app-eselect/eselect-vi" |
114 |
|
115 |
src_prepare() { |
116 |
- if use test && ! type -P vim &>/dev/null; then |
117 |
- sed -i 's/.*vim.*//' "${S}/test/Makefile" || die |
118 |
- fi |
119 |
- |
120 |
sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die |
121 |
sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die |
122 |
sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die |
123 |
-- |
124 |
2.26.2 |