diff options
| author | Michał Górny <mgorny@gentoo.org> | 2018-01-05 10:41:55 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-01-05 10:43:45 +0100 |
| commit | b0d2ac11db06d5963b0ca309b1e27478adb85bed (patch) | |
| tree | c8443986d042672a05e0d20f779f92c64560c10f /app-shells/bash-completion | |
| parent | 8facdb4ad3e5c488ccd3e7284da77ef24dd960a1 (diff) | |
| download | gentoo-b0d2ac11db06d5963b0ca309b1e27478adb85bed.tar.gz gentoo-b0d2ac11db06d5963b0ca309b1e27478adb85bed.tar.xz | |
app-shells/bash-completion: Block net-fs/mc due to file collision
Closes: https://bugs.gentoo.org/639828
Diffstat (limited to 'app-shells/bash-completion')
| -rw-r--r-- | app-shells/bash-completion/bash-completion-2.7-r2.ebuild (renamed from app-shells/bash-completion/bash-completion-2.7-r1.ebuild) | 6 | ||||
| -rw-r--r-- | app-shells/bash-completion/bash-completion-9999.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app-shells/bash-completion/bash-completion-2.7-r1.ebuild b/app-shells/bash-completion/bash-completion-2.7-r2.ebuild index 421b7392616..9509c019a0b 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 0d8fdec50aa..5a21ed358e4 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} |