[gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/

[Michał Górny]

commit:     ebecf48c22d9c5e85fd87024c19230e4b2938c59
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 19:54:16 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 25 19:57:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebecf48c

app-shells/bash-completion: Use bashcomp2 git repo in -9999

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../bash-completion/bash-completion-9999.ebuild      | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index bd5e53f21aa..5c0bff2495f 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -3,14 +3,12 @@
 
 EAPI=7
 
-BASHCOMP_P=bashcomp-2.0.2
 PYTHON_COMPAT=( python3_{5,6,7} )
 inherit autotools git-r3 python-any-r1
 
 DESCRIPTION="Programmable Completion for bash"
 HOMEPAGE="https://github.com/scop/bash-completion"
 EGIT_REPO_URI="https://github.com/scop/bash-completion"
-SRC_URI="https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -23,7 +21,7 @@ RDEPEND=">=app-shells/bash-4.3_p30-r1:0
 	sys-apps/miscfiles
 	!app-eselect/eselect-bashcomp
 	!!net-fs/mc"
-DEPEND="app-arch/xz-utils
+DEPEND="
 	test? (
 		${RDEPEND}
 		app-misc/dtach
@@ -79,13 +77,19 @@ pkg_setup() {
 }
 
 src_unpack() {
-	git-r3_src_unpack
-	default
+	git-r3_fetch https://github.com/mgorny/bashcomp2
+	git-r3_fetch
+
+	git-r3_checkout https://github.com/mgorny/bashcomp2 \
+		"${WORKDIR}"/bashcomp2
+	git-r3_checkout
 }
 
 src_prepare() {
-	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
 	eapply_user
+	# generate and apply patch
+	emake -C "${WORKDIR}"/bashcomp2 bash-completion-blacklist-support.patch
+	eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch
 
 	eautoreconf
 }
@@ -124,9 +128,7 @@ src_install() {
 	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
 
 	# install the eselect module
-	insinto /usr/share/eselect/modules
-	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
-	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+	emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }
 
 pkg_postinst() {