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: Fri, 01 Sep 2017 03:29:19
Message-Id: 1504236175.b1b7284d66c74f53588365eb310a9e80796e857f.zmedico@gentoo
1 commit: b1b7284d66c74f53588365eb310a9e80796e857f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 1 03:22:55 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 1 03:22:55 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1b7284d
7
8 app-admin/consul: remove old versions for bug 628544
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.2
11
12 app-admin/consul/Manifest | 5 --
13 app-admin/consul/consul-0.7.5.ebuild | 106 -----------------------------------
14 app-admin/consul/consul-0.8.0.ebuild | 106 -----------------------------------
15 app-admin/consul/consul-0.8.3.ebuild | 104 ----------------------------------
16 4 files changed, 321 deletions(-)
17
18 diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
19 index b39f8b6b6b3..031db5c3d9f 100644
20 --- a/app-admin/consul/Manifest
21 +++ b/app-admin/consul/Manifest
22 @@ -1,6 +1 @@
23 -DIST consul-0.7.5.tar.gz 5157056 SHA256 e213ba0c55bcb0d752ab120c770048e5156159db5974dc94193731f2e67d7d1f SHA512 6825a92ca2d1e3bf1db561de803e890bfa3a4c08718477a819ea10f5d0d9d13bf23ba7bedf2123cfa32b8f87d63ede7ee85d57a20f8cef5effd4651d28ab8a36 WHIRLPOOL 56e139b39bf73df558369acdd99a0cec42e05b88333013c18f69cfc56837ec007985ec48a845d461df44eed57d0f13256948942860431b84ab4d5d01becca2d2
24 -DIST consul-0.8.0.tar.gz 4629677 SHA256 d50787c290d91f6e3472d2adeb3b2cedf3eb71c7c0fce32b60d2739af2d81dcf SHA512 4bb8bb50e4ab897cac7936bef590c7d8f93eca61913cd88588d5d0324c04fe2582d224dd25191b20bf76b000f764b4decce23118d3f8ed024b887b3194520644 WHIRLPOOL b0f1b03ed013f5a23a3d37cabe09fdc839c4097612f6355238ecfee55a7d5ab91b6386a6d107dfb01f210ff722e505abbe3882b0f6c2fd4015e20b1faef91765
25 -DIST consul-0.8.3.tar.gz 6513579 SHA256 8088ae2f4259a736400211eed63f6df3b5264f3a18d31b31845c4a4481b349ac SHA512 84c72f5cdc9f82288b29b92e386324214bf71ef3952cbd3391f4c7c427cf5f385a3e472304cfb8c837bbfb009547ad3b736d6f66f0546a5f994d547d431bd4b8 WHIRLPOOL 159e0cc899702d19e5d46e02b4e64da5097a13016acc0331a638f248f6678ecee19ef019dad3123a42081a97985b7498622731d486c6eb9e015da80d442b2c33
26 DIST consul-0.8.4.tar.gz 6614287 SHA256 d5573d6e70d490c8b8109722c2019b5a2b35eff703b92d6276997846361cff1b SHA512 4bbb167a603f1d20940330bd9615ba0f50e0113e1d96ce47773f5d2813635f76dd1aec8f43dae4c8c547cec8a891eb0726eeeda7bd7c5b1d495029b359378e68 WHIRLPOOL e270367c69fe74f25c89ef9e8c7f71307d3b8e48b4210e43e48907f1f5a73f11f45aa2b212f70c24463e35d800b861ccd34e2c82de863fc6e7da9cd3eda5214c
27 -DIST gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
28 -DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
29
30 diff --git a/app-admin/consul/consul-0.7.5.ebuild b/app-admin/consul/consul-0.7.5.ebuild
31 deleted file mode 100644
32 index 4e61df91c08..00000000000
33 --- a/app-admin/consul/consul-0.7.5.ebuild
34 +++ /dev/null
35 @@ -1,106 +0,0 @@
36 -# Copyright 1999-2017 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -inherit systemd user
42 -
43 -KEYWORDS="~amd64"
44 -EGO_PN="github.com/hashicorp/consul"
45 -DESCRIPTION="A tool for service discovery, monitoring and configuration"
46 -HOMEPAGE="http://www.consul.io"
47 -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
48 - https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz
49 - https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
50 -"
51 -
52 -SLOT="0"
53 -LICENSE="MPL-2.0"
54 -IUSE=""
55 -
56 -RESTRICT="test"
57 -
58 -DEPEND="
59 - >=dev-lang/go-1.7.5:=
60 - >=dev-go/go-tools-0_pre20160121"
61 -RDEPEND=""
62 -
63 -pkg_setup() {
64 - enewgroup consul
65 - enewuser consul -1 -1 /var/lib/${PN} consul
66 -}
67 -
68 -get_archive_go_package() {
69 - local archive=${1} uri x
70 - for x in ${SRC_URI}; do
71 - if [[ ${x} == http* ]]; then
72 - uri=${x}
73 - elif [[ ${x} == ${archive} ]]; then
74 - break
75 - fi
76 - done
77 - uri=${uri#https://}
78 - echo ${uri%/archive/*}
79 -}
80 -
81 -unpack_go_packages() {
82 - local go_package x
83 - # Unpack packages to appropriate locations for GOPATH
84 - for x in ${A}; do
85 - unpack ${x}
86 - if [[ ${x} == *.tar.gz ]]; then
87 - go_package=$(get_archive_go_package ${x})
88 - mkdir -p src/${go_package%/*}
89 - mv ${go_package##*/}-* src/${go_package} || die
90 - fi
91 - done
92 -}
93 -
94 -src_unpack() {
95 - mkdir "${S}" || die
96 - cd "${S}" || die
97 - unpack_go_packages
98 -}
99 -
100 -src_prepare() {
101 - eapply_user
102 - # Avoid the need to have a git checkout
103 - sed -e 's:^GIT.*::' \
104 - -e 's:-X main.GitCommit.*:" \\:' \
105 - -i "${S}/src/${EGO_PN}/scripts/build.sh" || die
106 -
107 - # go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
108 - sed -e 's:go get -u -v $(GOTOOLS)::' \
109 - -i "${S}/src/${EGO_PN}/GNUmakefile" || die
110 -}
111 -
112 -src_compile() {
113 - export GOPATH="${S}"
114 - go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
115 - # The dev target sets causes build.sh to set appropriate XC_OS
116 - # and XC_ARCH, and skips generation of an unused zip file,
117 - # avoiding a dependency on app-arch/zip.
118 - PATH=${PATH}:${S}/bin \
119 - emake -C "${S}/src/${EGO_PN}" dev
120 -}
121 -
122 -src_install() {
123 - local x
124 -
125 - dobin "${S}/bin/${PN}"
126 -
127 - keepdir /etc/consul.d
128 - insinto /etc/consul.d
129 - doins "${FILESDIR}/"*.json.example
130 -
131 - for x in /var/{lib,log}/${PN}; do
132 - keepdir "${x}"
133 - fowners consul:consul "${x}"
134 - done
135 -
136 - newinitd "${FILESDIR}/consul.initd" "${PN}"
137 - newconfd "${FILESDIR}/consul.confd" "${PN}"
138 - insinto /etc/logrotate.d
139 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
140 - systemd_dounit "${FILESDIR}/consul.service"
141 -}
142
143 diff --git a/app-admin/consul/consul-0.8.0.ebuild b/app-admin/consul/consul-0.8.0.ebuild
144 deleted file mode 100644
145 index 4e61df91c08..00000000000
146 --- a/app-admin/consul/consul-0.8.0.ebuild
147 +++ /dev/null
148 @@ -1,106 +0,0 @@
149 -# Copyright 1999-2017 Gentoo Foundation
150 -# Distributed under the terms of the GNU General Public License v2
151 -
152 -EAPI=6
153 -
154 -inherit systemd user
155 -
156 -KEYWORDS="~amd64"
157 -EGO_PN="github.com/hashicorp/consul"
158 -DESCRIPTION="A tool for service discovery, monitoring and configuration"
159 -HOMEPAGE="http://www.consul.io"
160 -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
161 - https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz
162 - https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
163 -"
164 -
165 -SLOT="0"
166 -LICENSE="MPL-2.0"
167 -IUSE=""
168 -
169 -RESTRICT="test"
170 -
171 -DEPEND="
172 - >=dev-lang/go-1.7.5:=
173 - >=dev-go/go-tools-0_pre20160121"
174 -RDEPEND=""
175 -
176 -pkg_setup() {
177 - enewgroup consul
178 - enewuser consul -1 -1 /var/lib/${PN} consul
179 -}
180 -
181 -get_archive_go_package() {
182 - local archive=${1} uri x
183 - for x in ${SRC_URI}; do
184 - if [[ ${x} == http* ]]; then
185 - uri=${x}
186 - elif [[ ${x} == ${archive} ]]; then
187 - break
188 - fi
189 - done
190 - uri=${uri#https://}
191 - echo ${uri%/archive/*}
192 -}
193 -
194 -unpack_go_packages() {
195 - local go_package x
196 - # Unpack packages to appropriate locations for GOPATH
197 - for x in ${A}; do
198 - unpack ${x}
199 - if [[ ${x} == *.tar.gz ]]; then
200 - go_package=$(get_archive_go_package ${x})
201 - mkdir -p src/${go_package%/*}
202 - mv ${go_package##*/}-* src/${go_package} || die
203 - fi
204 - done
205 -}
206 -
207 -src_unpack() {
208 - mkdir "${S}" || die
209 - cd "${S}" || die
210 - unpack_go_packages
211 -}
212 -
213 -src_prepare() {
214 - eapply_user
215 - # Avoid the need to have a git checkout
216 - sed -e 's:^GIT.*::' \
217 - -e 's:-X main.GitCommit.*:" \\:' \
218 - -i "${S}/src/${EGO_PN}/scripts/build.sh" || die
219 -
220 - # go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
221 - sed -e 's:go get -u -v $(GOTOOLS)::' \
222 - -i "${S}/src/${EGO_PN}/GNUmakefile" || die
223 -}
224 -
225 -src_compile() {
226 - export GOPATH="${S}"
227 - go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
228 - # The dev target sets causes build.sh to set appropriate XC_OS
229 - # and XC_ARCH, and skips generation of an unused zip file,
230 - # avoiding a dependency on app-arch/zip.
231 - PATH=${PATH}:${S}/bin \
232 - emake -C "${S}/src/${EGO_PN}" dev
233 -}
234 -
235 -src_install() {
236 - local x
237 -
238 - dobin "${S}/bin/${PN}"
239 -
240 - keepdir /etc/consul.d
241 - insinto /etc/consul.d
242 - doins "${FILESDIR}/"*.json.example
243 -
244 - for x in /var/{lib,log}/${PN}; do
245 - keepdir "${x}"
246 - fowners consul:consul "${x}"
247 - done
248 -
249 - newinitd "${FILESDIR}/consul.initd" "${PN}"
250 - newconfd "${FILESDIR}/consul.confd" "${PN}"
251 - insinto /etc/logrotate.d
252 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
253 - systemd_dounit "${FILESDIR}/consul.service"
254 -}
255
256 diff --git a/app-admin/consul/consul-0.8.3.ebuild b/app-admin/consul/consul-0.8.3.ebuild
257 deleted file mode 100644
258 index feb992b3d54..00000000000
259 --- a/app-admin/consul/consul-0.8.3.ebuild
260 +++ /dev/null
261 @@ -1,104 +0,0 @@
262 -# Copyright 1999-2017 Gentoo Foundation
263 -# Distributed under the terms of the GNU General Public License v2
264 -
265 -EAPI=6
266 -
267 -inherit golang-base systemd user
268 -
269 -KEYWORDS="~amd64"
270 -EGO_PN="github.com/hashicorp/consul"
271 -DESCRIPTION="A tool for service discovery, monitoring and configuration"
272 -HOMEPAGE="http://www.consul.io"
273 -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
274 - https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz
275 - https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
276 -"
277 -
278 -SLOT="0"
279 -LICENSE="MPL-2.0"
280 -IUSE=""
281 -
282 -RESTRICT="test"
283 -
284 -DEPEND="
285 - >=dev-lang/go-1.7.5:=
286 - >=dev-go/go-tools-0_pre20160121"
287 -RDEPEND=""
288 -
289 -pkg_setup() {
290 - enewgroup consul
291 - enewuser consul -1 -1 /var/lib/${PN} consul
292 -}
293 -
294 -get_archive_go_package() {
295 - local archive=${1} uri x
296 - for x in ${SRC_URI}; do
297 - if [[ ${x} == http* ]]; then
298 - uri=${x}
299 - elif [[ ${x} == ${archive} ]]; then
300 - break
301 - fi
302 - done
303 - uri=${uri#https://}
304 - echo ${uri%/archive/*}
305 -}
306 -
307 -unpack_go_packages() {
308 - local go_package x
309 - # Unpack packages to appropriate locations for GOPATH
310 - for x in ${A}; do
311 - unpack ${x}
312 - if [[ ${x} == *.tar.gz ]]; then
313 - go_package=$(get_archive_go_package ${x})
314 - mkdir -p src/${go_package%/*}
315 - mv ${go_package##*/}-* src/${go_package} || die
316 - fi
317 - done
318 -}
319 -
320 -src_unpack() {
321 - mkdir "${S}" || die
322 - cd "${S}" || die
323 - unpack_go_packages
324 -}
325 -
326 -src_prepare() {
327 - eapply_user
328 -
329 - sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
330 - -e 's:^\(GIT_COMMIT=\).*:\1:' \
331 - -e 's:^\(GIT_DIRTY=\).*:\1:' \
332 - -e 's:go get -u -v $(GOTOOLS)::' \
333 - -i "${S}/src/${EGO_PN}/GNUmakefile" || die
334 -}
335 -
336 -src_compile() {
337 - export GOPATH="${S}"
338 - go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
339 - # The dev target sets causes build.sh to set appropriate XC_OS
340 - # and XC_ARCH, and skips generation of an unused zip file,
341 - # avoiding a dependency on app-arch/zip.
342 - PATH=${PATH}:${S}/bin \
343 - emake -C "${S}/src/${EGO_PN}" dev
344 -}
345 -
346 -src_install() {
347 - local x
348 -
349 - dobin "${S}/bin/${PN}"
350 -
351 - keepdir /etc/consul.d
352 - insinto /etc/consul.d
353 - doins "${FILESDIR}/"*.json.example
354 -
355 - for x in /var/{lib,log}/${PN}; do
356 - keepdir "${x}"
357 - fowners consul:consul "${x}"
358 - done
359 -
360 - newinitd "${FILESDIR}/consul.initd" "${PN}"
361 - newconfd "${FILESDIR}/consul.confd" "${PN}"
362 - insinto /etc/logrotate.d
363 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
364 - systemd_dounit "${FILESDIR}/consul.service"
365 -}