From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 5 Jan 2018 09:41:55 +0000 (+0100)
Subject: app-shells/bash-completion: Block net-fs/mc due to file collision
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b0d2ac11db06d5963b0ca309b1e27478adb85bed;p=gentoo.git

app-shells/bash-completion: Block net-fs/mc due to file collision

Closes: https://bugs.gentoo.org/639828
---

diff --git a/app-shells/bash-completion/bash-completion-2.7-r1.ebuild b/app-shells/bash-completion/bash-completion-2.7-r2.ebuild
similarity index 96%
rename from app-shells/bash-completion/bash-completion-2.7-r1.ebuild
rename to app-shells/bash-completion/bash-completion-2.7-r2.ebuild
index 421b73926166..9509c019a0bb 100644
--- a/app-shells/bash-completion/bash-completion-2.7-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,9 +18,11 @@ 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
 	sys-apps/miscfiles
-	!app-eselect/eselect-bashcomp"
+	!app-eselect/eselect-bashcomp
+	!!net-fs/mc"
 DEPEND="app-arch/xz-utils
 	test? (
 		${RDEPEND}
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild
index 0d8fdec50aa0..5a21ed358e41 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,9 +16,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE="test"
 
+# completion collision with net-fs/mc
 RDEPEND=">=app-shells/bash-4.3_p30-r1
 	sys-apps/miscfiles
-	!app-eselect/eselect-bashcomp"
+	!app-eselect/eselect-bashcomp
+	!!net-fs/mc"
 DEPEND="app-arch/xz-utils
 	test? (
 		${RDEPEND}