diff --git a/dev-go/gopkg-sourcemap/gopkg-sourcemap-1.0.5.ebuild b/dev-go/gopkg-sourcemap/gopkg-sourcemap-1.0.5.ebuild
index e32b343f1..6ebab72c6 100644
--- a/dev-go/gopkg-sourcemap/gopkg-sourcemap-1.0.5.ebuild
+++ b/dev-go/gopkg-sourcemap/gopkg-sourcemap-1.0.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGO_PN="gopkg.in/sourcemap.v1"
 
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	SRC_URI="https://github.com/go-sourcemap/sourcemap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
diff --git a/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.3.ebuild b/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.3.ebuild
index c64a7720b..921bbc009 100644
--- a/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.3.ebuild
+++ b/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGO_PN="github.com/go-sourcemap/sourcemap"
 
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit golang-vcs
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	inherit golang-vcs-snapshot
 fi
diff --git a/dev-go/gopkg-sourcemap/metadata.xml b/dev-go/gopkg-sourcemap/metadata.xml
new file mode 100644
index 000000000..4fa8ff351
--- /dev/null
+++ b/dev-go/gopkg-sourcemap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>