From 339298bd3ee2c750aa5dbef02c0f214ec9910c85 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Fri, 5 Nov 2021 21:58:03 +0100
Subject: [PATCH] eclass/*: Be more lenient with the EAPI versions

We are in progress of updating packages with old EAPIs, so this change
should be reverted really soon.
---
 .../eclass/bash-completion-r1.eclass              | 10 ++++++----
 .../portage-stable/eclass/multilib.eclass         | 15 +++++++++------
 .../portage-stable/eclass/toolchain-funcs.eclass  | 12 +++++++-----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass
index f0451b773a..e966b8709b 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass
@@ -28,10 +28,12 @@ _BASH_COMPLETION_R1_ECLASS=1
 
 inherit toolchain-funcs
 
-case ${EAPI} in
-	5|6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
+# Flatcar: we still have some packages that use old EAPI, revert this
+# change when we update those packages.
+#case ${EAPI} in
+#	5|6|7|8) ;;
+#	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+#esac
 
 # @FUNCTION: _bash-completion-r1_get_bashdir
 # @INTERNAL
diff --git a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass
index 483f8d10c7..430fb865b0 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass
@@ -9,11 +9,13 @@
 # @DESCRIPTION:
 # This eclass is for all functions pertaining to handling multilib configurations.
 
-case ${EAPI:-0} in
-	# EAPI=0 is still used by crossdev, bug #797367
-	0|5|6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
+# Flatcar: we still have some packages that use old EAPI, revert this
+# change when we update those packages.
+#case ${EAPI:-0} in
+#	# EAPI=0 is still used by crossdev, bug #797367
+#	0|5|6|7|8) ;;
+#	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+#esac
 
 if [[ -z ${_MULTILIB_ECLASS} ]]; then
 _MULTILIB_ECLASS=1
@@ -54,7 +56,8 @@ has_multilib_profile() {
 #   fall back on old behavior.  Any profile that has these set should also
 #   depend on a newer version of portage (not yet released) which uses these
 #   over CONF_LIBDIR in econf, dolib, etc...
-if [[ ${EAPI} == [05] ]] ; then
+# Flatcar: Support older EAPIs for now.
+if [[ ${EAPI} == [0345] ]] ; then
 	get_libdir() {
 		local CONF_LIBDIR
 		if [ -n  "${CONF_LIBDIR_OVERRIDE}" ] ; then
diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
index 563d9deef4..032433daa7 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
@@ -13,11 +13,13 @@
 # in such a way that you can rely on the function always returning
 # something sane.
 
-case ${EAPI:-0} in
-	# EAPI=0 is still used by crossdev, bug #797367
-	0|5|6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
+# Flatcar: we still have some packages that use old EAPI, revert this
+# change when we update those packages.
+#case ${EAPI:-0} in
+#	# EAPI=0 is still used by crossdev, bug #797367
+#	0|5|6|7|8) ;;
+#	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+#esac
 
 if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then
 _TOOLCHAIN_FUNCS_ECLASS=1