gentoo auto-resync : 02:11:2022 - 21:10:25

4 files changed, 13 insertions, 15 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 2c3b1f2bf870..baf9486a5f34 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 7876d4bc134a..25d5bfcc78d4 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -3,7 +3,7 @@ AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb3
 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 2938 BLAKE2B eea54402913fb3c1b2aa5b1acc1d307f2b43ed3fb18b489f8341becc281280417222c2996cb5e353a6fb0c42792184c65f670cae931eb08356dc0659e8fcd7e6 SHA512 cfa0719bf069dd1eca885df658b9722b7701a78afc9a498df4a1e868f8bb8e1eb3c5f990003901bd3ed20a29d73d644ff7438f024b43217b90f9a92f9e88bc2a
-AUX neovim-9999-cmake-release-type.patch 1087 BLAKE2B a3cad7ee2803fe189200eea597aaaf5f45f4306c53b8e69e3c2ccc93ec64b52c1a60214c41033a1d3dc50b907b14faeb49eaf50c586855448ba02e82495336b3 SHA512 474f23acf6e8f41b954eec0fa2d52d4fde4712058d95b4d93a975374af8db9239d69c1c720384c1625cdf521e50d7da78f7bf802d1e1e60866fc45ab0d07a4c1
+AUX neovim-9999-cmake-release-type.patch 1102 BLAKE2B 2b0071bca32ab58aeebe5f0ad3fa3a9d52e31a695301cc440ddf0aa4bc59cd00a218ea90368e228e07df150eaf0735d70a87de2e707809830a385c87d7669d06 SHA512 121b9ae9d70c05e565908462a7d15f557cd40868131d75d830ff4b5d1f602c4daf1cb6a69fc0a60cf92b6168347d9e2f5aac1cb12a00677b7d25ce7daad4ca75
 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
@@ -12,5 +12,5 @@ DIST neovim-0.8.0.tar.gz 11387355 BLAKE2B 341f0fa10f0001324c87c26e7c0047334c2580
 EBUILD neovim-0.7.0.ebuild 3140 BLAKE2B 3b64420a63edd801b3a51fc23c2902e9aa57e3000dfda0979be57e7dbf61c690f0096e080dc6182f640a9400efbdfe99fcf3ae88468ff1081eff84d33e057fcb SHA512 69a13c372fa79a70b58419cd968f0ee325e73a00600fe17cdea8316d8062dc6b099e59db396fb99acefda62b0ef08ffdc2d9cd21b35ca18134ceba1766b2b7ba
 EBUILD neovim-0.7.2.ebuild 3139 BLAKE2B e7d19b040ba9d94abe6a1a89b0c59f25d1b9907782924e43f912dab8e9d7fc646ebd7b63c2474e1e33c9064f670b5366830b68f937b9bb7ebc9dfca418effeae SHA512 fe34e9673f54ede295abafc363eece3537fa5ce4e63a340565a871c8f0bbaf1d8bc3f19aadb5b3447ce87c1bd5db849e37e815c0911c56eb85ea9f3ca58b0c71
 EBUILD neovim-0.8.0-r1.ebuild 3514 BLAKE2B 757f25d1541942cd4ccbec8492686ecdb9c4d401675dae187685247fbd69125d3633cab0043b14a5551df9c2350f74aef328f2c3f6e3814c6f7b09aeb1bd5f03 SHA512 003a6631d3579af7d177fcb9827e3ac6e6b72d6299d40820954395bcc99602235a3ab4ff439cd241616be68fd16153aa63c08b31d84a0366b296c5d53cfa0cf2
-EBUILD neovim-9999.ebuild 3514 BLAKE2B 757f25d1541942cd4ccbec8492686ecdb9c4d401675dae187685247fbd69125d3633cab0043b14a5551df9c2350f74aef328f2c3f6e3814c6f7b09aeb1bd5f03 SHA512 003a6631d3579af7d177fcb9827e3ac6e6b72d6299d40820954395bcc99602235a3ab4ff439cd241616be68fd16153aa63c08b31d84a0366b296c5d53cfa0cf2
+EBUILD neovim-9999.ebuild 3410 BLAKE2B 5545f7480e3316aaef27277345f93f6bacab4cb6b3a61289f2e612f20e1dacfb29974f2b6445f4e7e7afac19be72a462f2245ee422c4c5c706d9b97b19f3cc8d SHA512 5a750bc0de072accda56ca64c98ac6b7b912f83bd682cf439f4fd1c691e20c2bfa6844846b4276949881d8cfd2f5235a50e994ae9283c12465f0c952ce1b4107
 MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8
diff --git a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch b/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
index 8114e2a92b74..8c24b6b6123f 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
+++ b/app-editors/neovim/files/neovim-9999-cmake-release-type.patch
@@ -1,16 +1,16 @@
 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/runtime/lua/nvim/health.lua
++++ b/runtime/lua/nvim/health.lua
+@@ -149,7 +149,7 @@ local function check_performance()
+     let s:buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+')
+     if empty(s:buildtype)
+       call health#report_error('failed to get build type from :version')
+-    elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)'
++    elseif s:buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)'
+       call health#report_ok(s:buildtype)
+     else
+       call health#report_info(s:buildtype)
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -137,12 +137,6 @@ else()
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index fe675b291f83..da37df6874aa 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -73,13 +73,11 @@ 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}-9999-cmake_lua_version.patch"
-		"${FILESDIR}/${PN}-9999-cmake-release-type.patch"
 		"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
 	)
 fi