commit: cbf247770f5c163973312a668af8d8e6f880ba76
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 14 14:11:00 2025 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 07:22:07 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf24777
app-shells/bash-completion: Port to ver_replacing
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
.../bash-completion/bash-completion-2.15.0.ebuild | 29 +++++++++-----------
.../bash-completion/bash-completion-9999.ebuild | 31 ++++++++++------------
2 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/app-shells/bash-completion/bash-completion-2.15.0.ebuild
b/app-shells/bash-completion/bash-completion-2.15.0.ebuild
index ab76f23fc0e2..f94d443fa924 100644
--- a/app-shells/bash-completion/bash-completion-2.15.0.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.15.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
BASHCOMP_P=bashcomp-2.0.3
PYTHON_COMPAT=( python3_{10..13} )
-inherit python-any-r1
+inherit eapi9-ver python-any-r1
DESCRIPTION="Programmable Completion for bash"
HOMEPAGE="https://github.com/scop/bash-completion";
@@ -157,21 +157,18 @@ src_install() {
}
pkg_postinst() {
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -lt 2.1-r90; then
- ewarn "For bash-completion autoloader to work, all
completions need to"
- ewarn "be installed in
/usr/share/bash-completion/completions. You may"
- ewarn "need to rebuild packages that installed
completions in the old"
- ewarn "location. You can do this using:"
- ewarn
- ewarn "$ find ${EPREFIX}/usr/share/bash-completion
-maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
- ewarn
- ewarn "After the rebuild, you should remove the old
setup symlinks:"
- ewarn
- ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l
-delete"
- fi
- done
+ if ver_replacing -lt 2.1-r90; then
+ ewarn "For bash-completion autoloader to work, all completions
need to"
+ ewarn "be installed in /usr/share/bash-completion/completions.
You may"
+ ewarn "need to rebuild packages that installed completions in
the old"
+ ewarn "location. You can do this using:"
+ ewarn
+ ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1
-type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+ ewarn
+ ewarn "After the rebuild, you should remove the old setup
symlinks:"
+ ewarn
+ ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+ fi
if has_version 'app-shells/zsh'; then
elog
diff --git a/app-shells/bash-completion/bash-completion-9999.ebuild
b/app-shells/bash-completion/bash-completion-9999.ebuild
index ab48b5fd6c59..437c7a111cf9 100644
--- a/app-shells/bash-completion/bash-completion-9999.ebuild
+++ b/app-shells/bash-completion/bash-completion-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit autotools git-r3 python-any-r1
+inherit autotools eapi9-ver git-r3 python-any-r1
DESCRIPTION="Programmable Completion for bash"
HOMEPAGE="https://github.com/scop/bash-completion";
@@ -148,21 +148,18 @@ src_install() {
}
pkg_postinst() {
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ver_test "${v}" -lt 2.1-r90; then
- ewarn "For bash-completion autoloader to work, all
completions need to"
- ewarn "be installed in
/usr/share/bash-completion/completions. You may"
- ewarn "need to rebuild packages that installed
completions in the old"
- ewarn "location. You can do this using:"
- ewarn
- ewarn "$ find ${EPREFIX}/usr/share/bash-completion
-maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
- ewarn
- ewarn "After the rebuild, you should remove the old
setup symlinks:"
- ewarn
- ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l
-delete"
- fi
- done
+ if ver_replacing -lt 2.1-r90; then
+ ewarn "For bash-completion autoloader to work, all completions
need to"
+ ewarn "be installed in /usr/share/bash-completion/completions.
You may"
+ ewarn "need to rebuild packages that installed completions in
the old"
+ ewarn "location. You can do this using:"
+ ewarn
+ ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1
-type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+ ewarn
+ ewarn "After the rebuild, you should remove the old setup
symlinks:"
+ ewarn
+ ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+ fi
if has_version 'app-shells/zsh'; then
elog
