gentoo resync : 10.04.2018

3 files changed, 3 insertions, 72 deletions

diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index db0f3e8476e7..e228c20acfa7 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,10 +3,8 @@ AUX vault.confd 243 BLAKE2B 6598fa2138c4ca94fdd6b7a02048ee4a4eb2b37d17b8a065ae2f
 AUX vault.initd 542 BLAKE2B 5e28a00356c010d34458c6f64d2bdb0736673ae552bec809cc5e23a1613e44cd847b4df99bee652a99cb6fb84443d5f9c5c1fba1c165d946f1c93cd8ca31ffa3 SHA512 ac13c688e006799b607c44e94fbdf922befc62131014b714a93ca4bb0205f5f012bb3e4814eeeb47b31034f5c35b187fc8ebaeca02bd02430c5842bc9821f29a
 AUX vault.logrotated 83 BLAKE2B 63b106e949f8a2da0ca97f1d07732fdea4dafbe44cb97ea81074472b95489d179deccd14f4d4176043f488f2be68b96dc6bee20748fe68f650d70fd32078d2bd SHA512 83d73760d85dbb731652aa5936d2780208ac4643e975538652f53b49305d024df6d72a8a06d82f430982b07cf940b2fd69f9a6eedb39d380136c8e5bfda280e5
 AUX vault.service 409 BLAKE2B 1e34e7bb4e5d52949b1b0afbe495aea00202ee599db1b1737bd81c5252a6d57efd2a5c98e4dfaa4d632bb664a467414e644ec751921ced20f5e4c40b27222eb6 SHA512 2c4c7c395ebcd06e70de57d93384442ea88346cc2815b509966bd9f12579758e5f43d9a2ca1158e3b25198ad0c82ed9cf5d453f3cd7b5873011b3b13ec60196c
-DIST vault-0.8.3.tar.gz 8128509 BLAKE2B 681b19e7a775e26d396411b137608bc5b68f1226e407dc254c9f498e59a6022d9633aa206b5efe692d35f816a6d8ee6399b7a00b64395b3d775b97fc46a93c6a SHA512 e2b273ebb761246f6d85fc040d911a3f3a7beb0951fed4adcbe5df4106dd0cb013328b5816ef4153b2c4d363f7f2a14ae1c82bae9baaea74ef707ff0934d6c8d
-DIST vault-0.9.0.tar.gz 8457263 BLAKE2B 021887cd3ab8185b3369f8355fc6cac23553e90277dfa2121fedcf170bbac19997f723c995ed0e00b80b25671ee827aa43a15040a6b57c43634abd5030dd7130 SHA512 c5755bd8a696764af2375ac51b955759ece36796e6c138e6fc3e8abd487c10ac41c8927501234e0cdfcd448021254b2f09097d8e00a6278b44f971d8b8442da6
 DIST vault-0.9.3.tar.gz 8694430 BLAKE2B 2ac99f5723b9ecf65382f10b795e51d29659b2d218732c6e9d8cc5a3a788a5dfbdc58926399a98ef27bae05454c74dec028a4ed631417788843c7ca7102263e8 SHA512 3939c952c12497f5fb9d4ba0fa4ca94acfd8ee8bb2f3636364dad680a54be4256d52018521573a0c1499a3cf573ff9daa27a52dee3ff7216181436b9aadea574
-EBUILD vault-0.8.3.ebuild 1496 BLAKE2B 3249d2b2cb3cc23d7b8d96670d7f5a55f3dd83792e6c491b7eef7609a4982e30de9470ac82e1805245e9e57c85f482f9494a55b6e760ed7ae7cc8781d1cb9373 SHA512 6f1c1d653a026a5ba928539007fc999f16bf022e34a79349866ec9e453bbee0a7ad71350948c358cd49758299ce66d15009124221871a0e45b8f7ad7b139bde8
-EBUILD vault-0.9.0.ebuild 1496 BLAKE2B 3249d2b2cb3cc23d7b8d96670d7f5a55f3dd83792e6c491b7eef7609a4982e30de9470ac82e1805245e9e57c85f482f9494a55b6e760ed7ae7cc8781d1cb9373 SHA512 6f1c1d653a026a5ba928539007fc999f16bf022e34a79349866ec9e453bbee0a7ad71350948c358cd49758299ce66d15009124221871a0e45b8f7ad7b139bde8
+DIST vault-0.9.6.tar.gz 10464094 BLAKE2B 6e776b000ba6e0e209fd6c89dceedc7925cf41a151816c08a3d96627dd3f2d747be10da70c9c87fcda7870dc1540887fe194c101b275f9cdf12073ad70191f3d SHA512 31c6a39f2a5ebce79660f9ba7b673f95042ab283681de016a9540da17b6a938a45762cf4b4625cf35545fe80716e212a9ee362abe5c6fca52eafd5322b6b0de4
 EBUILD vault-0.9.3.ebuild 1496 BLAKE2B 4d46543b6efca5db609be21267274ad67a99c0761c407b7baf88ad17ed154759b462264f5f66047573ac3e503474ce56703f4dd150d677853a8ec5d252b7cdbe SHA512 2c0aa6df6b4c3d675eb177c8837befd10cc6bda97a5470441173fc5150edc20ff536efcaad0012df8684e50850514b512f958808881a1fe6ee4d25af374634de
+EBUILD vault-0.9.6.ebuild 1496 BLAKE2B 4d46543b6efca5db609be21267274ad67a99c0761c407b7baf88ad17ed154759b462264f5f66047573ac3e503474ce56703f4dd150d677853a8ec5d252b7cdbe SHA512 2c0aa6df6b4c3d675eb177c8837befd10cc6bda97a5470441173fc5150edc20ff536efcaad0012df8684e50850514b512f958808881a1fe6ee4d25af374634de
 MISC metadata.xml 306 BLAKE2B 882a83701d71a45cdc6fc00ba3da98ff7d7439c9f81ef0aa1655c49bd5e79b3e625858d33f4ac6d5157df6ef74c5dd00a2b8efb1fd5ee45f9a0ed785c90d8ebc SHA512 d1fc4040379fb33c7f193f37a1c044000408e47c9df8b17771ed7cb5194f9d8b8c062b8a6804e72fb5a666683a8d5b49ec5a6328394870d9bdc1b7f3e0e4e787
diff --git a/app-admin/vault/vault-0.9.0.ebuild b/app-admin/vault/vault-0.9.0.ebuild
deleted file mode 100644
index e41ab098f405..000000000000
--- a/app-admin/vault/vault-0.9.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps golang-base golang-vcs-snapshot systemd user
-
-EGO_PN="github.com/hashicorp/${PN}"
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
-LICENSE="MPL-2.0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.9:=
-	dev-go/gox"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-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" -i src/${EGO_PN}/Makefile || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_compile() {
-	mkdir bin || die
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	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-0.8.3.ebuild b/app-admin/vault/vault-0.9.6.ebuild
index e41ab098f405..81830bee313e 100644
--- a/app-admin/vault/vault-0.8.3.ebuild
+++ b/app-admin/vault/vault-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6