gentoo resync : 29.06.2020

3 files changed, 7 insertions, 77 deletions

diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 717af1445848..1ba4dac9c5d1 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.4.0-webui.tar.xz 1211468 BLAKE2B 5a7b221f2339ca451f6bc2df7b1a4611a9f7786305ec0631d0e7130fb0287f764553d8a8a99ade5d28a2ae39fca1028b5a3c7299a5049acff0d1a3c1e9b8124f SHA512 3b17221e189f9e5fa73afbae3496e4d1105401a94ce5f99ff1c6975ca25b20485a05dc7f0b0c469d29d896524370d8fa23157d401d28e2e92a71a4813a4d9ba6
-DIST vault-1.4.0.tar.gz 33097110 BLAKE2B 837f23a50128b0fab6542fc6a596d911267a1e14453091f22171db2ccf6a1a3d0aacdb3f210ac0d07efc7ed5ce845a197f61dd4dab37c35ad6f0f47cefc09c9d SHA512 13c1fb901fe577d91f2734f8a0ae5e51083e1307e7fc32a4388a1be48f2c46cd3d121432fa7450d6f9b439285d3ad5819b123631f41bb347e8d75ce683d24a7e
 DIST vault-1.4.2-webui.tar.xz 1208924 BLAKE2B 5177afc91e7bc774b7d78e5e344d7c8310a13a592c57768ac6a0c8e12ef6e7ac8b6dbc975e5e9131888478a7fb18ad9ef1ee9b1da43c2899fcf636e99d049078 SHA512 ab462bebfa38102e354938e9b8c6990b6bb19b29dd0da96d65f290394a987d89063800247c1d751a8f7ba7c3fa6645aab9383a5455444244adb5f40528408b17
 DIST vault-1.4.2.tar.gz 33158384 BLAKE2B 263f20419c210b83448907b1e95464fb139f52f4f7347eb01803b5aa487797c191f1e61a9fb77321f776ea70feb83a741f10c79400fdd471b790fe37a6404a9c SHA512 d4f2a426a4c0531cca0d3812c2e29ebc5ebbd6da2897d3ee57fe57d4dfde0395f30713cfe21600b4dd51fdc90bf2a10527957b04c8215bd185bd502267f93503
-EBUILD vault-1.4.0.ebuild 1794 BLAKE2B 687a5f85ef6715db8f4f940a1990f47a1380ea52004cd34b467e22b6b93dc7bd851c440cdfdce801b9abc3f397b69f4afdcfecf6f0998f700bec49cba2852f13 SHA512 10bf23a0dfd461fc067667d7c9f6a9b627d72c569940899b7a3b935dda254c0bb0103752145cec61e629d5c9622ac47ad2ef42bbb26ef979ec14cc5fbbbad8d1
-EBUILD vault-1.4.2.ebuild 1794 BLAKE2B a679a23b1d2e349fa1d22e58d9cd22022e4b67a09fab41d672a8f244b6a2a9be9d5907fd5324e5ccbe61efab825d32a37eb5f95597c6984f7c8803f3e66446d8 SHA512 001ba7123b4fbb4c2c56be8d2923402c6ecbf736c85e07805b16c167ccbc80108546fb99244bee055e73fbdb5f146039778b9ffea3b724f2e36088045b773b34
+EBUILD vault-1.4.2-r1.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.4.0.ebuild b/app-admin/vault/vault-1.4.0.ebuild
deleted file mode 100644
index a095561ace9e..000000000000
--- a/app-admin/vault/vault-1.4.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 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/~williamh/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"
-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}
-}
diff --git a/app-admin/vault/vault-1.4.2.ebuild b/app-admin/vault/vault-1.4.2-r1.ebuild
index 4a81ecf016aa..671178b25133 100644
--- a/app-admin/vault/vault-1.4.2.ebuild
+++ b/app-admin/vault/vault-1.4.2-r1.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"
@@ -70,3 +70,8 @@ src_install() {
 	keepdir /var/log/${PN}
 	fowners ${PN}:${PN} /var/log/${PN}
 }
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+}