[gentoo-commits] repo/proj/guru:dev commit in: dev-util/fnm/

[Jonas Frei]

commit:     945501cb11c369c03b08d23c0853d3d388c1a3f1
Author:     Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Wed Apr 12 03:58:03 2023 +0000
Commit:     Jonas Frei <freijon <AT> pm <DOT> me>
CommitDate: Wed Apr 12 04:01:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=945501cb

dev-util/fnm: Make use of 'shell-completion' eclass

Signed-off-by: Jonas Frei <freijon <AT> pm.me>

 dev-util/fnm/fnm-1.33.1.ebuild | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/dev-util/fnm/fnm-1.33.1.ebuild b/dev-util/fnm/fnm-1.33.1.ebuild
index 40df75220..82e3fa532 100644
--- a/dev-util/fnm/fnm-1.33.1.ebuild
+++ b/dev-util/fnm/fnm-1.33.1.ebuild
@@ -243,7 +243,7 @@ CRATES="
        zstd-sys-2.0.1+zstd.1.5.2
 "
 
-inherit cargo bash-completion-r1 flag-o-matic
+inherit cargo flag-o-matic shell-completion
 
 DESCRIPTION="Fast and simple Node.js version manager"
 HOMEPAGE="https://github.com/Schniz/fnm";
@@ -284,16 +284,14 @@ src_prepare() {
 src_install() {
        cargo_src_install
 
-       "${D}"/usr/bin/fnm completions --shell bash > fnm.bash-completion || 
die "Cannot generate bash completions"
-       newbashcomp fnm.bash-completion fnm
+       "${D}"/usr/bin/fnm completions --shell bash > "${PN}.bash-completion" 
|| die "Cannot generate bash completions"
+       newbashcomp "${PN}.bash-completion" "${PN}"
 
-       "${D}"/usr/bin/fnm completions --shell zsh > fnm.zsh-completion || die 
"Cannot generate zsh completions"
-       insinto /usr/share/zsh/site-functions
-       newins fnm.zsh-completion _fnm
+       "${D}"/usr/bin/fnm completions --shell zsh > "${PN}.zsh-completion" || 
die "Cannot generate zsh completions"
+       newzshcomp "${PN}.zsh-completion" "_${PN}"
 
-       "${D}"/usr/bin/fnm completions --shell fish > fnm.fish-completion || 
die "Cannot generate fish completions"
-       insinto /usr/share/fish/vendor_completions.d/
-       newins fnm.fish-completion fnm.fish
+       "${D}"/usr/bin/fnm completions --shell fish > "${PN}.fish-completion" 
|| die "Cannot generate fish completions"
+       newfishcomp "${PN}.fish-completion" "${PN}.fish"
 
        dodoc CHANGELOG.md README.md
 }