1 |
commit: aeb72c05262db4cba7b1b39a79c2a68f4d748f61 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 1 08:08:37 2020 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 1 08:08:37 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb72c05 |
7 |
|
8 |
app-admin/consul: Remove old versions |
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 | 2 - |
14 |
app-admin/consul/consul-1.5.3.ebuild | 74 ------------------------------------ |
15 |
app-admin/consul/consul-1.6.1.ebuild | 74 ------------------------------------ |
16 |
3 files changed, 150 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest |
19 |
index ea45743bb07..426ed0b13b5 100644 |
20 |
--- a/app-admin/consul/Manifest |
21 |
+++ b/app-admin/consul/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9 |
24 |
-DIST consul-1.6.1.tar.gz 22621651 BLAKE2B b696823d3f7f3ef135ba578f3c4ae76f78a1f172e083a3bb5cd07212b3907aefbac3fc0a1d68c5d494e7781cb84c686e2cfb1e5f7cd2d34f8bf671be84b3ca00 SHA512 c96855f3a344699580e34d6f45efe863ba4e6b23ef0889a22ee89bad8ffa807b3cec1a9d14604a340b16b0a8df8227c9eeacd507f94e4a19b25e0385ca5155ac |
25 |
DIST consul-1.6.2.tar.gz 22041280 BLAKE2B 0b2edcd68fa166c178587a1ed3ca0445847d34510cd4e341f85a370257958a155ef6f976b045fc8e87af39107a3930ccb6d7a798ad142e87362f82d68ece4c3c SHA512 2df67854b85fa27600bf2cd57c913669f784019ee5a25b20a950ab00a403ca0562d74cb73c3402ebcec6cd951d7b9b4eb80c926746bcc27050db85f31192f826 |
26 |
DIST consul-1.6.3.tar.gz 22065994 BLAKE2B 4d37a8141c097182c66a8ba7ab8f7031125e71b7a1b7dc8c419630504896634d797f4d733ddeb71555a2a988a2418548f40a12f333202833527483cbc8a590f6 SHA512 16a3fb3584d273ca178b213c9f314577d9473c39a5e436108bcae42f8b68803a548a5cc62d0c8426aa82e2b86dd6355f3d86f833ee6ec6fe1a4955589daf039f |
27 |
|
28 |
diff --git a/app-admin/consul/consul-1.5.3.ebuild b/app-admin/consul/consul-1.5.3.ebuild |
29 |
deleted file mode 100644 |
30 |
index 89aa8a2c884..00000000000 |
31 |
--- a/app-admin/consul/consul-1.5.3.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,74 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit golang-vcs-snapshot systemd user |
40 |
-GIT_COMMIT="a42ded4" |
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 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" |
49 |
-IUSE="" |
50 |
- |
51 |
-RESTRICT="test" |
52 |
- |
53 |
-DEPEND="dev-go/gox |
54 |
- >=dev-lang/go-1.11:= |
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 |
- # avoid network-sandbox violations since go-1.13 |
67 |
- rm src/${EGO_PN}/go.mod || die |
68 |
- grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \ |
69 |
- xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die |
70 |
- |
71 |
- sed -e 's:go get -u -v $(GOTOOLS)::' \ |
72 |
- -e 's:vendorfmt dev-build:dev-build:' \ |
73 |
- -i "src/${EGO_PN}/GNUmakefile" || die |
74 |
-} |
75 |
- |
76 |
-src_compile() { |
77 |
- # The dev target sets causes build.sh to set appropriate XC_OS |
78 |
- # and XC_ARCH, and skips generation of an unused zip file, |
79 |
- # avoiding a dependency on app-arch/zip. |
80 |
- GOPATH="${S}" \ |
81 |
- GOBIN="${S}/bin" \ |
82 |
- GIT_DESCRIBE="v${PV}" \ |
83 |
- GIT_DIRTY="" \ |
84 |
- GIT_COMMIT="${GIT_COMMIT}" \ |
85 |
- emake -C "src/${EGO_PN}" dev-build |
86 |
-} |
87 |
- |
88 |
-src_install() { |
89 |
- local x |
90 |
- |
91 |
- dobin bin/consul |
92 |
- |
93 |
- keepdir /etc/consul.d |
94 |
- insinto /etc/consul.d |
95 |
- doins "${FILESDIR}/"*.json.example |
96 |
- |
97 |
- for x in /var/{lib,log}/${PN}; do |
98 |
- keepdir "${x}" |
99 |
- fowners consul:consul "${x}" |
100 |
- done |
101 |
- |
102 |
- newinitd "${FILESDIR}/consul.initd" "${PN}" |
103 |
- newconfd "${FILESDIR}/consul.confd" "${PN}" |
104 |
- insinto /etc/logrotate.d |
105 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
106 |
- systemd_dounit "${FILESDIR}/consul.service" |
107 |
-} |
108 |
|
109 |
diff --git a/app-admin/consul/consul-1.6.1.ebuild b/app-admin/consul/consul-1.6.1.ebuild |
110 |
deleted file mode 100644 |
111 |
index 1908bfe8fca..00000000000 |
112 |
--- a/app-admin/consul/consul-1.6.1.ebuild |
113 |
+++ /dev/null |
114 |
@@ -1,74 +0,0 @@ |
115 |
-# Copyright 1999-2019 Gentoo Authors |
116 |
-# Distributed under the terms of the GNU General Public License v2 |
117 |
- |
118 |
-EAPI=7 |
119 |
- |
120 |
-inherit golang-vcs-snapshot systemd user |
121 |
-GIT_COMMIT="9be6dfc" |
122 |
-KEYWORDS="~amd64" |
123 |
-EGO_PN="github.com/hashicorp/consul" |
124 |
-DESCRIPTION="A tool for service discovery, monitoring and configuration" |
125 |
-HOMEPAGE="https://www.consul.io" |
126 |
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
127 |
- |
128 |
-SLOT="0" |
129 |
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT" |
130 |
-IUSE="" |
131 |
- |
132 |
-RESTRICT="test" |
133 |
- |
134 |
-DEPEND="dev-go/gox |
135 |
- >=dev-lang/go-1.11:= |
136 |
- >=dev-go/go-tools-0_pre20160121" |
137 |
-RDEPEND="" |
138 |
- |
139 |
-pkg_setup() { |
140 |
- enewgroup consul |
141 |
- enewuser consul -1 -1 /var/lib/${PN} consul |
142 |
-} |
143 |
- |
144 |
-src_prepare() { |
145 |
- default |
146 |
- |
147 |
- # avoid network-sandbox violations since go-1.13 |
148 |
- rm src/${EGO_PN}/go.mod || die |
149 |
- grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \ |
150 |
- xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die |
151 |
- |
152 |
- sed -e 's:go get -u -v $(GOTOOLS)::' \ |
153 |
- -e 's:vendorfmt dev-build:dev-build:' \ |
154 |
- -i "src/${EGO_PN}/GNUmakefile" || die |
155 |
-} |
156 |
- |
157 |
-src_compile() { |
158 |
- # The dev target sets causes build.sh to set appropriate XC_OS |
159 |
- # and XC_ARCH, and skips generation of an unused zip file, |
160 |
- # avoiding a dependency on app-arch/zip. |
161 |
- GOPATH="${S}" \ |
162 |
- GOBIN="${S}/bin" \ |
163 |
- GIT_DESCRIBE="v${PV}" \ |
164 |
- GIT_DIRTY="" \ |
165 |
- GIT_COMMIT="${GIT_COMMIT}" \ |
166 |
- emake -C "src/${EGO_PN}" dev-build |
167 |
-} |
168 |
- |
169 |
-src_install() { |
170 |
- local x |
171 |
- |
172 |
- dobin bin/consul |
173 |
- |
174 |
- keepdir /etc/consul.d |
175 |
- insinto /etc/consul.d |
176 |
- doins "${FILESDIR}/"*.json.example |
177 |
- |
178 |
- for x in /var/{lib,log}/${PN}; do |
179 |
- keepdir "${x}" |
180 |
- fowners consul:consul "${x}" |
181 |
- done |
182 |
- |
183 |
- newinitd "${FILESDIR}/consul.initd" "${PN}" |
184 |
- newconfd "${FILESDIR}/consul.confd" "${PN}" |
185 |
- insinto /etc/logrotate.d |
186 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
187 |
- systemd_dounit "${FILESDIR}/consul.service" |
188 |
-} |