gentoo auto-resync : 02:12:2024 - 02:07:07

2 files changed, 64 insertions, 0 deletions

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 70eb4c8d43b3..bd84ec805969 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -14,9 +14,12 @@ DIST consul-1.18.2-deps.tar.xz 10054328 BLAKE2B ed8dd4188f692b9ea0104eccc9d32668
 DIST consul-1.18.2.tar.gz 34440848 BLAKE2B c1b383c088db069a5acc4b09929f0e129be6eb35b2ab1177bd78638687d1274ded75111adc0c4a1511fa10d95e0a6218d2a7ae0b8c4692afabba21392a4d2a5e SHA512 e02296199bc8e53549ef4b7e63b8392c2ddb3d78a1ec5ceee2ea08acb1b7a78b25c383172a6abf8be07717b3c8462297bdf594327784854788f902e938509931
 DIST consul-1.19.1-deps.tar.xz 10102748 BLAKE2B 9d121764915ff191e660450007adaab4a2b2f6ee3dbd7993a32a9d0f105584aff1940f4ebdde1811dcaedcd253df77f2227e6ddb36b165657532f1d9693b716e SHA512 3981ce7dfeaf0b8bf83342edfe6cb3f01112af60b7ec155ee6df355e9f7e7a6d928a34d5be299a31dafb8bc87d369882d1ef80acce72dd53a071dc80ba37b243
 DIST consul-1.19.1.tar.gz 35683711 BLAKE2B 47504c91413388ef3439adc848af19af2e344944845e0a275fb9b5e5df81b13d86002f4df421a467a82b194b738422e90691b281c37ff7807093905eba95ff10 SHA512 d5912b5340e49f38823f265c0a90f09a20d6b7d8920d6d1bcce96ee556e7edf2fca0441afe4b2f65cc50b3c228479ef6babc917c5c0f17fa521c136a5147c899
+DIST consul-1.20.1-deps.tar.xz 10033856 BLAKE2B dcd9df79d1f5948eb7ed1c6279a679d1d368271c2dd971451fffe58c7de7d15e6656f9f8fbfd274bd0269a2d6495d5f9d88a5440e82ca71e9ebf50d1dfa1aafa SHA512 7484183b0b38665df7758afb18928d0cc4a96e8df1f71c4654e6527370c74451c96c3f5cc7b055cdd9fe33dd7e9a39b02e9254b4faeb60171043c624947b800b
+DIST consul-1.20.1.tar.gz 35647978 BLAKE2B 3287c57ea426f5fc0be6c023bd5c3701908d1d2f2309dcb815a1087f2b2c10bc40895d362c56ac53a1daac90d65c8dbb03b55126244608d18eb7bb19f79a8bb0 SHA512 88ddb750f60d87d31713dabd6cc22590fd96ec12d912d08f1d4690839c64e896254e207c029001233b7e47ddf03b171e0daaf24a26437c36199c30632b183163
 EBUILD consul-1.15.11.ebuild 1596 BLAKE2B 042a8ef2dfbd403ad46515f2bc408a0d2209faf44aee9f6638d0e44ba992fa106db11c09dcea395ab275a77c0f4727c7d1c1263469901c6c43612775351fb5e7 SHA512 06bd16ea9b8425fcd81b6505943cb799a08b096d086c71bc7841bccb9702d6f8cc3f04255167ca5cecdc0009d29cc9fe5e81e0de606f6509f89bbd04e0316cbd
 EBUILD consul-1.15.3.ebuild 1528 BLAKE2B 2891bd50fc5724c581c1a22744facad77fad5245448e9e23452cefc0107093732917c35c608fadbe305f100e04b363d85160de181b479b38195dce3b4dbedc0c SHA512 d2b62e8516431314efd38428eafa50bd6a7048db64684b89c1f16073b1f5871dc66d27c3d8d78750b38f3248a6814112ea98e4a434384159df92948fd6b2083d
 EBUILD consul-1.18.1.ebuild 1573 BLAKE2B cd959989546b1b7c133a1e7a63e8e0e7c005b73c5823474513712ae4fc4ca3e3d8eedba2cccb55823fe741bc04de09f3afabe773b868cbb91bf89a16c74de16d SHA512 d1a1939d8653a952c80fe3f4191f86db65992728bc470ccfab106cba4a31c63cd0d20299fedb4a2ebb1237ea7f8ac2e7149bf731c0f8050f81f5da2d4ea27d5a
 EBUILD consul-1.18.2.ebuild 1597 BLAKE2B f9a4c7afc46daf60b808b5d2f09dc59b7620de8d9100ac6e55833da4010d10cda3e8a4cb48cfebef7e445fd753acb2582d60d48e82d29b224c6745eda8a1ce68 SHA512 e5e37b20f4b674559947a25697918a6987a1ee007033f71ebd61dc0ce1477543d81868cd074dc4a4288dea320dbf898608eb24cc2c0d6bd2bda2b5f3febfb45c
 EBUILD consul-1.19.1.ebuild 1651 BLAKE2B 6a5e0b1b2df67b5346f170d161dd6101cf7ccaa5277c5d9af58ea8bcd77e016dfd0a907b98425be29ce80225026563e6b88904470ed810361c3c5dcb607fe2d2 SHA512 4239a8b6b2b2a832345c85690029d773591ddd56910467e6e187bdea37a984d77e10ed06bde028bc365dde3ce5dccbf08d3a17cc404cfc8ae78d02fad985f070
+EBUILD consul-1.20.1.ebuild 1651 BLAKE2B c0114e3d16975bc717a505585ff756e0c8951080598554e0798af2e209f77a1c1434f0b270a182e8fe8cecae5b248cd1580916a20a6e2e0db2cfc7db6cb69993 SHA512 f0f82be52a006ae402cc8205d76f8858f6fd2a85481312a1c17675d783a6e6f99041badda425bac37dc4367e3c3fe07edaefb29abd3fd8b76cd9eb327a54a62e
 MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1
diff --git a/app-admin/consul/consul-1.20.1.ebuild b/app-admin/consul/consul-1.20.1.ebuild
new file mode 100644
index 000000000000..6a75c2c8ac00
--- /dev/null
+++ b/app-admin/consul/consul-1.20.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="https://www.consul.io"
+GIT_COMMIT="920cc7c649225b52e1c45951e609c3d37a49324d"
+GIT_DATE="2024-10-29T19:04:05Z" # source build-support/functions/10-util.sh; git_date
+
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test"
+
+BDEPEND="dev-go/gox"
+COMMON_DEPEND="
+	acct-group/consul
+	acct-user/consul"
+	DEPEND="${COMMON_DEPEND}"
+	RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	sed -e "s|^GIT_DATE=.*|GIT_DATE=${GIT_DATE}|" -i Makefile || die
+}
+
+src_compile() {
+	if use x86; then
+		#924629 pie breaks build on x86
+		GOFLAGS=${GOFLAGS//-buildmode=pie}
+	fi
+	# 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"
+}