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

[Jonas Frei]

commit:     2861fbb99dc3fb8bd4b2b5459dd9b163948b2ad8
Author:     Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Wed Apr 12 03:58:28 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=2861fbb9

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

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

 dev-util/osc/osc-0.173.0.ebuild | 8 +++-----
 dev-util/osc/osc-9999.ebuild    | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/dev-util/osc/osc-0.173.0.ebuild b/dev-util/osc/osc-0.173.0.ebuild
index f9f6b56e8..1dc986843 100644
--- a/dev-util/osc/osc-0.173.0.ebuild
+++ b/dev-util/osc/osc-0.173.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_9 )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit bash-completion-r1 distutils-r1
+inherit distutils-r1 shell-completion
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="
@@ -61,8 +61,6 @@ src_install() {
        newbashcomp dist/complete.sh "${PN}"
        insinto /usr/lib/osc
        newins dist/osc.complete complete
-       insinto /usr/share/zsh/site-functions
-       newins "${FILESDIR}/osc.zsh_completion" _osc
-       insinto /usr/share/fish/vendor_completions.d
-       doins osc.fish
+       newzshcomp "${FILESDIR}/${PN}.zsh_completion" "_${PN}"
+       dofishcomp "${PN}.fish"
 }

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index f9f6b56e8..1dc986843 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_9 )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit bash-completion-r1 distutils-r1
+inherit distutils-r1 shell-completion
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="
@@ -61,8 +61,6 @@ src_install() {
        newbashcomp dist/complete.sh "${PN}"
        insinto /usr/lib/osc
        newins dist/osc.complete complete
-       insinto /usr/share/zsh/site-functions
-       newins "${FILESDIR}/osc.zsh_completion" _osc
-       insinto /usr/share/fish/vendor_completions.d
-       doins osc.fish
+       newzshcomp "${FILESDIR}/${PN}.zsh_completion" "_${PN}"
+       dofishcomp "${PN}.fish"
 }