From 8db31faa6b75f838ccef98f5b33389b567dcb21b Mon Sep 17 00:00:00 2001
From: David Michael <dm0@redhat.com>
Date: Tue, 18 Dec 2018 17:34:27 +0000
Subject: [PATCH] coreos-go-depend.eclass: Use EAPI=7 host dependencies for the
 compiler

---
 .../third_party/coreos-overlay/eclass/coreos-go-depend.eclass | 4 ++--
 .../third_party/coreos-overlay/eclass/coreos-go-utils.eclass  | 2 +-
 .../src/third_party/coreos-overlay/eclass/coreos-go.eclass    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass
index 73cd910ab6..63b328d268 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-depend.eclass
@@ -16,7 +16,8 @@
 export COREOS_GO_VERSION="${COREOS_GO_VERSION:-go1.11}"
 
 case "${EAPI:-0}" in
-	5|6) ;;
+	5|6) DEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;;
+	7) BDEPEND="dev-lang/go:${COREOS_GO_VERSION#go}=" ;;
 	*) die "Unsupported EAPI=${EAPI} for ${ECLASS}"
 esac
 
@@ -26,4 +27,3 @@ inherit coreos-go-utils
 # the package gets rebuilt when the version changes.
 IUSE="+go_version_${COREOS_GO_VERSION//./_}"
 REQUIRED_USE="go_version_${COREOS_GO_VERSION//./_}"
-DEPEND="dev-lang/go:${COREOS_GO_VERSION#go}="
diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass
index b99e9cb7eb..aff37573b3 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go-utils.eclass
@@ -8,7 +8,7 @@
 # and packages that depend on it. It does not set any metadata.
 
 case "${EAPI:-0}" in
-	5|6) ;;
+	5|6|7) ;;
 	*) die "Unsupported EAPI=${EAPI} for ${ECLASS}"
 esac
 
diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass
index 5945b85907..80f0d92fb5 100644
--- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass
+++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-go.eclass
@@ -25,7 +25,7 @@
 # @CODE
 
 case "${EAPI:-0}" in
-	5|6) ;;
+	5|6|7) ;;
 	*) die "Unsupported EAPI=${EAPI} for ${ECLASS}"
 esac
 
@@ -56,7 +56,7 @@ go_build() {
 
 coreos-go_src_prepare() {
 	debug-print-function ${FUNCNAME} "$@"
-	has ${EAPI:-0} 6 && default
+	has ${EAPI:-0} 6 7 && default
 
 	go_export
 	export GOPATH="${WORKDIR}/gopath"