From e7e0ae230435b140bf036e55b134ec168439361a Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 29 May 2023 22:52:50 +0200 Subject: [PATCH] app-shells/atuin: add missing local, style improvements, 14.0.1 also requires rust 1.67 Signed-off-by: Florian Schmaus --- app-shells/atuin/atuin-14.0.1.ebuild | 18 +++++++++++------- app-shells/atuin/atuin-15.0.0.ebuild | 15 +++++++++------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app-shells/atuin/atuin-14.0.1.ebuild b/app-shells/atuin/atuin-14.0.1.ebuild index d97a4ea035..d788813ae4 100644 --- a/app-shells/atuin/atuin-14.0.1.ebuild +++ b/app-shells/atuin/atuin-14.0.1.ebuild @@ -316,9 +316,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="doc" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="dev-lang/rust" +BDEPEND=">=dev-lang/rust-1.67.1" QA_FLAGS_IGNORED="usr/bin/${PN}" @@ -331,16 +329,22 @@ DOCS=( src_install() { cargo install --path "${PN}" + local atuin_bin="target/$(usex debug debug release)/${PN}" + exeinto "/usr/bin" - doexe "target/$(usex debug debug release)/${PN}" + doexe "${atuin_bin}" use doc && dodoc -r "${DOCS[@]}" # Prepare shell completion generation mkdir completions || die - for shell in 'bash' 'fish' 'zsh'; do - "target/$(usex debug debug release)/${PN}" gen-completions -s "$shell" -o completions || die - done + local shell + for shell in bash fish zsh; do + "${atuin_bin}" gen-completions \ + -s ${shell} \ + -o completions \ + || die + done newbashcomp "completions/${PN}.bash" "${PN}" dozshcomp "completions/_${PN}" diff --git a/app-shells/atuin/atuin-15.0.0.ebuild b/app-shells/atuin/atuin-15.0.0.ebuild index 7dfad66d04..cafda860e2 100644 --- a/app-shells/atuin/atuin-15.0.0.ebuild +++ b/app-shells/atuin/atuin-15.0.0.ebuild @@ -326,10 +326,7 @@ SRC_URI=" LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB" SLOT="0" KEYWORDS="~amd64" -IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" BDEPEND=">=dev-lang/rust-1.67.1" QA_FLAGS_IGNORED="usr/bin/${PN}" @@ -343,15 +340,21 @@ DOCS=( src_install() { cargo install --path "${PN}" + local atuin_bin="target/$(usex debug debug release)/${PN}" + exeinto "/usr/bin" - doexe "target/$(usex debug debug release)/${PN}" + doexe "${atuin_bin}" dodoc -r "${DOCS[@]}" # Prepare shell completion generation mkdir completions || die - for shell in 'bash' 'fish' 'zsh'; do - "target/$(usex debug debug release)/${PN}" gen-completions -s "$shell" -o completions || die + local shell + for shell in bash fish zsh; do + "${atuin_bin}" gen-completions \ + -s ${shell} \ + -o completions \ + || die done newbashcomp "completions/${PN}.bash" "${PN}"