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

[Michał Górny]

commit:     9f8c7401d89d6a01d96c811e7e3ca4e84b7b3309
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 21:30:55 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 21:31:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8c7401

app-shells/bash-completion: Strip colliding rfkill executable

Closes: https://bugs.gentoo.org/635158

 ...n-9999.ebuild => bash-completion-2.7-r1.ebuild} | 28 ++++++++++------------
 .../bash-completion/bash-completion-9999.ebuild    |  3 +++
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-2.7-r1.ebuild
similarity index 81%
copy from app-shells/bash-completion/bash-completion-9999.ebuild
copy to app-shells/bash-completion/bash-completion-2.7-r1.ebuild
index 543a7c362bb..421b7392616 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.7-r1.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 ~sparc-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"
 
 RDEPEND=">=app-shells/bash-4.3_p30-r1
 	sys-apps/miscfiles
@@ -45,17 +47,16 @@ STRIP_COMPLETIONS=(
 
 	# Installed by sys-apps/util-linux-2.28
 	mount umount mount.linux umount.linux
-)
 
-src_unpack() {
-	git-r3_src_unpack
-	default
-}
+	# Installed by sys-apps/util-linux-2.31
+	rfkill
+)
 
 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
 }
 
 src_test() {
@@ -68,13 +69,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 543a7c362bb..0d8fdec50aa 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -45,6 +45,9 @@ 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
 )
 
 src_unpack() {