3 files changed, 49 insertions, 43 deletions
diff --git a/app-metrics/vault_exporter/metadata.xml b/app-metrics/vault_exporter/metadata.xml
index 4eafefdd6820..32ae9b22ca43 100644
--- a/app-metrics/vault_exporter/metadata.xml
+++ b/app-metrics/vault_exporter/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">grapeshot/vault_exporter</remote-id>
+		<remote-id type="github">Talend/vault_exporter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild b/app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..4f8185cc0e8c
--- /dev/null
+++ b/app-metrics/vault_exporter/vault_exporter-0.1.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/grapeshot/vault_exporter"
+MY_PV="${PV/_/}"
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Vault exporter for Prometheus"
+HOMEPAGE="https://github.com/grapeshot/vault_exporter"
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	acct-group/vault_exporter
+	acct-user/vault_exporter
+"
+
+BDEPEND="${RDEPEND}"
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	GOPATH="${S}" emake build
+	popd || die
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	newbin _output/bin/vault_exporter-v${PV}* vault_exporter
+	dodoc README.md
+	popd || die
+
+	keepdir /var/log/vault_exporter
+	fowners vault_exporter:vault_exporter /var/log/vault_exporter
+
+	newinitd "${FILESDIR}"/vault_exporter.initd vault_exporter
+	newconfd "${FILESDIR}"/vault_exporter.confd vault_exporter
+}
diff --git a/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild b/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
deleted file mode 100644
index 3c48b2307d64..000000000000
--- a/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-MY_PV=${PV/_/}
-
-EGO_PN="github.com/grapeshot/vault_exporter"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Vault exporter for Prometheus"
-HOMEPAGE="https://github.com/grapeshot/vault_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	newbin _output/bin/vault_exporter-v${PV}* vault_exporter
-	dodoc README.md
-	popd || die
-	keepdir /var/log/vault_exporter
-	fowners ${PN}:${PN} /var/log/vault_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}