| 1 |
commit: 7d92fb6108b4abd32a285de88cba2ed8819e9683 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 1 12:17:42 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 1 12:17:42 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d92fb61 |
| 7 |
|
| 8 |
app-editors/neovim: add 0.6.0 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
app-editors/neovim/Manifest | 1 + |
| 13 |
.../{neovim-9999.ebuild => neovim-0.6.0.ebuild} | 21 +++++++++++++-------- |
| 14 |
app-editors/neovim/neovim-9999.ebuild | 21 +++++++++++++-------- |
| 15 |
3 files changed, 27 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest |
| 18 |
index e0a3ebb99498..65e60f15859a 100644 |
| 19 |
--- a/app-editors/neovim/Manifest |
| 20 |
+++ b/app-editors/neovim/Manifest |
| 21 |
@@ -1,3 +1,4 @@ |
| 22 |
DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183 |
| 23 |
DIST neovim-0.5.0.tar.gz 10337976 BLAKE2B e7630e96fdd1a159ca68c8f61ed473a7fa7d0c5ebf7485e42c47f314f1a3031ac3f63519f4789d7244b9677f9fa9b2aabbffa1e11d97456255c44348acb814d3 SHA512 f6649f804faabb4104d3b28283932e40358c23990961f4ca7b380089318da312e59242746cee06387f4d881dd6514abbfec79c4063482383adfb4106e9e7a3a4 |
| 24 |
DIST neovim-0.5.1.tar.gz 10349190 BLAKE2B eb7e0c6a0742369c4a0fbc32a0f0e5d595f03470fb10287c39dde2f86db433a21798acee49d2cc363f18843950ef76d1376f5e52358d0b19a4b1e090c0d620a6 SHA512 a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709 |
| 25 |
+DIST neovim-0.6.0.tar.gz 10592213 BLAKE2B f0f4654b6ae37b29c903ec54175b7dc6742c9f8dadd3242119a0288df4e3262ff5d9cb7ccd41fd8b1431db828ddb806714ced62ef1893cb923cf84badd47e3d8 SHA512 c007d076fb89288fe0496fa243fc6f485b0b33120c96b0bf37d8fe6469c672eb641fefbc3f7262ec726e40910c44d37ff7efb1723c05ba920ff6ae512b1d43e6 |
| 26 |
|
| 27 |
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-0.6.0.ebuild |
| 28 |
similarity index 87% |
| 29 |
copy from app-editors/neovim/neovim-9999.ebuild |
| 30 |
copy to app-editors/neovim/neovim-0.6.0.ebuild |
| 31 |
index 99aa8bbbb72f..54ffbbed750b 100644 |
| 32 |
--- a/app-editors/neovim/neovim-9999.ebuild |
| 33 |
+++ b/app-editors/neovim/neovim-0.6.0.ebuild |
| 34 |
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-{1..2} luajit ) |
| 35 |
|
| 36 |
inherit cmake lua-single optfeature xdg |
| 37 |
|
| 38 |
-DESCRIPTION="Vim-fork focused on extensibility and agility." |
| 39 |
+DESCRIPTION="Vim-fork focused on extensibility and agility" |
| 40 |
HOMEPAGE="https://neovim.io" |
| 41 |
|
| 42 |
if [[ ${PV} == 9999 ]]; then |
| 43 |
@@ -15,18 +15,19 @@ if [[ ${PV} == 9999 ]]; then |
| 44 |
EGIT_REPO_URI="https://github.com/neovim/neovim.git" |
| 45 |
else |
| 46 |
SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 47 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" |
| 48 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" |
| 49 |
fi |
| 50 |
|
| 51 |
LICENSE="Apache-2.0 vim" |
| 52 |
SLOT="0" |
| 53 |
-IUSE="+lto +nvimpager +tui" |
| 54 |
+IUSE="+lto +nvimpager test +tui" |
| 55 |
|
| 56 |
REQUIRED_USE="${LUA_REQUIRED_USE}" |
| 57 |
# Upstream say the test library needs LuaJIT |
| 58 |
# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 |
| 59 |
-#REQUIRED_USE="test? ( lua_single_target_luajit )" |
| 60 |
-#RESTRICT="!test? ( test )" |
| 61 |
+REQUIRED_USE="test? ( lua_single_target_luajit )" |
| 62 |
+# TODO: Get tests running |
| 63 |
+RESTRICT="!test? ( test ) test" |
| 64 |
|
| 65 |
# Upstream build scripts invoke the Lua interpreter |
| 66 |
BDEPEND="${LUA_DEPS} |
| 67 |
@@ -35,8 +36,6 @@ BDEPEND="${LUA_DEPS} |
| 68 |
virtual/libintl |
| 69 |
virtual/pkgconfig |
| 70 |
" |
| 71 |
-# TODO: add tests, dev-lua/busted has now got luajit support. |
| 72 |
-# bug #584694 |
| 73 |
DEPEND="${LUA_DEPS} |
| 74 |
dev-lua/luv[${LUA_SINGLE_USEDEP}] |
| 75 |
$(lua_gen_cond_dep ' |
| 76 |
@@ -59,6 +58,11 @@ RDEPEND=" |
| 77 |
${DEPEND} |
| 78 |
app-eselect/eselect-vi |
| 79 |
" |
| 80 |
+BDEPEND=" |
| 81 |
+ test? ( |
| 82 |
+ $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') |
| 83 |
+ ) |
| 84 |
+" |
| 85 |
|
| 86 |
PATCHES=( |
| 87 |
"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" |
| 88 |
@@ -67,7 +71,7 @@ PATCHES=( |
| 89 |
) |
| 90 |
|
| 91 |
src_prepare() { |
| 92 |
- # use our system vim dir |
| 93 |
+ # Use our system vim dir |
| 94 |
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ |
| 95 |
-i src/nvim/globals.h || die |
| 96 |
|
| 97 |
@@ -106,6 +110,7 @@ src_install() { |
| 98 |
|
| 99 |
pkg_postinst() { |
| 100 |
xdg_pkg_postinst |
| 101 |
+ |
| 102 |
optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard |
| 103 |
optfeature "Python plugin support" dev-python/pynvim |
| 104 |
optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client |
| 105 |
|
| 106 |
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild |
| 107 |
index 99aa8bbbb72f..54ffbbed750b 100644 |
| 108 |
--- a/app-editors/neovim/neovim-9999.ebuild |
| 109 |
+++ b/app-editors/neovim/neovim-9999.ebuild |
| 110 |
@@ -7,7 +7,7 @@ LUA_COMPAT=( lua5-{1..2} luajit ) |
| 111 |
|
| 112 |
inherit cmake lua-single optfeature xdg |
| 113 |
|
| 114 |
-DESCRIPTION="Vim-fork focused on extensibility and agility." |
| 115 |
+DESCRIPTION="Vim-fork focused on extensibility and agility" |
| 116 |
HOMEPAGE="https://neovim.io" |
| 117 |
|
| 118 |
if [[ ${PV} == 9999 ]]; then |
| 119 |
@@ -15,18 +15,19 @@ if [[ ${PV} == 9999 ]]; then |
| 120 |
EGIT_REPO_URI="https://github.com/neovim/neovim.git" |
| 121 |
else |
| 122 |
SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 123 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" |
| 124 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" |
| 125 |
fi |
| 126 |
|
| 127 |
LICENSE="Apache-2.0 vim" |
| 128 |
SLOT="0" |
| 129 |
-IUSE="+lto +nvimpager +tui" |
| 130 |
+IUSE="+lto +nvimpager test +tui" |
| 131 |
|
| 132 |
REQUIRED_USE="${LUA_REQUIRED_USE}" |
| 133 |
# Upstream say the test library needs LuaJIT |
| 134 |
# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 |
| 135 |
-#REQUIRED_USE="test? ( lua_single_target_luajit )" |
| 136 |
-#RESTRICT="!test? ( test )" |
| 137 |
+REQUIRED_USE="test? ( lua_single_target_luajit )" |
| 138 |
+# TODO: Get tests running |
| 139 |
+RESTRICT="!test? ( test ) test" |
| 140 |
|
| 141 |
# Upstream build scripts invoke the Lua interpreter |
| 142 |
BDEPEND="${LUA_DEPS} |
| 143 |
@@ -35,8 +36,6 @@ BDEPEND="${LUA_DEPS} |
| 144 |
virtual/libintl |
| 145 |
virtual/pkgconfig |
| 146 |
" |
| 147 |
-# TODO: add tests, dev-lua/busted has now got luajit support. |
| 148 |
-# bug #584694 |
| 149 |
DEPEND="${LUA_DEPS} |
| 150 |
dev-lua/luv[${LUA_SINGLE_USEDEP}] |
| 151 |
$(lua_gen_cond_dep ' |
| 152 |
@@ -59,6 +58,11 @@ RDEPEND=" |
| 153 |
${DEPEND} |
| 154 |
app-eselect/eselect-vi |
| 155 |
" |
| 156 |
+BDEPEND=" |
| 157 |
+ test? ( |
| 158 |
+ $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') |
| 159 |
+ ) |
| 160 |
+" |
| 161 |
|
| 162 |
PATCHES=( |
| 163 |
"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" |
| 164 |
@@ -67,7 +71,7 @@ PATCHES=( |
| 165 |
) |
| 166 |
|
| 167 |
src_prepare() { |
| 168 |
- # use our system vim dir |
| 169 |
+ # Use our system vim dir |
| 170 |
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ |
| 171 |
-i src/nvim/globals.h || die |
| 172 |
|
| 173 |
@@ -106,6 +110,7 @@ src_install() { |
| 174 |
|
| 175 |
pkg_postinst() { |
| 176 |
xdg_pkg_postinst |
| 177 |
+ |
| 178 |
optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard |
| 179 |
optfeature "Python plugin support" dev-python/pynvim |
| 180 |
optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client |
Archives