From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6140B138334 for ; Sat, 25 May 2019 21:11:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92071E0823; Sat, 25 May 2019 21:11:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65B45E0823 for ; Sat, 25 May 2019 21:11:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE29C344F9D for ; Sat, 25 May 2019 21:11:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71F06449 for ; Sat, 25 May 2019 21:11:46 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1558818692.bd78224eb9d3692d97a0fe049c8352f511504fb6.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bash-completion/bash-completion-9999.ebuild app-shells/bash-completion/metadata.xml X-VCS-Directories: app-shells/bash-completion/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bd78224eb9d3692d97a0fe049c8352f511504fb6 X-VCS-Branch: master Date: Sat, 25 May 2019 21:11:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8dccfc3f-902c-4dfe-8435-9d93021371bf X-Archives-Hash: 9d20cd233c11459c6b475528145592f7 commit: bd78224eb9d3692d97a0fe049c8352f511504fb6 Author: Michał Górny gentoo org> AuthorDate: Sat May 25 21:03:25 2019 +0000 Commit: Michał Górny gentoo 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 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 @@ shell-tools@gentoo.org Gentoo Shell Tools Project + + + Support blacklisting of completions via 'eselect bash-completion'. + This enables custom Gentoo patching of upstream completion loader. + + Since v2.04, bash has allowed you to intelligently program and extend its standard completion behavior to achieve complex command lines with just a