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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C8B4A158030 for ; Fri, 3 Mar 2023 13:29:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08FB6E0869; Fri, 3 Mar 2023 13:29:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4CE6E0869 for ; Fri, 3 Mar 2023 13:29:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F408E340970 for ; Fri, 3 Mar 2023 13:29:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A16B48CA for ; Fri, 3 Mar 2023 13:29:40 +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: <1677850171.3fd01bd87ec4e79653d66c4ec2ea617f83ae91db.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-2.11.ebuild app-shells/bash-completion/bash-completion-9999.ebuild X-VCS-Directories: app-shells/bash-completion/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3fd01bd87ec4e79653d66c4ec2ea617f83ae91db X-VCS-Branch: master Date: Fri, 3 Mar 2023 13:29:40 +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: bb2ecfa5-f26a-4678-9324-4ba476bfc23f X-Archives-Hash: aaf16877f47d64243f79ab6108f47fed commit: 3fd01bd87ec4e79653d66c4ec2ea617f83ae91db Author: Michał Górny gentoo org> AuthorDate: Fri Mar 3 12:32:37 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Mar 3 13:29:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fd01bd8 app-shells/bash-completion: Reformat Signed-off-by: Michał Górny gentoo.org> .../bash-completion/bash-completion-2.11.ebuild | 22 ++++++++++++++++------ .../bash-completion/bash-completion-9999.ebuild | 17 ++++++++++++----- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/app-shells/bash-completion/bash-completion-2.11.ebuild b/app-shells/bash-completion/bash-completion-2.11.ebuild index a1fa288f505d..6620da126225 100644 --- a/app-shells/bash-completion/bash-completion-2.11.ebuild +++ b/app-shells/bash-completion/bash-completion-2.11.ebuild @@ -5,13 +5,17 @@ EAPI=7 BASHCOMP_P=bashcomp-2.0.3 PYTHON_COMPAT=( python3_{9..11} ) + inherit python-any-r1 DESCRIPTION="Programmable Completion for bash" HOMEPAGE="https://github.com/scop/bash-completion" SRC_URI=" https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz - eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz )" + eselect? ( + https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz + ) +" LICENSE="GPL-2+" SLOT="0" @@ -20,9 +24,11 @@ IUSE="+eselect test" RESTRICT="!test? ( test )" # completion collision with net-fs/mc -RDEPEND=">=app-shells/bash-4.3_p30-r1:0 +RDEPEND=" + >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles - !!net-fs/mc" + !!net-fs/mc +" DEPEND=" test? ( ${RDEPEND} @@ -30,8 +36,11 @@ DEPEND=" dev-python/pexpect[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] ') - )" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" + ) +" +PDEPEND=" + >=app-shells/gentoo-bashcomp-20140911 +" strip_completions() { # Remove unwanted completions. @@ -76,8 +85,9 @@ pkg_setup() { } src_prepare() { - use eselect && + if use eselect; then eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch" + fi # redhat-specific, we strip these completions rm test/t/test_if{down,up}.py || die diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild index db9e158ca8ee..b6d3b0aa9615 100644 --- a/app-shells/bash-completion/bash-completion-9999.ebuild +++ b/app-shells/bash-completion/bash-completion-9999.ebuild @@ -4,6 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{9..11} ) + inherit autotools git-r3 python-any-r1 DESCRIPTION="Programmable Completion for bash" @@ -17,9 +18,11 @@ IUSE="+eselect test" RESTRICT="!test? ( test )" # completion collision with net-fs/mc -RDEPEND=">=app-shells/bash-4.3_p30-r1:0 +RDEPEND=" + >=app-shells/bash-4.3_p30-r1:0 sys-apps/miscfiles - !!net-fs/mc" + !!net-fs/mc +" DEPEND=" test? ( ${RDEPEND} @@ -27,8 +30,11 @@ DEPEND=" dev-python/pexpect[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] ') - )" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" + ) +" +PDEPEND=" + >=app-shells/gentoo-bashcomp-20140911 +" strip_completions() { # Remove unwanted completions. @@ -116,9 +122,10 @@ src_install() { dodoc AUTHORS CHANGES CONTRIBUTING.md README.md # install the eselect module - use eselect && + if use eselect; then emake -C "${WORKDIR}"/bashcomp2 DESTDIR="${D}" \ PREFIX="${EPREFIX}/usr" install + fi } pkg_postinst() {