From c744441eadfbc0c9bb593849f958de68b276e46c Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Oct 2024 07:07:34 +0000 Subject: [PATCH] eclass/vcs-clean: Sync with Gentoo It's from Gentoo commit c8af7eb1285a2683460618b71e2e9a14ca6badcd. --- .../portage-stable/eclass/vcs-clean.eclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/vcs-clean.eclass b/sdk_container/src/third_party/portage-stable/eclass/vcs-clean.eclass index 719bdec176..8558d9998d 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/vcs-clean.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/vcs-clean.eclass @@ -6,17 +6,13 @@ # base-system@gentoo.org # @AUTHOR: # Benedikt Böhm -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: helper functions to remove VCS directories if [[ -z ${_VCS_CLEAN_ECLASS} ]] ; then _VCS_CLEAN_ECLASS=1 case ${EAPI} in - 5|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 @@ -27,7 +23,7 @@ esac # Remove CVS directories and .cvs* files recursively. Useful when a # source tarball contains internal CVS directories. Defaults to ${PWD}. ecvs_clean() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ $# -eq 0 ]] && set -- . find "$@" '(' -type d -name 'CVS' -prune -o -type f -name '.cvs*' ')' \ @@ -40,7 +36,7 @@ ecvs_clean() { # Remove .svn directories recursively. Useful when a source tarball # contains internal Subversion directories. Defaults to ${PWD}. esvn_clean() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ $# -eq 0 ]] && set -- . find "$@" -type d -name '.svn' -prune -exec rm -rf '{}' + || die @@ -52,7 +48,7 @@ esvn_clean() { # Remove .git* directories recursively. Useful when a source tarball # contains internal Git directories. Defaults to ${PWD}. egit_clean() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" [[ $# -eq 0 ]] && set -- . find "$@" -type d -name '.git*' -prune -exec rm -rf '{}' + || die