From 643bf03fdc3f1d2158399481827d24092f370c3d Mon Sep 17 00:00:00 2001 From: tastytea Date: Sun, 28 Aug 2022 00:06:31 +0200 Subject: [PATCH] dev-util/lua-language-server: use prefix eclass for wrapper Signed-off-by: tastytea --- .../files/{wrapper-r1.sh.in => wrapper.sh} | 4 ++-- .../lua-language-server/lua-language-server-3.5.3-r1.ebuild | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename dev-util/lua-language-server/files/{wrapper-r1.sh.in => wrapper.sh} (70%) diff --git a/dev-util/lua-language-server/files/wrapper-r1.sh.in b/dev-util/lua-language-server/files/wrapper.sh similarity index 70% rename from dev-util/lua-language-server/files/wrapper-r1.sh.in rename to dev-util/lua-language-server/files/wrapper.sh index 4a4db9e..85ea5c1 100644 --- a/dev-util/lua-language-server/files/wrapper-r1.sh.in +++ b/dev-util/lua-language-server/files/wrapper.sh @@ -5,8 +5,8 @@ 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 EPREFIX/opt/lua-language-server/bin/lua-language-server \ - -E EPREFIX/opt/lua-language-server/main.lua \ +exec @GENTOO_PORTAGE_EPREFIX@/opt/lua-language-server/bin/lua-language-server \ + -E @GENTOO_PORTAGE_EPREFIX@/opt/lua-language-server/main.lua \ --logpath="${STATEPATH}/log" \ --metapath="${DATAPATH}/meta" \ "$@" diff --git a/dev-util/lua-language-server/lua-language-server-3.5.3-r1.ebuild b/dev-util/lua-language-server/lua-language-server-3.5.3-r1.ebuild index e025594..0f80eb0 100644 --- a/dev-util/lua-language-server/lua-language-server-3.5.3-r1.ebuild +++ b/dev-util/lua-language-server/lua-language-server-3.5.3-r1.ebuild @@ -7,7 +7,7 @@ EAPI=8 LUA_COMPAT=( lua{5-{1,3,4},jit} ) -inherit lua-single ninja-utils toolchain-funcs +inherit lua-single ninja-utils prefix toolchain-funcs DESCRIPTION="A language server that offers Lua language support" HOMEPAGE="https://github.com/sumneko/lua-language-server" @@ -39,7 +39,7 @@ src_prepare() { sed -i "s/flags = \"-Wall -Werror\"/flags = \"-Wall ${CXXFLAGS}\"/" \ make/code_format.lua || die - sed "s/EPREFIX/${EPREFIX}/g" "${FILESDIR}"/wrapper-r1.sh.in > wrapper.sh || die + prefixify_ro "${FILESDIR}"/wrapper.sh default } @@ -50,7 +50,7 @@ src_compile() { } src_install() { - newbin wrapper.sh ${PN} + newbin "${T}"/wrapper.sh ${PN} into /opt/${PN} dobin bin/${PN}