diff --git a/sdk_container/src/third_party/portage-stable/eclass/golang-base.eclass b/sdk_container/src/third_party/portage-stable/eclass/golang-base.eclass
index cd36a269bf..bcb37d432c 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/golang-base.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/golang-base.eclass
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: golang-base.eclass
 # @MAINTAINER:
 # William Hubbs <williamh@gentoo.org>
 # @SUPPORTED_EAPIS: 5 6 7
+# @DEPRECATED: go-module.eclass
 # @BLURB: Eclass that provides base functions for Go packages.
 # @DESCRIPTION:
 # This eclass provides base functions for software written in the Go
@@ -15,7 +16,7 @@ case "${EAPI:-0}" in
 	5|6|7)
 		;;
 	*)
-		die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
+		die "${ECLASS}: Unsupported EAPI (EAPI=${EAPI})"
 		;;
 esac
 
@@ -36,6 +37,9 @@ QA_FLAGS_IGNORED='.*'
 # Upstream does not support stripping go packages
 RESTRICT="strip"
 
+# force GO111MODULE to be auto for bug https://bugs.gentoo.org/771129
+export GO111MODULE=auto
+
 # @ECLASS-VARIABLE: EGO_PN
 # @REQUIRED
 # @DESCRIPTION: