From e724949232fc31296f1691233d46dfef2e7692f5 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Thu, 29 Aug 2024 00:00:22 +0900 Subject: [PATCH] app-editors/lapce: use cargo_target_dir helper Signed-off-by: Takuya Wakazono --- app-editors/lapce/lapce-0.4.0.ebuild | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/app-editors/lapce/lapce-0.4.0.ebuild b/app-editors/lapce/lapce-0.4.0.ebuild index 460ffbc71d..5cff3f8fbf 100644 --- a/app-editors/lapce/lapce-0.4.0.ebuild +++ b/app-editors/lapce/lapce-0.4.0.ebuild @@ -25,10 +25,12 @@ DEPEND=" dev-libs/libgit2:= " RDEPEND="${DEPEND}" +# time v0.3.34 can't be built with rust-1.80 BDEPEND=" dev-build/cmake sys-devel/gcc virtual/pkgconfig + =virtual/rust-1.64 " @@ -39,10 +41,10 @@ src_unpack() { default cargo_gen_config ln -s "${WORKDIR}/vendor/" "${WORKDIR}/lapce-${PV}/vendor" || die - sed -i "${ECARGO_HOME}/config" -e '/source.crates-io/d' || die - sed -i "${ECARGO_HOME}/config" -e '/replace-with = "gentoo"/d' || die - sed -i "${ECARGO_HOME}/config" -e '/local-registry = "\/nonexistent"/d' || die - cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config" || die + sed -i "${ECARGO_HOME}/config.toml" -e '/source.crates-io/d' || die + sed -i "${ECARGO_HOME}/config.toml" -e '/replace-with = "gentoo"/d' || die + sed -i "${ECARGO_HOME}/config.toml" -e '/local-registry = "\/nonexistent"/d' || die + cat "${WORKDIR}/vendor/vendor-config.toml" >> "${ECARGO_HOME}/config.toml" || die } src_compile() { @@ -51,12 +53,7 @@ src_compile() { } src_install() { - local btype=release - if use debug; then - btype=debug - fi - dobin target/"${btype}"/lapce - dobin target/"${btype}"/lapce-proxy + dobin "$(cargo_target_dir)"/lapce{,-proxy} domenu extra/linux/dev.lapce.lapce.desktop newicon extra/images/logo.png dev.lapce.lapce.png }