gentoo resync : 15.01.2020

3 files changed, 5 insertions, 74 deletions

diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index b42b5e27a5f3..afbe3599cf84 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -2,9 +2,8 @@ AUX consul-template.confd 293 BLAKE2B 5c3ef27d72b4c98098b128f29c55f5e674c7d4427d
 AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a553677fbf049a37dccad0d7645e681665db36e89263a5a73a1155e9b19446bdab7f58f04bb7173a727c711 SHA512 bbaa059f1b339f7f8c70babe90917fc1bbff36ca446452f6e4a744dd986392227342b865aa47be02ccec2d35c43814b8faadd66f9e5af5dab3abec9805b7e676
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
-DIST consul-template-0.20.0.tar.gz 46430965 BLAKE2B 025919b928e07cda618e05aab4488214459e6bc443524bbf8fa83331c3ad5708ebbeaf0cf20351ff70a325fb56aed9cede3010b43726fa32b5b1997d6f4f294a SHA512 a09ff31ddd7d11d78e8c2afcc9a63ab4458cc9feacc02fbf95a30c82b9ad58526c6e6575f5b3ddb21d0dd720687b9ee135bacdbe761f1b5f95592a3e3e74c170
-DIST consul-template-0.22.0.tar.gz 186074 BLAKE2B b2c38e2a0e720fb39ce0978ca929b872e1dd898d510a0ab5697a746257f25fc77e172c418c5db9c9865e2e0530b7d38d7373f7c792e37c723950c02dd06b7859 SHA512 0875a4a20ba9e9e078cd26c620cb9edbd22193b6b5fe25bb6006bd7d3272dcf29d7051448d3672f9d9caaa1b871f08b050fa07882933ad6d13b90d1c8f6406af
 DIST consul-template-0.23.0.tar.gz 192356 BLAKE2B 204f0fc7ca6780a60d88ccbd75181897e9c4db5194cd702e2ac3759d456dcb9fcae4a9f8481ccbd2d61609fb9d1330f143a0c039b6278e15d85cc2535cf5b13e SHA512 769992578fb6b9f69e9c41280a46c27e74cabbd7cffddc158dc301ffaa9ad1e5b11e626e5bc2e18532952fecb61f83c107003929e9671d5de4c6f3a82b7120f6
+DIST consul-template-0.24.0.tar.gz 192679 BLAKE2B 85717ad08038c9ec27174220cb5bc7174c8ac8eae9815fd0f403ebf0f5daea39429cfed30939764c53cd1448be94e8a2045e6fdd79af41a4fd913592b4f74600 SHA512 ea5c92b2b30534a2e9e407ebef5057e05f201488f3b46fc9f2b339e1cf56086fac15fff3bc17c5622f852139d1d9b3f872a13b9e6978282f4939c76beeeae28a
 DIST github.com-BurntSushi-toml-v0.3.1.tar.gz 42077 BLAKE2B d846b7961dc3447a43e5c91dee1897a9701c997a407d9ba8737d08b82b493f99823eeab87cc9d4fe6dd4dbdb7b0d2a218d9f9f220ffcda2056188afbf0f2ab87 SHA512 75801d0263a68613233f3b18e35b000e1aeb5322015c0f032598d9447122fc45b1854741ce6ce9fb4d5a064546ad26f3d6384710bd8e6e1229ed2d4551524852
 DIST github.com-armon-go-metrics-ec5e00d3c878b2a97bbe0884ef45ffd1b4f669f5.tar.gz 27423 BLAKE2B 48344146241205d76ae35407e4e5131db7277a7bcd2b44c966ed2c8fbfcd7bd628dcedb7538c28b9106643f8c0f2af4bf0985ada6cb58db0bff739583435b306 SHA512 bf28c4df0927296214f4e89263e30a6ab7c2f5fb62c20177e597890bb878f68df4aaf5445ff9af629864b38da8f506fb530f09ff22d5d8509ad7b5f4ca20a395
 DIST github.com-frankban-quicktest-v1.4.0.tar.gz 26586 BLAKE2B 365dbf6520d5e4b936dfa71022437012b45ca8d499998af8b204fa2f4ad00086b8adbd7c871e494c0a45481809253bbdbb10c05e72f3e6247b29148b61f7a7d7 SHA512 5fb98186c0ce5c96858bd9c018a86f5db2d5b04d7d659a9aafef16e6abb6ea9fbe076c84e74d5b8c5cf7e8460f273bce203dedce0e3ce6c024a16f588acac20d
@@ -17,7 +16,6 @@ DIST github.com-golang-sys-1393eb0183657fb29200106b17a5042ec6e48dbe.tar.gz 14570
 DIST github.com-golang-text-v0.3.2.tar.gz 7168069 BLAKE2B c2412f4554e2a50fe0764c24cd52a0799d526cb78952839fa1c031c43e7c34a58f6c65d2e450a0ddd0447d5f749aa5104dd47dca5a2c4964e3dd6e2eb39313c3 SHA512 48156313c3ae4c01ea3a8b790ae829f50f2a53ea9ad7c14509749405da5cb7c98e6e1a2e9f3619e01393935d452b5b5e568b29719cd1f286570272d59508da58
 DIST github.com-golang-time-c4c64cad1fd0a1a8dab2523e04e61d35308e131e.tar.gz 9392 BLAKE2B 9c06e2cf9a4d51eefa4d687263bd64ffef69d1937754bff1aee0a51c441510a9ce2e3193c361632c45a818b3cdd906349f44c9ee29f1fbf5c405d68bcc4b9f89 SHA512 2e1bdf8a182875315f776c556a1ad8cf2f8e3ceef72d386b8bb7dd5a3de9d5cf2216e2bbec58d2aada149f4a332fbcdef639d6479923f5a0139bb9ed3fe0f952
 DIST github.com-google-btree-v1.0.0.tar.gz 15292 BLAKE2B 663edd55fb375f2b2b1ea377efea8d891baa501161bd5b87a5d10cc84a65d4de0cd4e7b60f421d476f49f26b2ded0fb8633348392c993585790d1af194c147ad SHA512 1bbd6fff467a0f6f6ce074e94a1c13a019e7d37949cbc041d2886bcafa1076426146b46c21a15f55449d525265c04749312792006bd9ea6baeffa6f3d9705a20
-DIST github.com-hashicorp-consul-v1.1.0.tar.gz 11125956 BLAKE2B 61a8c7463f6659368d990626ebefa20bc545f17e66fb0a06a178e8cf7cb83637e64cf7496ed93facab73ef2340d46b08d7f86533378a7e57530ce1a959a9f398 SHA512 80c16a42fc58930234cb277bfdd21c3f1d9f7fe1cf2fea6284056a47f602a40a15ddd447779e83fc5b42502ca8a507a819f5ad7d11689c0bcbb0da739b217721
 DIST github.com-hashicorp-consul-v1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
 DIST github.com-hashicorp-errwrap-v1.0.0.tar.gz 8346 BLAKE2B b407c23ddc2daa5534e38f23d69363d47012fcfcfae4e75f31513ab9fbf3d05f101258afb2bd60009aa4a6277eebe7c2396db5cb713670ecba6589a0d4b9dccc SHA512 f3bb952d98bdaaed055c4d4adac0a727459964645f8c6bf9becb03ad7eff4ec71e8e4047a29c446ee52148a0e201aac3d4b47d05bd750627650ca0e84c91652f
 DIST github.com-hashicorp-go-cleanhttp-v0.5.1.tar.gz 8069 BLAKE2B 36f2411ec94ba71b4360fc625d19fe995606560d92a4b08459b490831a4d4fda5114622cfe1aea2d100e316300a107045b9d5ce217d3748ab142e49c662ad880 SHA512 a94953d10485bbb6b1510036c8b87dac1d3ca41f84b1b397bb987ae7df68964e082ed09d9b57cfb8439735d246e599a7848882810699d26505662da735cfd406
@@ -46,7 +44,6 @@ DIST github.com-pkg-errors-v0.8.1.tar.gz 11009 BLAKE2B 02adfe3cea02b0ddb7cde923c
 DIST github.com-ryanuber-go-glob-v1.0.0.tar.gz 2969 BLAKE2B 152f01873947fd0e17928b7ef86b826bdb66f1d2e6a4139b6963a5ce2133567816488d7dd240221b15adf56713094bcd11b155ac29faae04590b31f0d566c1df SHA512 fca7548194624dda5d7b5317a29c3a1a6bee44ecb3b62772943dca8afb5e665c9c3c72c740a91a7052fdddc50c60fe23917199cb67d79cdbb8b499f13a34f768
 DIST github.com-square-go-jose-v2.3.1.tar.gz 299480 BLAKE2B 861aa2e72c5e12013aab1e7fb81ef45b1f4be63a854c49dbdb2e537e9dc63f0a0478373e20ab437560fe245bd71172434fe19da42ee571bc0b48fb540fb31e12 SHA512 cc634dc543674016db6b52cba8235885ed3236f360e42992b55471b07dc20762c490edff7276d84109d1d46a9c052fb8fb62cfa002e91b1cbe43f00ff152727e
 DIST github.com-stretchr-testify-v1.3.0.tar.gz 102859 BLAKE2B 0b590484005372f6c1a8c591c6439d1072c53299db1508495c02712b187623552196421321c5e64aedc0fba6acdbd68db53ddbc8e5d6a78fd783e6f7344783b1 SHA512 29dc8389f0efba9caeb2d2d5704878c93f3b00c21e6ad2712bac52bbc09c460d9028aecbfd5430f200a15fd0e8c8d0157e084b72463d82ceecc5459d93d4d896
-EBUILD consul-template-0.20.0.ebuild 1534 BLAKE2B efb7e210dc8e15979c5a97b2c7578560027d0596c60409a2b1ce7a31da13f5eae8da03e2577177387e50507fb385ade659f78ba362bf6489824a1909c18d8aac SHA512 5554d0d5668989615abc120e1b321f70223ccc3c829428602fe3e5cb977606ef39ae4f6092492221199e3aad289acfa27a92c487e45f6b0b8b30039c987bb2c7
-EBUILD consul-template-0.22.0.ebuild 3306 BLAKE2B b5c6f9977cc1ac9f497b9c543729921c2ac036c1ed75272094e95029ffe2f1bf68aad307574ec55cc1a39ed2f80d8d2535f280ef635a586f359b0cc0e9a519b8 SHA512 bb59f560b81f53a4fa41fbf71fb9af6b728518d6c9769da86332f5f8863f7546bbe6362801bd2b4eb830d926a07bae7a6d8182fe12088b30ac407f4e1d162af4
 EBUILD consul-template-0.23.0.ebuild 3306 BLAKE2B deb62933b47ba59e47d3ef8c329621e84aed26668edb872e2972862caa9f950882b7d1512224457eccd1a92bc11d212eb16511e817ebd1ecf87d80d1f949ee1f SHA512 1fb3133715911a5d41b7b0088b12d5d41c0f7331613c8902a06a0c9c7e02f4d54ded9c1477ffb5ff0e81755cafe2c04c833f58179329be4db5284fbbcc0b6d1b
+EBUILD consul-template-0.24.0.ebuild 3306 BLAKE2B 532da4c3bd7a22d3fbadafb91c983c300602641ed751498e44ea1b21e6e931d9434d0b571128f18c2d636c1ad7265abf429553b8beed68eb8903850032786d03 SHA512 f8ea687c558eb084f834f83d7b3c251468ae92b6a8983b4c540738b265a1edacac26f1eb8389d0afc888853e27e3b1527c11ef0ec95703cddb802fb850028b07
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.20.0.ebuild b/app-admin/consul-template/consul-template-0.20.0.ebuild
deleted file mode 100644
index 0dc27765b37a..000000000000
--- a/app-admin/consul-template/consul-template-0.20.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="Generic template rendering and notifications with Consul"
-GIT_COMMIT="9a0f301"
-EGO_PN="github.com/hashicorp/${PN}"
-HOMEPAGE="https://github.com/hashicorp/consul-template"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"
-SLOT="0"
-# TODO: debug test failures
-RESTRICT="test"
-
-DEPEND="dev-lang/go"
-RDEPEND=""
-
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	# Avoid the need to have a git checkout
-	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
-		-e '/-s \\/d' \
-		-i src/${EGO_PN}/Makefile || die
-	# Printf format %q has arg r.config.PidFile of wrong type *string
-	sed -e 's|remove pid at %q: %s|remove pid at %v: %s|' \
-		-i src/${EGO_PN}/manager/runner.go || die
-}
-
-src_compile() {
-	export GOPATH=${S}
-	cd src/${EGO_PN} || die
-	#XC_ARCH=$(go env GOARCH) \
-	#XC_OS=$(go env GOOS) \
-	emake dev
-}
-
-src_test() {
-	cd src/${EGO_PN} || die
-	emake test
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc src/${EGO_PN}/{CHANGELOG.md,README.md}
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-}
diff --git a/app-admin/consul-template/consul-template-0.22.0.ebuild b/app-admin/consul-template/consul-template-0.24.0.ebuild
index b43c4c0bc0ec..bf93081bbff2 100644
--- a/app-admin/consul-template/consul-template-0.22.0.ebuild
+++ b/app-admin/consul-template/consul-template-0.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ EGO_VENDOR=(
 	"github.com/frankban/quicktest v1.4.0"
 	"github.com/golang/snappy v0.0.1"
 	"github.com/google/btree v1.0.0"
-	"github.com/hashicorp/consul v1.1.0"
+	"github.com/hashicorp/consul v1.2.0"
 	"github.com/hashicorp/errwrap v1.0.0"
 	"github.com/hashicorp/go-cleanhttp v0.5.1"
 	"github.com/hashicorp/go-gatedio v0.5.0"
@@ -50,7 +50,7 @@ inherit golang-vcs-snapshot systemd user
 
 KEYWORDS="~amd64"
 DESCRIPTION="Generic template rendering and notifications with Consul"
-GIT_COMMIT="005b42e"
+GIT_COMMIT="521adf1"
 EGO_PN="github.com/hashicorp/${PN}"
 HOMEPAGE="https://github.com/hashicorp/consul-template"
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 ISC MIT WTFPL-2"