commit:     3502e4f637e92eedb871b5aab25aec6ea238308a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May  3 12:34:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May  3 12:35:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3502e4f6

app-shells/bash-completion: block old app-text/tree which installs its own 
completion

>=app-text/tree-2.1.1-r1 defers to the new one in >=bash-completion-2.13.0.

Closes: https://bugs.gentoo.org/931129
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{bash-completion-2.13.0.ebuild => bash-completion-2.13.0-r1.ebuild}  | 1 +
 app-shells/bash-completion/bash-completion-9999.ebuild                   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app-shells/bash-completion/bash-completion-2.13.0.ebuild 
b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
similarity index 99%
rename from app-shells/bash-completion/bash-completion-2.13.0.ebuild
rename to app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
index e3dbaa5e5448..19a8ed2ada9a 100644
--- a/app-shells/bash-completion/bash-completion-2.13.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.13.0-r1.ebuild
@@ -27,6 +27,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
        >=app-shells/bash-4.3_p30-r1:0
        sys-apps/miscfiles
+       !<app-text/tree/tree-2.1.1-r1
        !!net-fs/mc
 "
 BDEPEND="

diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild 
b/app-shells/bash-completion/bash-completion-9999.ebuild
index 452614926c31..908ef5fe7dae 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -20,6 +20,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
        >=app-shells/bash-4.3_p30-r1:0
        sys-apps/miscfiles
+       !<app-text/tree/tree-2.1.1-r1
        !!net-fs/mc
 "
 BDEPEND="

Reply via email to