From 441510fa20665b7920b149994e72b3a1cd62a813 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 May 2023 09:23:01 +0100 Subject: gentoo auto-resync : 31:05:2023 - 09:23:01 --- app-editors/neovim/Manifest | 14 +-- .../neovim/files/neovim-0.8-cmake-darwin.patch | 65 ----------- .../files/neovim-0.8-cmake_lua_version.patch | 11 -- .../files/neovim-0.8-msgpack-6.0.0-fix.patch | 26 ----- .../files/neovim-0.8.0-cmake-release-type.patch | 28 ----- .../neovim/files/neovim-0.9.1-cmake-darwin.patch | 14 +++ .../neovim/files/neovim-9999-cmake-darwin.patch | 14 --- app-editors/neovim/metadata.xml | 1 - app-editors/neovim/neovim-0.8.3.ebuild | 130 --------------------- app-editors/neovim/neovim-0.9.1.ebuild | 120 +++++++++++++++++++ app-editors/neovim/neovim-9999.ebuild | 2 +- 11 files changed, 140 insertions(+), 285 deletions(-) delete mode 100644 app-editors/neovim/files/neovim-0.8-cmake-darwin.patch delete mode 100644 app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch delete mode 100644 app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch delete mode 100644 app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch create mode 100644 app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch delete mode 100644 app-editors/neovim/files/neovim-9999-cmake-darwin.patch delete mode 100644 app-editors/neovim/neovim-0.8.3.ebuild create mode 100644 app-editors/neovim/neovim-0.9.1.ebuild (limited to 'app-editors/neovim') diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 460dbd7fa566..56ae8f8e5b2d 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,15 +1,11 @@ -AUX neovim-0.8-cmake-darwin.patch 2938 BLAKE2B eea54402913fb3c1b2aa5b1acc1d307f2b43ed3fb18b489f8341becc281280417222c2996cb5e353a6fb0c42792184c65f670cae931eb08356dc0659e8fcd7e6 SHA512 cfa0719bf069dd1eca885df658b9722b7701a78afc9a498df4a1e868f8bb8e1eb3c5f990003901bd3ed20a29d73d644ff7438f024b43217b90f9a92f9e88bc2a -AUX neovim-0.8-cmake_lua_version.patch 433 BLAKE2B bf24bad4c0e0f7f902172e35771ff8d2fdadbaa14460b0757f0a3ae5e8be083da6149a7025c70cf5de3f6fb853dc2563d0b83891dabcf18a7745a699b6173e17 SHA512 245e5427a79d7ab3cbea66ee2b27aee5020ae9db2784f2aa3945773bbff629c721da1dc562b0142e9e870e159be888457893d253339cf2f5988c5c0e63ec4973 -AUX neovim-0.8-msgpack-6.0.0-fix.patch 867 BLAKE2B 0e8a08973fb1ed766337c19bc43ff5576ad7c0c6372eca1937ea9c0cc6807a9245020bc4dfc26f56c82a8efeeb6cd8e60ec9e78348e96110ee94437dc8b15ebf SHA512 d726c8ab9b143d7493f280d157c8adcb7a3847005ad3aa132634a6fa9eaa09331e2bd3c41c5480b78b0bb262aed187b1ac75465358c677e532c7267bdfdcf3a4 -AUX neovim-0.8.0-cmake-release-type.patch 1087 BLAKE2B a3cad7ee2803fe189200eea597aaaf5f45f4306c53b8e69e3c2ccc93ec64b52c1a60214c41033a1d3dc50b907b14faeb49eaf50c586855448ba02e82495336b3 SHA512 474f23acf6e8f41b954eec0fa2d52d4fde4712058d95b4d93a975374af8db9239d69c1c720384c1625cdf521e50d7da78f7bf802d1e1e60866fc45ab0d07a4c1 AUX neovim-0.9.0-cmake-darwin.patch 471 BLAKE2B c594177bfe134d469c1311859ace1fc9b425cce90fe19dafd8c679eb517fe106258bad9fea19036e76b93879142d035540998777e1d67de934695358fb5012bc SHA512 f5d01f4d4c1f669e81275e1184e3c4b7c220ff6afe67cd41a2b3c3fee653a058ea8d0fb3cc447563d89038020f0a33d59ce4c72a9cf7999820d42ee202c12d50 AUX neovim-0.9.0-cmake-release-type.patch 624 BLAKE2B ee230ce39f70bbd7c37c15d1b6e37e664bb5f729d4563b392f904f0e38e67f9416ffb6e23bf7dfc200b334288cd75f89b542e26ad74b7aac796ee6a2662642fc SHA512 af82955921c76e031bb62b5418fb0c116c431bba31e18e43bc3e7fccf8b82a45ef18646bdecd25a98c75d58c9105fdeb2ff23462d97b6105d19c5b5f480dae99 AUX neovim-0.9.0-cmake_lua_version.patch 583 BLAKE2B 085ef029e0945e410724c586f7a9f0e679af967bfe1d36cb2c4fac7579697f4d1473ef62ddbe9770bb6ef79130a6c5f0d81d3918334b5e3ca83cb951bfb547f5 SHA512 e29fbc7198b71ea8804a1676da6e9e0b3e42d436c1a280fc83dd5e932b490d5210c4cc46639d7592ab3b98ba82d5b1f8046650bc3cdcf53193f8298481611d47 -AUX neovim-9999-cmake-darwin.patch 438 BLAKE2B da56fa8bfd3a01a93c5039cb8b9d02753e6be5b96782537e4c9f7f2c4ebab32f95f42eeb3c193e2ae22acea03c293d808736ca38c7f082ca5fcc57076f16e736 SHA512 87afea0d283eaf261dda76d84e3b09dabc2aaf021877f2457af240581ca22d9bb29cc7fa44c3804727dacd9e8c0d3c0edf5d72e59e34dd5e6496b9a30a0669b8 +AUX neovim-0.9.1-cmake-darwin.patch 438 BLAKE2B da56fa8bfd3a01a93c5039cb8b9d02753e6be5b96782537e4c9f7f2c4ebab32f95f42eeb3c193e2ae22acea03c293d808736ca38c7f082ca5fcc57076f16e736 SHA512 87afea0d283eaf261dda76d84e3b09dabc2aaf021877f2457af240581ca22d9bb29cc7fa44c3804727dacd9e8c0d3c0edf5d72e59e34dd5e6496b9a30a0669b8 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a -DIST neovim-0.8.3.tar.gz 11406282 BLAKE2B 67f4d4d1857e4c0416639dd0986f34b3842883ef48b68d90704472b40f1f064798f1f5f3c29e485f04ef8b2ed387132549442e86624b43f2ababff05bc477312 SHA512 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8 DIST neovim-0.9.0.tar.gz 11549103 BLAKE2B f07b61f02a11acf678358999ea364b6a64724451a9a75f2d6ca436edc5ead9c6422f1c7e99c4322dc0bb92daacf306e32e214ab34d10f78f28d4ffad17b878c7 SHA512 e42f09f408b83fc34e8f169321e0349d1f851e67a998265c53d2ddb1a4792c3f4777fabe32baf2c7eff7d3745ff60d4a07da542ccd272883f7f4e080b2c9c1bf -EBUILD neovim-0.8.3.ebuild 3397 BLAKE2B 75e86227ed1929c26e5d3afeb1dcdbdbcdd72b82f836ed651e332bc69645a84e822b1a88c8454d238e52abd6b9dd4bfaac61bcb8b3dd43e50fc6b10e76ab7279 SHA512 67b074e94c7ab80ac2f52552bd7f314494cd6c2fc0a3167aca48002c413bdd918dcc7581815c4bdd243aaf89514e9dc8d7c1be51a33c6f156bf5decbb9bdedb0 +DIST neovim-0.9.1.tar.gz 11567358 BLAKE2B 7aa56c672f7d26db7d47df39941487de32008b9e78921d71860281e8319b30dc6cd889a029c83b61814baecac947f39a950245ed7e51c35509b30e9b39046a58 SHA512 339efd3d8c1a73aa3b43e8770d6943aeba9e4ce6a3598c0424e388f80759d50b14aa7c60fd435bf2d17997476e06d28b79e7e98670d02ca9ceec031841e8b9b8 EBUILD neovim-0.9.0-r1.ebuild 3240 BLAKE2B 1800f7fbd64380bfbdb2cc16a148b56deecb68e02d1e233fba1b976fc8adc09ad3dc72d170ae425fa0563d00748c8c78e7b37f93e1347710f4d18a15ced2b816 SHA512 15e3c8da9bd590f3c3a927bfca6a577f2307ac0f63ea793639274dd4c9d453e9c9e6fcdb2680f8667ea19137651320820e35a234d11e6c26d9bfe38b69cd352e -EBUILD neovim-9999.ebuild 3190 BLAKE2B 57f80f2afdd6e19d741640a63876fc340506ff5e2a52b33aec526b0b03fbb261dc6094b7d9439e8eb325a7ee073e951f320a67f7429a481f8c3e4159c1104dc2 SHA512 9b2c2cfb99b19af525d2f11e2b7e220b3ef04be8c44895a74d452552718bc3b68179f4276da557430955f0be7ef0a4b022eda0779b6cf62e97db80414a2a99c3 -MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8 +EBUILD neovim-0.9.1.ebuild 3243 BLAKE2B 132b99381ad9279fc24da1740958bfc1f9361de500658149d68cfc1edd9125c4e8a44ceed5d3e835372e6492df6b9442e192fb9bd6a9a6f29fc8b8bac647d8da SHA512 57f08ed56f8ead191e56b19aa2742c5505f399370b7678ed63879d6dc51317f11352708a7cd1a6d54b86a8701896be17f38e3bb441e62b8b28f892dbf8fbc8a8 +EBUILD neovim-9999.ebuild 3191 BLAKE2B f4c86a8619cec7bf68cc7d64da385b28d4f247e82bde4d7ccd564ab790ca85bdd586ba1189f7d694dd4640b23e5e9bd313f65add03e8ce083ba4ff95b224f967 SHA512 879f4f383680eb454cc43ca50bf3f7f8efd9c51b2b97aa86e9edb8fcd2796525bbdeb2f41387c97f9f1a01edeb646b8ebddbeffd039d85046853f03e9c743a31 +MISC metadata.xml 484 BLAKE2B 075d658bd19bfc42dd4e63d3c7943e2b758347f629cfc6ed0d60b93de96a6330a84bd22a562dfa8083230a88a59c266539747ce5ff011254d9c5117126a802e9 SHA512 222648431f7a89736563330d0de52d1f015825e7d6ff638f9b04afb7dc4217421ffc8e564f416d0a0efc15dc4e82930454d191c4ea1b02e949157619cf24bb68 diff --git a/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch deleted file mode 100644 index ad47a46e1a7a..000000000000 --- a/app-editors/neovim/files/neovim-0.8-cmake-darwin.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,33 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig") - # used for check_c_compiler_flag - include(CheckCCompilerFlag) - --if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") -- # CMake tries to treat /sw and /opt/local as extension of the system path, but -- # that doesn't really work out very well. Once you have a dependency that -- # resides there and have to add it as an include directory, then any other -- # dependency that could be satisfied from there must be--otherwise you can end -- # up with conflicting versions. So, let's make them more of a priority having -- # them be included as one of the first places to look for dependencies. -- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) -- -- # If the macOS deployment target is not set manually (via $MACOSX_DEPLOYMENT_TARGET), -- # fall back to local system version. Needs to be done both here and in cmake.deps. -- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET) -- execute_process(COMMAND sw_vers -productVersion -- OUTPUT_VARIABLE MACOS_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- set(CMAKE_OSX_DEPLOYMENT_TARGET "${MACOS_VERSION}") -- endif() -- message("Using deployment target ${CMAKE_OSX_DEPLOYMENT_TARGET}") -- -- # Work around some old, broken detection by CMake for knowing when to use the -- # isystem flag. Apple's compilers have supported this for quite some time -- # now. -- if(CMAKE_C_COMPILER_ID MATCHES "GNU") -- set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") -- endif() --endif() -- - if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") - # Ignore case when comparing filenames on Windows and Mac. - set(CASE_INSENSITIVE_FILENAME TRUE) ---- a/cmake.deps/CMakeLists.txt -+++ b/cmake.deps/CMakeLists.txt -@@ -112,13 +112,6 @@ if(CMAKE_CXX_COMPILER) - set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") - endif() - --if(CMAKE_OSX_SYSROOT) -- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- if(DEPS_CXX_COMPILER) -- set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- endif() --endif() -- - if(CMAKE_OSX_ARCHITECTURES) - string(REPLACE ";" "|" CMAKE_OSX_ARCHITECTURES_ALT_SEP "${CMAKE_OSX_ARCHITECTURES}") - # The LuaJIT build does not like being passed multiple `-arch` flags ---- a/src/nvim/CMakeLists.txt -+++ b/src/nvim/CMakeLists.txt -@@ -181,10 +181,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) - foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) - list(APPEND gen_cflags "-I${gen_include}") - endforeach() --if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) -- list(APPEND gen_cflags "-isysroot") -- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") --endif() - string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) - separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) - separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) diff --git a/app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch deleted file mode 100644 index 87a898032493..000000000000 --- a/app-editors/neovim/files/neovim-0.8-cmake_lua_version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -464,7 +464,7 @@ endif() - 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) - set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) - set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES}) - # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped. diff --git a/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch b/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch deleted file mode 100644 index ce5f7bb86dc4..000000000000 --- a/app-editors/neovim/files/neovim-0.8-msgpack-6.0.0-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -# https://github.com/neovim/neovim/commit/46c4cbced567f5f05f2c95b91cd90084ea8b5528 -# Closes: https://bugs.gentoo.org/903629 -# Contributed by Olivier Huber ---- a/cmake/FindMsgpack.cmake -+++ b/cmake/FindMsgpack.cmake -@@ -26,18 +26,8 @@ - set(MSGPACK_VERSION_STRING) - endif() - --if(MSVC) -- # The import library for the msgpack DLL has a different name -- list(APPEND MSGPACK_NAMES msgpackc_import) --else() -- list(APPEND MSGPACK_NAMES msgpackc msgpack) --endif() -- --find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES} -- # Check each directory for all names to avoid using headers/libraries from -- # different places. -- NAMES_PER_DIR -- HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS}) -+find_library(MSGPACK_LIBRARY NAMES msgpackc msgpack msgpackc_import msgpack-c -+ NAMES_PER_DIR) - - mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY) - diff --git a/app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch deleted file mode 100644 index 8114e2a92b74..000000000000 --- a/app-editors/neovim/files/neovim-0.8.0-cmake-release-type.patch +++ /dev/null @@ -1,28 +0,0 @@ -Ensure that :checkhealth is happy with the Gentoo build type. -https://bugs.gentoo.org/757744 ---- a/runtime/autoload/health/nvim.vim -+++ b/runtime/autoload/health/nvim.vim -@@ -135,7 +135,7 @@ function! s:check_performance() abort - let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') - if empty(buildtype) - call health#report_error('failed to get build type from :version') -- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' -+ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' - call health#report_ok(buildtype) - else - call health#report_info(buildtype) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -137,12 +137,6 @@ else() - message(STATUS "MIN_LOG_LEVEL=${MIN_LOG_LEVEL}") - endif() - --# 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() -- - if(CMAKE_C_COMPILER_ID MATCHES "GNU") - check_c_compiler_flag(-Og HAS_OG_FLAG) - else() diff --git a/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch new file mode 100644 index 000000000000..1488148298bd --- /dev/null +++ b/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch @@ -0,0 +1,14 @@ +--- a/src/nvim/CMakeLists.txt ++++ b/src/nvim/CMakeLists.txt +@@ -415,11 +415,7 @@ foreach(gen_include ${prop}) + list(APPEND gen_cflags "-I${gen_include}") + endforeach() + endforeach() + +-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-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch deleted file mode 100644 index 1488148298bd..000000000000 --- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/nvim/CMakeLists.txt -+++ b/src/nvim/CMakeLists.txt -@@ -415,11 +415,7 @@ foreach(gen_include ${prop}) - list(APPEND gen_cflags "-I${gen_include}") - endforeach() - endforeach() - --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/metadata.xml b/app-editors/neovim/metadata.xml index 555238c9fc17..93b24740c1b1 100644 --- a/app-editors/neovim/metadata.xml +++ b/app-editors/neovim/metadata.xml @@ -8,7 +8,6 @@ Build with Link Time Optimization (LTO) Install nvimpager symlink to less.sh macro - Build the neovim unix tui neovim/neovim diff --git a/app-editors/neovim/neovim-0.8.3.ebuild b/app-editors/neovim/neovim-0.8.3.ebuild deleted file mode 100644 index f511e1520665..000000000000 --- a/app-editors/neovim/neovim-0.8.3.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# 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 ~ppc64 ~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.2:= - 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.8-cmake_lua_version.patch" - "${FILESDIR}/${PN}-0.8-cmake-darwin.patch" - "${FILESDIR}/${PN}-0.8-msgpack-6.0.0-fix.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|" \ - -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 -} diff --git a/app-editors/neovim/neovim-0.9.1.ebuild b/app-editors/neovim/neovim-0.9.1.ebuild new file mode 100644 index 000000000000..36905669dd9e --- /dev/null +++ b/app-editors/neovim/neovim-0.9.1.ebuild @@ -0,0 +1,120 @@ +# 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 ~ppc64 ~riscv ~x86 ~x64-macos" +fi + +LICENSE="Apache-2.0 vim" +SLOT="0" +IUSE="+lto +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 )" +# 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:= + >=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.1-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) + -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") + -DLUA_PRG="${ELUA}" + ) + 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 +} diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 0bae751e05f7..154062cd1320 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -68,7 +68,7 @@ BDEPEND+=" PATCHES=( "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch" - "${FILESDIR}/${PN}-9999-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch" ) src_prepare() { -- cgit v1.2.3