summaryrefslogtreecommitdiff
path: root/app-admin/consul
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/consul')
-rw-r--r--app-admin/consul/Manifest5
-rw-r--r--app-admin/consul/consul-1.12.5.ebuild2
-rw-r--r--app-admin/consul/consul-1.9.17.ebuild56
3 files changed, 2 insertions, 61 deletions
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 9feee8bc54dd..5d7fcc565cf3 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -9,9 +9,6 @@ DIST consul-1.12.5-deps.tar.xz 289550768 BLAKE2B d64d074987dd8abaed5defdfbcab1ff
DIST consul-1.12.5.tar.gz 25159461 BLAKE2B 4e2bdffd77d032037c6999bee0e2ba4ac6c83daee422097f7cec37c74375419336ec50b19abf9b17db9375a9ee69894ad6577499c137945f7f0557d38d6aa4dc SHA512 df735447dae074ac84dc9dbf5bf2e6d907152d233841137fc4ba632bad19b6db49a60cb79473e6432f76c99ac3c1e287be00416a6553eb3acef8b2fcc4c5dcda
DIST consul-1.13.2-deps.tar.xz 252165800 BLAKE2B b954d36ecd06c2aca46eab6680fb31c709f5d05b6645a7d5b042cdd98ae088a1d38fda6e801eede95b32d4c690f59e05161d8a70de0831d8ba47dfa8c529d32c SHA512 4468a11d53cdb9ab70b9286f5b168681d6805401fbdad0f79d02a0a98e869e0c52c098ab90c4ea3291811876444582057efe72c1972b9bb6cbfd13dfda82453b
DIST consul-1.13.2.tar.gz 25412424 BLAKE2B db6b5f86ef73d1273f2657e6d36640f6bf9252a215f914ec4fc7451cce1e3659725fecc1254401223ead034834443df18eaf54155db466e160bc70101944a8cc SHA512 2af6dd62b178aee975a05efd5c5c3b1d763b64226b6e5ff66060ff31e0b7deaba1603bd5fb4507ff48158acb087f1e4190b6b1961cef6a8809aac6a0473d85f9
-DIST consul-1.9.17-deps.tar.xz 214799320 BLAKE2B c9fe5511156d50d4155ed6050186af894b7efc29e2f311ff542f79d298769b2dc55ee1bba12ca5ba5b81eddb6959a1d7a5e55aeb533827d5e924d3a72853a418 SHA512 be9f417e721372b8eaffe8b908f1ca1d1299c897f032cfb8b7ea8b62f7c2689011c5079a450fb5eed2e4e5454f0ad6a5e3859c91bd67166193334d100968f093
-DIST consul-1.9.17.tar.gz 29480703 BLAKE2B c233eab63ea515f886234395100e47910c1acdefa0b29af5bbc96d6c078dae41e0cd4150e1f6f17daac972b3e66d3abe43b594a0c37bff790e43f0f3c0a20da2 SHA512 c859fbede7294884befd0c70469febed5a4269b21cb351f8619d13e3b29f9b8bdd8d18e9611ef34908fc54bd38f2fd0bbc6e96d4e08ab23da952c3db537fb92c
-EBUILD consul-1.12.5.ebuild 1344 BLAKE2B d6b18a9b0c52ec4fbd529c2a776b04ad4c624043fcae3088319ea8a232fa412adff0b1e5cd2fd2ab050527b2d7bc6f6afb39b67ae14a906d1dd957d78293e416 SHA512 8aef82d90f7817c15a0b578582e743c4e7228346558edfe98e2173f80f46cf7a4561bc324c24bd0fb0aa0e4ae006f0d43c868283a8570f1854740d5b179b7c60
+EBUILD consul-1.12.5.ebuild 1343 BLAKE2B ef7ea872ae274fd2703827b70a2e1791e9464a1c03ec05a818abc00e5892329d5875db1e05927f2d81021d2fa1e9a7eb3940b688770c150e7de44a302ffb8741 SHA512 4e6aa3d376fda5f4af8ff2d7b79e4f3f92702f67cb468a0d8ddd288ce3e0b43aa37aac3af59442cfeaf4d0551e02e225f35fe99efd72827dc673ef5433d08fb3
EBUILD consul-1.13.2.ebuild 1450 BLAKE2B db2f1dd22668fc6b338b048bf7c4ec1fbab287f02e05bae78dc4b57325fd8b510491917da88f0c0ac4c0dcb93b3a485e4dee4ba6d6a0c5216ce4e51b177833c1 SHA512 04afd2923652bb85b7d37185269bbed1607cf89c2037057e52bea26ce069beb57815d0e79071f76957725347cfe9e2c23ed31b6e692ee1517995a2b0076b8d16
-EBUILD consul-1.9.17.ebuild 1521 BLAKE2B 4b452b57b8d672d18f3c41b545814b20d0437d190a0439b08579acc5d01f437f1af8411ea4372cc2d4ad3db13f4387c373dae06b6e465ac0becf006f104cb546 SHA512 8edc438a09e02e87b67f1e686fc3ec24921deffc8b577d3239e03dbd78a7f92f9a2da04f65234f2563c55eff3fabc8e844e7f165dc36f5bfc4f66cbfbc68576f
MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1
diff --git a/app-admin/consul/consul-1.12.5.ebuild b/app-admin/consul/consul-1.12.5.ebuild
index 62d10cef792d..62a5094a5777 100644
--- a/app-admin/consul/consul-1.12.5.ebuild
+++ b/app-admin/consul/consul-1.12.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
RESTRICT+=" test"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
BDEPEND="dev-go/gox"
COMMON_DEPEND="
diff --git a/app-admin/consul/consul-1.9.17.ebuild b/app-admin/consul/consul-1.9.17.ebuild
deleted file mode 100644
index 79da67e99b66..000000000000
--- a/app-admin/consul/consul-1.9.17.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module systemd
-
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="https://www.consul.io"
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="amd64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
- acct-group/consul
- acct-user/consul"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
- local git_commit
- git_commit=$(grep '^[[:space:]]*gitCommit[[:space:]]' vendor/k8s.io/client-go/pkg/version/base.go)
- git_commit=${git_commit#*\"}
- git_commit=${git_commit%\"*}
- [[ ${git_commit} ]] || die "failed to determine gitCommit"
-
- # The dev target sets causes build.sh to set appropriate XC_OS
- # and XC_ARCH, and skips generation of an unused zip file,
- # avoiding a dependency on app-arch/zip.
- GIT_DESCRIBE="v${PV}" \
- GIT_DIRTY="" \
- GIT_COMMIT="${git_commit}" \
- emake dev-build
-}
-
-src_install() {
- dobin bin/consul
-
- keepdir /etc/consul.d
- insinto /etc/consul.d
- doins "${FILESDIR}/"*.json.example
-
- keepdir /var/log/consul
- fowners consul:consul /var/log/consul
-
- newinitd "${FILESDIR}/consul.initd" "${PN}"
- newconfd "${FILESDIR}/consul.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- systemd_dounit "${FILESDIR}/consul.service"
-}