diff options
author | Jonas Toth <gentoo@jonas-toth.eu> | 2024-10-11 18:51:42 +0200 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-12-11 10:34:57 +0000 |
commit | ed8968926e922ae0eed0a978ee4b3073f34c4530 (patch) | |
tree | 2fddace947ba91407116df4416afbfabb5f2c87d /app-editors | |
parent | sys-libs/libmodulemd: add glib docs location patch (diff) | |
download | gentoo-ed8968926e922ae0eed0a978ee4b3073f34c4530.tar.gz gentoo-ed8968926e922ae0eed0a978ee4b3073f34c4530.tar.bz2 gentoo-ed8968926e922ae0eed0a978ee4b3073f34c4530.zip |
app-editors/neovim: remove tree-sitter deps that are not in upstream
The `bash` and `python` tree-sitter runtimes are not required in
upstream `nvim`. They are not in the file
[https://github.com/neovim/neovim/blob/release-0.10/cmake.deps/deps.txt#L44](deps.txt)
anymore.
Installing tree-sitter runtimes can be done with `nvim` plugins as well.
Signed-off-by: Jonas Toth <gentoo@jonas-toth.eu>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/neovim/neovim-0.10.2-r1.ebuild | 127 | ||||
-rw-r--r-- | app-editors/neovim/neovim-9999.ebuild | 4 |
2 files changed, 128 insertions, 3 deletions
diff --git a/app-editors/neovim/neovim-0.10.2-r1.ebuild b/app-editors/neovim/neovim-0.10.2-r1.ebuild new file mode 100644 index 000000000000..b3efb2e90d10 --- /dev/null +++ b/app-editors/neovim/neovim-0.10.2-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# RelWithDebInfo sets -Og -g +CMAKE_BUILD_TYPE=Release +LUA_COMPAT=( lua5-{1..2} luajit ) +inherit cmake lua-single optfeature xdg + +DESCRIPTION="Vim-fork focused on extensibility and agility" +HOMEPAGE="https://neovim.io" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/neovim/neovim.git" +else + SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos" +fi + +LICENSE="Apache-2.0 vim" +SLOT="0" +IUSE="+nvimpager test" + +# Upstream say the test library needs LuaJIT +# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 +REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )" +# TODO: Get tests running +RESTRICT="!test? ( test ) test" + +# Upstream build scripts invoke the Lua interpreter +BDEPEND="${LUA_DEPS} + >=dev-util/gperf-3.1 + >=sys-devel/gettext-0.20.1 + virtual/libiconv + virtual/libintl + virtual/pkgconfig +" +# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for +# new dependency bounds and so on on bumps (obviously adjust for right branch/tag). +# List of required tree-sitter parsers is taken from cmake.deps/deps.txt +DEPEND="${LUA_DEPS} + >=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}] + $(lua_gen_cond_dep ' + dev-lua/lpeg[${LUA_USEDEP}] + dev-lua/mpack[${LUA_USEDEP}] + ') + $(lua_gen_cond_dep ' + dev-lua/LuaBitOp[${LUA_USEDEP}] + ' lua5-{1,2}) + >=dev-libs/libutf8proc-2.9.0:= + >=dev-libs/libuv-1.46.0:= + >=dev-libs/libvterm-0.3.3 + >=dev-libs/msgpack-3.0.0:= + >=dev-libs/tree-sitter-0.22.6:= + =dev-libs/tree-sitter-c-0.21* + =dev-libs/tree-sitter-lua-0.1* + =dev-libs/tree-sitter-markdown-0.2* + =dev-libs/tree-sitter-query-0.4* + =dev-libs/tree-sitter-vim-0.4* + =dev-libs/tree-sitter-vimdoc-3* + >=dev-libs/unibilium-2.0.0:0= +" +RDEPEND=" + ${DEPEND} + app-eselect/eselect-vi +" +BDEPEND+=" + test? ( + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch" + "${FILESDIR}/${PN}-9999-cmake-darwin.patch" +) + +src_prepare() { + # Use our system vim dir + sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ + -i src/nvim/globals.h || die + + # https://forums.gentoo.org/viewtopic-p-8750050.html + xdg_environment_reset + cmake_src_prepare +} + +src_configure() { + # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now + local mycmakeargs=( + # appends -flto + -DENABLE_LTO=OFF + -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") + -DLUA_PRG="${LUA}" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # install a default configuration file + insinto /etc/vim + doins "${FILESDIR}"/sysinit.vim + + # symlink tree-sitter parsers + dodir /usr/share/nvim/runtime + for parser in c lua markdown query vim vimdoc; do + dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so + done + + # conditionally install a symlink for nvimpager + if use nvimpager; then + dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard + optfeature "Python plugin support" dev-python/pynvim + optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client + optfeature "remote/nvr support" dev-python/neovim-remote +} diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index edf16933b50b..b3efb2e90d10 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -54,11 +54,9 @@ DEPEND="${LUA_DEPS} >=dev-libs/libvterm-0.3.3 >=dev-libs/msgpack-3.0.0:= >=dev-libs/tree-sitter-0.22.6:= - =dev-libs/tree-sitter-bash-0.21* =dev-libs/tree-sitter-c-0.21* =dev-libs/tree-sitter-lua-0.1* =dev-libs/tree-sitter-markdown-0.2* - =dev-libs/tree-sitter-python-0.21* =dev-libs/tree-sitter-query-0.4* =dev-libs/tree-sitter-vim-0.4* =dev-libs/tree-sitter-vimdoc-3* @@ -109,7 +107,7 @@ src_install() { # symlink tree-sitter parsers dodir /usr/share/nvim/runtime - for parser in bash c lua markdown python query vim vimdoc; do + for parser in c lua markdown query vim vimdoc; do dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so done |