commit: ed5abaac7d0aba7f462c795151928530d4cb36bd Author: Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email> AuthorDate: Sun Jun 18 10:53:29 2023 +0000 Commit: Mathis Winterer <mrmagic223325 <AT> fedora <DOT> email> CommitDate: Sun Jun 18 10:57:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed5abaac
dev-util/lua-language-server: add 3.6.22, drop 3.6.21 Signed-off-by: Mathis Winterer <mrmagic223325 <AT> fedora.email> app-admin/gentoo_update/Manifest | 2 +- ...ate-0.1.5.ebuild => gentoo_update-0.1.4.ebuild} | 6 -- dev-util/lua-language-server/Manifest | 2 +- .../lua-language-server/files/build.ninja.patch | 67 +++++++++------------- ...21.ebuild => lua-language-server-3.6.22.ebuild} | 0 5 files changed, 29 insertions(+), 48 deletions(-) diff --git a/app-admin/gentoo_update/Manifest b/app-admin/gentoo_update/Manifest index 8dc9bef7e..e9d7a74cf 100644 --- a/app-admin/gentoo_update/Manifest +++ b/app-admin/gentoo_update/Manifest @@ -1,2 +1,2 @@ -DIST gentoo_update-0.1.5.gh.tar.gz 8474 BLAKE2B d30128bc7b63c0b980f700ebfc646e7ed2c579598e03f13e8ae1a048f2362acbe1800f5f679e92fb24fa17ade7f03847b7b4049b44266dc95f4e04b84adf2f94 SHA512 032f8338bd3e6d4fa1cadfafc7906b14dee6f17f9209e4bdb45828bb2bf90234584a89e84418c27d411829f2f57263e1913f863861306241bd0df8d7303d9c33 +DIST gentoo_update-0.1.4.gh.tar.gz 7757 BLAKE2B 1455dcc51d43448701cc2ffc93330baf7e5fb516fa9e42757156133ace1c60943b85f58ab120129123ac567f0fc4e133b67cd6cb9c48a67d8763cf3b1df362bd SHA512 8a89ef60253948b8526ffcb75d95619df68ffd3f5c593080f14f05242b8bcd6f2951619fda15d054730fdeebbba58292fd7a30f146d8798c72c97037503b1518 diff --git a/app-admin/gentoo_update/gentoo_update-0.1.5.ebuild b/app-admin/gentoo_update/gentoo_update-0.1.4.ebuild similarity index 74% rename from app-admin/gentoo_update/gentoo_update-0.1.5.ebuild rename to app-admin/gentoo_update/gentoo_update-0.1.4.ebuild index 979f8e976..8ecaee677 100644 --- a/app-admin/gentoo_update/gentoo_update-0.1.5.ebuild +++ b/app-admin/gentoo_update/gentoo_update-0.1.4.ebuild @@ -13,12 +13,6 @@ SRC_URI="https://github.com/Lab-Brat/gentoo_update/archive/refs/tags/${PV}.tar.g LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gentoo_update_cleanup gentoo_update_checkrestart" - -RDEPEND=" - gentoo_update_cleanup? ( app-portage/gentoolkit ) - gentoo_update_checkrestart? ( app-admin/needrestart ) -" distutils_enable_tests unittest diff --git a/dev-util/lua-language-server/Manifest b/dev-util/lua-language-server/Manifest index 10618d574..1e9328218 100644 --- a/dev-util/lua-language-server/Manifest +++ b/dev-util/lua-language-server/Manifest @@ -1 +1 @@ -DIST lua-language-server-3.6.21.zip 31225327 BLAKE2B 0b0e9d45368306e008a156693c8f7e3ee28b6ab49a21ddbd6727da37f3c5e03764e8dcc27cbb35532eccace4fd9016685d3eed2d5b729370d5b32acd911d6fb2 SHA512 7e0fbcb813ec4ef4b64d57b785abf47a0f6bd501293717eaafbf64706c0047486db6fd5c5cd0a987272e6e01f975853c8050417937282a720081e9523e7752f5 +DIST lua-language-server-3.6.22.zip 31238168 BLAKE2B dfd357d979b48f241146d546b754cfaa0a4e5b4675da942f28730de2616a284cee0a8d53020d75d74912e60830c0bdd8f69a50e5b64d4e09e13a73bb0cd8be9c SHA512 13ad6d4e74a5e7ccb124b8389c1b88f7bb1697eecb18ca3d176b5f207529cd84b2a6fb178875426e09a7b4db95008b8ccb2eff98f8f7a87ed07bf5fbdebc6309 diff --git a/dev-util/lua-language-server/files/build.ninja.patch b/dev-util/lua-language-server/files/build.ninja.patch index 3d3e8cc79..8f83ef7eb 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,23 +12,23 @@ +@@ -12,8 +12,8 @@ 3rd/bee.lua/compile/config.lua 3rd/bee.lua/compile/common.lua $ make/code_format.lua rule c_source_bee @@ -11,45 +11,41 @@ description = Compile C $out deps = gcc depfile = $out.d - build $obj/source_bee/lua-seri.obj: c_source_bee $ +@@ -21,14 +21,14 @@ 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 $ + command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ - -Werror -fvisibility=hidden -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 description = Compile C++ $out deps = gcc depfile = $out.d build $obj/source_bee/format.obj: cxx_source_bee 3rd/bee.lua/3rd/fmt/format.cc rule cxx_source_bee_1 -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ + 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 -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ + -fvisibility=hidden -I3rd/bee.lua -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -54,9 +54,9 @@ - build $obj/source_bee/path_helper.obj: cxx_source_bee_1 $ +@@ -61,8 +61,8 @@ 3rd/bee.lua/bee/utility/path_helper.cpp rule cxx_source_bee_2 -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ + command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ - -Werror -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 $ - -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ + -fvisibility=hidden -I3rd/bee.lua -I$builddir/lua54 $ + -DBEE_STATIC -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -77,26 +77,26 @@ +@@ -83,17 +83,17 @@ build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $ 3rd/bee.lua/binding/lua_time.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 -+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $ ++ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ + -fvisibility=hidden -DNDEBUG -fPIC -o $out -c $in CFLAGS description = Compile C $out deps = gcc @@ -58,72 +54,63 @@ 3rd/bee.lua/3rd/lua/utf8_crt.c rule c_source_lua_1 - command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -Werror $ -+ command = $cc -MMD -MT $out -MF $out.d -std=c11 -Wall $ ++ command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $ -DMAKE_LIB -DLUA_USE_LINUX -DNDEBUG -Wno-maybe-uninitialized -fPIC -o $ - $out -c $in + $out -c $in CFLAGS description = Compile C $out deps = gcc depfile = $out.d - build $obj/source_lua/linit.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/linit.c +@@ -101,8 +101,8 @@ build $obj/source_lua/onelua.obj: c_source_lua_1 3rd/bee.lua/3rd/lua/onelua.c rule cxx_source_bootstrap -- command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ + command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -O2 -Wall $ - -Werror -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $ - -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in -+ command = $cc -MMD -MT $out -MF $out.d -std=c++17 -fno-rtti -Wall $ + -fvisibility=hidden -I3rd/bee.lua/3rd/lua -I3rd/bee.lua $ + -DLUA_USE_LINUX -DNDEBUG -fPIC -o $out -c $in CXXFLAGS description = Compile C++ $out deps = gcc depfile = $out.d -@@ -106,7 +106,7 @@ - 3rd/bee.lua/bootstrap/progdir.cpp +@@ -110,7 +110,7 @@ + 3rd/bee.lua/bootstrap/main.cpp rule link_bootstrap command = $cc $in -o $out -Wl,-E -static-libgcc -lm -ldl -lstdc++fs $ - -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -s + -pthread -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic LDFLAGS description = Link Exe $out build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $ - $obj/source_bootstrap/progdir.obj $obj/source_bee/lua-seri.obj $ -@@ -144,10 +144,10 @@ - 3rd/bee.lua/test/test_thread.lua 3rd/bee.lua/test/test_time.lua | $ - $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 $ - -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 + $obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $ +@@ -152,8 +152,8 @@ + -fvisibility=hidden -I3rd/EmmyLuaCodeStyle/Util/include $ + -I3rd/EmmyLuaCodeStyle/CodeFormatCore/include $ + -I3rd/EmmyLuaCodeStyle/LuaParser/include -I3rd/bee.lua/3rd/lua $ +- -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 -@@ -244,9 +244,9 @@ - build $obj/code_format/Utf8.obj: cxx_code_format $ - 3rd/EmmyLuaCodeStyle/Util/src/Utf8.cpp +@@ -256,7 +256,7 @@ 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 $ + command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -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 -@@ -256,9 +256,9 @@ - build $obj/lpeglabel/lpltree.obj: c_lpeglabel 3rd/lpeglabel/lpltree.c - build $obj/lpeglabel/lplvm.obj: c_lpeglabel 3rd/lpeglabel/lplvm.c +@@ -268,7 +268,7 @@ 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 $ + command = $cc -MMD -MT $out -MF $out.d -std=c++17 -O2 -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 -@@ -266,7 +266,7 @@ +@@ -276,7 +276,7 @@ make/modules.cpp rule link_lua_language_server command = $cc $in -o $out -lm -ldl -lstdc++fs -pthread -Wl,-Bstatic $ diff --git a/dev-util/lua-language-server/lua-language-server-3.6.21.ebuild b/dev-util/lua-language-server/lua-language-server-3.6.22.ebuild similarity index 100% rename from dev-util/lua-language-server/lua-language-server-3.6.21.ebuild rename to dev-util/lua-language-server/lua-language-server-3.6.22.ebuild
