gentoo auto-resync : 12:12:2024 - 02:01:23

8 files changed, 143 insertions, 17 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 032138419061..2e19f0666ea8 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 7f26db7fd033..471f555254b4 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -4,6 +4,7 @@ AUX sysinit.vim 3131 BLAKE2B 0c64d5750f2db149308021549b327d0835b20bd4cf07f9eafd4
 DIST neovim-0.10.1.tar.gz 12796966 BLAKE2B 85d98abe03f69ab03d09dc1b39783974af392f707deddef4640b6953ad574f9a455897217c2431c6c2fadb56568b55ac18ed06bbfcc7bbe1c6ab013991e99ee6 SHA512 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908
 DIST neovim-0.10.2.tar.gz 12801272 BLAKE2B 0cba241ec6466639044decf26728b6c17c3be7970c85b6938fceb05c329d2832c8c46d0113d83aedee458991e4cb27dfad67b3d7b84080a23035ca85ccd57e36 SHA512 6478c53bddff0bf042388464fa1c5114e8fe75c7c41b22e5426783bd2f8406bd3297ffd4bc895ea13e573f0cd28a64755c1f5c063531bb8de477c4e439384418
 EBUILD neovim-0.10.1-r1.ebuild 3554 BLAKE2B e09720f5c77fd83007375227b31d38228bc4dfa5b17235ac906ffdea99e1a06b794949f7cd6250d3c87b6bb9952c311c84cfdf2b8b4b8a93f28e91b7cdeb5ef6 SHA512 a9b43b4c12622c2638bc0bf72144fcf734fb46f197c241ceb9a59c9ee53ac6e979184b88d23031e31172544404e2c1da6fc1d5b7114f1ea714018c7defd232d2
+EBUILD neovim-0.10.2-r1.ebuild 3475 BLAKE2B 4272d7a26931c9c0067054d3055102d3a1148381f5dd11e1865c47b7c2c815d7626b79ab51c355290fc0e4d5880310435161390d3d73e843070bedcb09da201b SHA512 51f83cedbda106411dd337ee31bd545887c3ff07211d2c5b621018c9aa6305cc658aebe2397fa3013349de4809ac911888ecd720e5da67de052d9cf8ed2081a9
 EBUILD neovim-0.10.2.ebuild 3554 BLAKE2B e09720f5c77fd83007375227b31d38228bc4dfa5b17235ac906ffdea99e1a06b794949f7cd6250d3c87b6bb9952c311c84cfdf2b8b4b8a93f28e91b7cdeb5ef6 SHA512 a9b43b4c12622c2638bc0bf72144fcf734fb46f197c241ceb9a59c9ee53ac6e979184b88d23031e31172544404e2c1da6fc1d5b7114f1ea714018c7defd232d2
-EBUILD neovim-9999.ebuild 3557 BLAKE2B a47d9afecae288c109ea3f0faa7eced95dae233ccdb02ca8210762a8c7b004528ad9c6a11c3375ad930454d3c0e49066f0f81e2a2a9a9200190963dd8a9c47c1 SHA512 71fdbecf7de0e7c6a41036a8fc3b9f2ed68b645fadc61077a71a5799f338af7028a660181f6dd05762e7b1ffc0f4f15cf32a0c3a59f34bd9fb7b3dff26e8a001
+EBUILD neovim-9999.ebuild 3475 BLAKE2B 7264295dc68f17a4651ea57dc586e8aeab089608a45b6baae9cca9dd70a1a222a9a03a90ce87c06646785d5f6795ceddb4359f924c934ab2fad692ce877a3538 SHA512 785b9e27e26f905be4b30b44f8dcb84ab0ad4d84dba53e1da77495261becab4b45ebd927a3e7eed5db4f110660680e7789db9082063a1de56553c673f5592708
 MISC metadata.xml 678 BLAKE2B 45ead4b7163d0750477ac40d5aeaa3baee2cc9f2b90d6fee9d9c18c3433a6eecdcdb16665218538ddb644d2701eff02d397e44c0b84d21b1571ce7ee99354333 SHA512 faef3288490a32cf7fed881d6f35430fcc4f74a38881aee4162b2729472152f56cd2818e093d4cf832d3b74781598050300e4bcc85b0e996fb9b2d8d2da43bac
diff --git a/app-editors/neovim/neovim-0.10.2-r1.ebuild b/app-editors/neovim/neovim-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..b3efb2e90d10
--- /dev/null
+++ b/app-editors/neovim/neovim-0.10.2-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 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 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager test"
+
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+REQUIRED_USE="${LUA_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).
+# List of required tree-sitter parsers is taken from cmake.deps/deps.txt
+DEPEND="${LUA_DEPS}
+	>=dev-lua/luv-1.45.0[${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/libutf8proc-2.9.0:=
+	>=dev-libs/libuv-1.46.0:=
+	>=dev-libs/libvterm-0.3.3
+	>=dev-libs/msgpack-3.0.0:=
+	>=dev-libs/tree-sitter-0.22.6:=
+	=dev-libs/tree-sitter-c-0.21*
+	=dev-libs/tree-sitter-lua-0.1*
+	=dev-libs/tree-sitter-markdown-0.2*
+	=dev-libs/tree-sitter-query-0.4*
+	=dev-libs/tree-sitter-vim-0.4*
+	=dev-libs/tree-sitter-vimdoc-3*
+	>=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}-9999-cmake-darwin.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() {
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+	local mycmakeargs=(
+		# appends -flto
+		-DENABLE_LTO=OFF
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${LUA}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# symlink tree-sitter parsers
+	dodir /usr/share/nvim/runtime
+	for parser in c lua markdown query vim vimdoc; do
+		dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so
+	done
+
+	# 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 edf16933b50b..53c660946d05 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -53,12 +53,10 @@ DEPEND="${LUA_DEPS}
 	>=dev-libs/libuv-1.46.0:=
 	>=dev-libs/libvterm-0.3.3
 	>=dev-libs/msgpack-3.0.0:=
-	>=dev-libs/tree-sitter-0.22.6:=
-	=dev-libs/tree-sitter-bash-0.21*
-	=dev-libs/tree-sitter-c-0.21*
-	=dev-libs/tree-sitter-lua-0.1*
-	=dev-libs/tree-sitter-markdown-0.2*
-	=dev-libs/tree-sitter-python-0.21*
+	>=dev-libs/tree-sitter-0.24.3:=
+	=dev-libs/tree-sitter-c-0.23*
+	=dev-libs/tree-sitter-lua-0.2*
+	=dev-libs/tree-sitter-markdown-0.3*
 	=dev-libs/tree-sitter-query-0.4*
 	=dev-libs/tree-sitter-vim-0.4*
 	=dev-libs/tree-sitter-vimdoc-3*
@@ -109,7 +107,7 @@ src_install() {
 
 	# symlink tree-sitter parsers
 	dodir /usr/share/nvim/runtime
-	for parser in bash c lua markdown python query vim vimdoc; do
+	for parser in c lua markdown query vim vimdoc; do
 		dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so
 	done
 
diff --git a/app-editors/zed/Manifest b/app-editors/zed/Manifest
index 06104d1dc4d9..efa361753594 100644
--- a/app-editors/zed/Manifest
+++ b/app-editors/zed/Manifest
@@ -23,7 +23,7 @@ DIST zed-0.159.10-crates.tar.xz 94070480 BLAKE2B e71cbd177b8bda76f2a43b84e93c266
 DIST zed-0.159.10.tar.gz 13112831 BLAKE2B 6ce82efb4fd6a637d8951b59a892cf70e7d09c7659d75affc39930fd6f97e249f599cd7fbef7410aed3bfc7e85ea529cc536c073c4761c61980af5762bbf3230 SHA512 dcd2fbd1f61eacaadaa5db418f88fd7bceb6e5e360ad3098adaf574a1f874c5d0d1ce4de52f274b6be9df32c4fd815d0f519f413a8f7297312bd191ff30f90eb
 DIST zed-0.160.7-crates.tar.xz 94131964 BLAKE2B f7f0887b90c660c807a0a59d0c8fd11524de7511942a0779f36a185bcd8de1bfe36ce68618bafb58e56fdeae4bf84274a600c79cd0b75f854e1764d683210ffe SHA512 cb422582835923825c514ca6e4174c79fc94970a2182b46019d73dd8e2357c02a5d6a5dd7bd5d6007663b413d81e3d0c473b8e847a14435e2422818adac04ddf
 DIST zed-0.160.7.tar.gz 13122247 BLAKE2B 944333d478f6c1595ee6efc70ca3a1b01fd242b51e5e289d985cb9df3c91cda1ae2b6fc497104656f36625bdd59d618b13b1f6f6060ac898626433947231bb34 SHA512 aa16f6ecd17371330b15281418581027f868819af17ed7b7c1dda1c1abbe05d9306d13b9aa94cdbe4ec533c24f8e37132d08a9497b07be0b5c225c3f3c3687d4
-EBUILD zed-0.155.2-r1.ebuild 5326 BLAKE2B 4d77d96a302a94bcbdf3bb871323f94f446e52e2da1b46f536b9e833ca1abb256f99ce03908005b8425b8c4299a2ce013b9430c9e4a84fa1917d0ec610476ab6 SHA512 08118573af5f7d5a5b8b957b8fdc5ff4a2b595b76172ae1518bc71762bb60038e78ee0b2d90b4d5eaa3174d78d6f1d83d2da9eb938b271e9c3c6d66889e08454
-EBUILD zed-0.159.10-r1.ebuild 9438 BLAKE2B 01b7ba97496d0b26e31f01ff875f0b377ab22200eb1e6d19da54b79e03e6cd1b985b8fa71cd73f6f2a8709a5841acd5b85461dc10d672eb5def613d11e1c3a67 SHA512 81201417a3c2d1b4cb7666a65bd36ff8ab5d978852169f481764ddb3fde82ab446507190db8ed6680afe6cd71324b71bffc2006f6c0a6de6db96a8996229c43f
-EBUILD zed-0.160.7-r1.ebuild 9437 BLAKE2B 9cf33c0d87928c936fd11fd1d8a65b2552914a3aedabec3e9321ea3f5dee699960b05a2af376c00757c402b91da0fde968c9c7e6317a732775366a6f657f3cdc SHA512 68852168017d97729ceaaea8762b4b3234fe443615139ce87eb1025243c342713c64e24aa79ac17caed0a99cdf136f1c5a42282f4cdd28ac3913edae8fbd76f0
+EBUILD zed-0.155.2-r1.ebuild 5326 BLAKE2B 6108c0fbe2282bb50b06f79e063d580e8fb5c5b89466a9c4bc6670362dc790c23eadebbddb9d0e454408ca67823feafd81871fd2d937dc4bf00505e83ccc8e17 SHA512 47f472d38072e4470d35ed01706321a46239ea8e71f0380ff8087b22365b5d7627905a005ac1849a4d8dce0339f8a8018ecb510363267e37d08e0f9829833ba1
+EBUILD zed-0.159.10-r1.ebuild 9438 BLAKE2B cd13dca3c7807a86e336c97b21bfb122b09e9f0a04e3fa9fb4b4b7280ef115213c51b2693d3e8c24a7dfc2fdec34e8da71f5074ad29b353b369d550e67c6b47e SHA512 3981dfbe8767697152ca73fc5860496f3df327ca47553f5db76751e16e202b4544e38a8424129ef8211ecba5b92df9e4cc8b36a586bb26dd08ed66a76537582d
+EBUILD zed-0.160.7-r1.ebuild 9437 BLAKE2B 2f8c0685ed9cd4451b707991a0f56ab68ff038525abdc7ff7873dfec5c1fc0ef0757a87894ef6cf8211b4006874f279c2ca05ddbb6d1397870e091983ed865d0 SHA512 b58c93cf210e27c021d3c0c15f17acc96406988fa8220e03e2b28764a87af12b3c653f523d04a67206627c849722c8d7ab052aabad8a4ccc3a7de2aaa73af271
 MISC metadata.xml 575 BLAKE2B 3793593f06424fd3986e23cd148b663bfcbf5c1dc0f76847a3991bbdde8badfdc863d0994ba1b59fc0e886243ded4e4421da4b4bf6d2951887801f78b0d6d290 SHA512 b0660a1a36d59dea6b9a6e25a239f0484e1cbf98a6569dd17d6bae1145f12d7e3ac2609bbce32627bf7ca6161581cd82c087d7deb17dd662c23bd81db6465a02
diff --git a/app-editors/zed/zed-0.155.2-r1.ebuild b/app-editors/zed/zed-0.155.2-r1.ebuild
index d48523bf4511..f6d3bf8ddcca 100644
--- a/app-editors/zed/zed-0.155.2-r1.ebuild
+++ b/app-editors/zed/zed-0.155.2-r1.ebuild
@@ -80,8 +80,8 @@ BDEPEND="
 	sys-devel/gettext
 	sys-devel/mold
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=
-		sys-devel/llvm:${LLVM_SLOT}=
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
 	')
 "
 
diff --git a/app-editors/zed/zed-0.159.10-r1.ebuild b/app-editors/zed/zed-0.159.10-r1.ebuild
index 3fc90c2cbb66..ece902784f20 100644
--- a/app-editors/zed/zed-0.159.10-r1.ebuild
+++ b/app-editors/zed/zed-0.159.10-r1.ebuild
@@ -106,8 +106,8 @@ BDEPEND="
 	sys-devel/gettext
 	sys-devel/mold
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=
-		sys-devel/llvm:${LLVM_SLOT}=
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
 	')
 "
 
diff --git a/app-editors/zed/zed-0.160.7-r1.ebuild b/app-editors/zed/zed-0.160.7-r1.ebuild
index 40b6fb65ded8..ba409f0f9c56 100644
--- a/app-editors/zed/zed-0.160.7-r1.ebuild
+++ b/app-editors/zed/zed-0.160.7-r1.ebuild
@@ -106,8 +106,8 @@ BDEPEND="
 	sys-devel/gettext
 	sys-devel/mold
 	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}=
-		sys-devel/llvm:${LLVM_SLOT}=
+		llvm-core/clang:${LLVM_SLOT}=
+		llvm-core/llvm:${LLVM_SLOT}=
 	')
 "