commit: b0d2ac11db06d5963b0ca309b1e27478adb85bed Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Jan 5 09:41:55 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Jan 5 09:43:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0d2ac11
app-shells/bash-completion: Block net-fs/mc due to file collision Closes: https://bugs.gentoo.org/639828 ...{bash-completion-2.7-r1.ebuild => bash-completion-2.7-r2.ebuild} | 6 ++++-- 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 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 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}
