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 CB5731382C5 for ; Sun, 11 Mar 2018 15:56:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10E0EE0837; Sun, 11 Mar 2018 15:56:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D56AAE0837 for ; Sun, 11 Mar 2018 15:56:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C2769335C0A for ; Sun, 11 Mar 2018 15:56:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81386238 for ; Sun, 11 Mar 2018 15:56:21 +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: <1520783774.ddcca142e8aeffdba8a5a40d886f3f8254252be4.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.7-r3.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: ddcca142e8aeffdba8a5a40d886f3f8254252be4 X-VCS-Branch: master Date: Sun, 11 Mar 2018 15:56:21 +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-Archives-Salt: 1741277d-2daa-495b-8f9c-8b97bc364bca X-Archives-Hash: ce503ea7c4158153fc6572720461350e commit: ddcca142e8aeffdba8a5a40d886f3f8254252be4 Author: Michał Górny gentoo org> AuthorDate: Sun Mar 11 15:32:44 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Mar 11 15:56:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcca142 app-shells/bash-completion: Remove implicit completions for vim Closes: https://bugs.gentoo.org/649986 ...n-9999.ebuild => bash-completion-2.7-r3.ebuild} | 34 ++++++++++------------ .../bash-completion/bash-completion-9999.ebuild | 6 ++++ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild similarity index 78% copy from app-shells/bash-completion/bash-completion-9999.ebuild copy to app-shells/bash-completion/bash-completion-2.7-r3.ebuild index 5a21ed358e4..8b94a7a3122 100644 --- a/app-shells/bash-completion/bash-completion-9999.ebuild +++ b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild @@ -4,17 +4,19 @@ EAPI=6 BASHCOMP_P=bashcomp-2.0.2 -EGIT_REPO_URI="https://github.com/scop/bash-completion" -inherit autotools git-r3 versionator +inherit versionator DESCRIPTION="Programmable Completion for bash" HOMEPAGE="https://github.com/scop/bash-completion" -SRC_URI="https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" +SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz + https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" IUSE="test" +# Multiple test failures, need to investigate the exact problem +RESTRICT="test" # completion collision with net-fs/mc RDEPEND=">=app-shells/bash-4.3_p30-r1 @@ -48,19 +50,20 @@ STRIP_COMPLETIONS=( # Installed by sys-apps/util-linux-2.28 mount umount mount.linux umount.linux - # Deprecated in favor of sys-apps/util-linux-2.31 - _rfkill + # Installed by sys-apps/util-linux-2.31 + rfkill ) -src_unpack() { - git-r3_src_unpack - default -} - src_prepare() { eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch + # Bug 543100, update bug 601194 + eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch" eapply_user - eautoreconf + + # Remove implicit completions for vim. + # https://bugs.gentoo.org/649986 + sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \ + bash_completion || die } src_test() { @@ -73,13 +76,8 @@ src_test() { tail -f "${T}/dtach-test.log" & local tail_pid=${!} - # override the default expect timeout and buffer size to avoid tests - # failing randomly due to cold cache, busy system or just more output - # than upstream anticipated (they run tests on pristine docker - # installs of binary distros) nonfatal dtach -N "${T}/dtach.sock" \ - bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" \ - &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out' + bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out' kill "${tail_pid}" [[ -f ${T}/dtach-test.out ]] || die "Unable to run tests" diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild index 5a21ed358e4..cec5bc36226 100644 --- a/app-shells/bash-completion/bash-completion-9999.ebuild +++ b/app-shells/bash-completion/bash-completion-9999.ebuild @@ -60,6 +60,12 @@ src_unpack() { src_prepare() { eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch eapply_user + + # Remove implicit completions for vim. + # https://bugs.gentoo.org/649986 + sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \ + bash_completion || die + eautoreconf }