public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Takuya Wakazono" <pastalian46@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-editors/lapce/
Date: Wed, 28 Aug 2024 15:37:15 +0000 (UTC)	[thread overview]
Message-ID: <1724859365.e724949232fc31296f1691233d46dfef2e7692f5.pastalian46@gentoo> (raw)

commit:     e724949232fc31296f1691233d46dfef2e7692f5
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Aug 28 15:00:22 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Aug 28 15:36:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e7249492

app-editors/lapce: use cargo_target_dir helper

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 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 460ffbc71..5cff3f8fb 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.80
 	>=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
 }


             reply	other threads:[~2024-08-28 15:37 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-28 15:37 Takuya Wakazono [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-29 14:49 [gentoo-commits] repo/proj/guru:dev commit in: app-editors/lapce/ Takuya Wakazono
2024-08-29 14:49 Takuya Wakazono
2024-08-28 15:37 Takuya Wakazono
2024-04-25 18:38 Pascal Jäger
2023-12-06 14:20 Pascal Jäger
2023-12-06 14:20 Pascal Jäger
2023-12-06 12:29 Pascal Jäger
2023-12-06 12:29 Pascal Jäger
2023-12-06 12:29 Pascal Jäger
2023-12-06 12:29 Pascal Jäger
2023-11-06 19:48 Pascal Jäger
2023-11-04 21:53 Pascal Jäger
2023-11-04 21:51 Pascal Jäger
2023-06-02 19:10 Pascal Jäger
2023-06-02 19:10 Pascal Jäger
2023-05-27 16:28 Rahul Sandhu
2023-05-27 14:49 Pascal Jäger
2023-03-18 21:15 Pascal Jäger
2023-03-14 19:09 Pascal Jäger
2023-03-14 19:09 Pascal Jäger
2022-11-10 21:51 Pascal Jäger
2022-11-10 14:18 Pascal Jäger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1724859365.e724949232fc31296f1691233d46dfef2e7692f5.pastalian46@gentoo \
    --to=pastalian46@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox