5 files changed, 100 insertions, 137 deletions
diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 55ec17b41336..b553b1706ff5 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1,2 +1,3 @@
-DIST lua-language-server-3.16.1.zip 31995002 BLAKE2B 2c51f7b7cbefc96230d61ac23925521d284ef9875346cad4f5bc3a2ad499393925687eda8057c13ed4279fff03f2ac1d82d3f261d4287d45f40a9791542506a0 SHA512 0fd267ceb35284a7d300af2c1c464ffd6cb2e1fe3945ea936fe5e2316af52838ada4eb9b018a6bb396e95f9eac27e00309d7ed51a7f4bc34529077c3438234cf
 DIST lua-language-server-3.16.4.zip 32006835 BLAKE2B 84f4288b59b724a1332a10da03fd677d41a6062be9a0cb2f2f1f63cb4debca7332ec4d05a2b4b7b8969f18c9737c7c1b5b8d22e00688ec17cce8c9e414ec3533 SHA512 0787e5e2e5149e8a9df8e438b7e63cd55b6354f7fd6cc1cbd13b53df2efd4d185b64bb0fc25baf6800c7075e9f3e7c4826e619ab0786120e40e62679a531c332
+DIST lua-language-server-3.17.0.zip 32018097 BLAKE2B d6fcb2e8bc6a4d8aea59243939c48f25cf692b696da97b983a32c5ea163dd9bf728b01189562cec022194c4db6ff8d3c57a442b800d1082495e5dda4c889dbdf SHA512 cff02240a6394cc0d9d7533beb88e11ca47b0806fc37976ae33ea75eca5928d78dbb0501189f5150183cc0d1991c61e086c06e88f50d0fa53954ffa04562e1fa
+DIST lua-language-server-3.17.1.zip 32018139 BLAKE2B 967835203328326e5556ec81512016af302cc7a5b26a9cc13df41946862eca771a29ddc8036f9bdeadc0a076a6c3d173dcc836737295a4a18c8c2fd6b40fade9 SHA512 e21771f4c9f2c693344b10014a8d40f48bf668ff170ffac6c0e1b1a53989c1e1036b19ea8f203add3423f8d701506f4331382c3391de657469f9333769f9e6b4
diff --git a/dev-util/lua-language-server/files/3.16.1-build.ninja.patch b/dev-util/lua-language-server/files/3.16.1-build.ninja.patch
deleted file mode 100644
index 3d313b6e7501..000000000000
--- a/dev-util/lua-language-server/files/3.16.1-build.ninja.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- a/build/build.ninja
-+++ b/build/build.ninja
-@@ -12,14 +12,14 @@ rule configure
- rule c_source_lua
-   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-     -I3rd/bee.lua/3rd/lua54 -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -fPIC -o $
--    $out -c $in
-+    $out -c $in CFLAGS
-   description = Compile C   $out
-   deps = gcc
-   depfile = $out.d
- build $obj/source_lua/onelua.obj: c_source_lua 3rd/bee.lua/3rd/lua54/onelua.c
- rule cxx_source_bee
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
--    -fvisibility=hidden -I3rd/bee.lua/3rd/lua54 -DNDEBUG -fPIC -o $out -c $in
-+    -fvisibility=hidden -I3rd/bee.lua/3rd/lua54 -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -27,7 +27,7 @@ build $obj/source_bee/lua-seri.obj: cxx_source_bee $
-     3rd/bee.lua/3rd/lua-seri/lua-seri.cpp
- rule cxx_source_bee_1
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
--    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
-+    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -36,7 +36,7 @@ build $obj/source_bee/format.obj: cxx_source_bee_1 $
- rule cxx_source_bee_2
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 -DNDEBUG $
--    -fPIC -o $out -c $in
-+    -fPIC -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -90,7 +90,7 @@ build $obj/source_bee/version.obj: cxx_source_bee_2 $
- rule c_source_bee
-   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 -DBEE_STATIC $
--    -DNDEBUG -fPIC -o $out -c $in
-+    -DNDEBUG -fPIC -o $out -c $in CFLAGS
-   description = Compile C   $out
-   deps = gcc
-   depfile = $out.d
-@@ -134,7 +134,7 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_3 $
- rule cxx_source_bootstrap
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 $
--    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in
-+    -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -138,7 +138,7 @@ build $obj/source_bootstrap/main.obj: cxx_source_bootstrap $
-     3rd/bee.lua/bootstrap/main.cpp
- rule link_bootstrap
-   command = $cc $in -o $out -Wl,-E -static-libgcc -lstdc++fs -pthread -lm $
--    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+    -ldl -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
-   description = Link    Exe $out
- rule copy
-   command = cp -fv $in$input $out 1>/dev/null
-@@ -159,8 +159,8 @@ rule cxx_code_format
-     -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $
-     -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $
-     -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua54 $
--    -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -Werror -o $
--    $out -c $in
-+    -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include -DNDEBUG -Wall -o $
-+    $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -265,7 +265,7 @@ build $obj/code_format/Utf8.obj: cxx_code_format $
- rule c_lpeglabel
-   command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua/3rd/lua54 -DMAXRECLEVEL=1000 -DNDEBUG $
--    -o $out -c $in
-+    -o $out -c $in CFLAGS
-   description = Compile C   $out
-   deps = gcc
-   depfile = $out.d
-@@ -277,7 +277,7 @@ build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c
- rule cxx_lua_language_server
-   command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
-     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua54 -DCODE_FORMAT $
--    -DNDEBUG -o $out -c $in
-+    -DNDEBUG -o $out -c $in CXXFLAGS
-   description = Compile C++ $out
-   deps = gcc
-   depfile = $out.d
-@@ -279,7 +279,7 @@ build $obj/lua-language-server/modules.obj: cxx_lua_language_server $
-     make/modules.cpp
- rule link_lua_language_server
-   command = $cc $in -o $out -rdynamic -lstdc++fs -pthread -lm -ldl $
--    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s
-+    -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s LDFLAGS
-   description = Link    Exe $out
- rule run_bee_test
-   command = $bin/lua-language-server $in
diff --git a/dev-util/lua-language-server/files/lua-language-server-3.16.1-ucontext_t.patch b/dev-util/lua-language-server/files/lua-language-server-3.16.1-ucontext_t.patch
deleted file mode 100644
index 4c8f0b105dfc..000000000000
--- a/dev-util/lua-language-server/files/lua-language-server-3.16.1-ucontext_t.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/3rd/bee.lua/bee/crash/linux/unwind_linux.cpp
-+++ b/3rd/bee.lua/bee/crash/linux/unwind_linux.cpp
-@@ -6,12 +6,8 @@
- namespace bee::crash {
-     void unwind(ucontext_t *ctx, uint16_t skip, unwind_callback func, void *ud) noexcept {
-         unw_cursor_t cursor;
--#if defined(__aarch64__)
-         unw_context_t *unw_ctx = (unw_context_t *)ctx;
-         unw_init_local(&cursor, unw_ctx);
--#else
--        unw_init_local(&cursor, ctx);
--#endif
-         while (unw_step(&cursor) > 0) {
-             unw_word_t pc;
-             unw_get_reg(&cursor, UNW_REG_IP, &pc);
---- a/3rd/luamake/bee.lua/bee/crash/unwind_linux.cpp
-+++ b/3rd/luamake/bee.lua/bee/crash/unwind_linux.cpp
-@@ -6,12 +6,8 @@
- namespace bee::crash {
-     void unwind(ucontext_t *ctx, uint16_t skip, unwind_callback func, void *ud) noexcept {
-         unw_cursor_t cursor;
--#if defined(__aarch64__)
-         unw_context_t *unw_ctx = (unw_context_t *)ctx;
-         unw_init_local(&cursor, unw_ctx);
--#else
--        unw_init_local(&cursor, ctx);
--#endif
-         while (unw_step(&cursor) > 0) {
-             unw_word_t pc;
-             unw_get_reg(&cursor, UNW_REG_IP, &pc);
diff --git a/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild b/dev-util/lua-language-server/lua-language-server-3.17.0.ebuild
index b8c86a131d66..549d060cfbab 100644
--- a/dev-util/lua-language-server/lua-language-server-3.16.1.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 Gentoo Authors
+# Copyright 2022-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,8 +38,7 @@ src_prepare() {
 	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
 		3rd/lpeglabel/makefile || die
 	# Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
-	eapply "${FILESDIR}/3.16.0-linux.ninja.patch"
-	eapply "${FILESDIR}/${PN}-${PV}-ucontext_t.patch"
+	eapply "${FILESDIR}/3.16.4-linux.ninja.patch"
 	eapply_user
 	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
 		-e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \
@@ -64,7 +63,7 @@ src_compile() {
 		-e "s/^ar =.*./ar = REPLACE_AR/" \
 		build/build.ninja || die
 
-	eapply "${FILESDIR}/${PV}-build.ninja.patch"
+	eapply "${FILESDIR}/3.16.4-build.ninja.patch"
 	sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
 		-e "s/REPLACE_AR/$(tc-getAR)/" \
 		-e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
diff --git a/dev-util/lua-language-server/lua-language-server-3.17.1.ebuild b/dev-util/lua-language-server/lua-language-server-3.17.1.ebuild
new file mode 100644
index 000000000000..549d060cfbab
--- /dev/null
+++ b/dev-util/lua-language-server/lua-language-server-3.17.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1,3,4} luajit )
+
+inherit ninja-utils toolchain-funcs lua-single prefix
+
+DESCRIPTION="Lua language server"
+HOMEPAGE="https://github.com/LuaLS/lua-language-server"
+SRC_URI="https://github.com/LuaLS/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="llvm-libunwind test"
+REQUIRE_USE="${LUA_REQUIRED_USE}"
+
+DEPEND="
+	${LUA_DEPS}
+	sys-libs/binutils-libs
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	app-alternatives/ninja
+	app-arch/unzip
+	!llvm-libunwind? ( sys-libs/libunwind )
+	llvm-libunwind? ( llvm-runtimes/libunwind )
+"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# Remove hardcoded gcc references
+	sed -i "/lm.cxx/a lm.cc = '$(tc-getCC)'" \
+		make.lua || die
+	sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \
+		3rd/lpeglabel/makefile || die
+	# Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
+	eapply "${FILESDIR}/3.16.4-linux.ninja.patch"
+	eapply_user
+	sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \
+		-e "s/^ar = REPLACE_AR/ar = $(tc-getAR)/" \
+		-e "s/CFLAGS/${CFLAGS}/" \
+		-e "s/CXXFLAGS/${CXXFLAGS}/" \
+		-e "s/LDFLAGS/${LDFLAGS}/" \
+		3rd/luamake/compile/ninja/linux.ninja || die
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		sed -i "s/-lstdc++fs//" 3rd/luamake/compile/ninja/linux.ninja || die
+	fi
+
+	prefixify_ro "${FILESDIR}/wrapper.sh"
+}
+
+src_compile() {
+	eninja -C 3rd/luamake -f compile/ninja/linux.ninja "$(usex test "test" "luamake")"
+	use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake
+	./3rd/luamake/luamake init || die
+
+	# Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS
+	sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \
+		-e "s/^ar =.*./ar = REPLACE_AR/" \
+		build/build.ninja || die
+
+	eapply "${FILESDIR}/3.16.4-build.ninja.patch"
+	sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \
+		-e "s/REPLACE_AR/$(tc-getAR)/" \
+		-e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \
+		-e "s/CFLAGS/${CFLAGS}/" \
+		-e "s/CXXFLAGS/${CXXFLAGS}/" \
+		-e "s/LDFLAGS/${LDFLAGS}/" \
+		build/build.ninja || die
+	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
+		sed -i "s/-lstdc++fs//" build/build.ninja || die
+	fi
+
+	use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
+	rm -rf meta/198256b1
+}
+
+src_install() {
+	newbin "${T}/wrapper.sh" ${PN}
+
+	into /opt/${PN}
+	dobin bin/${PN}
+
+	insinto /opt/${PN}/bin
+	doins bin/main.lua
+
+	insinto /opt/${PN}
+	doins -r debugger.lua main.lua locale meta script
+
+	einstalldocs
+}