gentoo resync : 28.07.2021

3 files changed, 2 insertions, 83 deletions

diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 5d69b54e869f..8f5fa26e5017 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,16 +3,13 @@ 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.5.6-webui.tar.xz 1237168 BLAKE2B 997a3ef1e297e288d2abf14647667fd07ebd2e9c6389aad90e3c8fe4d66b5e77004ad07575c6a48d38eb1a4e4040af6cf341edc17bbe87a575a31e06f91449aa SHA512 afed06fe9866dd24ea925e49e2ebdb477ef40dd8ea0137fec1f8a86e17cbe5679ef23a9d9a248ce4de8a21392c96d50f47487c5a866f45ad7317c6cbfc1a5fda
-DIST vault-1.5.6.tar.gz 35110596 BLAKE2B 6e2581b82dfc98f0fd4c807dd24c9e17b4e4c3252ab5744388e17a076d8ed613ea2360f8bf5b975ee5b15d6c7f96100f2b814e290ab47e33c565525ffe1eeda3 SHA512 1da2a6f1307583f03298a4199d301536783787ae1d9b16a8b0a4cce55d29a1fd8a1631366a55aa4671d5b7f6fb9108ffe55d9ec9575e887e495a512b00cf9cb3
 DIST vault-1.5.9-webui.tar.xz 1244124 BLAKE2B bdd56f3ffc3c1733f9ba3c76be2e6969039dfbf03ba3ced1f9fa69b2622b51d09e18c5a2c1127a5056db54a2a034549d40e3edbba23849276ce15360e3859afb SHA512 5abac5ccaf0c3010327eb79e78b3fe37de89202e998c19457d8782d138e826e2c6e319dca221419977ecc6dbe7477e7778c9d5011ecef5eaa49e53a4485f586e
 DIST vault-1.5.9.tar.gz 35127251 BLAKE2B 7b2c24f797f0c54672b49a28989e0e465d9a0054f26cfcaf22d030a9f3b25d79b496044bb65a6d4c363b7478a3ca6d8dac1520169d6c347fe75bac3ff6001df6 SHA512 de5dfa9cb0ca41514fa5652d2cd3dacc312b1a6d9f2311823a1634dadb6bc4430d8124ac9089dd93f7277ff44f3fee37354b3ae48f8ece839ba859c89655510b
 DIST vault-1.6.5-webui.tar.xz 1273364 BLAKE2B 3fd23a322f435cc1151c7c7321bd48ddbf5a06e260e77cb51353e5df940a7e7932b7043e914da149664d20e7a10b24771c6c3f1cad0cae035b654f4e206212aa SHA512 cbc433bf101996ff1f800b023664f1a6b9e3473fb2220986724f2019801cbe758a0889f1e9ab8a4fbcda3a6d75e453251a24f1c81228616f6a377100c4e7ae7a
 DIST vault-1.6.5.tar.gz 39136426 BLAKE2B ed977f7035b37b801c785c0f63c7338e6ad829de27d50fcc2078bbc008f9cdb0fb399786af62b16d9e85fab57d8a6c22417581b84e902fc3829144548cb41634 SHA512 0f5640d376f21d57bf25db0865b4509ef819dd82e950f8c9192188ab3ef1c2477c369049b69a5194e27051b5d8dc523b9760b01eda6568f7348bb782cf6f97c6
 DIST vault-1.7.3-webui.tar.xz 1331416 BLAKE2B 81a3e70086ef4aa1a4761188d8d8b294593cf26ffe8e697d556a3bc27319c0ea149ba3f652ff3fc9f552252354a86e7923ecd87a81ecc2b9d29d6ff25180e50e SHA512 a9f2aa9ed9e4303054a8c7c97a49daab8e2c6142ddff18ec0f38fd68383af10a644e47c02b3ef6e2d4f74e68a6a9d3324f58c7b7725b990c7c290649134f90d3
 DIST vault-1.7.3.tar.gz 39626087 BLAKE2B 54e777c0703c2b3ae32012507579079a97c19aee9b8488af71b863ab2f0b536417470441c68c5ace40069559485c9f2fa108d3f2e3cbbd9a44e1baffd812ed13 SHA512 06929599eb03373489da87bc63577b10b92080212fd090d5f95e29007a03c7e70c40148219415f252ac2acc7a8c46afe03fb5d034812fe379c79b7dd01d172e5
-EBUILD vault-1.5.6.ebuild 1879 BLAKE2B 5bddff9571265a85ae83006d0c5443ec74127d486db55e96a1121cec364ff280c8c5c34645794769d7a5997774ccfb6bac37b60b50e343f6959b1671214dfe59 SHA512 e637af281634f65377b14168fd037c24380f696830c5b520847991b5c66ef98e6011b37a073a8f1c24abe91b06b206ac140618b151e2f3ef30a9cf3f48e51481
-EBUILD vault-1.5.9.ebuild 1880 BLAKE2B 7df42f193de56d3affdb68ce2bd067367baef69d5572af56e3f48521d1057089ad3e0bbc21a370b8a5f58f7f74bb5400d8b80ca94dcf50a1d1f583f73d00efef SHA512 fdb48177c021d987454ce89a686f7e8914df17b39f3bc2ab37a4d1d1f94a0b6ed26e914d0c72202cffb3ad659ae3d3de2d3ad884f5a080408356b20c46a36bcc
+EBUILD vault-1.5.9.ebuild 1879 BLAKE2B 5bddff9571265a85ae83006d0c5443ec74127d486db55e96a1121cec364ff280c8c5c34645794769d7a5997774ccfb6bac37b60b50e343f6959b1671214dfe59 SHA512 e637af281634f65377b14168fd037c24380f696830c5b520847991b5c66ef98e6011b37a073a8f1c24abe91b06b206ac140618b151e2f3ef30a9cf3f48e51481
 EBUILD vault-1.6.5.ebuild 1880 BLAKE2B 9f7e8579490d1cd24afc040ac6af21d435e5199084ddb392000292f529c355a16d6fb9451c348003d2e71679b2a5c9062be6fd38cf1b5ee81900f45538014190 SHA512 e1956379e8f151dd471e03bbdb4bb816d7d92519a38b79355b99a6f3391556c01e40f268af59d5875bed878000fe0ea30f35e05455c9114b6db4080c364a4143
 EBUILD vault-1.7.3.ebuild 1880 BLAKE2B 9f7e8579490d1cd24afc040ac6af21d435e5199084ddb392000292f529c355a16d6fb9451c348003d2e71679b2a5c9062be6fd38cf1b5ee81900f45538014190 SHA512 e1956379e8f151dd471e03bbdb4bb816d7d92519a38b79355b99a6f3391556c01e40f268af59d5875bed878000fe0ea30f35e05455c9114b6db4080c364a4143
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.5.6.ebuild b/app-admin/vault/vault-1.5.6.ebuild
deleted file mode 100644
index 0e1b75de2be5..000000000000
--- a/app-admin/vault/vault-1.5.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps go-module systemd
-
-DESCRIPTION="A tool for managing secrets"
-HOMEPAGE="https://vaultproject.io/"
-VAULT_WEBUI_ARCHIVE="${P}-webui.tar.xz"
-SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	webui? (
-		https://dev.gentoo.org/~zmedico/dist/${VAULT_WEBUI_ARCHIVE}
-	)"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+webui"
-
-BDEPEND="dev-go/gox
-	>=dev-lang/go-1.14.7"
-COMMON_DEPEND="acct-group/vault
-	acct-user/vault"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-FILECAPS=(
-	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
-)
-
-RESTRICT+=" test"
-
-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 scripts/build.sh || die
-	sed -e "/hooks/d" \
-		-e 's|^\([[:space:]]*\)goimports .*)|\1true|' \
-		-i Makefile || die
-	if [[ -f "${WORKDIR}/http/bindata_assetfs.go" ]]; then
-		mv "${WORKDIR}/http/bindata_assetfs.go" "${S}/http" ||
-			die "mv failed"
-	fi
-}
-
-src_compile() {
-	mkdir "${T}"/bin || die
-	BUILD_TAGS="$(usex webui ui '')" \
-	GOFLAGS="-mod=vendor" \
-	GOPATH="${T}" \
-	XC_ARCH=$(go env GOARCH) \
-	XC_OS=$(go env GOOS) \
-	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
-	emake
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc CHANGELOG.md CONTRIBUTING.md README.md
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	go-module_pkg_postinst
-}
diff --git a/app-admin/vault/vault-1.5.9.ebuild b/app-admin/vault/vault-1.5.9.ebuild
index f66aa7089ee8..0e1b75de2be5 100644
--- a/app-admin/vault/vault-1.5.9.ebuild
+++ b/app-admin/vault/vault-1.5.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hashicorp/vault/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+webui"
 
 BDEPEND="dev-go/gox