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: Wed, 21 Sep 2022 00:35:32
Message-Id: 1663720448.b7aec9a8f7b6a672503ce305af7d0e3c3578cf50.zmedico@gentoo
1 commit: b7aec9a8f7b6a672503ce305af7d0e3c3578cf50
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 21 00:33:48 2022 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 21 00:34:08 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7aec9a8
7
8 app-admin/consul: drop 1.12.4, 1.13.1
9
10 Bug: https://bugs.gentoo.org/872086
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-admin/consul/Manifest | 4 ---
14 app-admin/consul/consul-1.12.4.ebuild | 51 -------------------------------
15 app-admin/consul/consul-1.13.1.ebuild | 56 -----------------------------------
16 3 files changed, 111 deletions(-)
17
18 diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
19 index e650169063be..91649ae09ae8 100644
20 --- a/app-admin/consul/Manifest
21 +++ b/app-admin/consul/Manifest
22 @@ -1,9 +1,5 @@
23 -DIST consul-1.12.3-deps.tar.xz 289711856 BLAKE2B 471b51dfc95ec8185a5d15bd94998f8d115ecbede7df6bc792704a4d63d222bda5e1a7aa260c7a93dcbe602a62df8aefd2d907602f3ca36a57dee8698205c19e SHA512 68b8bc91e03f922e31e68980350b58020ce734b808348bffff5c4b03436e50270cf6337bc9b48b95f28cb085316670ae5bc937d5620b79504e8fac766518621b
24 -DIST consul-1.12.4.tar.gz 24910442 BLAKE2B cc67dca433d2b96116cb57025b61799fdc6aeeca82bfee002116afe08ce3d30d4b49387927d5a257c44ffa7e30f0242b37f37096a2e271c0ee209c62aae5e918 SHA512 a91279983340d1ca5b349ccaf6b5681516c2be5b0eee7808a0bedb6205020fe3a1b2d1fd9ac29db69bfacb35455200bca62ad5b3e867343fe116f78e89d3b2ac
25 DIST consul-1.12.5-deps.tar.xz 289550768 BLAKE2B d64d074987dd8abaed5defdfbcab1ffe56b89c52b4912fc098ff0dfc29ae5dda65ce1ae0d83ee23a1d9b4ce22b6a09680575480c65d56d8ad9ad9442afc64e46 SHA512 afec76f7a8769b165c6a3df3faac4e6371017f3c51e0f3cb5e45f2302d2db1b7779c5d857718606edac0799cf13410373643294d466519076dc9dce549a793ae
26 DIST consul-1.12.5.tar.gz 25159461 BLAKE2B 4e2bdffd77d032037c6999bee0e2ba4ac6c83daee422097f7cec37c74375419336ec50b19abf9b17db9375a9ee69894ad6577499c137945f7f0557d38d6aa4dc SHA512 df735447dae074ac84dc9dbf5bf2e6d907152d233841137fc4ba632bad19b6db49a60cb79473e6432f76c99ac3c1e287be00416a6553eb3acef8b2fcc4c5dcda
27 -DIST consul-1.13.1-deps.tar.xz 252045224 BLAKE2B 55cfd035cbe2b5d1d49ad9cad2abecc73b6103e9d70ef9a49d3476bb8bc5e9f7d34927ea58a994d817fbaf7460b064fc83452392513b40b63d60d119f508a1cb SHA512 e966124d8344309e0fd6d8f76275be13496def38bf30683c1ded50479eaea4ea680b8dd83b916625b1dfabec8e1d23acae23c9d6ccd3f0784145ea56d092f2f5
28 -DIST consul-1.13.1.tar.gz 24587018 BLAKE2B fb4135ba8cfd3e82312b007f5a49bdc8ca8f01d3107e53a1dfccc7869111053022ce17f5c78715da0c1c9a8cff2543172b14d02dbcea75f5bd758a479354d350 SHA512 b70760ec9b7339f8a1aed76db89d1ea8f96dba6a4d996993b21d59228e885b5f577bab36bf2f153db9572bf81590927442db2ae074ef5f45ccfd154b0ff27284
29 DIST consul-1.13.2-deps.tar.xz 252165800 BLAKE2B b954d36ecd06c2aca46eab6680fb31c709f5d05b6645a7d5b042cdd98ae088a1d38fda6e801eede95b32d4c690f59e05161d8a70de0831d8ba47dfa8c529d32c SHA512 4468a11d53cdb9ab70b9286f5b168681d6805401fbdad0f79d02a0a98e869e0c52c098ab90c4ea3291811876444582057efe72c1972b9bb6cbfd13dfda82453b
30 DIST consul-1.13.2.tar.gz 25412424 BLAKE2B db6b5f86ef73d1273f2657e6d36640f6bf9252a215f914ec4fc7451cce1e3659725fecc1254401223ead034834443df18eaf54155db466e160bc70101944a8cc SHA512 2af6dd62b178aee975a05efd5c5c3b1d763b64226b6e5ff66060ff31e0b7deaba1603bd5fb4507ff48158acb087f1e4190b6b1961cef6a8809aac6a0473d85f9
31 DIST consul-1.9.17-deps.tar.xz 214799320 BLAKE2B c9fe5511156d50d4155ed6050186af894b7efc29e2f311ff542f79d298769b2dc55ee1bba12ca5ba5b81eddb6959a1d7a5e55aeb533827d5e924d3a72853a418 SHA512 be9f417e721372b8eaffe8b908f1ca1d1299c897f032cfb8b7ea8b62f7c2689011c5079a450fb5eed2e4e5454f0ad6a5e3859c91bd67166193334d100968f093
32
33 diff --git a/app-admin/consul/consul-1.12.4.ebuild b/app-admin/consul/consul-1.12.4.ebuild
34 deleted file mode 100644
35 index 09ef685ae064..000000000000
36 --- a/app-admin/consul/consul-1.12.4.ebuild
37 +++ /dev/null
38 @@ -1,51 +0,0 @@
39 -# Copyright 1999-2022 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=7
43 -inherit go-module systemd
44 -
45 -DESCRIPTION="A tool for service discovery, monitoring and configuration"
46 -HOMEPAGE="https://www.consul.io"
47 -GIT_COMMIT="94542765739cff9b09469e1fc5e738ae8a334038"
48 -
49 -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
50 - https://dev.gentoo.org/~zmedico/dist/consul-1.12.3-deps.tar.xz"
51 -
52 -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
53 -RESTRICT+=" test"
54 -SLOT="0"
55 -KEYWORDS="~amd64 ~arm64"
56 -
57 -BDEPEND="dev-go/gox"
58 -COMMON_DEPEND="
59 - acct-group/consul
60 - acct-user/consul"
61 - DEPEND="${COMMON_DEPEND}"
62 - RDEPEND="${COMMON_DEPEND}"
63 -
64 -src_compile() {
65 - # The dev target sets causes build.sh to set appropriate XC_OS
66 - # and XC_ARCH, and skips generation of an unused zip file,
67 - # avoiding a dependency on app-arch/zip.
68 - GIT_DESCRIBE="v${PV}" \
69 - GIT_DIRTY="" \
70 - GIT_COMMIT="${GIT_COMMIT}" \
71 - emake dev-build
72 -}
73 -
74 -src_install() {
75 - dobin bin/consul
76 -
77 - keepdir /etc/consul.d
78 - insinto /etc/consul.d
79 - doins "${FILESDIR}/"*.json.example
80 -
81 - keepdir /var/log/consul
82 - fowners consul:consul /var/log/consul
83 -
84 - newinitd "${FILESDIR}/consul.initd" "${PN}"
85 - newconfd "${FILESDIR}/consul.confd" "${PN}"
86 - insinto /etc/logrotate.d
87 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
88 - systemd_dounit "${FILESDIR}/consul.service"
89 -}
90
91 diff --git a/app-admin/consul/consul-1.13.1.ebuild b/app-admin/consul/consul-1.13.1.ebuild
92 deleted file mode 100644
93 index 05dc180af5c1..000000000000
94 --- a/app-admin/consul/consul-1.13.1.ebuild
95 +++ /dev/null
96 @@ -1,56 +0,0 @@
97 -# Copyright 1999-2022 Gentoo Authors
98 -# Distributed under the terms of the GNU General Public License v2
99 -
100 -EAPI=7
101 -inherit go-module systemd
102 -
103 -DESCRIPTION="A tool for service discovery, monitoring and configuration"
104 -HOMEPAGE="https://www.consul.io"
105 -GIT_COMMIT="c6d0f9ecc48e2044db04f5795e997bd9179586de"
106 -
107 -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
108 - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
109 -
110 -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
111 -RESTRICT+=" test"
112 -SLOT="0"
113 -KEYWORDS="~amd64 ~arm64"
114 -
115 -BDEPEND="dev-go/gox"
116 -COMMON_DEPEND="
117 - acct-group/consul
118 - acct-user/consul"
119 - DEPEND="${COMMON_DEPEND}"
120 - RDEPEND="${COMMON_DEPEND}"
121 -
122 -src_prepare() {
123 - default
124 - sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-08-11T19:07:00Z|' -i GNUmakefile || die
125 -}
126 -
127 -src_compile() {
128 - # The dev target sets causes build.sh to set appropriate XC_OS
129 - # and XC_ARCH, and skips generation of an unused zip file,
130 - # avoiding a dependency on app-arch/zip.
131 - GIT_DESCRIBE="v${PV}" \
132 - GIT_DIRTY="" \
133 - GIT_COMMIT="${GIT_COMMIT}" \
134 - emake dev-build
135 -}
136 -
137 -src_install() {
138 - dobin bin/consul
139 -
140 - keepdir /etc/consul.d
141 - insinto /etc/consul.d
142 - doins "${FILESDIR}/"*.json.example
143 -
144 - keepdir /var/log/consul
145 - fowners consul:consul /var/log/consul
146 -
147 - newinitd "${FILESDIR}/consul.initd" "${PN}"
148 - newconfd "${FILESDIR}/consul.confd" "${PN}"
149 - insinto /etc/logrotate.d
150 - newins "${FILESDIR}/${PN}.logrotated" "${PN}"
151 - systemd_dounit "${FILESDIR}/consul.service"
152 -}