gentoo auto-resync : 10:04:2023 - 05:36:05

7 files changed, 35 insertions, 28 deletions

diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index d1e825caf2f8..f1945ffb3177 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,12 +2,13 @@ AUX neovim-0.8-cmake-darwin.patch 2938 BLAKE2B eea54402913fb3c1b2aa5b1acc1d307f2
 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-9999-cmake-darwin.patch 471 BLAKE2B c594177bfe134d469c1311859ace1fc9b425cce90fe19dafd8c679eb517fe106258bad9fea19036e76b93879142d035540998777e1d67de934695358fb5012bc SHA512 f5d01f4d4c1f669e81275e1184e3c4b7c220ff6afe67cd41a2b3c3fee653a058ea8d0fb3cc447563d89038020f0a33d59ce4c72a9cf7999820d42ee202c12d50
-AUX neovim-9999-cmake_lua_version.patch 583 BLAKE2B 085ef029e0945e410724c586f7a9f0e679af967bfe1d36cb2c4fac7579697f4d1473ef62ddbe9770bb6ef79130a6c5f0d81d3918334b5e3ca83cb951bfb547f5 SHA512 e29fbc7198b71ea8804a1676da6e9e0b3e42d436c1a280fc83dd5e932b490d5210c4cc46639d7592ab3b98ba82d5b1f8046650bc3cdcf53193f8298481611d47
+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 sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.8.2.tar.gz 11401444 BLAKE2B 2b652e98fa68c64f547777396726b80c28493841f2ec5acc01ef5dd659f0babce0baf3d5575cec1d08dd924b1855b21f13b75d2de9d117fcc125b1ec7945376e SHA512 f6c9ad09618c9f8ebb4fe522f55fd3381cc4b6d079d912a0d2ef6ca5f48ed6c4c66805c14695469e2b3d2be2266a9b60e5fc698116cd655fd92ef0f4705fdbb2
 DIST neovim-0.8.3.tar.gz 11406282 BLAKE2B 67f4d4d1857e4c0416639dd0986f34b3842883ef48b68d90704472b40f1f064798f1f5f3c29e485f04ef8b2ed387132549442e86624b43f2ababff05bc477312 SHA512 0ecf60b564a323eb95eb2e67f7dc7e1c1e7bfc70b08466a66eb668d1b75a7362ca42901cd5a64fda22292375e2921ba61c299ac846f820ac146dc55426813eb8
-EBUILD neovim-0.8.2.ebuild 3389 BLAKE2B 0f7b25c4f66906a4567550d45ece8690c9d8d6c4dd6125866a833c99554af53631b37a5b2a2647a377838e4d2aa06e5e845ec2ee4d61bee98fe2206d3b4ab4c0 SHA512 d81577242262d1eda5822fc9c07b7d65effbca90dc8f0c2e1e9e6abf9908eeaf2fa214f27c8794ccb7cbd8b6ce86c80fc4b2a40cfc6d7be0c7b187d94f6ba5f3
-EBUILD neovim-0.8.3.ebuild 3398 BLAKE2B 23e837d22b1d69d53e07f55f5cdcdad9b637cd1f91e827d763adca332a8a68f95ad082c32d96cdc78fa0d79422f78b0de493a9f646bec9ae13659031c2bdc4c6 SHA512 d2698bf694eda1ed9d8c87ceddda8225c8fc09620ed761156902f49ab82c5421b8ea9ccec85b65e4f5470c74094142bae55f8aec6aa0a0f02b32ee3e4f0423f6
-EBUILD neovim-9999.ebuild 3346 BLAKE2B a6bf1bfacf1f5beee04f48a3c4655842312bbce8217f14edc5b910de81122ef9c5b78691bcd0ed6f15dc3ad41d9ed932d22e77afc0a9c449954bc982e19edb93 SHA512 fe2ddc72b3246a495599df7bffac19705a2485bbd377fc0004f84b3529b5bd434ebabbf68337bba675b1c5053fb6207dc585f8885c1e5f9714a52a0ba818981b
+DIST neovim-0.9.0.tar.gz 11549103 BLAKE2B f07b61f02a11acf678358999ea364b6a64724451a9a75f2d6ca436edc5ead9c6422f1c7e99c4322dc0bb92daacf306e32e214ab34d10f78f28d4ffad17b878c7 SHA512 e42f09f408b83fc34e8f169321e0349d1f851e67a998265c53d2ddb1a4792c3f4777fabe32baf2c7eff7d3745ff60d4a07da542ccd272883f7f4e080b2c9c1bf
+EBUILD neovim-0.8.3.ebuild 3397 BLAKE2B 75e86227ed1929c26e5d3afeb1dcdbdbcdd72b82f836ed651e332bc69645a84e822b1a88c8454d238e52abd6b9dd4bfaac61bcb8b3dd43e50fc6b10e76ab7279 SHA512 67b074e94c7ab80ac2f52552bd7f314494cd6c2fc0a3167aca48002c413bdd918dcc7581815c4bdd243aaf89514e9dc8d7c1be51a33c6f156bf5decbb9bdedb0
+EBUILD neovim-0.9.0.ebuild 3306 BLAKE2B fc49b2daf69b33ed7b47a62e07575ee2403454074038014ac57a199d9c3bd5ef644ccf4ff29748f39a877a3fda53b9fa837ea2ab3a2a34175d17824712df02ac SHA512 23bafda6c32f981fe7e4588e833ce52182205c65cd619c8d2be8aeb0941fa173575cf00e91735043be19abf539deac5e08baa7c4dc33815752311998edeec56c
+EBUILD neovim-9999.ebuild 3306 BLAKE2B fc49b2daf69b33ed7b47a62e07575ee2403454074038014ac57a199d9c3bd5ef644ccf4ff29748f39a877a3fda53b9fa837ea2ab3a2a34175d17824712df02ac SHA512 23bafda6c32f981fe7e4588e833ce52182205c65cd619c8d2be8aeb0941fa173575cf00e91735043be19abf539deac5e08baa7c4dc33815752311998edeec56c
 MISC metadata.xml 795 BLAKE2B cd2ca0a1f0024ef58bf71ae5b8e50da205213b110f42b62cbcaa10ce6b1edd3fdc724afbb996f29aae52765e29a9342fd22b43b6de8c27b532bd5f094e14b160 SHA512 e36e72c448a6e430668e7a1fd45e9c83e8a396e6b23177fc61ce6e8e8996184b84f3d9f282a9faf5b3cbea845189578437f356f92414393b3cfeb2ea313d9644
diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.9.0-cmake-darwin.patch
index cba966a4ebfa..cba966a4ebfa 100644
--- a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch
+++ b/app-editors/neovim/files/neovim-0.9.0-cmake-darwin.patch
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-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch
index b14b3b992349..b14b3b992349 100644
--- a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch
+++ b/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch
diff --git a/app-editors/neovim/neovim-0.8.3.ebuild b/app-editors/neovim/neovim-0.8.3.ebuild
index 7d44b52012f1..f511e1520665 100644
--- a/app-editors/neovim/neovim-0.8.3.ebuild
+++ b/app-editors/neovim/neovim-0.8.3.ebuild
@@ -16,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 ~ppc64 ~riscv x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
diff --git a/app-editors/neovim/neovim-0.8.2.ebuild b/app-editors/neovim/neovim-0.9.0.ebuild
index 68e7c6e9f33e..783269f4e2a4 100644
--- a/app-editors/neovim/neovim-0.8.2.ebuild
+++ b/app-editors/neovim/neovim-0.9.0.ebuild
@@ -16,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 ~ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -52,7 +52,7 @@ DEPEND="${LUA_DEPS}
 	>=dev-libs/libuv-1.44.2:=
 	>=dev-libs/libvterm-0.3
 	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.20.2:=
+	>=dev-libs/tree-sitter-0.20.8:=
 	tui? (
 		>=dev-libs/libtermkey-0.22
 		>=dev-libs/unibilium-2.0.0:0=
@@ -62,24 +62,18 @@ RDEPEND="
 	${DEPEND}
 	app-eselect/eselect-vi
 "
-BDEPEND="
+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"
+	"${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"
 )
 
-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|" \
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 75c83337a13a..783269f4e2a4 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -16,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 ~ppc64 ~riscv ~x86 ~x64-macos"
 fi
 
 LICENSE="Apache-2.0 vim"
@@ -69,16 +69,11 @@ BDEPEND+="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-9999-cmake_lua_version.patch"
-	"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+	"${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"
 )
 
-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|" \