summaryrefslogtreecommitdiff
path: root/app-admin/consul-template
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-05-04 12:02:00 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-05-04 12:02:00 +0100
commiteab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
treece35c6d01b5ff5de95c3a20fef853b9a6518ad2e /app-admin/consul-template
parentb7ebc951da8800f711142f69d9d958bde67a112d (diff)
gentoo resync : 04.05.2019
Diffstat (limited to 'app-admin/consul-template')
-rw-r--r--app-admin/consul-template/Manifest4
-rw-r--r--app-admin/consul-template/consul-template-0.18.5-r1.ebuild61
-rw-r--r--app-admin/consul-template/consul-template-0.19.5.ebuild5
3 files changed, 5 insertions, 65 deletions
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index f1a481717481..a44f628e3cbd 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -2,8 +2,6 @@ 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.18.5.tar.gz 5285939 BLAKE2B 822df39f77d9aebc55e03d74b43ace9d453135c6270aedd3d41a674b5ae325a588af2a76c9236072d6f6dd274ab75c050df6607aa5bfc98b0caf2cd3065b1b04 SHA512 1709c889cd414d2b3510400e8077aec49006c31958618a38f6bce78dad2ba4aac5405410b030bf968b5cf148f4cfbe963ccf95a015cd1e58f2f6d1f09edc13de
DIST consul-template-0.19.5.tar.gz 6054881 BLAKE2B 48d691f9d09531248310ec50c6c59d3c74db4c8ca5f0236ac8336df92c75da89677e64cb593518032f48f53b9f5aa914a7b6ac0a2dc6bf6d32ae7c1f6d1dc60d SHA512 bdba4e821e353a71f9f6287b8ff352e85a916201314229b998bfbebb066fec17c5d7f12e224bf2920b018a4f5fec9000f122f6c04cb2e455a195b945e35235a5
-EBUILD consul-template-0.18.5-r1.ebuild 1351 BLAKE2B d48a01aabea1abe073bf834c3167d6c15d5ea169ccb164a7daec1643ed4b9f8d1ac34aadd1df655b73b56442a5761df2f1e8b4e72ef4788876d86c422cedd836 SHA512 0ad472d57b8c815ee88d051d18287b13c7839f147bcef5525a92c15cfe099c71dae7a5acb349239fa4158f2fed5fe6363eceb47b1b0861d8235f2a2510882e6e
-EBUILD consul-template-0.19.5.ebuild 1328 BLAKE2B f19e2a8bc8129da1a7ec87b6e7b58cdba797e7ab52f6b401aac40b8e0126f76569166b054a80d343e05cc5df67c77140c1a46afa9e7502fe368ea0985bf69249 SHA512 500a8fdb1dcfa4456a252167bed358b8e14b04ac23c1889672e34eff22d12b88dd09fc40bf00c56252421ff82d213763f69a4327db12f913fef042e17747d944
+EBUILD consul-template-0.19.5.ebuild 1493 BLAKE2B 97b6e2745eff7a2387e972630c9518b374f81e65766875287e5ef97859421ab02df9224f84a5711013c6b59fc02f1e6e94a33f29255dedae44e7cae088ad3bdd SHA512 b62365114f34c528d591235cfd8fa9f7a9b40f9c6a0030a72588a141d3372e515bccbbcf72c13d434fae399ad20b2f3a03b71e1b61f29af3f5297f88d8eb8e9a
MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
diff --git a/app-admin/consul-template/consul-template-0.18.5-r1.ebuild b/app-admin/consul-template/consul-template-0.18.5-r1.ebuild
deleted file mode 100644
index 47439c5c68f5..000000000000
--- a/app-admin/consul-template/consul-template-0.18.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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"
-EGO_PN="github.com/hashicorp/${PN}"
-HOMEPAGE="https://github.com/hashicorp/consul-template"
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.6:="
-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() {
- eapply_user
- # Avoid the need to have a git checkout
- sed -e 's:^GIT.*::' \
- -i src/${EGO_PN}/scripts/compile.sh || die
-}
-
-src_compile() {
- export GOPATH=${S}
- cd "${S}"/src/${EGO_PN} || die
- PATH=${PATH}:${S}/bin \
- XC_ARCH=$(go env GOARCH) \
- XC_OS=$(go env GOOS) \
- emake bin-local
-}
-
-src_test() {
- cd "${S}"/src/${EGO_PN} || die
- emake test || die
-}
-
-src_install() {
- dobin "${S}"/src/${EGO_PN}/pkg/$(go env GOOS)_$(go env GOARCH)/${PN}
- dodoc "${S}"/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.19.5.ebuild b/app-admin/consul-template/consul-template-0.19.5.ebuild
index dfa6bf036b0b..ab75ab08e38d 100644
--- a/app-admin/consul-template/consul-template-0.19.5.ebuild
+++ b/app-admin/consul-template/consul-template-0.19.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -31,6 +31,9 @@ src_prepare() {
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() {