| 1 |
commit: b0d2ac11db06d5963b0ca309b1e27478adb85bed |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 5 09:41:55 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 5 09:43:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0d2ac11 |
| 7 |
|
| 8 |
app-shells/bash-completion: Block net-fs/mc due to file collision |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/639828 |
| 11 |
|
| 12 |
...{bash-completion-2.7-r1.ebuild => bash-completion-2.7-r2.ebuild} | 6 ++++-- |
| 13 |
app-shells/bash-completion/bash-completion-9999.ebuild | 6 ++++-- |
| 14 |
2 files changed, 8 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-shells/bash-completion/bash-completion-2.7-r1.ebuild b/app-shells/bash-completion/bash-completion-2.7-r2.ebuild |
| 17 |
similarity index 96% |
| 18 |
rename from app-shells/bash-completion/bash-completion-2.7-r1.ebuild |
| 19 |
rename to app-shells/bash-completion/bash-completion-2.7-r2.ebuild |
| 20 |
index 421b7392616..9509c019a0b 100644 |
| 21 |
--- a/app-shells/bash-completion/bash-completion-2.7-r1.ebuild |
| 22 |
+++ b/app-shells/bash-completion/bash-completion-2.7-r2.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2017 Gentoo Foundation |
| 25 |
+# Copyright 1999-2018 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
@@ -18,9 +18,11 @@ IUSE="test" |
| 30 |
# Multiple test failures, need to investigate the exact problem |
| 31 |
RESTRICT="test" |
| 32 |
|
| 33 |
+# completion collision with net-fs/mc |
| 34 |
RDEPEND=">=app-shells/bash-4.3_p30-r1 |
| 35 |
sys-apps/miscfiles |
| 36 |
- !app-eselect/eselect-bashcomp" |
| 37 |
+ !app-eselect/eselect-bashcomp |
| 38 |
+ !!net-fs/mc" |
| 39 |
DEPEND="app-arch/xz-utils |
| 40 |
test? ( |
| 41 |
${RDEPEND} |
| 42 |
|
| 43 |
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild b/app-shells/bash-completion/bash-completion-9999.ebuild |
| 44 |
index 0d8fdec50aa..5a21ed358e4 100644 |
| 45 |
--- a/app-shells/bash-completion/bash-completion-9999.ebuild |
| 46 |
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-# Copyright 1999-2017 Gentoo Foundation |
| 49 |
+# Copyright 1999-2018 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
|
| 52 |
EAPI=6 |
| 53 |
@@ -16,9 +16,11 @@ SLOT="0" |
| 54 |
KEYWORDS="" |
| 55 |
IUSE="test" |
| 56 |
|
| 57 |
+# completion collision with net-fs/mc |
| 58 |
RDEPEND=">=app-shells/bash-4.3_p30-r1 |
| 59 |
sys-apps/miscfiles |
| 60 |
- !app-eselect/eselect-bashcomp" |
| 61 |
+ !app-eselect/eselect-bashcomp |
| 62 |
+ !!net-fs/mc" |
| 63 |
DEPEND="app-arch/xz-utils |
| 64 |
test? ( |
| 65 |
${RDEPEND} |
Archives