From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DCDB1382C5 for ; Fri, 5 Jan 2018 09:43:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C7E9E0BFE; Fri, 5 Jan 2018 09:43:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63FB4E0BFE for ; Fri, 5 Jan 2018 09:43:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5FD12335C09 for ; Fri, 5 Jan 2018 09:43:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA4A1199 for ; Fri, 5 Jan 2018 09:43:51 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1515145425.b0d2ac11db06d5963b0ca309b1e27478adb85bed.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bash-completion/bash-completion-2.7-r1.ebuild app-shells/bash-completion/bash-completion-2.7-r2.ebuild app-shells/bash-completion/bash-completion-9999.ebuild X-VCS-Directories: app-shells/bash-completion/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b0d2ac11db06d5963b0ca309b1e27478adb85bed X-VCS-Branch: master Date: Fri, 5 Jan 2018 09:43:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a86559da-3597-456b-881a-74b5e0aa2cec X-Archives-Hash: a63c910a5dc29d3dc36605a507c41e79 commit: b0d2ac11db06d5963b0ca309b1e27478adb85bed Author: Michał Górny gentoo org> AuthorDate: Fri Jan 5 09:41:55 2018 +0000 Commit: Michał Górny gentoo 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}