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

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     86d6663954ac1affe897e4c444a4ff509a3d9d43
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Dec 26 20:31:21 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Dec 26 20:33:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=86d66639

dev-util/osc: install fish comp, use eclass for bashcomp

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-util/osc/{osc-9999.ebuild => osc-0.171.0-r1.ebuild} | 9 +++++----
 dev-util/osc/osc-9999.ebuild                            | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-0.171.0-r1.ebuild
similarity index 87%
copy from dev-util/osc/osc-9999.ebuild
copy to dev-util/osc/osc-0.171.0-r1.ebuild
index 7969127a..02af4e71 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-0.171.0-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit distutils-r1
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="
@@ -55,11 +55,12 @@ src_install() {
 	distutils-r1_src_install
 
 	dosym osc-wrapper.py /usr/bin/osc
-	rm -f "${ED}/usr/share/doc/${PN}"*/TODO*
-	insinto /usr/share/bash-completion/completions
-	newins dist/complete.sh osc
+	rm -f "${ED}/usr/share/doc/${PN}"*/TODO* || die
+	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
 }

diff --git a/dev-util/osc/osc-9999.ebuild b/dev-util/osc/osc-9999.ebuild
index 7969127a..02af4e71 100644
--- a/dev-util/osc/osc-9999.ebuild
+++ b/dev-util/osc/osc-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
-inherit distutils-r1
+inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="Command line tool for Open Build Service"
 HOMEPAGE="
@@ -55,11 +55,12 @@ src_install() {
 	distutils-r1_src_install
 
 	dosym osc-wrapper.py /usr/bin/osc
-	rm -f "${ED}/usr/share/doc/${PN}"*/TODO*
-	insinto /usr/share/bash-completion/completions
-	newins dist/complete.sh osc
+	rm -f "${ED}/usr/share/doc/${PN}"*/TODO* || die
+	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
 }