diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index c2e66296..99d24561 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1 +1 @@
-DIST go-bindata-3.13.0.tar.gz 15613198 SHA256 16d23471f8b092d36261fc6b162e4cc30b245bf3b9c28b0f548788e6180a5729 SHA512 e3da48d1bd6760c40d465d4084119ddfc59baf8538044dd96da411d5fb4ee3e1135a6034fc5724ba8af4f17c50eaa058c28c74be3293a18712730624e86f80e3 WHIRLPOOL 9ec575eda9aa3c3230238c84fe945df44f3629f8429db0ea4a37f322ffaef6d959e7ca947c6976cd2a6862c1aebc3fccc6989987a6c9374481413b53c942295a
+DIST go-bindata-3.21.0.tar.gz 15615959 SHA256 91ba0e1947c2c144d8834823b3ddd5b78b97391f912ae0d7a07b65bd468ac77d SHA512 004b9f0389d26f82d1419e8e8ad249d33583e85c4b4aaa4e36215bd5289a24146a237bcb55b9d51ff29c1b01ebd822ff60dcf205cb73d34f810e6838df172265 WHIRLPOOL bd11b223a0a2c7dfd7320e9d7c4a0e871b3df722abca40bddf0e763d970d8c8adfb44ea26a1733f2d445c85c399e81a4aa73ae1baddbbd446044c2b6c0a37548
diff --git a/dev-go/go-bindata/go-bindata-3.13.0.ebuild b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
similarity index 87%
rename from dev-go/go-bindata/go-bindata-3.13.0.ebuild
rename to dev-go/go-bindata/go-bindata-3.21.0.ebuild
index 14f0ab81..02d91496 100644
--- a/dev-go/go-bindata/go-bindata-3.13.0.ebuild
+++ b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Go Overlay Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # NOTE: The original github.com/jteeuwen/go-bindata is no more maintained.
 #       Instead, we use a fork which is API compatible.
@@ -17,4 +17,4 @@ DESCRIPTION="A small utility for embedding binary data in a GoLang program."
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 x86 arm"
+KEYWORDS="amd64 arm arm64 x86"
diff --git a/eclass/golang-common.eclass b/eclass/golang-common.eclass
index 8f66a08a..4357ef55 100644
--- a/eclass/golang-common.eclass
+++ b/eclass/golang-common.eclass
@@ -8,6 +8,7 @@
 # @AUTHOR:
 # Mauro Toffanin <toffanin.mauro@gmail.com>
 # @BLURB: Base eclass for GoLang packages
+# @SUPPORTED_EAPIS: 7
 # @DESCRIPTION:
 # This eclass provides functionalities which are used by golang-single.eclass,
 # golang-live.eclass, and as well as from ebuilds.
@@ -15,27 +16,27 @@
 # This eclass should not be inherited directly from an ebuild.
 # Instead, you should inherit golang-single or golang-live for GoLang packages.
 
-inherit versionator eutils multiprocessing
+inherit eutils multiprocessing
 
 if [[ -z ${_GOLANG_BASE_ECLASS} ]]; then
 _GOLANG_BASE_ECLASS=1
 
 # Silences repoman warnings.
 case "${EAPI:-0}" in
-		5|6)
-				case "${GOLANG_PKG_DEPEND_ON_GO_SUBSLOT:-yes}" in
-					yes)
-						GO_DEPEND="dev-lang/go:0="
-						;;
-					*)
-						GO_DEPEND="dev-lang/go:*"
-						;;
-				esac
+	7)
+		case "${GOLANG_PKG_DEPEND_ON_GO_SUBSLOT:-yes}" in
+			yes)
+				GO_DEPEND="dev-lang/go:0="
 				;;
-		*)
-				die "${ECLASS}: Unsupported eapi (EAPI=${EAPI})"
+			*)
+				GO_DEPEND="dev-lang/go:*"
 				;;
+		esac
+		;;
+	*)
+		die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
 esac
+
 DEPEND+=" ${GO_DEPEND}"
 
 RESTRICT+=" mirror strip"
@@ -167,6 +168,10 @@ GOLANG_PKG_VENDOR=()
 # This eclass defaults to an empty list.
 GOLANG_PKG_STATIK="${GOLANG_PKG_STATIK:-}"
 
+# @ECLASS-VARIABLE: GOLANG_PKG_USE_MODULES
+# @DESCRIPTION:
+# Set to enable the compilation of the package with Go modules support.
+
 
 # @ECLASS-VARIABLE: GO
 # @DEFAULT_UNSET
@@ -210,7 +215,7 @@ GOLANG_PKG_STATIK="${GOLANG_PKG_STATIK:-}"
 
 
 # Adds gccgo as a compile-time dependency when GOLANG_PKG_USE_CGO is set.
-[[ -n ${GOLANG_PKG_USE_CGO} ]] && DEPEND+=" >=sys-devel/gcc-4.8.4[go]"
+#[[ -n ${GOLANG_PKG_USE_CGO} ]] && DEPEND+=" >=sys-devel/gcc-4.8.4[go]"
 
 # Adds dev-go/statik as a compile-time dependency when GOLANG_PKG_STATIK is set.
 [[ -n ${GOLANG_PKG_STATIK} ]] && DEPEND+=" dev-go/statik"
@@ -396,8 +401,12 @@ golang_setup() {
 		export GOPATH="$_GOPATH"
 		export GOBIN="$_GOBIN"
 		export CGO_ENABLED
-		export GOEXPERIMENT
-		export GO15VENDOREXPERIMENT=0
+		#export GOEXPERIMENT
+		#export GO15VENDOREXPERIMENT=0
+
+		GO111MODULE="off"
+		[[ -z ${GOLANG_PKG_USE_MODULES} ]] || GO111MODULE="on"
+		export GO111MODULE
 
 		debug-print "${FUNCNAME}: GOPATH = ${GOPATH}"
 		debug-print "${FUNCNAME}: GOBIN = ${GOBIN}"
@@ -554,7 +563,6 @@ golang-common_src_prepare() {
 		golang_add_vendor "${VENDOR}"
 	fi
 
-
 	# Evaluates PATCHES array.
 	default_src_prepare
 }
@@ -596,7 +604,7 @@ golang-common_src_configure() {
 	# Removes GoLang object files from package source directories (pkg/)
 	# and temporary directories (_obj/ _test*/).
 	local EGO_SUBPACKAGES="${GOLANG_PKG_IMPORTPATH_ALIAS}/${GOLANG_PKG_NAME}"
-	case $( get_version_component_range 1-2 ${GOLANG_VERSION} ) in
+	case $( ver_cut 1-2 ${GOLANG_VERSION} ) in
 		1.4*) ;;
 		*)
 			EGO_SUBPACKAGES+="/..."
@@ -919,7 +927,7 @@ golang_do_build() {
 	# Filters "=" chars from ldflags declaration.
 	# NOTE: from go1.5+ linker syntax is no more compatible with <go1.4;
 	#       this hack ensures that the old behaviour is honoured.
-	if [[ $( get_version_component_range 1-2 ${GOLANG_VERSION} ) == "1.4" ]]; then
+	if [[ $( ver_cut 1-2 ${GOLANG_VERSION} ) == "1.4" ]]; then
 		GOLANG_PKG_LDFLAGS="${GOLANG_PKG_LDFLAGS//=/ }"
 	fi