gentoo auto-resync : 13:08:2022 - 14:24:01

5 files changed, 33 insertions, 9 deletions

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index c70907d9ace1..66b2d8c94b34 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,12 +2,13 @@ AUX neovim-0.4.4-cmake-darwin.patch 2599 BLAKE2B 7d5d5298f3b32385bcd17c582865f55
 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-9999-cmake-darwin.patch 2416 BLAKE2B 12395ed66834f755e35232c1227dd1ef69e7de9c14b76544657e4dd5f974054427cafd74f6c91957f62f47c860a15da1a91bb85dd663c5021fbb6f0cc50d8b25 SHA512 9743e998a584619bc1bc0a1f739e970cbe8a16127c743178a57dd024628fadf685a60704236345ff069e9fb7c78b6207c4dc7de0d7b8e2bf86116fe0394b18d3
-AUX neovim-9999-cmake_lua_version.patch 425 BLAKE2B bd4a2f9f92c5a625456905532b2e121478431267fcb8b7a59ce0e7a315b75f47795ba13686608143f618cef3c17c21c47ca50ae6c6cfaa568324fd515da57924 SHA512 5e4d51262e5098fd5fa596b5a1cb9cc8b49c1ad4b7ecdc333829d6f8745d082e199e4d68338c53bd09e7e57ae3235ad30ca4613eec8eb9fab14c61cad5ba502c
+AUX neovim-9999-cmake-darwin.patch 2928 BLAKE2B 351322e450215f6114b188aa18ce4ed697c04d0b7aa108c3a64354fa4f822a89d7c6ffe103fa8fc9e4961e59c8a18fc70e61617b5835588ca0252453c99d2f78 SHA512 615d9442db90b710754fdf5edb6090bcb27f951f2fca678e368a91a7d9a44ca1961e1d8d65112e249fe0a06b04bf60dce47a3384eecc97c893dbcaedc0c62761
+AUX neovim-9999-cmake-release-type.patch 627 BLAKE2B 66f933d3f2473107f7890534deae21769fcbfa95d999fc24143e1e9fd8356fb8c9a472142741ae2a96f5294300859c7057d0d107b5f4e094aee85cd180adc940 SHA512 f08da1e59b94a20393216de4a97bf551aa5edaa3d9f67495db3db02be5c91bb92e26ac50e1d072ddefc6d98d133d0e0fe65d7b760967bc6020eb2e8bba3421f9
+AUX neovim-9999-cmake_lua_version.patch 433 BLAKE2B bf24bad4c0e0f7f902172e35771ff8d2fdadbaa14460b0757f0a3ae5e8be083da6149a7025c70cf5de3f6fb853dc2563d0b83891dabcf18a7745a699b6173e17 SHA512 245e5427a79d7ab3cbea66ee2b27aee5020ae9db2784f2aa3945773bbff629c721da1dc562b0142e9e870e159be888457893d253339cf2f5988c5c0e63ec4973
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
 DIST neovim-0.7.0.tar.gz 10925354 BLAKE2B 0524d008ba1ebbe823406e94cfb048014b26bc394c686b2dd84bb7fae5a1f7f3acd42764b03b6efec10c0f25045c5838f624542b5125947e5f42d3b0d2ad1f84 SHA512 3597c54fb925a4d607bca9ba0fdb37df90ecb816da99f52baf46cc2ec79727a55048ba1d8d22c8e7d61f0e8e35546326b1d0d15c0a91de8bf5bc529c45fb1ce0
 DIST neovim-0.7.2.tar.gz 10933623 BLAKE2B c2db449a91f1685233da7125e3d4b49cb8fe26db5e498fd3a83340bd14842399474fcc7f2c78b88783195c6f7b0b8df196985b70387ed88972372a8866e2c721 SHA512 04d0fa5b23018531b70b53271821bf6944cde1bcec2210b99f5888e1339cd38f57feaa8e40874a3a504930e6614980947f31852185cbcd2ce106a0867896dd79
 EBUILD neovim-0.7.0.ebuild 3140 BLAKE2B 3b64420a63edd801b3a51fc23c2902e9aa57e3000dfda0979be57e7dbf61c690f0096e080dc6182f640a9400efbdfe99fcf3ae88468ff1081eff84d33e057fcb SHA512 69a13c372fa79a70b58419cd968f0ee325e73a00600fe17cdea8316d8062dc6b099e59db396fb99acefda62b0ef08ffdc2d9cd21b35ca18134ceba1766b2b7ba
 EBUILD neovim-0.7.2.ebuild 3139 BLAKE2B e7d19b040ba9d94abe6a1a89b0c59f25d1b9907782924e43f912dab8e9d7fc646ebd7b63c2474e1e33c9064f670b5366830b68f937b9bb7ebc9dfca418effeae SHA512 fe34e9673f54ede295abafc363eece3537fa5ce4e63a340565a871c8f0bbaf1d8bc3f19aadb5b3447ce87c1bd5db849e37e815c0911c56eb85ea9f3ca58b0c71
-EBUILD neovim-9999.ebuild 3309 BLAKE2B af43af4e917828b36914e73f6060a3e411921b66a55c1d8805b02cdb820562ffd0421b5359b00ab3ae29dc8a5217de12f6b23882f0b5bdca38313a0afa43d387 SHA512 3bf4fd433fbb60e6605fba82558602f87213d88876819a8fb680ec91c69570fb5beb3a87fbbc7a5da4aa6113cefce62f8a95ccaec4f899332c1c94ceea77e8df
+EBUILD neovim-9999.ebuild 3361 BLAKE2B c31ca7c2e75b0a5cc256ce793ae8b325245b304975ce17614174cd391da82f6dbd5af10b9aa599f0b892362a325fac188cb5472b5d89420720506ade06c0ceec SHA512 221190288e5b9e6cdb258ee275b5b7a8a7a12ee950661cf24181f72451fd22d4a79bc2a10cd3f4ba79553ec829b032bcc265293143918ab6463310a91c01055f
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
index 5b829904a13e..cf3e05716625 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -80,23 +80,6 @@ set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPS_PREFIX}/lib/pkgconfig")
+@@ -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)
  
@@ -13,6 +13,16 @@
 -  # 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.
@@ -42,7 +52,7 @@
    # The LuaJIT build does not like being passed multiple `-arch` flags
 --- a/src/nvim/CMakeLists.txt
 +++ b/src/nvim/CMakeLists.txt
-@@ -205,10 +205,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES)
+@@ -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()
diff --git a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch b/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
new file mode 100644
index 000000000000..1d7fb56b51c8
--- /dev/null
+++ b/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
@@ -0,0 +1,13 @@
+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)
diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
index d7e01275fb02..87a898032493 100644
--- a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
@@ -1,6 +1,6 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -384,7 +384,7 @@
+@@ -464,7 +464,7 @@ endif()
  option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)
  
  if(PREFER_LUA)
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index dc40449cb307..c1e19411b835 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -66,18 +66,18 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
-)
+PATCHES=()
 
 if [[ ${PV} == 9999 ]]; then
 	PATCHES+=(
 		"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
+		"${FILESDIR}/${PN}-9999-cmake-release-type.patch"
 		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
 	)
 else
 	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"
 	)
 fi