[gentoo-commits] repo/proj/guru:master commit in: dev-util/lua-language-server/, dev-util/lua-language-server/files/

["Florian Schmaus" <flow@gentoo.org>]

commit:     c3542d60dcdcbd0bce6ad2d795472ca28413dd86
Author:     Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email>
AuthorDate: Tue Feb  7 16:12:37 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 16:12:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c3542d60

dev-util/lua-language-server: add 3.6.10, drop 3.6.8

Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email>

 dev-util/lua-language-server/Manifest              |  2 +-
 .../lua-language-server/files/build.ninja.patch    | 51 +++++++++++++++++++---
 ....8.ebuild => lua-language-server-3.6.10.ebuild} |  4 +-
 dev-util/lua-language-server/metadata.xml          |  9 ++--
 4 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest
index 7967eaa88..dbfbf1d8e 100644
--- a/dev-util/lua-language-server/Manifest
+++ b/dev-util/lua-language-server/Manifest
@@ -1 +1 @@
-DIST lua-language-server-3.6.8.zip 389244327 BLAKE2B 67299716586bd01f2fc48319b68319b48090b87d8f4c72b79c52022af39140490983edfd1145d88616c1fabcb7f6a62bed8defbab7a8f4fe3330176812994a58 SHA512 bf5633e7570fa44d62bb5a2e4414d4f0e197fcef3b1a9876ea90cf37a79ae17afaaecdc5d54917cc7fb44e01b7db34abd6329cef0df4e3207177a0a6a8ec54f2
+DIST lua-language-server-3.6.10.zip 31998049 BLAKE2B 8c15c583c947cea7647d40fc82114c2f4ec4d1025377ce796b002f3761137e6499feccb934b5b5f0466d2f612b4801dc2ba7e6984027527b5c2174d6895d15ce SHA512 a49c28990e00115eaac83e615079192adfd39655436babc86dafe3660912c10346ab99c418272ac4a9c2113a98921b9b07c0c20bdf62fe633872417127247509

diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch
index 11db385d3..d0ccda1a5 100644
--- a/dev-util/lua-language-server/files/build.ninja.patch
+++ b/dev-util/lua-language-server/files/build.ninja.patch
@@ -1,6 +1,6 @@
 --- a/build/build.ninja
 +++ b/build/build.ninja
-@@ -12,18 +12,18 @@
+@@ -13,18 +13,18 @@
      3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $
      make/code_format.lua
  rule c_source_bee
@@ -24,7 +24,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -31,8 +31,8 @@
+@@ -32,8 +32,8 @@
      3rd/bee.lua/bee/nonstd/fmt/format.cc
  build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/fmt/os.cc
  rule cxx_source_bee_1
@@ -35,7 +35,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -56,9 +56,9 @@
+@@ -57,9 +57,9 @@
  build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $
      3rd/bee.lua/bee/utility/path_helper.cpp
  rule cxx_source_bee_2
@@ -48,9 +48,9 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -79,26 +79,26 @@
- build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
-     3rd/bee.lua/binding/lua_time.cpp
+@@ -82,26 +82,26 @@
+ build $obj/source_bee/luaref.obj: cxx_source_bee_2 $
+     3rd/bee.lua/binding/luaref.cpp
  rule c_source_lua
 -  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $
 -    -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in
@@ -83,7 +83,7 @@
    description = Compile C++ $out
    deps = gcc
    depfile = $out.d
-@@ -108,7 +108,7 @@
+@@ -111,7 +111,7 @@
      3rd/bee.lua/bootstrap/progdir.cpp
  rule link_bootstrap
    command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $
@@ -92,3 +92,40 @@
    description = Link    Exe $out
  build /bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
      $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $
+@@ -149,10 +149,10 @@
+     3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $
+     /bootstrap copy_script
+ rule cxx_code_format
+-  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -Wall $
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
+     -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/include $
+     -I3rd/bee.lua/3rd/lua -I3rd/EmmyLuaCodeStyle/3rd/wildcards/include $
+-    -DNDEBUG -Wall -Werror -o $out -c $in
++    -DNDEBUG -Wall -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d
+@@ -245,9 +245,9 @@
+ build $obj/code_format/Utf8.obj: cxx_code_format $
+     3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp
+ rule c_lpeglabel
+-  command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
++  command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $
+     -fvisibility=hidden -I3rd/bee.lua/3rd/lua -DMAXRECLEVEL=1000 -DNDEBUG $
+-    -o $out -c $in
++    -o $out -c $in CFLAGS
+   description = Compile C   $out
+   deps = gcc
+   depfile = $out.d
+@@ -257,9 +257,9 @@
+ build $obj/lpeglabel/lpltree.obj: c_lpeglabel 3rd/lpeglabel/lpltree.c
+ 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 $
++  command = $cc -MMD -MT $out -MF $out.d -std=c++17 -Wall $
+     -fvisibility=hidden -I3rd/bee.lua -I3rd/bee.lua/3rd/lua -DCODE_FORMAT $
+-    -DNDEBUG -o $out -c $in
++    -DNDEBUG -o $out -c $in CXXFLAGS
+   description = Compile C++ $out
+   deps = gcc
+   depfile = $out.d

diff --git a/dev-util/lua-language-server/lua-language-server-3.6.8.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.10.ebuild
similarity index 90%
rename from dev-util/lua-language-server/lua-language-server-3.6.8.ebuild
rename to dev-util/lua-language-server/lua-language-server-3.6.10.ebuild
index b4a2bfe1e..47618e68a 100644
--- a/dev-util/lua-language-server/lua-language-server-3.6.8.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.6.10.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 inherit ninja-utils toolchain-funcs
 
 DESCRIPTION="Lua language server"
-HOMEPAGE="https://github.com/sumneko/lua-language-server"
-SRC_URI="https://github.com/sumneko/lua-language-server/releases/download/${PV}/${P}-submodules.zip -> ${P}.zip"
+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"

diff --git a/dev-util/lua-language-server/metadata.xml b/dev-util/lua-language-server/metadata.xml
index 6253e3a9c..598098e82 100644
--- a/dev-util/lua-language-server/metadata.xml
+++ b/dev-util/lua-language-server/metadata.xml
@@ -9,11 +9,8 @@
 		The Lua language server provides various language features for Lua to make development easier and faster. With around half a million installs on Visual Studio Code, it is the most popular extension for Lua language support. Supports Lua versions 5.1, 5.2, 5.3, 5.4 and LuaJIT
 	</longdescription>
 	<upstream>
-		<maintainer status="active">
-			<name>Sumneko</name>
-		</maintainer>
-		<bugs-to>https://github.com/sumneko/lua-language-server/issues</bugs-to>
-		<doc>https://github.com/sumneko/lua-language-server/wiki</doc>
-		<remote-id type="github">sumneko/lua-language-server</remote-id>
+		<bugs-to>https://github.com/LuaLS/lua-language-server/issues</bugs-to>
+		<doc>https://github.com/LuaLS/lua-language-server/wiki</doc>
+		<remote-id type="github">LuaLS/lua-language-server</remote-id>
 	</upstream>
 </pkgmetadata>