gentoo auto-resync : 04:01:2023 - 12:06:28

5 files changed, 20 insertions, 93 deletions

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 854f28327ef1..925edbb41858 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,15 +1,12 @@
-AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb38a9a30be00ffa7b9d0a41b43f17d4f79860e4f097b76e093af474dfe20538332a7c6f233ebd57d845a74d7a8aead9cae2fec76 SHA512 b236c0b703ec2763a1179149715fa241573803a27dcb05324e2f766f49aaf53dfe0efc62f1c10aa6d58333ce115835e852608778d9582689550fb537103f361a
-AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c
-AUX neovim-0.7.2-cmake-darwin.patch 2418 BLAKE2B 8b80ddeedbb96d58301045f7512f9fff3dd682571c4f2cd9de57d9587efed7af5d7a44a081385d2a122b9ff456149087869f788008435311a9e21dd6c0d411bd SHA512 e5393466a3c4ac0db593f664b956bb1683f4e341c00de8b145599dbf7d0f5300c6169415ca44af21cccd8393a82747db6e0ba5cb5086a24ca5f7d82c1d1bdfd8
 AUX neovim-0.8.0-cmake-release-type.patch 1087 BLAKE2B a3cad7ee2803fe189200eea597aaaf5f45f4306c53b8e69e3c2ccc93ec64b52c1a60214c41033a1d3dc50b907b14faeb49eaf50c586855448ba02e82495336b3 SHA512 474f23acf6e8f41b954eec0fa2d52d4fde4712058d95b4d93a975374af8db9239d69c1c720384c1625cdf521e50d7da78f7bf802d1e1e60866fc45ab0d07a4c1
 AUX neovim-9999-cmake-darwin.patch 2938 BLAKE2B eea54402913fb3c1b2aa5b1acc1d307f2b43ed3fb18b489f8341becc281280417222c2996cb5e353a6fb0c42792184c65f670cae931eb08356dc0659e8fcd7e6 SHA512 cfa0719bf069dd1eca885df658b9722b7701a78afc9a498df4a1e868f8bb8e1eb3c5f990003901bd3ed20a29d73d644ff7438f024b43217b90f9a92f9e88bc2a
 AUX neovim-9999-cmake_lua_version.patch 433 BLAKE2B bf24bad4c0e0f7f902172e35771ff8d2fdadbaa14460b0757f0a3ae5e8be083da6149a7025c70cf5de3f6fb853dc2563d0b83891dabcf18a7745a699b6173e17 SHA512 245e5427a79d7ab3cbea66ee2b27aee5020ae9db2784f2aa3945773bbff629c721da1dc562b0142e9e870e159be888457893d253339cf2f5988c5c0e63ec4973
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.7.2.tar.gz 10933623 BLAKE2B c2db449a91f1685233da7125e3d4b49cb8fe26db5e498fd3a83340bd14842399474fcc7f2c78b88783195c6f7b0b8df196985b70387ed88972372a8866e2c721 SHA512 04d0fa5b23018531b70b53271821bf6944cde1bcec2210b99f5888e1339cd38f57feaa8e40874a3a504930e6614980947f31852185cbcd2ce106a0867896dd79
 DIST neovim-0.8.0.tar.gz 11387355 BLAKE2B 341f0fa10f0001324c87c26e7c0047334c25808901034f073945c3977dde4dda44b03869be1f530398d549f0b13dafae0eb82766464875ced2cd26621a0c5d88 SHA512 e9504e33df292043656b0ef064e465069c93d4be52bbe29ec33c111f3e00ed83647148d653e3f143e2243dac537eede6a9351990bd858ac20abc8edbc5249432
 DIST neovim-0.8.1.tar.gz 11387691 BLAKE2B fecdf430c854f36839332e1fd3b8fc4878a9d8a04adc83182d43a82047946de05f58c794b045678123a4f2ab820ec20e7f0fedb8f3bacc87071d27c1024f84db SHA512 b4059a8a0a3caedf15f4160f2342306f6f1d625f8f8499491efd6b4440e275de95a63aa857395f844cbc871432359f96abbca138f6278d1228366d6fb4c4f1a6
-EBUILD neovim-0.7.2.ebuild 3139 BLAKE2B e7d19b040ba9d94abe6a1a89b0c59f25d1b9907782924e43f912dab8e9d7fc646ebd7b63c2474e1e33c9064f670b5366830b68f937b9bb7ebc9dfca418effeae SHA512 fe34e9673f54ede295abafc363eece3537fa5ce4e63a340565a871c8f0bbaf1d8bc3f19aadb5b3447ce87c1bd5db849e37e815c0911c56eb85ea9f3ca58b0c71
+DIST neovim-0.8.2.tar.gz 11401444 BLAKE2B 2b652e98fa68c64f547777396726b80c28493841f2ec5acc01ef5dd659f0babce0baf3d5575cec1d08dd924b1855b21f13b75d2de9d117fcc125b1ec7945376e SHA512 f6c9ad09618c9f8ebb4fe522f55fd3381cc4b6d079d912a0d2ef6ca5f48ed6c4c66805c14695469e2b3d2be2266a9b60e5fc698116cd655fd92ef0f4705fdbb2
 EBUILD neovim-0.8.0-r1.ebuild 3460 BLAKE2B f18a80495bb7c241656d61aea52628610b55804e967f38b2257d44a54e48f8d270463731c543529bde973d43dc89ca172a07ca73a195b966cf712dc8aae9fc0d SHA512 263962b8cca03ab83b7a8b3120adf1ef76a3f9b2445a71b940c33bae9fce260eb9a6a188e2e924edde010447328f31a01a4d182d2581c04ea3c8edbe7d75fd6d
 EBUILD neovim-0.8.1.ebuild 3461 BLAKE2B bfeddeff2247519b07d257859d998060e635abd6db97908e6966c1ccbe9b121070b68bef226b0c31bd8afb70c1cd19bb327ec15db7abb488de76c2df631b321a SHA512 b010aefb5b843dc90593bfcdfb476c1aaf56fcdff1b81ad1d877f463aa004d409753d2d19fc1eb2caf33a009336e86170f040e4912ed5eb7dcf4ed3fd88b0f00
+EBUILD neovim-0.8.2.ebuild 3345 BLAKE2B 99383cf0fc60f7b3a26d5ecf0764c62ec0e915543527a946f5b87ee2b187331698f3cf121d9318d9dc5f3a323b75dc749331c8b43392f9dd631f768fa4754c43 SHA512 362e23b5dd98a03593ffabae9dc7174a6c7f5735a380548da529a71b723956443cf94f39d44eba6e8609684a73726096b67133e3c28fc9f45dd08be603857bd7
 EBUILD neovim-9999.ebuild 3410 BLAKE2B 5545f7480e3316aaef27277345f93f6bacab4cb6b3a61289f2e612f20e1dacfb29974f2b6445f4e7e7afac19be72a462f2245ee422c4c5c706d9b97b19f3cc8d SHA512 5a750bc0de072accda56ca64c98ac6b7b912f83bd682cf439f4fd1c691e20c2bfa6844846b4276949881d8cfd2f5235a50e994ae9283c12465f0c952ce1b4107
 MISC metadata.xml 795 BLAKE2B cd2ca0a1f0024ef58bf71ae5b8e50da205213b110f42b62cbcaa10ce6b1edd3fdc724afbb996f29aae52765e29a9342fd22b43b6de8c27b532bd5f094e14b160 SHA512 e36e72c448a6e430668e7a1fd45e9c83e8a396e6b23177fc61ce6e8e8996184b84f3d9f282a9faf5b3cbea845189578437f356f92414393b3cfeb2ea313d9644
diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch
deleted file mode 100644
index 2c9c80a7a690..000000000000
--- a/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch
+++ /dev/null
@@ -1,13 +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
-@@ -118,7 +118,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)
diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch
deleted file mode 100644
index 4703dee52613..000000000000
--- a/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -384,7 +384,7 @@
- option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
- 
- if(PREFER_LUA)
--  find_package(Lua 5.1 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.7.2-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch
deleted file mode 100644
index a8404bd4a97a..000000000000
--- a/app-editors/neovim/files/neovim-0.7.2-cmake-darwin.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,23 +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)
--
--  # 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_COMPILER_IS_GNUCC)
--    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/src/nvim/CMakeLists.txt
-+++ b/src/nvim/CMakeLists.txt
-@@ -205,10 +205,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}})
---- a/third-party/CMakeLists.txt
-+++ b/third-party/CMakeLists.txt
-@@ -117,13 +117,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
diff --git a/app-editors/neovim/neovim-0.7.2.ebuild b/app-editors/neovim/neovim-0.8.2.ebuild
index 62d976d90175..6083e311ff39 100644
--- a/app-editors/neovim/neovim-0.7.2.ebuild
+++ b/app-editors/neovim/neovim-0.8.2.ebuild
@@ -3,8 +3,9 @@
 
 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"
@@ -15,7 +16,7 @@ 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 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -32,6 +33,7 @@ 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
@@ -39,7 +41,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.43.0[${LUA_SINGLE_USEDEP}]
+	>=dev-lua/luv-1.44.2[${LUA_SINGLE_USEDEP}]
 	$(lua_gen_cond_dep '
 		dev-lua/lpeg[${LUA_USEDEP}]
 		dev-lua/mpack[${LUA_USEDEP}]
@@ -47,10 +49,10 @@ DEPEND="${LUA_DEPS}
 	$(lua_gen_cond_dep '
 		dev-lua/LuaBitOp[${LUA_USEDEP}]
 	' lua5-{1,2})
-	>=dev-libs/libuv-1.44.1:=
-	>=dev-libs/libvterm-0.1.4
+	>=dev-libs/libuv-1.44.2:=
+	>=dev-libs/libvterm-0.3
 	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.6:=
+	>=dev-libs/tree-sitter-0.20.2:=
 	tui? (
 		>=dev-libs/libtermkey-0.22
 		>=dev-libs/unibilium-2.0.0:0=
@@ -67,16 +69,23 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-	"${FILESDIR}/${PN}-0.7.2-cmake-darwin.patch"
+	"${FILESDIR}/${PN}-9999-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|" \
 		-i src/nvim/globals.h || die
 
+	# https://forums.gentoo.org/viewtopic-p-8750050.html
+	xdg_environment_reset
 	cmake_src_prepare
 }