1 |
commit: 162e986e4fa8da433f89aa4a9afb36c27c63e466 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Jul 18 21:44:34 2016 +0000 |
4 |
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 27 21:38:17 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162e986e |
7 |
|
8 |
app-editors/neovim: Readjust dependencies |
9 |
|
10 |
luajit is no longer a hard dependency, so we can depend on either |
11 |
dev-lang/luajit, or dev-lang/lua |
12 |
|
13 |
the perl support was erroneous, given that there is no perl client yet. |
14 |
|
15 |
the tui is now optional, so other ui's can be used instead. |
16 |
|
17 |
Add a clipboard use flag so neovim can copy to the clipboard. |
18 |
|
19 |
Update to EAPI=6. |
20 |
|
21 |
Signed-off-by: Ole Reifschneider <tranquility <AT> gentoo.org> |
22 |
|
23 |
app-editors/neovim/metadata.xml | 4 +++ |
24 |
.../{neovim-9999.ebuild => neovim-0.1.5-r1.ebuild} | 35 +++++++++++----------- |
25 |
app-editors/neovim/neovim-9999.ebuild | 35 +++++++++++----------- |
26 |
3 files changed, 40 insertions(+), 34 deletions(-) |
27 |
|
28 |
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml |
29 |
index 94ebef1..0671c79 100644 |
30 |
--- a/app-editors/neovim/metadata.xml |
31 |
+++ b/app-editors/neovim/metadata.xml |
32 |
@@ -6,8 +6,12 @@ |
33 |
<name>Gentoo Vim Project</name> |
34 |
</maintainer> |
35 |
<use> |
36 |
+ <flag name="clipboard">Enable clipboard support through a provider</flag> |
37 |
<flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag> |
38 |
<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag> |
39 |
+ <flag name="tui">Build the neovim unix tui</flag> |
40 |
+ <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of |
41 |
+ <pkg>dev-lang/lua</pkg></flag> |
42 |
</use> |
43 |
<upstream> |
44 |
<remote-id type="github">neovim/neovim</remote-id> |
45 |
|
46 |
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-0.1.5-r1.ebuild |
47 |
similarity index 74% |
48 |
copy from app-editors/neovim/neovim-9999.ebuild |
49 |
copy to app-editors/neovim/neovim-0.1.5-r1.ebuild |
50 |
index f23db6e..d7e6db0 100644 |
51 |
--- a/app-editors/neovim/neovim-9999.ebuild |
52 |
+++ b/app-editors/neovim/neovim-0.1.5-r1.ebuild |
53 |
@@ -2,8 +2,8 @@ |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Id$ |
56 |
|
57 |
-EAPI=5 |
58 |
-inherit cmake-utils flag-o-matic |
59 |
+EAPI=6 |
60 |
+inherit cmake-utils |
61 |
|
62 |
DESCRIPTION="Vim-fork focused on extensibility and agility." |
63 |
HOMEPAGE="https://neovim.io" |
64 |
@@ -17,26 +17,31 @@ fi |
65 |
|
66 |
LICENSE="Apache-2.0 vim" |
67 |
SLOT="0" |
68 |
-IUSE="+nvimpager perl python ruby +jemalloc" |
69 |
+IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc" |
70 |
|
71 |
-CDEPEND="dev-lang/luajit:2 |
72 |
- >=dev-libs/libtermkey-0.17 |
73 |
- >=dev-libs/libuv-1.2.0 |
74 |
+CDEPEND=">=dev-libs/libuv-1.2.0 |
75 |
>=dev-libs/msgpack-1.0.0 |
76 |
- >=dev-libs/unibilium-1.1.1 |
77 |
+ luajit? ( dev-lang/luajit:2 ) |
78 |
+ !luajit? ( |
79 |
+ dev-lang/lua:= |
80 |
+ dev-lua/LuaBitOp |
81 |
+ ) |
82 |
+ tui? ( |
83 |
+ >=dev-libs/libtermkey-0.17 |
84 |
+ >=dev-libs/unibilium-1.1.1 |
85 |
+ ) |
86 |
dev-libs/libvterm |
87 |
- dev-lua/lpeg[luajit] |
88 |
- dev-lua/mpack[luajit] |
89 |
+ dev-lua/lpeg[luajit=] |
90 |
+ dev-lua/mpack[luajit=] |
91 |
jemalloc? ( dev-libs/jemalloc ) |
92 |
" |
93 |
DEPEND="${CDEPEND} |
94 |
virtual/libiconv |
95 |
virtual/libintl" |
96 |
RDEPEND="${CDEPEND} |
97 |
- perl? ( dev-lang/perl ) |
98 |
python? ( dev-python/neovim-python-client ) |
99 |
ruby? ( dev-ruby/neovim-ruby-client ) |
100 |
-" |
101 |
+ clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )" |
102 |
|
103 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
104 |
|
105 |
@@ -52,13 +57,9 @@ src_prepare() { |
106 |
} |
107 |
|
108 |
src_configure() { |
109 |
- export USE_BUNDLED_DEPS=OFF |
110 |
- append-cflags "-Wno-error" |
111 |
local mycmakeargs=( |
112 |
- $(cmake-utils_use_enable jemalloc JEMALLOC) |
113 |
- -DLIBUNIBILIUM_USE_STATIC=OFF |
114 |
- -DLIBTERMKEY_USE_STATIC=OFF |
115 |
- -DLIBVTERM_USE_STATIC=OFF |
116 |
+ -DFEAT_TUI=$(usex tui) |
117 |
+ -DENABLE_JEMALLOC=$(usex jemalloc) |
118 |
) |
119 |
cmake-utils_src_configure |
120 |
} |
121 |
|
122 |
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild |
123 |
index f23db6e..d7e6db0 100644 |
124 |
--- a/app-editors/neovim/neovim-9999.ebuild |
125 |
+++ b/app-editors/neovim/neovim-9999.ebuild |
126 |
@@ -2,8 +2,8 @@ |
127 |
# Distributed under the terms of the GNU General Public License v2 |
128 |
# $Id$ |
129 |
|
130 |
-EAPI=5 |
131 |
-inherit cmake-utils flag-o-matic |
132 |
+EAPI=6 |
133 |
+inherit cmake-utils |
134 |
|
135 |
DESCRIPTION="Vim-fork focused on extensibility and agility." |
136 |
HOMEPAGE="https://neovim.io" |
137 |
@@ -17,26 +17,31 @@ fi |
138 |
|
139 |
LICENSE="Apache-2.0 vim" |
140 |
SLOT="0" |
141 |
-IUSE="+nvimpager perl python ruby +jemalloc" |
142 |
+IUSE="+clipboard +luajit +nvimpager python ruby +tui +jemalloc" |
143 |
|
144 |
-CDEPEND="dev-lang/luajit:2 |
145 |
- >=dev-libs/libtermkey-0.17 |
146 |
- >=dev-libs/libuv-1.2.0 |
147 |
+CDEPEND=">=dev-libs/libuv-1.2.0 |
148 |
>=dev-libs/msgpack-1.0.0 |
149 |
- >=dev-libs/unibilium-1.1.1 |
150 |
+ luajit? ( dev-lang/luajit:2 ) |
151 |
+ !luajit? ( |
152 |
+ dev-lang/lua:= |
153 |
+ dev-lua/LuaBitOp |
154 |
+ ) |
155 |
+ tui? ( |
156 |
+ >=dev-libs/libtermkey-0.17 |
157 |
+ >=dev-libs/unibilium-1.1.1 |
158 |
+ ) |
159 |
dev-libs/libvterm |
160 |
- dev-lua/lpeg[luajit] |
161 |
- dev-lua/mpack[luajit] |
162 |
+ dev-lua/lpeg[luajit=] |
163 |
+ dev-lua/mpack[luajit=] |
164 |
jemalloc? ( dev-libs/jemalloc ) |
165 |
" |
166 |
DEPEND="${CDEPEND} |
167 |
virtual/libiconv |
168 |
virtual/libintl" |
169 |
RDEPEND="${CDEPEND} |
170 |
- perl? ( dev-lang/perl ) |
171 |
python? ( dev-python/neovim-python-client ) |
172 |
ruby? ( dev-ruby/neovim-ruby-client ) |
173 |
-" |
174 |
+ clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )" |
175 |
|
176 |
CMAKE_BUILD_TYPE=RelWithDebInfo |
177 |
|
178 |
@@ -52,13 +57,9 @@ src_prepare() { |
179 |
} |
180 |
|
181 |
src_configure() { |
182 |
- export USE_BUNDLED_DEPS=OFF |
183 |
- append-cflags "-Wno-error" |
184 |
local mycmakeargs=( |
185 |
- $(cmake-utils_use_enable jemalloc JEMALLOC) |
186 |
- -DLIBUNIBILIUM_USE_STATIC=OFF |
187 |
- -DLIBTERMKEY_USE_STATIC=OFF |
188 |
- -DLIBVTERM_USE_STATIC=OFF |
189 |
+ -DFEAT_TUI=$(usex tui) |
190 |
+ -DENABLE_JEMALLOC=$(usex jemalloc) |
191 |
) |
192 |
cmake-utils_src_configure |
193 |
} |