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, 03 Jun 2017 09:35:09
Message-Id: 1496482500.ad811707cdd84c790cb1265c0971e4afa56b9a34.zmedico@gentoo
1 commit: ad811707cdd84c790cb1265c0971e4afa56b9a34
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 3 09:32:26 2017 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 3 09:35:00 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad811707
7
8 app-admin/consul: version bump to 0.8.3
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 app-admin/consul/Manifest | 1 +
13 app-admin/consul/consul-0.8.3.ebuild | 104 +++++++++++++++++++++++++++++++++++
14 2 files changed, 105 insertions(+)
15
16 diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
17 index 7d0f3abf535..d9c22b7b40d 100644
18 --- a/app-admin/consul/Manifest
19 +++ b/app-admin/consul/Manifest
20 @@ -3,5 +3,6 @@ DIST consul-0.7.2.tar.gz 4200076 SHA256 28441273a928d0976a668ca0657ec655b10fffe4
21 DIST consul-0.7.3.tar.gz 5022341 SHA256 4055c74382e9fd33c34389ed2b0ed00ab48dca19c1ab1f4293ca3d8f842b1d3d SHA512 abb81183118fa3af0e3ef6c46b15441c8ce6b15dbd37e8516a36f2a2fe7eda8f98a11c40e14181392858ba92d86f4148849c15b6afef16439f1b2e250159a717 WHIRLPOOL 04a4fed4f699a25201e036fd086c9375cd8cb54adfb31e1137f45fa24a478bdc8e1e16798354df192e7badffca0ab7ef6af3394aa371d32a3924912cfdc8f33d
22 DIST consul-0.7.5.tar.gz 5157056 SHA256 e213ba0c55bcb0d752ab120c770048e5156159db5974dc94193731f2e67d7d1f SHA512 6825a92ca2d1e3bf1db561de803e890bfa3a4c08718477a819ea10f5d0d9d13bf23ba7bedf2123cfa32b8f87d63ede7ee85d57a20f8cef5effd4651d28ab8a36 WHIRLPOOL 56e139b39bf73df558369acdd99a0cec42e05b88333013c18f69cfc56837ec007985ec48a845d461df44eed57d0f13256948942860431b84ab4d5d01becca2d2
23 DIST consul-0.8.0.tar.gz 4629677 SHA256 d50787c290d91f6e3472d2adeb3b2cedf3eb71c7c0fce32b60d2739af2d81dcf SHA512 4bb8bb50e4ab897cac7936bef590c7d8f93eca61913cd88588d5d0324c04fe2582d224dd25191b20bf76b000f764b4decce23118d3f8ed024b887b3194520644 WHIRLPOOL b0f1b03ed013f5a23a3d37cabe09fdc839c4097612f6355238ecfee55a7d5ab91b6386a6d107dfb01f210ff722e505abbe3882b0f6c2fd4015e20b1faef91765
24 +DIST consul-0.8.3.tar.gz 6513579 SHA256 8088ae2f4259a736400211eed63f6df3b5264f3a18d31b31845c4a4481b349ac SHA512 84c72f5cdc9f82288b29b92e386324214bf71ef3952cbd3391f4c7c427cf5f385a3e472304cfb8c837bbfb009547ad3b736d6f66f0546a5f994d547d431bd4b8 WHIRLPOOL 159e0cc899702d19e5d46e02b4e64da5097a13016acc0331a638f248f6678ecee19ef019dad3123a42081a97985b7498622731d486c6eb9e015da80d442b2c33
25 DIST gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
26 DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
27
28 diff --git a/app-admin/consul/consul-0.8.3.ebuild b/app-admin/consul/consul-0.8.3.ebuild
29 new file mode 100644
30 index 00000000000..feb992b3d54
31 --- /dev/null
32 +++ b/app-admin/consul/consul-0.8.3.ebuild
33 @@ -0,0 +1,104 @@
34 +# Copyright 1999-2017 Gentoo Foundation
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=6
38 +
39 +inherit golang-base 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.7.5:=
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 +
101 + sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
102 + -e 's:^\(GIT_COMMIT=\).*:\1:' \
103 + -e 's:^\(GIT_DIRTY=\).*:\1:' \
104 + -e 's:go get -u -v $(GOTOOLS)::' \
105 + -i "${S}/src/${EGO_PN}/GNUmakefile" || die
106 +}
107 +
108 +src_compile() {
109 + export GOPATH="${S}"
110 + go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
111 + # The dev target sets causes build.sh to set appropriate XC_OS
112 + # and XC_ARCH, and skips generation of an unused zip file,
113 + # avoiding a dependency on app-arch/zip.
114 + PATH=${PATH}:${S}/bin \
115 + emake -C "${S}/src/${EGO_PN}" dev
116 +}
117 +
118 +src_install() {
119 + local x
120 +
121 + dobin "${S}/bin/${PN}"
122 +
123 + keepdir /etc/consul.d
124 + insinto /etc/consul.d
125 + doins "${FILESDIR}/"*.json.example
126 +
127 + for x in /var/{lib,log}/${PN}; do
128 + keepdir "${x}"
129 + fowners consul:consul "${x}"
130 + done
131 +
132 + newinitd "${FILESDIR}/consul.initd" "${PN}"
133 + newconfd "${FILESDIR}/consul.confd" "${PN}"
134 + insinto /etc/logrotate.d
135 + newins "${FILESDIR}/${PN}.logrotated" "${PN}"
136 + systemd_dounit "${FILESDIR}/consul.service"
137 +}