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 12:57:55
Message-Id: 1663765047.b85fd58a10f811f1152c29f69c522bc58098f390.zmedico@gentoo
1 commit: b85fd58a10f811f1152c29f69c522bc58098f390
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 21 12:57:21 2022 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 21 12:57:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b85fd58a
7
8 app-admin/consul: drop 1.9.17
9
10 Bug: https://bugs.gentoo.org/872086
11 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
12
13 app-admin/consul/Manifest | 2 --
14 app-admin/consul/consul-1.9.17.ebuild | 56 -----------------------------------
15 2 files changed, 58 deletions(-)
16
17 diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
18 index 91649ae09ae8..fb564830e2ca 100644
19 --- a/app-admin/consul/Manifest
20 +++ b/app-admin/consul/Manifest
21 @@ -2,5 +2,3 @@ DIST consul-1.12.5-deps.tar.xz 289550768 BLAKE2B d64d074987dd8abaed5defdfbcab1ff
22 DIST consul-1.12.5.tar.gz 25159461 BLAKE2B 4e2bdffd77d032037c6999bee0e2ba4ac6c83daee422097f7cec37c74375419336ec50b19abf9b17db9375a9ee69894ad6577499c137945f7f0557d38d6aa4dc SHA512 df735447dae074ac84dc9dbf5bf2e6d907152d233841137fc4ba632bad19b6db49a60cb79473e6432f76c99ac3c1e287be00416a6553eb3acef8b2fcc4c5dcda
23 DIST consul-1.13.2-deps.tar.xz 252165800 BLAKE2B b954d36ecd06c2aca46eab6680fb31c709f5d05b6645a7d5b042cdd98ae088a1d38fda6e801eede95b32d4c690f59e05161d8a70de0831d8ba47dfa8c529d32c SHA512 4468a11d53cdb9ab70b9286f5b168681d6805401fbdad0f79d02a0a98e869e0c52c098ab90c4ea3291811876444582057efe72c1972b9bb6cbfd13dfda82453b
24 DIST consul-1.13.2.tar.gz 25412424 BLAKE2B db6b5f86ef73d1273f2657e6d36640f6bf9252a215f914ec4fc7451cce1e3659725fecc1254401223ead034834443df18eaf54155db466e160bc70101944a8cc SHA512 2af6dd62b178aee975a05efd5c5c3b1d763b64226b6e5ff66060ff31e0b7deaba1603bd5fb4507ff48158acb087f1e4190b6b1961cef6a8809aac6a0473d85f9
25 -DIST consul-1.9.17-deps.tar.xz 214799320 BLAKE2B c9fe5511156d50d4155ed6050186af894b7efc29e2f311ff542f79d298769b2dc55ee1bba12ca5ba5b81eddb6959a1d7a5e55aeb533827d5e924d3a72853a418 SHA512 be9f417e721372b8eaffe8b908f1ca1d1299c897f032cfb8b7ea8b62f7c2689011c5079a450fb5eed2e4e5454f0ad6a5e3859c91bd67166193334d100968f093
26 -DIST consul-1.9.17.tar.gz 29480703 BLAKE2B c233eab63ea515f886234395100e47910c1acdefa0b29af5bbc96d6c078dae41e0cd4150e1f6f17daac972b3e66d3abe43b594a0c37bff790e43f0f3c0a20da2 SHA512 c859fbede7294884befd0c70469febed5a4269b21cb351f8619d13e3b29f9b8bdd8d18e9611ef34908fc54bd38f2fd0bbc6e96d4e08ab23da952c3db537fb92c
27
28 diff --git a/app-admin/consul/consul-1.9.17.ebuild b/app-admin/consul/consul-1.9.17.ebuild
29 deleted file mode 100644
30 index 79da67e99b66..000000000000
31 --- a/app-admin/consul/consul-1.9.17.ebuild
32 +++ /dev/null
33 @@ -1,56 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -inherit go-module systemd
39 -
40 -DESCRIPTION="A tool for service discovery, monitoring and configuration"
41 -HOMEPAGE="https://www.consul.io"
42 -
43 -SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
44 - https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
45 -
46 -LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
47 -RESTRICT+=" test"
48 -SLOT="0"
49 -KEYWORDS="amd64"
50 -
51 -BDEPEND="dev-go/gox"
52 -COMMON_DEPEND="
53 - acct-group/consul
54 - acct-user/consul"
55 - DEPEND="${COMMON_DEPEND}"
56 - RDEPEND="${COMMON_DEPEND}"
57 -
58 -src_compile() {
59 - local git_commit
60 - git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
61 - git_commit=${git_commit#*\"}
62 - git_commit=${git_commit%\"*}
63 - [[ ${git_commit} ]] || die "failed to determine gitCommit"
64 -
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 -}