From fea6457e2b3b3eca7573362f2a594404e027dc1a Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 21 Oct 2024 07:07:13 +0000 Subject: [PATCH] eclass/readme.gentoo-r1: Sync with Gentoo It's from Gentoo commit c8af7eb1285a2683460618b71e2e9a14ca6badcd. --- .../portage-stable/eclass/readme.gentoo-r1.eclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo-r1.eclass index 3d2d824468..02167a746f 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/readme.gentoo-r1.eclass @@ -6,7 +6,7 @@ # Pacho Ramos # @AUTHOR: # Author: Pacho Ramos -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: install a doc file shown via elog messages # @DESCRIPTION: # An eclass for installing a README.gentoo doc file recording tips @@ -21,10 +21,6 @@ if [[ -z ${_README_GENTOO_ECLASS} ]]; then _README_GENTOO_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 @@ -58,7 +54,7 @@ esac # ${FILESDIR}/README.gentoo-${SLOT} also. # Usually called at src_install phase. readme.gentoo_create_doc() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if [[ -n "${DOC_CONTENTS}" ]]; then if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then @@ -82,7 +78,7 @@ readme.gentoo_create_doc() { ( # subshell to avoid pollution of calling environment docinto . dodoc "${T}"/README.gentoo - ) || die + ) README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo") } @@ -98,7 +94,7 @@ readme.gentoo_create_doc() { # rely on specific REPLACING_VERSIONS handling in your ebuild to print messages # when people update from versions still providing old message. readme.gentoo_print_elog() { - debug-print-function ${FUNCNAME} "${@}" + debug-print-function ${FUNCNAME} "$@" if [[ -z "${README_GENTOO_DOC_VALUE}" ]]; then die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!"