diff options
Diffstat (limited to 'eclass/bash-completion-r1.eclass')
| -rw-r--r-- | eclass/bash-completion-r1.eclass | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass index be506793ae94..2220cb2be508 100644 --- a/eclass/bash-completion-r1.eclass +++ b/eclass/bash-completion-r1.eclass @@ -4,7 +4,7 @@ # @ECLASS: bash-completion-r1.eclass # @MAINTAINER: # mgorny@gentoo.org -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: A few quick functions to install bash-completion files # @EXAMPLE: # @@ -23,16 +23,12 @@ # } # @CODE -if [[ ! ${_BASH_COMPLETION_R1_ECLASS} ]]; then +if [[ -z ${_BASH_COMPLETION_R1_ECLASS} ]]; then _BASH_COMPLETION_R1_ECLASS=1 inherit toolchain-funcs case ${EAPI} in - 6) - ewarn "${CATEGORY}/${PF}: ebuild uses ${ECLASS} with deprecated EAPI ${EAPI}!" - ewarn "${CATEGORY}/${PF}: Support will be removed on 2024-10-08. Please port to newer EAPI." - ;; 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -45,7 +41,7 @@ esac # @EXAMPLE: # _bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion _bash-completion-r1_get_bashdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if $(tc-getPKG_CONFIG) --exists bash-completion &>/dev/null; then local path @@ -63,7 +59,7 @@ _bash-completion-r1_get_bashdir() { # @DESCRIPTION: # Get unprefixed bash-completion completions directory. _bash-completion-r1_get_bashcompdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" _bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion/completions } @@ -73,7 +69,7 @@ _bash-completion-r1_get_bashcompdir() { # @DESCRIPTION: # Get unprefixed bash-completion helpers directory. _bash-completion-r1_get_bashhelpersdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" _bash-completion-r1_get_bashdir helpersdir /usr/share/bash-completion/helpers } @@ -82,7 +78,7 @@ _bash-completion-r1_get_bashhelpersdir() { # @DESCRIPTION: # Get the bash-completion completions directory. get_bashcompdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" echo "${EPREFIX}$(_bash-completion-r1_get_bashcompdir)" } @@ -92,7 +88,7 @@ get_bashcompdir() { # @DESCRIPTION: # Get the bash-completion helpers directory. get_bashhelpersdir() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" echo "${EPREFIX}$(_bash-completion-r1_get_bashhelpersdir)" } @@ -103,7 +99,7 @@ get_bashhelpersdir() { # Install bash-completion files passed as args. Has EAPI-dependent failure # behavior (like doins). dobashcomp() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" ( insopts -m 0644 @@ -118,7 +114,7 @@ dobashcomp() { # Install bash-completion file under a new name. Has EAPI-dependent failure # behavior (like newins). newbashcomp() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" ( insopts -m 0644 @@ -132,7 +128,7 @@ newbashcomp() { # @DESCRIPTION: # Alias <basename> completion to one or more commands (<alias>es). bashcomp_alias() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ ${#} -lt 2 ]] && die "Usage: ${FUNCNAME} <basename> <alias>..." local base=${1} f |