Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
Date: Sat, 01 Feb 2020 08:08:01
Message-Id: 1580544463.565088cfb8c626949ec8639511cc06d05c09b519.zmedico@gentoo
1 commit: 565088cfb8c626949ec8639511cc06d05c09b519
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 1 08:05:13 2020 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 1 08:07:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=565088cf
7
8 app-admin/consul: Bump to version 1.6.3
9
10 Package-Manager: Portage-2.3.86, Repoman-2.3.20
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-admin/consul/Manifest | 1 +
14 app-admin/consul/consul-1.6.3.ebuild | 74 ++++++++++++++++++++++++++++++++++++
15 2 files changed, 75 insertions(+)
16
17 diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
18 index e3af29c49f7..ea45743bb07 100644
19 --- a/app-admin/consul/Manifest
20 +++ b/app-admin/consul/Manifest
21 @@ -1,3 +1,4 @@
22 DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
23 DIST consul-1.6.1.tar.gz 22621651 BLAKE2B b696823d3f7f3ef135ba578f3c4ae76f78a1f172e083a3bb5cd07212b3907aefbac3fc0a1d68c5d494e7781cb84c686e2cfb1e5f7cd2d34f8bf671be84b3ca00 SHA512 c96855f3a344699580e34d6f45efe863ba4e6b23ef0889a22ee89bad8ffa807b3cec1a9d14604a340b16b0a8df8227c9eeacd507f94e4a19b25e0385ca5155ac
24 DIST consul-1.6.2.tar.gz 22041280 BLAKE2B 0b2edcd68fa166c178587a1ed3ca0445847d34510cd4e341f85a370257958a155ef6f976b045fc8e87af39107a3930ccb6d7a798ad142e87362f82d68ece4c3c SHA512 2df67854b85fa27600bf2cd57c913669f784019ee5a25b20a950ab00a403ca0562d74cb73c3402ebcec6cd951d7b9b4eb80c926746bcc27050db85f31192f826
25 +DIST consul-1.6.3.tar.gz 22065994 BLAKE2B 4d37a8141c097182c66a8ba7ab8f7031125e71b7a1b7dc8c419630504896634d797f4d733ddeb71555a2a988a2418548f40a12f333202833527483cbc8a590f6 SHA512 16a3fb3584d273ca178b213c9f314577d9473c39a5e436108bcae42f8b68803a548a5cc62d0c8426aa82e2b86dd6355f3d86f833ee6ec6fe1a4955589daf039f
26
27 diff --git a/app-admin/consul/consul-1.6.3.ebuild b/app-admin/consul/consul-1.6.3.ebuild
28 new file mode 100644
29 index 00000000000..61bae7df963
30 --- /dev/null
31 +++ b/app-admin/consul/consul-1.6.3.ebuild
32 @@ -0,0 +1,74 @@
33 +# Copyright 1999-2020 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +
38 +inherit golang-vcs-snapshot systemd user
39 +GIT_COMMIT="7f3b5f3"
40 +KEYWORDS="~amd64"
41 +EGO_PN="github.com/hashicorp/consul"
42 +DESCRIPTION="A tool for service discovery, monitoring and configuration"
43 +HOMEPAGE="https://www.consul.io"
44 +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
45 +
46 +SLOT="0"
47 +LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
48 +IUSE=""
49 +
50 +RESTRICT="test"
51 +
52 +DEPEND="dev-go/gox
53 + >=dev-lang/go-1.11:=
54 + >=dev-go/go-tools-0_pre20160121"
55 +RDEPEND=""
56 +
57 +pkg_setup() {
58 + enewgroup consul
59 + enewuser consul -1 -1 /var/lib/${PN} consul
60 +}
61 +
62 +src_prepare() {
63 + default
64 +
65 + # avoid network-sandbox violations since go-1.13
66 + rm src/${EGO_PN}/go.mod || die
67 + grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
68 + xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
69 +
70 + sed -e 's:go get -u -v $(GOTOOLS)::' \
71 + -e 's:vendorfmt dev-build:dev-build:' \
72 + -i "src/${EGO_PN}/GNUmakefile" || die
73 +}
74 +
75 +src_compile() {
76 + # The dev target sets causes build.sh to set appropriate XC_OS
77 + # and XC_ARCH, and skips generation of an unused zip file,
78 + # avoiding a dependency on app-arch/zip.
79 + GOPATH="${S}" \
80 + GOBIN="${S}/bin" \
81 + GIT_DESCRIBE="v${PV}" \
82 + GIT_DIRTY="" \
83 + GIT_COMMIT="${GIT_COMMIT}" \
84 + emake -C "src/${EGO_PN}" dev-build
85 +}
86 +
87 +src_install() {
88 + local x
89 +
90 + dobin bin/consul
91 +
92 + keepdir /etc/consul.d
93 + insinto /etc/consul.d
94 + doins "${FILESDIR}/"*.json.example
95 +
96 + for x in /var/{lib,log}/${PN}; do
97 + keepdir "${x}"
98 + fowners consul:consul "${x}"
99 + done
100 +
101 + newinitd "${FILESDIR}/consul.initd" "${PN}"
102 + newconfd "${FILESDIR}/consul.confd" "${PN}"
103 + insinto /etc/logrotate.d
104 + newins "${FILESDIR}/${PN}.logrotated" "${PN}"
105 + systemd_dounit "${FILESDIR}/consul.service"
106 +}