commit: bd78224eb9d3692d97a0fe049c8352f511504fb6 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat May 25 21:03:25 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat May 25 21:11:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd78224e
app-shells/bash-completion: Make eselect support optional Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-shells/bash-completion/bash-completion-9999.ebuild | 18 +++++++++++------- app-shells/bash-completion/metadata.xml | 6 ++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild index 5c0bff2495f..ee27e7fcf8f 100644 --- a/app-shells/bash-completion/bash-completion-9999.ebuild +++ b/app-shells/bash-completion/bash-completion-9999.ebuild @@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/scop/bash-completion"; LICENSE="GPL-2+" SLOT="0" KEYWORDS="" -IUSE="test" +IUSE="+eselect test" RESTRICT="!test? ( test )" # completion collision with net-fs/mc @@ -77,19 +77,21 @@ pkg_setup() { } src_unpack() { - git-r3_fetch https://github.com/mgorny/bashcomp2 + use eselect && git-r3_fetch https://github.com/mgorny/bashcomp2 git-r3_fetch - git-r3_checkout https://github.com/mgorny/bashcomp2 \ + use eselect && git-r3_checkout https://github.com/mgorny/bashcomp2 \ "${WORKDIR}"/bashcomp2 git-r3_checkout } src_prepare() { eapply_user - # generate and apply patch - emake -C "${WORKDIR}"/bashcomp2 bash-completion-blacklist-support.patch - eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch + if use eselect; then + # generate and apply patch + emake -C "${WORKDIR}"/bashcomp2 bash-completion-blacklist-support.patch + eapply "${WORKDIR}"/bashcomp2/bash-completion-blacklist-support.patch + fi eautoreconf } @@ -128,7 +130,9 @@ src_install() { dodoc AUTHORS CHANGES CONTRIBUTING.md README.md # install the eselect module - emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + use eselect && + emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" \ + PREFIX="${EPREFIX}/usr" install } pkg_postinst() { diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml index 2bb3ef23624..159d6c88d62 100644 --- a/app-shells/bash-completion/metadata.xml +++ b/app-shells/bash-completion/metadata.xml @@ -9,6 +9,12 @@ <email>[email protected]</email> <name>Gentoo Shell Tools Project</name> </maintainer> + <use> + <flag name='eselect'> + Support blacklisting of completions via 'eselect bash-completion'. + This enables custom Gentoo patching of upstream completion loader. + </flag> + </use> <longdescription> Since v2.04, bash has allowed you to intelligently program and extend its standard completion behavior to achieve complex command lines with just a
