diff options
Diffstat (limited to 'app-editors/neovim/neovim-9999.ebuild')
| -rw-r--r-- | app-editors/neovim/neovim-9999.ebuild | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 30760d605912..f0c3aab23120 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,17 +16,16 @@ if [[ ${PV} == 9999 ]]; then 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 ~riscv ~x86 ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+lto +nvimpager test +tui" +IUSE="+nvimpager test" -REQUIRED_USE="${LUA_REQUIRED_USE}" # Upstream say the test library needs LuaJIT # https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 -REQUIRED_USE="test? ( lua_single_target_luajit )" +REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )" # TODO: Get tests running RESTRICT="!test? ( test ) test" @@ -41,7 +40,7 @@ BDEPEND="${LUA_DEPS} # 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). DEPEND="${LUA_DEPS} - >=dev-lua/luv-1.44.2[${LUA_SINGLE_USEDEP}] + >=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] @@ -49,14 +48,12 @@ DEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' dev-lua/LuaBitOp[${LUA_USEDEP}] ' lua5-{1,2}) - >=dev-libs/libuv-1.44.2:= - >=dev-libs/libvterm-0.3 + >=dev-libs/libuv-1.46.0:= + >=dev-libs/libvterm-0.3.3 >=dev-libs/msgpack-3.0.0:= - >=dev-libs/tree-sitter-0.20.2:= - tui? ( - >=dev-libs/libtermkey-0.22 - >=dev-libs/unibilium-2.0.0:0= - ) + >=dev-libs/tree-sitter-0.20.9:= + >=dev-libs/libtermkey-0.22 + >=dev-libs/unibilium-2.0.0:0= " RDEPEND=" ${DEPEND} @@ -69,16 +66,10 @@ BDEPEND+=" " PATCHES=( - "${FILESDIR}/${PN}-9999-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch" "${FILESDIR}/${PN}-9999-cmake-darwin.patch" ) -if [[ ${PV} != 9999 ]]; then - PATCHES+=( - "${FILESDIR}/${PN}-0.8.0-cmake-release-type.patch" - ) -fi - src_prepare() { # Use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ @@ -90,18 +81,13 @@ src_prepare() { } src_configure() { - # Upstream default to LTO on non-debug builds - # Let's expose it as a USE flag because upstream - # have preferences for how we should use LTO - # if we want it on (not just -flto) - # ... but allow turning it off. + ln -s "${BROOT}"/usr/bin/luajit "${BUILD_DIR}"/luajit || die # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now local mycmakeargs=( - -DENABLE_LTO=$(usex lto) - -DFEAT_TUI=$(usex tui) + # appends -flto + -DENABLE_LTO=OFF -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") -DLUA_PRG="${ELUA}" - -DMIN_LOG_LEVEL=3 ) cmake_src_configure } |