From 19633c28d2b9880ad81cf2ca66c2f7ac68e176bc Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 18 Aug 2022 11:45:29 +0200 Subject: [PATCH] eclass/tmpfiles: Sync with Gentoo It's from Gentoo commit 0b999ae3827969168427437e5d1d9aff39e4e56a. The updated dev-libs/cyrus-sasl started using EAPI 8, and the tmpfiles eclass did not support it. Update it to gain support for EAPI 8 too. --- .../portage-stable/eclass/tmpfiles.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/tmpfiles.eclass b/sdk_container/src/third_party/portage-stable/eclass/tmpfiles.eclass index b9238a6434..39650401a6 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/tmpfiles.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/tmpfiles.eclass @@ -1,4 +1,4 @@ -# Copyright 2016-2021 Gentoo Authors +# Copyright 2016-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: tmpfiles.eclass @@ -8,7 +8,7 @@ # @AUTHOR: # Mike Gilbert # William Hubbs -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: Functions related to tmpfiles.d files # @DESCRIPTION: # This eclass provides functionality related to installing and @@ -52,15 +52,15 @@ # # @CODE -if [[ -z ${TMPFILES_ECLASS} ]]; then -TMPFILES_ECLASS=1 +if [[ -z ${_TMPFILES_ECLASS} ]]; then +_TMPFILES_ECLASS=1 case "${EAPI}" in -5|6|7) ;; +5|6|7|8) ;; *) die "API is undefined for EAPI ${EAPI}" ;; esac -# @ECLASS-VARIABLE: TMPFILES_OPTIONAL +# @ECLASS_VARIABLE: TMPFILES_OPTIONAL # @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: