From 3df97f3d736132a1ba41b62314234a501407ad03 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Oct 2024 07:07:35 +0000 Subject: [PATCH] eclass/vim-doc: Sync with Gentoo It's from Gentoo commit c8af7eb1285a2683460618b71e2e9a14ca6badcd. --- .../portage-stable/eclass/vim-doc.eclass | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/vim-doc.eclass b/sdk_container/src/third_party/portage-stable/eclass/vim-doc.eclass index f20f7397cf..ad595c5a67 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/vim-doc.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/vim-doc.eclass @@ -4,7 +4,7 @@ # @ECLASS: vim-doc.eclass # @MAINTAINER: # vim@gentoo.org -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Eclass for vim{,-plugin}.eclass to update documentation tags. # @DESCRIPTION: # This eclass is used by vim.eclass and vim-plugin.eclass to update @@ -16,13 +16,10 @@ # DEPEND in vim-plugin or by whatever version of vim is being # installed by the eclass. -if [[ ! ${_VIM_DOC_ECLASS} ]] ; then +if [[ -z ${_VIM_DOC_ECLASS} ]]; then +_VIM_DOC_ECLASS=1 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 @@ -32,7 +29,7 @@ esac # @DESCRIPTION: # Update the documentation tags in the versioned Vim directory. update_vim_helptags() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" local vimfiles helpfile files vim d @@ -58,7 +55,7 @@ update_vim_helptags() { # Install the documentation symlinks into the versioned vim # directory and run :helptags - for d in "${EROOT%/}"/usr/share/vim/vim[0-9]*; do + for d in "${EROOT}"/usr/share/vim/vim[0-9]*; do [[ -d "${d}/doc" ]] || continue # catch a failed glob # Remove links @@ -104,5 +101,4 @@ update_vim_helptags() { fi } -_VIM_DOC_ECLASS=1 fi