From e7e61efa9814d0b6c9d6669f37638d126ba3ac25 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Tue, 21 Dec 2021 10:46:50 +0100
Subject: [PATCH] eclass/multibuild: Sync with gentoo

It's from gentoo commit 991ee6a9b2a150cfbe0bdd001cba00788da594f7.
---
 .../portage-stable/eclass/multibuild.eclass         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/multibuild.eclass b/sdk_container/src/third_party/portage-stable/eclass/multibuild.eclass
index 169c0fa008..37568ebf87 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/multibuild.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/multibuild.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multibuild.eclass
@@ -6,7 +6,7 @@
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:
 # Author: Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 4 5 6 7
+# @SUPPORTED_EAPIS: 4 5 6 7 8
 # @BLURB: A generic eclass for building multiple variants of packages.
 # @DESCRIPTION:
 # The multibuild eclass aims to provide a generic framework for building
@@ -14,10 +14,10 @@
 # implementations).
 
 case "${EAPI:-0}" in
-	0|1|2|3)
+	[0-3])
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5|6|7)
+	[4-8])
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
@@ -27,6 +27,7 @@ esac
 if [[ ! ${_MULTIBUILD} ]]; then
 
 # @ECLASS-VARIABLE: MULTIBUILD_VARIANTS
+# @REQUIRED
 # @DESCRIPTION:
 # An array specifying all enabled variants which multibuild_foreach*
 # can execute the process for.
@@ -43,6 +44,7 @@ if [[ ! ${_MULTIBUILD} ]]; then
 # @CODE
 
 # @ECLASS-VARIABLE: MULTIBUILD_VARIANT
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # The current variant which the function was executed for.
 #
@@ -52,6 +54,7 @@ if [[ ! ${_MULTIBUILD} ]]; then
 # @CODE
 
 # @ECLASS-VARIABLE: MULTIBUILD_ID
+# @OUTPUT_VARIABLE
 # @DESCRIPTION:
 # The unique identifier for a multibuild run. In a simple run, it is
 # equal to MULTIBUILD_VARIANT. In a nested multibuild environment, it
@@ -65,6 +68,8 @@ if [[ ! ${_MULTIBUILD} ]]; then
 # @CODE
 
 # @ECLASS-VARIABLE: BUILD_DIR
+# @OUTPUT_VARIABLE
+# @DEFAULT_UNSET
 # @DESCRIPTION:
 # The current build directory. In global scope, it is supposed
 # to contain an 'initial' build directory. If unset, ${S} is used.