1 |
commit: f60946ba6398fac3388cb690d6c687b03d7d8d4d |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 29 23:53:08 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 30 00:03:40 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f60946ba |
7 |
|
8 |
app-editors/neovim: bump to 0.4.4 |
9 |
|
10 |
* Bump to 0.4.4 |
11 |
* Pave the way for tests, but we can't yet because |
12 |
dev-lua/busted lacks luajit support (needed for tests). |
13 |
* Make LTO optional. |
14 |
|
15 |
Bug: https://bugs.gentoo.org/584694 |
16 |
Closes: https://bugs.gentoo.org/744184 |
17 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
18 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
19 |
|
20 |
app-editors/neovim/Manifest | 1 + |
21 |
app-editors/neovim/metadata.xml | 1 + |
22 |
app-editors/neovim/neovim-0.4.3.ebuild | 4 ---- |
23 |
.../{neovim-0.4.3.ebuild => neovim-0.4.4.ebuild} | 22 ++++++++++++++-------- |
24 |
app-editors/neovim/neovim-9999.ebuild | 22 +++++++++++++++------- |
25 |
5 files changed, 31 insertions(+), 19 deletions(-) |
26 |
|
27 |
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest |
28 |
index d94440938b4..4eb16e981f8 100644 |
29 |
--- a/app-editors/neovim/Manifest |
30 |
+++ b/app-editors/neovim/Manifest |
31 |
@@ -1 +1,2 @@ |
32 |
DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5 |
33 |
+DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183 |
34 |
|
35 |
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml |
36 |
index 73806d95e8a..b263ac23770 100644 |
37 |
--- a/app-editors/neovim/metadata.xml |
38 |
+++ b/app-editors/neovim/metadata.xml |
39 |
@@ -6,6 +6,7 @@ |
40 |
<name>Gentoo Vim Project</name> |
41 |
</maintainer> |
42 |
<use> |
43 |
+ <flag name="lto">Build with Link Time Optimization (LTO)</flag> |
44 |
<flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag> |
45 |
<flag name="tui">Build the neovim unix tui</flag> |
46 |
</use> |
47 |
|
48 |
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild |
49 |
index 3c3a8cc28cb..b2b35d2f82a 100644 |
50 |
--- a/app-editors/neovim/neovim-0.4.3.ebuild |
51 |
+++ b/app-editors/neovim/neovim-0.4.3.ebuild |
52 |
@@ -26,7 +26,6 @@ BDEPEND=" |
53 |
virtual/libintl |
54 |
virtual/pkgconfig |
55 |
" |
56 |
- |
57 |
DEPEND=" |
58 |
dev-libs/libuv:0= |
59 |
>=dev-libs/libvterm-0.1.2 |
60 |
@@ -45,7 +44,6 @@ DEPEND=" |
61 |
>=dev-libs/unibilium-2.0.0:0= |
62 |
) |
63 |
" |
64 |
- |
65 |
RDEPEND=" |
66 |
${DEPEND} |
67 |
app-eselect/eselect-vi |
68 |
@@ -53,8 +51,6 @@ RDEPEND=" |
69 |
|
70 |
CMAKE_BUILD_TYPE=Release |
71 |
|
72 |
-PATCHES=( "${FILESDIR}"/${P}-gcc-10-fix.patch ) |
73 |
- |
74 |
src_prepare() { |
75 |
# use our system vim dir |
76 |
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ |
77 |
|
78 |
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild |
79 |
similarity index 74% |
80 |
copy from app-editors/neovim/neovim-0.4.3.ebuild |
81 |
copy to app-editors/neovim/neovim-0.4.4.ebuild |
82 |
index 3c3a8cc28cb..d10522f3c6b 100644 |
83 |
--- a/app-editors/neovim/neovim-0.4.3.ebuild |
84 |
+++ b/app-editors/neovim/neovim-0.4.4.ebuild |
85 |
@@ -13,12 +13,16 @@ if [[ ${PV} == 9999 ]]; then |
86 |
EGIT_REPO_URI="https://github.com/neovim/neovim.git" |
87 |
else |
88 |
SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
89 |
- KEYWORDS="amd64 ~arm ~arm64 x86" |
90 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
91 |
fi |
92 |
|
93 |
LICENSE="Apache-2.0 vim" |
94 |
SLOT="0" |
95 |
-IUSE="+luajit +nvimpager +tui" |
96 |
+IUSE="+lto +luajit +nvimpager +tui" |
97 |
+# Upstream say the test library needs LuaJIT |
98 |
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 |
99 |
+#REQUIRED_USE="test? ( luajit )" |
100 |
+#RESTRICT="!test? ( test )" |
101 |
|
102 |
BDEPEND=" |
103 |
dev-util/gperf |
104 |
@@ -26,7 +30,8 @@ BDEPEND=" |
105 |
virtual/libintl |
106 |
virtual/pkgconfig |
107 |
" |
108 |
- |
109 |
+# Once dev-lua/busted has luajit support, we can add tests. |
110 |
+# bug #584694 |
111 |
DEPEND=" |
112 |
dev-libs/libuv:0= |
113 |
>=dev-libs/libvterm-0.1.2 |
114 |
@@ -45,16 +50,11 @@ DEPEND=" |
115 |
>=dev-libs/unibilium-2.0.0:0= |
116 |
) |
117 |
" |
118 |
- |
119 |
RDEPEND=" |
120 |
${DEPEND} |
121 |
app-eselect/eselect-vi |
122 |
" |
123 |
|
124 |
-CMAKE_BUILD_TYPE=Release |
125 |
- |
126 |
-PATCHES=( "${FILESDIR}"/${P}-gcc-10-fix.patch ) |
127 |
- |
128 |
src_prepare() { |
129 |
# use our system vim dir |
130 |
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ |
131 |
@@ -64,7 +64,13 @@ src_prepare() { |
132 |
} |
133 |
|
134 |
src_configure() { |
135 |
+ # Upstream default to LTO on non-debug builds |
136 |
+ # Let's expose it as a USE flag because upstream |
137 |
+ # have preferences for how we should use LTO |
138 |
+ # if we want it on (not just -flto) |
139 |
+ # ... but allow turning it off. |
140 |
local mycmakeargs=( |
141 |
+ -DENABLE_LTO=$(usex lto) |
142 |
-DFEAT_TUI=$(usex tui) |
143 |
-DPREFER_LUA=$(usex luajit no yes) |
144 |
) |
145 |
|
146 |
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild |
147 |
index 6944c0791a4..ae758e6e27b 100644 |
148 |
--- a/app-editors/neovim/neovim-9999.ebuild |
149 |
+++ b/app-editors/neovim/neovim-9999.ebuild |
150 |
@@ -13,12 +13,16 @@ if [[ ${PV} == 9999 ]]; then |
151 |
EGIT_REPO_URI="https://github.com/neovim/neovim.git" |
152 |
else |
153 |
SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
154 |
- KEYWORDS="~amd64 ~arm ~x86" |
155 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
156 |
fi |
157 |
|
158 |
LICENSE="Apache-2.0 vim" |
159 |
SLOT="0" |
160 |
-IUSE="+luajit +nvimpager +tui" |
161 |
+IUSE="+lto +luajit +nvimpager +tui" |
162 |
+# Upstream say the test library needs LuaJIT |
163 |
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 |
164 |
+#REQUIRED_USE="test? ( luajit )" |
165 |
+#RESTRICT="!test? ( test )" |
166 |
|
167 |
BDEPEND=" |
168 |
dev-util/gperf |
169 |
@@ -26,11 +30,12 @@ BDEPEND=" |
170 |
virtual/libintl |
171 |
virtual/pkgconfig |
172 |
" |
173 |
- |
174 |
+# Once dev-lua/busted has luajit support, we can add tests. |
175 |
+# bug #584694 |
176 |
DEPEND=" |
177 |
dev-libs/libutf8proc:= |
178 |
dev-libs/libuv:0= |
179 |
- >=dev-libs/libvterm-0.1 |
180 |
+ >=dev-libs/libvterm-0.1.2 |
181 |
dev-libs/msgpack:0= |
182 |
dev-lua/lpeg[luajit=] |
183 |
dev-lua/luv[luajit=] |
184 |
@@ -46,14 +51,11 @@ DEPEND=" |
185 |
>=dev-libs/unibilium-2.0.0:0= |
186 |
) |
187 |
" |
188 |
- |
189 |
RDEPEND=" |
190 |
${DEPEND} |
191 |
app-eselect/eselect-vi |
192 |
" |
193 |
|
194 |
-CMAKE_BUILD_TYPE=Release |
195 |
- |
196 |
src_prepare() { |
197 |
# use our system vim dir |
198 |
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ |
199 |
@@ -63,7 +65,13 @@ src_prepare() { |
200 |
} |
201 |
|
202 |
src_configure() { |
203 |
+ # Upstream default to LTO on non-debug builds |
204 |
+ # Let's expose it as a USE flag because upstream |
205 |
+ # have preferences for how we should use LTO |
206 |
+ # if we want it on (not just -flto) |
207 |
+ # ... but allow turning it off. |
208 |
local mycmakeargs=( |
209 |
+ -DENABLE_LTO=$(usex lto) |
210 |
-DFEAT_TUI=$(usex tui) |
211 |
-DPREFER_LUA=$(usex luajit no yes) |
212 |
) |