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 421b7392616661fa3f186894d1e058b620db7395..9509c019a0bb9d2fd155b18d7ad6c2aa74a939d7 100644 (file)
--- 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 0d8fdec50aa0f272b8ce143efc45874798e6c980..5a21ed358e41ac3fd064769a2669394a88f19549 100644 (file)
--- 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}