Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/consul/
Date: Fri, 13 Jul 2018 14:52:30
Message-Id: 1531493509.4e61b0533abdf819569476f87157ed30ed744897.mrueg@gentoo
1 commit: 4e61b0533abdf819569476f87157ed30ed744897
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 13 14:51:49 2018 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 13 14:51:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e61b053
7
8 app-admin/consul: Remove old
9
10 Package-Manager: Portage-2.3.42, Repoman-2.3.9
11
12 app-admin/consul/Manifest | 2 --
13 app-admin/consul/consul-0.9.3.ebuild | 68 ------------------------------------
14 app-admin/consul/consul-1.0.0.ebuild | 68 ------------------------------------
15 3 files changed, 138 deletions(-)
16
17 diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
18 index bdbe0313ed0..0c5790da38d 100644
19 --- a/app-admin/consul/Manifest
20 +++ b/app-admin/consul/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST consul-0.9.3.tar.gz 7278357 BLAKE2B 041164951fe798f51bc79ef4cf322e3c37b583471d66f0d78b0a100b57ee367a5942ef07fc85adafeb6c014b5a6047dae10da42427600de25656614c235dab1a SHA512 a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f
23 -DIST consul-1.0.0.tar.gz 7354292 BLAKE2B f2e245cec5859e23dd55c991de5c4d68be8526ec7085273660271407d9f1898c803edbffaff3cd4f0d5de114b9d8b2cd205e03002d5685b77f831957b021140c SHA512 8223f79aa1b7bfc5693168b56fbe9a506ca504771c92328afeb99e78dce8699c7532582749a372dfed10dd4b7c440ace0dd248f1ae27247059da3e2f88293a88
24 DIST consul-1.0.6.tar.gz 8211299 BLAKE2B 7ea5df497f4796e572a86127e0854935f97439504aff82fb697f33700e9d138048772f32f171dbbe4f1fb4d1ceefa7ca96cf3dce2a22cdffd4e1906f6befa55b SHA512 c55f09272859b828816ddf548952769172331c22be8a70a7f73ab9362744fb1f4bc5fdf81955a0dbc4101584cf3660f182620dcdc56bcf94b42dce644be232a8
25 DIST consul-1.2.0.tar.gz 17187054 BLAKE2B 5e8d1151efe1e8ad5932886367d0012774713081aa2725f10d45af1e05751e328d76471ff3cbd85031c252c65cde0137f96c3ef86eca7e3e7f6b28e2d20ed0d5 SHA512 1c018a5f35164a899a086ccdae94cb5e6e2a490e4c788d65b0026dbf448950d0c1038b2d61cb10f5e8c9ad22a1affad64dd4a7086b59dffd115d40aa7b3d0cce
26 DIST consul-1.2.1.tar.gz 14819500 BLAKE2B debb7ee5b8016527de0ebc680b228a9749435db4364e8d6e0160b1a20e2896dd4109edc5930dad961ce18f79182dda0c00a52a567ea6ff2d267b17448df2129d SHA512 5b5d8b62056c305f7388db50b54427ed21c41fef6d1b5f67da845a66bece35454e9f538bb0df59bc86788826b6cd20cd6179552060482908fc5cbc4a048c14a8
27
28 diff --git a/app-admin/consul/consul-0.9.3.ebuild b/app-admin/consul/consul-0.9.3.ebuild
29 deleted file mode 100644
30 index 05b4622df94..00000000000
31 --- a/app-admin/consul/consul-0.9.3.ebuild
32 +++ /dev/null
33 @@ -1,68 +0,0 @@
34 -# Copyright 1999-2018 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit golang-vcs-snapshot 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="https://www.consul.io"
45 -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
46 -
47 -SLOT="0"
48 -LICENSE="MPL-2.0"
49 -IUSE=""
50 -
51 -RESTRICT="test"
52 -
53 -DEPEND="dev-go/gox
54 - >=dev-lang/go-1.9:=
55 - >=dev-go/go-tools-0_pre20160121"
56 -RDEPEND=""
57 -
58 -pkg_setup() {
59 - enewgroup consul
60 - enewuser consul -1 -1 /var/lib/${PN} consul
61 -}
62 -
63 -src_prepare() {
64 - default
65 -
66 - sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
67 - -e 's:^\(GIT_COMMIT=\).*:\1:' \
68 - -e 's:^\(GIT_DIRTY=\).*:\1:' \
69 - -e 's:go get -u -v $(GOTOOLS)::' \
70 - -e 's:vendorfmt dev-build:dev-build:' \
71 - -i "${S}/src/${EGO_PN}/GNUmakefile" || die
72 -}
73 -
74 -src_compile() {
75 - # The dev target sets causes build.sh to set appropriate XC_OS
76 - # and XC_ARCH, and skips generation of an unused zip file,
77 - # avoiding a dependency on app-arch/zip.
78 - GOPATH="${S}" GOBIN="${S}/bin" \
79 - emake -C "${S}/src/${EGO_PN}" dev
80 -}
81 -
82 -src_install() {
83 - local x
84 -
85 - dobin "${S}/bin/${PN}"
86 -
87 - keepdir /etc/consul.d
88 - insinto /etc/consul.d
89 - doins "${FILESDIR}/"*.json.example
90 -
91 - for x in /var/{lib,log}/${PN}; do
92 - keepdir "${x}"
93 - fowners consul:consul "${x}"
94 - done
95 -
96 - newinitd "${FILESDIR}/consul.initd" "${PN}"
97 - newconfd "${FILESDIR}/consul.confd" "${PN}"
98 - insinto /etc/logrotate.d
99 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
100 - systemd_dounit "${FILESDIR}/consul.service"
101 -}
102
103 diff --git a/app-admin/consul/consul-1.0.0.ebuild b/app-admin/consul/consul-1.0.0.ebuild
104 deleted file mode 100644
105 index 05b4622df94..00000000000
106 --- a/app-admin/consul/consul-1.0.0.ebuild
107 +++ /dev/null
108 @@ -1,68 +0,0 @@
109 -# Copyright 1999-2018 Gentoo Foundation
110 -# Distributed under the terms of the GNU General Public License v2
111 -
112 -EAPI=6
113 -
114 -inherit golang-vcs-snapshot systemd user
115 -
116 -KEYWORDS="~amd64"
117 -EGO_PN="github.com/hashicorp/consul"
118 -DESCRIPTION="A tool for service discovery, monitoring and configuration"
119 -HOMEPAGE="https://www.consul.io"
120 -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
121 -
122 -SLOT="0"
123 -LICENSE="MPL-2.0"
124 -IUSE=""
125 -
126 -RESTRICT="test"
127 -
128 -DEPEND="dev-go/gox
129 - >=dev-lang/go-1.9:=
130 - >=dev-go/go-tools-0_pre20160121"
131 -RDEPEND=""
132 -
133 -pkg_setup() {
134 - enewgroup consul
135 - enewuser consul -1 -1 /var/lib/${PN} consul
136 -}
137 -
138 -src_prepare() {
139 - default
140 -
141 - sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
142 - -e 's:^\(GIT_COMMIT=\).*:\1:' \
143 - -e 's:^\(GIT_DIRTY=\).*:\1:' \
144 - -e 's:go get -u -v $(GOTOOLS)::' \
145 - -e 's:vendorfmt dev-build:dev-build:' \
146 - -i "${S}/src/${EGO_PN}/GNUmakefile" || die
147 -}
148 -
149 -src_compile() {
150 - # The dev target sets causes build.sh to set appropriate XC_OS
151 - # and XC_ARCH, and skips generation of an unused zip file,
152 - # avoiding a dependency on app-arch/zip.
153 - GOPATH="${S}" GOBIN="${S}/bin" \
154 - emake -C "${S}/src/${EGO_PN}" dev
155 -}
156 -
157 -src_install() {
158 - local x
159 -
160 - dobin "${S}/bin/${PN}"
161 -
162 - keepdir /etc/consul.d
163 - insinto /etc/consul.d
164 - doins "${FILESDIR}/"*.json.example
165 -
166 - for x in /var/{lib,log}/${PN}; do
167 - keepdir "${x}"
168 - fowners consul:consul "${x}"
169 - done
170 -
171 - newinitd "${FILESDIR}/consul.initd" "${PN}"
172 - newconfd "${FILESDIR}/consul.confd" "${PN}"
173 - insinto /etc/logrotate.d
174 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
175 - systemd_dounit "${FILESDIR}/consul.service"
176 -}