From c30a3f925914edfc7c93158227b5eed3663e6efa Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 8 Aug 2022 02:12:59 +0100
Subject: gentoo auto-resync : 08:08:2022 - 02:12:59

---
 eclass/Manifest.gz       | Bin 36986 -> 36998 bytes
 eclass/linux-info.eclass |  26 ++++++++++----------------
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index cba1026eb1d7..20810aa8a12d 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index 7e130062a6c1..8925f83b6695 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -29,6 +29,15 @@
 # A Couple of env vars are available to effect usage of this eclass
 # These are as follows:
 
+
+# @ECLASS_VARIABLE: CHECKCONFIG_DONOTHING
+# @USER_VARIABLE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Do not error out in check_extra_config if CONFIG settings are not met.
+# This is a user flag and should under _no circumstances_ be set in the ebuild.
+: ${CHECKCONFIG_DONOTHING:=""}
+
 # @ECLASS_VARIABLE: KERNEL_DIR
 # @DESCRIPTION:
 # A string containing the directory of the target kernel sources. The default value is
@@ -149,21 +158,6 @@ esac
 # Set the env ARCH to match what the kernel expects.
 set_arch_to_kernel() { export ARCH=$(tc-arch-kernel); }
 
-# @FUNCTION: set_arch_to_portage
-# @DESCRIPTION:
-# Set the env ARCH to match what portage expects.
-set_arch_to_portage() { 
-
-	ewarn "The function name: set_arch_to_portage is being deprecated and"
-	ewarn "being changed to:  set_arch_to_pkgmgr to comply with pms policy."
-	ewarn "See bug #843686"
-	ewarn "The old function name will be removed on or about July 1st, 2022."
-	ewarn "Please update your ebuild or eclass before this date."
-	ewarn ""
-
-	export ARCH=$(tc-arch); 
-}
-
 # @FUNCTION: set_arch_to_pkgmgr
 # @DESCRIPTION:
 # Set the env ARCH to match what the package manager expects.
@@ -978,7 +972,7 @@ linux-info_pkg_setup() {
 
 	linux-info_get_any_version
 
-	[ -n "${CONFIG_CHECK}" ] && check_extra_config;
+	[[ -n "${CONFIG_CHECK}" && -z ${CHECKCONFIG_DONOTHING} ]] && check_extra_config;
 }
 
 # @FUNCTION: kernel_get_makefile
-- 
cgit v1.2.3