[gentoo-commits] repo/gentoo:master commit in: app-editors/neovim/files/, app-editors/neovim/

["Sam James" <sam@gentoo.org>]

commit:     979e5e38c70d6e57429a205dfe80c6872b64bbde
Author:     brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Fri Apr  7 16:17:21 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 02:50:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979e5e38

app-editors/neovim: Version bump to 0.9.0

Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-editors/neovim/Manifest                        |   1 +
 .../neovim/files/neovim-0.9.0-cmake-darwin.patch   |  13 +++
 .../files/neovim-0.9.0-cmake-release-type.patch    |  17 +++
 .../files/neovim-0.9.0-cmake_lua_version.patch     |  11 ++
 app-editors/neovim/neovim-0.9.0.ebuild             | 124 +++++++++++++++++++++
 5 files changed, 166 insertions(+)

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 6120b89fc034..79f0bc75cae0 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,2 +1,3 @@
 DIST neovim-0.8.2.tar.gz 11401444 BLAKE2B 2b652e98fa68c64f547777396726b80c28493841f2ec5acc01ef5dd659f0babce0baf3d5575cec1d08dd924b1855b21f13b75d2de9d117fcc125b1ec7945376e SHA512 f6c9ad09618c9f8ebb4fe522f55fd3381cc4b6d079d912a0d2ef6ca5f48ed6c4c66805c14695469e2b3d2be2266a9b60e5fc698116cd655fd92ef0f4705fdbb2
 DIST neovim-0.8.3.tar.gz 11406282 BLAKE2B 67f4d4d1857e4c0416639dd0986f34b3842883ef48b68d90704472b40f1f064798f1f5f3c29e485f04ef8b2ed387132549442e86624b43f2ababff05bc477312 SHA512 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8
+DIST neovim-0.9.0.tar.gz 11549103 BLAKE2B f07b61f02a11acf678358999ea364b6a64724451a9a75f2d6ca436edc5ead9c6422f1c7e99c4322dc0bb92daacf306e32e214ab34d10f78f28d4ffad17b878c7 SHA512 e42f09f408b83fc34e8f169321e0349d1f851e67a998265c53d2ddb1a4792c3f4777fabe32baf2c7eff7d3745ff60d4a07da542ccd272883f7f4e080b2c9c1bf

diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.9.0-cmake-darwin.patch
new file mode 100644
index 000000000000..cba966a4ebfa
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.9.0-cmake-darwin.patch
@@ -0,0 +1,13 @@
+--- a/src/nvim/CMakeLists.txt
++++ b/src/nvim/CMakeLists.txt
+@@ -394,10 +394,6 @@ foreach(gen_include ${prop})
+   list(APPEND gen_cflags "-I${gen_include}")
+ endforeach()
+ list(APPEND gen_cflags "-I${DEPS_PREFIX}/include")
+-if(APPLE AND CMAKE_OSX_SYSROOT)
+-  list(APPEND gen_cflags "-isysroot")
+-  list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}")
+-endif()
+ set(gen_cflags ${gen_cflags} -O2)
+
+ set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h)

diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch
new file mode 100644
index 000000000000..b6026437f7bf
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 521ef93..a637866 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,12 +114,6 @@ set(NVIM_API_LEVEL 11)         # Bump this after any API change.
+ set(NVIM_API_LEVEL_COMPAT 0)  # Adjust this after a _breaking_ API change.
+ set(NVIM_API_PRERELEASE false)
+ 
+-# Default to -O2 on release builds.
+-if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3")
+-  message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2")
+-  string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+-endif()
+-
+ # Build-type: RelWithDebInfo
+ 
+ # /Og means something different in MSVC

diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch
new file mode 100644
index 000000000000..b14b3b992349
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/src/nvim/CMakeLists.txt
++++ b/src/nvim/CMakeLists.txt
+@@ -464,7 +464,7 @@ endif()
+ # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
+ option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
+ if(PREFER_LUA)
+-  find_package(Lua 5.1 EXACT REQUIRED)
++  find_package(Lua ${PREFER_LUA} EXACT REQUIRED)
+   target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUA_INCLUDE_DIR})
+   target_link_libraries(main_lib INTERFACE ${LUA_LIBRARIES})
+   # Passive (not REQUIRED): if LUAJIT_FOUND is not set, fixtures for unittests is skipped.

diff --git a/app-editors/neovim/neovim-0.9.0.ebuild b/app-editors/neovim/neovim-0.9.0.ebuild
new file mode 100644
index 000000000000..74754842445c
--- /dev/null
+++ b/app-editors/neovim/neovim-0.9.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2023 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 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+lto +nvimpager test +tui"
+
+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 )"
+# 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).
+DEPEND="${LUA_DEPS}
+	>=dev-lua/luv-1.44.2[${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/libuv-1.44.2:=
+	>=dev-libs/libvterm-0.3
+	>=dev-libs/msgpack-3.0.0:=
+	>=dev-libs/tree-sitter-0.20.8:=
+	tui? (
+		>=dev-libs/libtermkey-0.22
+		>=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}-0.9.0-cmake-darwin.patch"
+	"${FILESDIR}/${PN}-0.9.0-cmake-release-type.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() {
+	# 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.
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+	local mycmakeargs=(
+		-DENABLE_LTO=$(usex lto)
+		-DFEAT_TUI=$(usex tui)
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${ELUA}"
+		-DMIN_LOG_LEVEL=3
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# 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
+}