commit: 54297db3c91d8b9a0eec01c5e1c35f97d4afd1e4 Author: Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email> AuthorDate: Mon Mar 13 21:54:25 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Mon Mar 13 22:02:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=54297db3
dev-util/lua-language-server: add 3.6.17, drop 3.6.11; Close bug (thanks tastytea) https://schlomp.space/tastytea/overlay/src/branch/master/dev-util/lua-language-server Closes: https://bugs.gentoo.org/900545 Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email> dev-util/lua-language-server/Manifest | 3 +- .../lua-language-server/files/build.ninja.patch | 29 +++++----- dev-util/lua-language-server/files/wrapper.sh | 15 +++++ .../lua-language-server-3.6.13.ebuild | 67 ---------------------- ...11.ebuild => lua-language-server-3.6.17.ebuild} | 32 ++++++++--- 5 files changed, 55 insertions(+), 91 deletions(-) diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest index c7658e94d..df201ba8c 100644 --- a/dev-util/lua-language-server/Manifest +++ b/dev-util/lua-language-server/Manifest @@ -1,2 +1 @@ -DIST lua-language-server-3.6.11.zip 32022639 BLAKE2B 9e5a33b12e40f8b9f7b3eb5a8b049e09e8a7f0b5a5569ee15d5aa2a2035a13a6e75036321aac439a97c56c401914908f878e2f02a136c1de9413f2a9879a56c1 SHA512 6474ad8c84af034002e124a802a28afccb7f7ea439b00b508639a4a20471b5eed995dacf12fe0c8cb2313530fba787fa1127712093402e4e67c7d72e5118ce59 -DIST lua-language-server-3.6.13.zip 30691495 BLAKE2B 376b5f792d1002a0b1e0942e4d91aed4bbdccc5cf033cad56e9fafc6df3a5ef28247fc611c2563c6b3c499e491699bf6f21edc9ac6106440a7dc4662803f8aee SHA512 ce595dfe2e16bb468e90c2e73d5569eeac2cf093a0caaa0006e23ec876edcf491be92dad88e35369f9c250949c887850e8c1805736e8b8f20b0c643a56d6faed +DIST lua-language-server-3.6.17.zip 30696826 BLAKE2B a6d65b45efd7e10afef4a48986a3e7f622885146830df26647653065efd35c8bada7421ad74ea990cfb3842756dd42fe304c6bfbb3346d00621dd1c4d1e653f8 SHA512 44cbdb25fbd90ca9931669a3cb90216bb6f33ac1e2dc0dea4c28a4340f9c2feb92c005b2212fadc33066481944bb27c03c541cd0c6d0cd7706eeeca34339d567 diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch index 5bd6ac190..ff953cae3 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,17 +12,17 @@ +@@ -12,26 +12,26 @@ 3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $ make/code_format.lua rule c_source_bee @@ -16,15 +16,16 @@ 3rd/bee.lua/3rd/lua-seri/lua-seri.c rule cxx_source_bee - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ -- -Werror -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in +- -Werror -fvisibility=hidden -I3rd/bee.lua/bee/nonstd/3rd -DNDEBUG -fPIC $ +- -o $out -c $in + command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ -+ -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CXXFLAGS ++ -fvisibility=hidden -I3rd/bee.lua/bee/nonstd/3rd -DNDEBUG -fPIC $ ++ -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -30,8 +30,8 @@ - 3rd/bee.lua/bee/nonstd/3rd/format.cc - build $obj/source_bee/os.obj: cxx_source_bee 3rd/bee.lua/bee/nonstd/3rd/os.cc + build $obj/source_bee/format.obj: cxx_source_bee $ + 3rd/bee.lua/bee/nonstd/3rd/fmt/format.cc rule cxx_source_bee_1 - command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ - -Werror -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in @@ -33,7 +34,7 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -55,9 +55,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 @@ -46,7 +47,7 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -78,26 +78,26 @@ +@@ -80,26 +80,26 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $ 3rd/bee.lua/binding/lua_time.cpp rule c_source_lua @@ -80,18 +81,18 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -107,7 +107,7 @@ +@@ -109,7 +109,7 @@ 3rd/bee.lua/bootstrap/progdir.cpp rule link_bootstrap command = $cc $in -o $out -lm -ldl -Wl,-E -lstdc++fs -pthread $ - -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc -s + -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -static-libgcc LDFLAGS description = Link Exe $out - build /bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $ + build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $ $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $ -@@ -145,10 +145,10 @@ +@@ -148,10 +148,10 @@ 3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $ - /bootstrap copy_script + $bin/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 $ @@ -102,7 +103,7 @@ description = Compile C++ $out deps = gcc depfile = $out.d -@@ -243,9 +243,9 @@ +@@ -246,9 +246,9 @@ build $obj/code_format/Utf8.obj: cxx_code_format $ 3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp rule c_lpeglabel @@ -114,7 +115,7 @@ description = Compile C $out deps = gcc depfile = $out.d -@@ -255,9 +255,9 @@ +@@ -258,9 +258,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 diff --git a/dev-util/lua-language-server/files/wrapper.sh b/dev-util/lua-language-server/files/wrapper.sh new file mode 100644 index 000000000..271f66ae7 --- /dev/null +++ b/dev-util/lua-language-server/files/wrapper.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Thanks To tastytea for the script <https://schlomp.space/tastytea/overlay/src/branch/master/dev-util/lua-language-server/files/wrapper-r1.sh> + +# Some paths must be writable, so we put them into user-owned directories + +DATAPATH="${XDG_DATA_HOME:-${HOME}/.local/share}/lua-language-server" +STATEPATH="${XDG_STATE_HOME:-${HOME}/.local/state}/lua-language-server" + +mkdir --parents ${DATAPATH} ${STATEPATH} + +exec @GENTOO_PORTAGE_EPREFIX@/opt/lua-language-server/bin/lua-language-server \ + --logpath="${STATEPATH}/log" \ + --metapath="${DATAPATH}/meta" \ + "${@}" diff --git a/dev-util/lua-language-server/lua-language-server-3.6.13.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.13.ebuild deleted file mode 100644 index 823cceb46..000000000 --- a/dev-util/lua-language-server/lua-language-server-3.6.13.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit ninja-utils toolchain-funcs - -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="test" -BDPEND=" - ${NINJA_DEPEND} - app-arch/unzip - dev-util/ninja -" -RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}/linux.ninja.patch" "${FILESDIR}/build.ninja.patch" ) - -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 - eapply "${FILESDIR}/linux.ninja.patch" - eapply_user - sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \ - -e "s/CFLAGS/${CFLAGS}/" \ - -e "s/CXXFLAGS/${CXXFLAGS}/" \ - -e "s/LDFLAGS/${LDFLAGS}/" \ - 3rd/luamake/compile/ninja/linux.ninja || die -} - -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 - sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \ - -e "s/^luamake =.*./luamake = LUAMAKE_PATH/" \ - build/build.ninja || die - - eapply "${FILESDIR}/build.ninja.patch" - sed -i -e "s/REPLACE_ME/$(tc-getCC)/" \ - -e "s|LUAMAKE_PATH|${S}/3rd/luamake/luamake|" \ - -e "s/CFLAGS/${CFLAGS}/" \ - -e "s/CXXFLAGS/${CXXFLAGS}/" \ - -e "s/LDFLAGS/${LDFLAGS}/" \ - -e "7d" \ - build/build.ninja || die - - # Tests are broken - eninja -f build/build.ninja all -} - -src_install() { - dobin ./bin/{main.lua,lua-language-server} - dodoc changelog.md README.md -} diff --git a/dev-util/lua-language-server/lua-language-server-3.6.11.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.17.ebuild similarity index 72% rename from dev-util/lua-language-server/lua-language-server-3.6.11.ebuild rename to dev-util/lua-language-server/lua-language-server-3.6.17.ebuild index 823cceb46..ac2bf19c0 100644 --- a/dev-util/lua-language-server/lua-language-server-3.6.11.ebuild +++ b/dev-util/lua-language-server/lua-language-server-3.6.17.ebuild @@ -3,7 +3,9 @@ EAPI=8 -inherit ninja-utils toolchain-funcs +LUA_COMPAT=( lua{5-{1,3,4},jit} ) + +inherit ninja-utils toolchain-funcs lua-single prefix DESCRIPTION="Lua language server" HOMEPAGE="https://github.com/LuaLS/lua-language-server"; @@ -14,8 +16,11 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" +REQUIRE_USE="${LUA_REQUIRED_USE}" + +DEPEND="${LUA_DEPS}" +RDEPEND="${DEPEND}" BDPEND=" - ${NINJA_DEPEND} app-arch/unzip dev-util/ninja " @@ -28,7 +33,7 @@ src_prepare() { make.lua || die sed -i "s/CC = gcc/ CC = ${tc-getCC}/" \ 3rd/lpeglabel/makefile || die - # Shipped file doesn't respect CFLAGS/CXXFLAGS + # Shipped file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS eapply "${FILESDIR}/linux.ninja.patch" eapply_user sed -i -e "s/^cc = REPLACE_ME/cc = $(tc-getCC)/" \ @@ -36,6 +41,8 @@ src_prepare() { -e "s/CXXFLAGS/${CXXFLAGS}/" \ -e "s/LDFLAGS/${LDFLAGS}/" \ 3rd/luamake/compile/ninja/linux.ninja || die + + prefixify_ro "${FILESDIR}/wrapper.sh" } src_compile() { @@ -43,7 +50,7 @@ src_compile() { use test && eninja -C 3rd/luamake -f compile/ninja/linux.ninja luamake ./3rd/luamake/luamake init || die - # Generated file doesn't respect CFLAGS/CXXFLAGS + # Generated file doesn't respect CFLAGS/CXXFLAGS/LDFLAGS sed -i -e "s/^cc =.*./cc = REPLACE_ME/" \ -e "s/^luamake =.*./luamake = LUAMAKE_PATH/" \ build/build.ninja || die @@ -57,11 +64,20 @@ src_compile() { -e "7d" \ build/build.ninja || die - # Tests are broken - eninja -f build/build.ninja all + use test && eninja -f build/build.ninja || eninja -f build/build.ninja all } src_install() { - dobin ./bin/{main.lua,lua-language-server} - dodoc changelog.md README.md + 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 }
