From f5c8846f8c1412076ede3677a959ca5982d82efa Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Mon, 16 Jan 2023 15:50:44 +0100
Subject: [PATCH] eclass/multibuild: Sync with Gentoo

It's from Gentoo commit 68b99c1c59935641b354ae51fa6a1762d6316c2d.
---
 .../portage-stable/eclass/multibuild.eclass   | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 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 7ae03adbe1..33edb9312a 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-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: multibuild.eclass
@@ -14,7 +14,10 @@
 # implementations).
 
 case ${EAPI} in
-	6|7|8) ;;
+	6|7|8)
+		# backwards compatibility for run_in_build_dir
+		inherit out-of-source-utils
+		;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
@@ -175,26 +178,6 @@ multibuild_copy_sources() {
 	multibuild_foreach_variant _multibuild_create_source_copy
 }
 
-# @FUNCTION: run_in_build_dir
-# @USAGE: <argv>...
-# @DESCRIPTION:
-# Run the given command in the directory pointed by BUILD_DIR.
-run_in_build_dir() {
-	debug-print-function ${FUNCNAME} "${@}"
-	local ret
-
-	[[ ${#} -ne 0 ]] || die "${FUNCNAME}: no command specified."
-	[[ ${BUILD_DIR} ]] || die "${FUNCNAME}: BUILD_DIR not set."
-
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	"${@}"
-	ret=${?}
-	popd >/dev/null || die
-
-	return ${ret}
-}
-
 # @FUNCTION: multibuild_merge_root
 # @USAGE: <src-root> <dest-root>
 # @DESCRIPTION: