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, 28 Jan 2017 07:38:25
Message-Id: 1485588983.d1e8279f6ef166e593bf5747d78f7420a80ef840.zmedico@gentoo
1 commit: d1e8279f6ef166e593bf5747d78f7420a80ef840
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 28 07:36:23 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 28 07:36:23 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1e8279f
7
8 app-admin/consul: version bump to 0.7.3
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 app-admin/consul/Manifest | 1 +
13 app-admin/consul/consul-0.7.3.ebuild | 107 +++++++++++++++++++++++++++++++++++
14 2 files changed, 108 insertions(+)
15
16 diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
17 index 7f82c48..8477796 100644
18 --- a/app-admin/consul/Manifest
19 +++ b/app-admin/consul/Manifest
20 @@ -1,4 +1,5 @@
21 DIST consul-0.7.1.tar.gz 4003354 SHA256 d1498c851df8aa150c7b4398fdbb74467af4949d20ce5b4840b88095fce71135 SHA512 0cc7dfb5b13c9aa5c59f3c74d44c863cb4099108dadc448233edd006bfd1c1ad422c18224d58113bdad1ca6160a89d1a0a04bf1f5e5f645d5499c0c4422d12ba WHIRLPOOL 33ebd4521a3caa0fb84a4d698e05b7f32c59848b90bbab0899661c51dc34c96fbac37f4eb9cb141be079c4419f57ac0da942d764737baf36dafd73230c84feac
22 DIST consul-0.7.2.tar.gz 4200076 SHA256 28441273a928d0976a668ca0657ec655b10fffe45be19b879f3731812ec9e1c5 SHA512 62638f652bad421fe6400338f52f6a142dda9bf4838682f5a31c94ebdb3569ed217cfc7ba8b53a38fae44aaaa8e93912a486d445ed7addb2ff58c7c608469322 WHIRLPOOL fff1869c7d20dc6aa50b765d81d07b610187331d53bd9ec1526fcd85bb00b5426ee8b879946534186694bd3da88a2dd10042632c9bb31249ba6eeb9a8ca20b62
23 +DIST consul-0.7.3.tar.gz 5022341 SHA256 4055c74382e9fd33c34389ed2b0ed00ab48dca19c1ab1f4293ca3d8f842b1d3d SHA512 abb81183118fa3af0e3ef6c46b15441c8ce6b15dbd37e8516a36f2a2fe7eda8f98a11c40e14181392858ba92d86f4148849c15b6afef16439f1b2e250159a717 WHIRLPOOL 04a4fed4f699a25201e036fd086c9375cd8cb54adfb31e1137f45fa24a478bdc8e1e16798354df192e7badffca0ab7ef6af3394aa371d32a3924912cfdc8f33d
24 DIST gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
25 DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
26
27 diff --git a/app-admin/consul/consul-0.7.3.ebuild b/app-admin/consul/consul-0.7.3.ebuild
28 new file mode 100644
29 index 00000000..7bbd099
30 --- /dev/null
31 +++ b/app-admin/consul/consul-0.7.3.ebuild
32 @@ -0,0 +1,107 @@
33 +# Copyright 1999-2017 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +# $Id$
36 +
37 +EAPI=6
38 +
39 +inherit systemd user
40 +
41 +KEYWORDS="~amd64"
42 +EGO_PN="github.com/hashicorp/consul"
43 +DESCRIPTION="A tool for service discovery, monitoring and configuration"
44 +HOMEPAGE="http://www.consul.io"
45 +SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
46 + https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz
47 + https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
48 +"
49 +
50 +SLOT="0"
51 +LICENSE="MPL-2.0"
52 +IUSE=""
53 +
54 +RESTRICT="test"
55 +
56 +DEPEND="
57 + >=dev-lang/go-1.6:=
58 + >=dev-go/go-tools-0_pre20160121"
59 +RDEPEND=""
60 +
61 +pkg_setup() {
62 + enewgroup consul
63 + enewuser consul -1 -1 /var/lib/${PN} consul
64 +}
65 +
66 +get_archive_go_package() {
67 + local archive=${1} uri x
68 + for x in ${SRC_URI}; do
69 + if [[ ${x} == http* ]]; then
70 + uri=${x}
71 + elif [[ ${x} == ${archive} ]]; then
72 + break
73 + fi
74 + done
75 + uri=${uri#https://}
76 + echo ${uri%/archive/*}
77 +}
78 +
79 +unpack_go_packages() {
80 + local go_package x
81 + # Unpack packages to appropriate locations for GOPATH
82 + for x in ${A}; do
83 + unpack ${x}
84 + if [[ ${x} == *.tar.gz ]]; then
85 + go_package=$(get_archive_go_package ${x})
86 + mkdir -p src/${go_package%/*}
87 + mv ${go_package##*/}-* src/${go_package} || die
88 + fi
89 + done
90 +}
91 +
92 +src_unpack() {
93 + mkdir "${S}" || die
94 + cd "${S}" || die
95 + unpack_go_packages
96 +}
97 +
98 +src_prepare() {
99 + eapply_user
100 + # Avoid the need to have a git checkout
101 + sed -e 's:^GIT.*::' \
102 + -e 's:-X main.GitCommit.*:" \\:' \
103 + -i "${S}/src/${EGO_PN}/scripts/build.sh" || die
104 +
105 + # go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
106 + sed -e 's:go get -u -v $(GOTOOLS)::' \
107 + -i "${S}/src/${EGO_PN}/GNUmakefile" || die
108 +}
109 +
110 +src_compile() {
111 + export GOPATH="${S}"
112 + go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
113 + # The dev target sets causes build.sh to set appropriate XC_OS
114 + # and XC_ARCH, and skips generation of an unused zip file,
115 + # avoiding a dependency on app-arch/zip.
116 + PATH=${PATH}:${S}/bin \
117 + emake -C "${S}/src/${EGO_PN}" dev
118 +}
119 +
120 +src_install() {
121 + local x
122 +
123 + dobin "${S}/bin/${PN}"
124 +
125 + keepdir /etc/consul.d
126 + insinto /etc/consul.d
127 + doins "${FILESDIR}/"*.json.example
128 +
129 + for x in /var/{lib,log}/${PN}; do
130 + keepdir "${x}"
131 + fowners consul:consul "${x}"
132 + done
133 +
134 + newinitd "${FILESDIR}/consul.initd" "${PN}"
135 + newconfd "${FILESDIR}/consul.confd" "${PN}"
136 + insinto /etc/logrotate.d
137 + newins "${FILESDIR}/${PN}.logrotated" "${PN}"
138 + systemd_dounit "${FILESDIR}/consul.service"
139 +}