Merge updates from master

dev-python/survey/Manifest

@@ -1,2 +1,2 @@
 DIST survey-3.4.3.tar.gz 21219 BLAKE2B e866addd9233409c603f2b34bbf811209f3f6c2ade1bee00258c4f25d741dc526948d16b2e9e0dc3632e6e20fa7863f573c4c27ed1f48ddaa954c7d53a8c51e3 SHA512 47ff72dd1223a32ec038ccf57709e8fe64806ecc9bb8e54daaced27afaa1c2a45e76fc1b149232a107729c462db7657ad0fd08d8b14bb314e3905aabd23fff4a
-DIST survey-4.2.0_alpha.gh.tar.gz 826841 BLAKE2B 3b434a32429b0c6b9ae175cc4c71d5297c0e81f2698f60412e3cb61fc95f6312a20db9645c2ae8c80d99d600c03279d12095c9bdc756b37418928abb9ea56245 SHA512 08acfc3b891b8400845cc28cc237f36bf6375c5c392ace2aebaa9e218879f434bd8dc01cfe15c67a2b6de9703e06accc8e890f755855dab2aeb549a2e0312c72
+DIST survey-4.2.1_alpha.gh.tar.gz 826833 BLAKE2B d4835ec34f47fff64ab157e2c46fd8755394abbdfc7d7c5aefda685ae43c380cc13932753e54a182302d2b5cd80ff74f4e2d96c50a62a7d50e1b274093772b44 SHA512 174d26c4cd7719cf429399a041dd965155a4cf2135e86944c04d753075fddeb85116e38da09e993874059f4d7e022c61f211efaa94033bc82fb37c46b18a1124

dev-util/lua-language-server/Manifest

@@ -1,2 +1 @@
-DIST lua-language-server-3.6.18.zip 30708893 BLAKE2B 69bc01187fd85582766bf0d8f217bea163234d05698490b860d0ff446fcc0515f3b842600ff2ea980ff8c30acfb7b394df9a98b81a5b537df445cc18a70b744e SHA512 b2bc488734df7eb0ad00993d352917d9d328b73603319fa8f1b0da8e93586cfdb85e715d6c3bd2ad6a9189551cc1e86a2fe35d3df4951f5feb80745c498424d2
-DIST lua-language-server-3.6.19.zip 31131706 BLAKE2B 6a01d97f42354440597709a7f2e66282fadffa309f6ab40714f46a545c03acf9c29b4e9f06ee68af6d7e48bd03b43cde46078182c7aa810ea2823a60be176628 SHA512 7fd6020140cbcd0ae4e9f1d894736499b8ce8c25c536e85d71033ea7205f7be07799eb08fe4fc884362067a3a88de683154ddf79bed03588f89c8185705e10f4
+DIST lua-language-server-3.6.21.zip 31225327 BLAKE2B 0b0e9d45368306e008a156693c8f7e3ee28b6ab49a21ddbd6727da37f3c5e03764e8dcc27cbb35532eccace4fd9016685d3eed2d5b729370d5b32acd911d6fb2 SHA512 7e0fbcb813ec4ef4b64d57b785abf47a0f6bd501293717eaafbf64706c0047486db6fd5c5cd0a987272e6e01f975853c8050417937282a720081e9523e7752f5

dev-util/lua-language-server/lua-language-server-3.6.19.ebuild

@@ -1,83 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-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"
-REQUIRE_USE="${LUA_REQUIRED_USE}"
-
-DEPEND="${LUA_DEPS}"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	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/LDFLAGS
-	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
-
-	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/^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
-
-	use test && eninja -f build/build.ninja || eninja -f build/build.ninja all
-}
-
-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
-}