gentoo resync : 25.11.2020

6 files changed, 13 insertions, 92 deletions

diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 7b26cf9c425b..2a6c4fd23535 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,19 +3,16 @@ 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.2-webui.tar.xz 1208924 BLAKE2B 5177afc91e7bc774b7d78e5e344d7c8310a13a592c57768ac6a0c8e12ef6e7ac8b6dbc975e5e9131888478a7fb18ad9ef1ee9b1da43c2899fcf636e99d049078 SHA512 ab462bebfa38102e354938e9b8c6990b6bb19b29dd0da96d65f290394a987d89063800247c1d751a8f7ba7c3fa6645aab9383a5455444244adb5f40528408b17
-DIST vault-1.4.2.tar.gz 33158384 BLAKE2B 263f20419c210b83448907b1e95464fb139f52f4f7347eb01803b5aa487797c191f1e61a9fb77321f776ea70feb83a741f10c79400fdd471b790fe37a6404a9c SHA512 d4f2a426a4c0531cca0d3812c2e29ebc5ebbd6da2897d3ee57fe57d4dfde0395f30713cfe21600b4dd51fdc90bf2a10527957b04c8215bd185bd502267f93503
-DIST vault-1.4.3-webui.tar.xz 1212168 BLAKE2B d068d3218462b2e2eda9eec623a0438a3c7f6a894713ccfa3260a4b1ed53bf0791760f2ad9ac6071ae5227e7c44e5c9b675d7a1cc8ecb7052b322d8415f79955 SHA512 5542a170d853a52bbe05b4bfab7014305c6fa68e7fc2ea24df5f508905c7db8cf8a0f65b8f91c209563779a22044959d615f05d26a12df2b8ef1f749b8af450e
-DIST vault-1.4.3.tar.gz 33169383 BLAKE2B 78adde5dfe68fbb51b43abc7f12fe96df7df6b7f5a7fc0af35439184a3f1ce03a71e445fe735e692953a68e039093f9eb65265ee9aae786e4ef9b8f0ca81c030 SHA512 638bdeaaee122263d8f8c44b6db48b0f10869dd6f2cd6d35bcefb96e8b25dde4596a4a41f287d065f0cece01c5e75f9a4ae220864dddc381365fe57faeb2efe2
 DIST vault-1.4.5-webui.tar.xz 1239532 BLAKE2B fe861cdf9ea833010f6b8b2ffa403fb8095456cc9038f19edefe44fbbdd418bf4c3ec129b1436296c78914d75964dbb6dcaf3077cad45a3cf905a54a42e7e82d SHA512 d0fe0878b6f30a63e7156644c7a53bd8bf0008355e6bf9b79b8a4acd4a094ab43914e2b7ca63f48f3b31433dd36b1091ebbfb9afe8002e51c18dcf217292b521
 DIST vault-1.4.5.tar.gz 33272136 BLAKE2B 3e0f3b11b975b1e563883d43f392dc998dc21ad057859c4aaad3dc67133e3a2dd9e3d1ab5b46f07d981738bdccaa5ced477ace6e057579815c13557cd74f30eb SHA512 5b709ef857d6c64a1332b1c01b13f525491e21e958a7e1441fa817067a8016e8d78d7f71043c2b24d75141becea18063d97cfb5dd7a337130d6d8ef58a76d062
-DIST vault-1.5.0-webui.tar.xz 1237556 BLAKE2B 2647d9733a6a20b61f5884b15dd46d048705c3fe5dcfb9f4c8c2fa71303d17c9b69d2f08a42ec171e863affd45632c0407d4db4cb6bb229ba780860dfbf05449 SHA512 b5164f7525c94752f3f6a17ba6c738eb42e05f33682b790b49c322882964dfdb68abf28d0f30836759383ff6777cc5d5061699fc2a5d2a7a3706b5423ccca378
-DIST vault-1.5.0.tar.gz 34940170 BLAKE2B cbc4b25bbb6881415c63be41970429e4413e3f70fc9aa3dfb3c54136719c7166896475d77a11d33d3e388344d863a19d63836f2ed3e20cc42db98ee2b57ba9a4 SHA512 245d5ea837f561d6c3832a0cb28d851dabe908fac2be7e53d3fd466689778d67b2cd5d9ea8c297f8daceb003c571a9768254a7e27d1fbeb1a376ac75e3c6edfb
-DIST vault-1.5.2-webui.tar.xz 1242056 BLAKE2B 7ec3bf3c30170bad5e09168bd75ebccf5664a6500bbfdcbf8fab8abb2bc78472a0614e602d4521ecf998547a9e5f86f27f265324b9220db84c724f7add52b64a SHA512 04fb481936bd0ce8e60865962a5b6726f2ab82bc56d25c888f7cf7d920174cbb7916255fd38a701709c1d56a00f8216a22f884c2456c26f510075fc0ad9d41f8
-DIST vault-1.5.2.tar.gz 35118624 BLAKE2B 96e9f3070ffea0d1c513004ad02558363a5c51da2e8211e664fadefc004cf65c8da6489c3a95573a9a1712ece9355966298efc122b350f9c6df79f1fd9cc2ec3 SHA512 be2c5eb530687fe199762195960fc497badbae933d57ac2861f88c05991e967e2512a5de90e3ce9ce14a094a25da18eb482da59360b6d6de594e91d75bff09c6
-EBUILD vault-1.4.2-r1.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
-EBUILD vault-1.4.3.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
-EBUILD vault-1.4.5.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
-EBUILD vault-1.5.0.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
-EBUILD vault-1.5.2.ebuild 1880 BLAKE2B 723b98ca4b9f724ef36ce105b516830feafd49d642b06498d69701f1f9b322e98d663ce80192d86f6229933e0928c6d7d825adae89b21c5bc074a207da85ceef SHA512 f044c61a12b406443b977ddf79a7ef005f406755d344e62c9cd8b9de9f7382ab630be6f4c54cd8dbcba650572fe18d01fe0a6a14134c76cb7cb50cf7491141b4
+DIST vault-1.4.7-webui.tar.xz 1236924 BLAKE2B 83ab6f4494708f0738aed4f7226d5e634d01268da6b672c6ef1340559eccfdbb2a74baaa9a67cb3287290bd1ef332e325ba365280999f7db86e1694ec1731788 SHA512 634128a0a46c01d671c3c766eb4f84a58802f0cf0ade297f34e9d84eedb8d8dfbbbd4ad0eae6a28e33acb0b161f123a692b8b98a25918da8337cbce380c5f94b
+DIST vault-1.4.7.tar.gz 33265037 BLAKE2B 11cd3d1bd2321a6240a31f326666e0725b1bd3104a4cb050ecc78c9fc6bac1db1a79799e3a4b212468556a54e1f431e61f18115d2c86ddd0b229ae0f5ad06726 SHA512 a7af7780756df02a465a60989e3aba382116e0846cc48ab81d7b272133c31b7c47f60eed4ec5ad47ad0a80247baee7087a1554fcaf189a60a1edb807a268c3a4
+DIST vault-1.5.5-webui.tar.xz 1239480 BLAKE2B d1f9d98c2a6ece03f994c08c1e842343f713bdcde981c55ea75049f3cc51f4989a9187786190ff138a9c8ef264a7a9a26428f8a7d916b4b2c0554da85e48ae4d SHA512 a9516605ec262ad44cb8ae61308a70a5cfa0458b8bb2e80d49c4e28711db5a7ad18ef2bcf0e9756b9da6534f1d47ed8bcfc6c7c734042aa8d9b0e9851059fa9d
+DIST vault-1.5.5.tar.gz 35123385 BLAKE2B 428d509378cd912d2ef13630a0fd4ff4df89a7144b30291cecd3c62e91b10a67210c7ae79e5459d7da5d9c635ae2634d3edd99614c40cce744d93713804c407b SHA512 de19be6b9fdaf06ce2debc7784ef1a6dff00ced7811a110b58348d61b304ed2c850d957605a47abfa0cc7568488b3b0920437ace7891a69d470e98b44c0f9fae
+DIST vault-1.6.0-webui.tar.xz 1272792 BLAKE2B cef45043b7ca26de774e17a994f35a3c52b796c94b75b9377300f8755bb4c0d8814147d740e07be8d5dd5f909051adf7fb05be29b1ca1e1db349a0c3977ec034 SHA512 3b13687f7f0f475513152544ae423914520d0bcd9c0ea4295277f326002048707adfdf5ac405561ddb415affb842952409d6586ef19c7faca37d87aee973337a
+DIST vault-1.6.0.tar.gz 38888893 BLAKE2B e6da6ba813625a2a00553181e5d16bb52510856d9ad4e1538b824b5f87b2beb6c8d19f60b274e68d9521210c72dbd93cb63ba73175d079b43b03b48fefd1e1be SHA512 f9a99c29de585031c00b7f0a2125f61df1cb0a15ab0aa04e3cca950bdd23a4055dd3764561594730e62a1b3ae4d13e66df30032bf2b1000063edc4f772a8146d
+EBUILD vault-1.4.5.ebuild 1857 BLAKE2B 3bfa96148412f6c7e2979f8e86baeb100e4e0e42fa2ddc9251c4a4017c18b639583fd51cc360b4c31db25d8641a82058a11572c47a2eeca3d92068e44cd00d1a SHA512 29726e334b3abc150235ba6bc72770bd82e8a0f9225f018ded55fbf08366b90d989d1457ac57e882321ae5209d82a102526924db0e44c9598534587772dcd338
+EBUILD vault-1.4.7.ebuild 1858 BLAKE2B 52b8324bd218fdafd0327cb7fb6516af1ab5a0d5a0463c174b6b68d4d25ad000b400a9bb959605a93e4b2431bdb92ccabfc3acb4fc7e066feb27256049c2f23e SHA512 a605fc295f41be04e0b1828b053d616632eecf868f5b4822f89a1ccc92b5fdc77ffecdd4c4f89e56fb24b04d74c470237bf38c6d5f65de0573788e527512cd8c
+EBUILD vault-1.5.5.ebuild 1880 BLAKE2B 723b98ca4b9f724ef36ce105b516830feafd49d642b06498d69701f1f9b322e98d663ce80192d86f6229933e0928c6d7d825adae89b21c5bc074a207da85ceef SHA512 f044c61a12b406443b977ddf79a7ef005f406755d344e62c9cd8b9de9f7382ab630be6f4c54cd8dbcba650572fe18d01fe0a6a14134c76cb7cb50cf7491141b4
+EBUILD vault-1.6.0.ebuild 1880 BLAKE2B 5d28f6333392f64f9ca59e3208f48e535164608cf3af0b46472a94f986989e9461b784e21506f7c14c9ec7563eb08e9fca4b7933e0e9886b5d6f74a2a6e99317 SHA512 238539a783c20b69f3c3b8f160ca9e9f48c69ff3bad4b175784544b505125d25f8947f28825eddbd30722b8a732f970b4c10d353373f061c4da1c80184e06bcd
 MISC metadata.xml 371 BLAKE2B bdee8ae91cf8ccf66bfceb7ee5e1a46494d3e1b36cf5159ce9e6ad36eb251ea0ea03b1a9aab034936021d1a0f17c8577dafb30dc76a912ec04d8cfc3ae8c37cc SHA512 2517b0ec49190a14a2261c3544e4115435abcc0824a0fd255f6eb585d2de9e97f6feddeff8bb15c505d0f9e3086839e00e2abbd18bc639b45a25f6a7f384be6a
diff --git a/app-admin/vault/vault-1.4.2-r1.ebuild b/app-admin/vault/vault-1.4.2-r1.ebuild
deleted file mode 100644
index 671178b25133..000000000000
--- a/app-admin/vault/vault-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 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"
-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.4.5.ebuild b/app-admin/vault/vault-1.4.5.ebuild
index d7f0e36a12fb..671178b25133 100644
--- a/app-admin/vault/vault-1.4.5.ebuild
+++ b/app-admin/vault/vault-1.4.5.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"
diff --git a/app-admin/vault/vault-1.4.3.ebuild b/app-admin/vault/vault-1.4.7.ebuild
index d7f0e36a12fb..d7f0e36a12fb 100644
--- a/app-admin/vault/vault-1.4.3.ebuild
+++ b/app-admin/vault/vault-1.4.7.ebuild
diff --git a/app-admin/vault/vault-1.5.2.ebuild b/app-admin/vault/vault-1.5.5.ebuild
index 03db71b29ae1..03db71b29ae1 100644
--- a/app-admin/vault/vault-1.5.2.ebuild
+++ b/app-admin/vault/vault-1.5.5.ebuild
diff --git a/app-admin/vault/vault-1.5.0.ebuild b/app-admin/vault/vault-1.6.0.ebuild
index d7f0e36a12fb..d339b69b89e5 100644
--- a/app-admin/vault/vault-1.5.0.ebuild
+++ b/app-admin/vault/vault-1.6.0.ebuild
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+webui"
 
-BDEPEND="dev-go/gox"
+BDEPEND="dev-go/gox
+	>=dev-lang/go-1.15.3"
 COMMON_DEPEND="acct-group/vault
 	acct-user/vault"
 	DEPEND="${COMMON_DEPEND}"