commit:     c04518a1840f3481e2b21b7934204986a26b6beb
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Jun 26 17:01:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 02:57:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c04518a1

app-text/lesspipe: avoid a false positive bash-completion QA warning

We leave an empty directory behind after moving the completion files
around. Portage's QA check thinks that means we are actually using a
legacy dynamic loader location??

 * QA Notice: Bash completions were installed in legacy location. Please update
 * the ebuild to get the install paths using bash-completion-r1.eclass.

But the eclass doesn't support the eager-loader directory at all, and
the QA notice isn't warning about it either -- the warning is simply
because we have that empty directory (that gets cleaned up after the QA
checks run, since keepdir isn't used).

No revbump. It only affects an install-time warning and rmdir cannot
change the resulting package contents.

Closes: https://bugs.gentoo.org/926047
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/lesspipe/lesspipe-2.11-r1.ebuild | 1 +
 app-text/lesspipe/lesspipe-2.12.ebuild    | 1 +
 app-text/lesspipe/lesspipe-2.13.ebuild    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app-text/lesspipe/lesspipe-2.11-r1.ebuild 
b/app-text/lesspipe/lesspipe-2.11-r1.ebuild
index 975d91af0d67..bbd53d1c3046 100644
--- a/app-text/lesspipe/lesspipe-2.11-r1.ebuild
+++ b/app-text/lesspipe/lesspipe-2.11-r1.ebuild
@@ -55,6 +55,7 @@ src_install() {
        #   . /usr/share/bash-completion/less_completion
        #   Or consider installing the file less_completion in 
/etc/bashcompletion.d
        rm "${ED}"/usr/share/bash-completion/less_completion || die
+       rmdir "${ED}"/usr/share/bash-completion || die
        insinto /etc/bash_completion.d
        doins less_completion
 }

diff --git a/app-text/lesspipe/lesspipe-2.12.ebuild 
b/app-text/lesspipe/lesspipe-2.12.ebuild
index 24065f86cbcf..a0393dafe206 100644
--- a/app-text/lesspipe/lesspipe-2.12.ebuild
+++ b/app-text/lesspipe/lesspipe-2.12.ebuild
@@ -50,6 +50,7 @@ src_install() {
        #   . /usr/share/bash-completion/less_completion
        #   Or consider installing the file less_completion in 
/etc/bashcompletion.d
        rm "${ED}"/usr/share/bash-completion/less_completion || die
+       rmdir "${ED}"/usr/share/bash-completion || die
        insinto /etc/bash_completion.d
        doins less_completion
 }

diff --git a/app-text/lesspipe/lesspipe-2.13.ebuild 
b/app-text/lesspipe/lesspipe-2.13.ebuild
index 9b06994b07f0..31e7d52d9b69 100644
--- a/app-text/lesspipe/lesspipe-2.13.ebuild
+++ b/app-text/lesspipe/lesspipe-2.13.ebuild
@@ -50,6 +50,7 @@ src_install() {
        #   . /usr/share/bash-completion/less_completion
        #   Or consider installing the file less_completion in 
/etc/bashcompletion.d
        rm "${ED}"/usr/share/bash-completion/less_completion || die
+       rmdir "${ED}"/usr/share/bash-completion || die
        insinto /etc/bash_completion.d
        doins less_completion
 }

Reply via email to