3 files changed, 2 insertions, 98 deletions
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 80afbfb84849..50cd0b8c379c 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,10 +3,7 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 573 BLAKE2B 444541b8912910cf6b5d038e466e18baebb7dfd2905d802217baf9e861bb7f2a3e032716545c74e269782aa420fbd052745322576b4bcb8c4cf53ba07471b261 SHA512 11124e6fc656977c20b55b578e30fd76b8f6905760c2f17f93b960a317975f1914c6bd8d4ffd3741ba405bfe5aa0cecb68067f8ce52b2df9015863d31f9a7aad
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 677 BLAKE2B 0d9c6636c841ff33fa38afca10f10c62d273dc1c6419e35e2fa844472de0c963e177c80a6db3e95230db6f641ab50148843085cb4f141fa2dd2765aecf8457d3 SHA512 15951d095181fb1b1a5f79e0f385bdb96812a517ea59e05017141a29ed880d0e6f29d377e7c4bc53d5b70175122785a39923297b8e3304fc46a63835d2d2ec50
-DIST vault-1.2.2-webui.tar.xz 1920136 BLAKE2B 81b90a0d796727c7523712ae50f85a24fa98b8b78c304d3ee50654e7f0ea1b3d58005abcbe55a15c3b496f5fce5701306ac57f0c6decc7ab8ae24ab12f5dd81d SHA512 b454e02e664190903b11bf0e3e465463182f3b7060efeb2c858127306869d731193102ba58398c28441d2be1a3956b88b2591aab1460047647742ba9dab5a00c
-DIST vault-1.2.2.tar.gz 27588019 BLAKE2B 5d989d1750a134f0c68e25ced7406ec8e7ae1d2233a1ece634e1487e4879af2d4a3e938aea1016d6872754f31ef19c85d04cd65e63f6547d7a5cf3cfa93ec208 SHA512 ce9211b3deb1839759646f8488fe2b89fec379bafed472921a62cd507f842ed05647fe4da7cb9482d195b028a29eb576f947da24aecd8b19181c7282fd3a155d
 DIST vault-1.2.3-webui.tar.xz 1916848 BLAKE2B 503425336fac45645b837380dcf94be4bdbb3876b1408a6bbd6ccaca96fd93e47dd2fcaf9913a70cb69fc0c7c1c36a90680acb629be3d616fe77d95662d93ed0 SHA512 1e414143ea163dc021ffefba023ff827f8241db5c125c3aa5de407dc4ae476413d32bf3b150167ffb14026f07663a26f3ab62b142019758f751a4f115d438d87
 DIST vault-1.2.3.tar.gz 27773681 BLAKE2B 862b386c96e7d284c5b82a89dca5a0a8668a900a5b32758a472b5d7ea4ed995dce608dfda0398bcf15e703f21099ddc662abb585cca0e2d2f43a0863184e055c SHA512 9543e394f187cd9b06e88b64319504e07519041741650db3b7b905f1b34348ed7d9e22955ce2a456ffd2e06210e9e01b1a0ded459cde4840fbf5903ff6e21e75
-EBUILD vault-1.2.2.ebuild 2356 BLAKE2B 44b548555490725c9cdd4d94868a3a056a57e513f1cfca5c6a88b177dff71bcf2b0041e3cd9a4680d06671b87f784de6baeb86d51aca668120cd5b7769d209e7 SHA512 a8ac5a57df9e4994cce9ac55a720b2fe54dfa4ef076887d7068dfaa1dc70fbe611ece1ec6b25118979fac7a6aeea8875a4ecd46d57f953cfc5c34725c1701d25
-EBUILD vault-1.2.3.ebuild 2356 BLAKE2B 44b548555490725c9cdd4d94868a3a056a57e513f1cfca5c6a88b177dff71bcf2b0041e3cd9a4680d06671b87f784de6baeb86d51aca668120cd5b7769d209e7 SHA512 a8ac5a57df9e4994cce9ac55a720b2fe54dfa4ef076887d7068dfaa1dc70fbe611ece1ec6b25118979fac7a6aeea8875a4ecd46d57f953cfc5c34725c1701d25
+EBUILD vault-1.2.3.ebuild 2356 BLAKE2B c68a7cc7b1b93c93a9a0bb9e4e67ce6900071650f567054a9e4fe5b9b383ea106635ad4a595219f16c877c767ce751d8fbb679cb6d442c2098e5e7e9d7200079 SHA512 55f85e6d4781cd7ad278942f080081bfdc7a6587405a84f79a842680a6142b32a4e32d5547874790556279bd39d9e9279ff3735025552502ffe6ba56159ac4c7
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.2.2.ebuild b/app-admin/vault/vault-1.2.2.ebuild
deleted file mode 100644
index cda2c7eb5033..000000000000
--- a/app-admin/vault/vault-1.2.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		mirror://gentoo/${VAULT_WEBUI_ARCHIVE}
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-KEYWORDS="~amd64"
-IUSE="+webui"
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.11:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-	if use webui; then
-		# The webui assets build has numerous nodejs dependencies,
-		# see https://github.com/hashicorp/vault/blob/master/ui/README.md
-		pushd "${S}/src/${EGO_PN}" >/dev/null || die
-		unpack "${VAULT_WEBUI_ARCHIVE}"
-		popd >/dev/null
-	fi
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
-		-e 's:^\(GIT_DIRTY=\).*:\1:' \
-		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
-		-i src/${EGO_PN}/scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i src/${EGO_PN}/Makefile || die
-
-	# Avoid network-sandbox violations since go-1.13
-	rm src/${EGO_PN}/go.mod || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export -n GOCACHE XDG_CACHE_HOME #678970
-	export GOBIN=${S}/bin GOPATH=${S}
-	cd src/${EGO_PN} || die
-	# The fmt target may need to be executed if it was previously
-	# executed by an older version of go (bug 665438).
-	emake fmt
-	BUILD_TAGS="$(usex webui ui '')" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	dobin bin/${PN}
-}
diff --git a/app-admin/vault/vault-1.2.3.ebuild b/app-admin/vault/vault-1.2.3.ebuild
index cda2c7eb5033..ba761e123410 100644
--- a/app-admin/vault/vault-1.2.3.ebuild
+++ b/app-admin/vault/vault-1.2.3.ebuild
@@ -21,7 +21,7 @@ IUSE="+webui"
 
 RESTRICT="test"
 
-DEPEND=">=dev-lang/go-1.11:=
+DEPEND=">=dev-lang/go-1.12:=
 	dev-go/gox"
 
 FILECAPS=(