gentoo auto-resync : 13:08:2022 - 02:23:08

5 files changed, 9 insertions, 163 deletions

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 1ea0bc545ea2..1d134031486d 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -5,19 +5,13 @@ AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca168442180
 AUX consul.service 359 BLAKE2B 04a42a1546d2e4dbf57b9d75b32feddd4d0f4f8b6f750b1b4a8c19cd51fdb3cedce2cbe2a1680dcbb407890aa3e75ab9ffc5c88566b3c1e44158b1b480e5119f SHA512 d0f73304d644cf26e609a2136f1107efe36afe54721cbbd6208cfe279629ef5603a94ecd786e83ad37d7828c038f01baa4482872fa65c625646fa73684e3e477
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
-DIST consul-1.12.0-deps.tar.xz 252403904 BLAKE2B 742eaeaf4c24276de9b66d8d6b8f3b51d836d41b8466e7be23a00e3787132f8a0ffad7bf6e8c288797d8de52885ec4c72f43206022d6d4d2a1b89febd878531d SHA512 11087675a0d353c94576609986a7ddf777e8454e90161e35f80f1592ea3af48477684ec63d1ed870db71066a58c21977b7e9d58a5408c65fee213d64f152671a
-DIST consul-1.12.0.tar.gz 23969785 BLAKE2B 57a13905917bac77793be26fb5ac7e668233400e1f9c8eceace3463018cd8fee06b6f5a3753c8eeb250c276f8c95afd63b3b6ae1a7d847dc5adaa11880e52f53 SHA512 c83a5b9e68f46e5f458fb607f60d80fa7bc2dd46000c60bd9838fb03ea925ec5f0c0a4336f9052f70f805b41b4dd8fc872f5f6e883de5da29a87f5273507f31e
-DIST consul-1.12.1.tar.gz 24196810 BLAKE2B b82929de9228adaaf1bbf3a4269dd09e17b51f769d0bf040b86949dd8648e1f0b813e5cc5d5e9704b964ef5185074f58ac7347e049be6bc493cc96e4b977e22b SHA512 33925b20a81c7ab9873e5dfc24c26d14c86494c03de0a4030304bf4ac0169b59843337ef05f0564fa69de9dba08e350774e7ae62c6914769d8f0d4cb625e4910
-DIST consul-1.12.2.tar.gz 24195804 BLAKE2B 550b5bc4977c9181a097f699ad5da88a81571327707b448bc659d7c8f2d92a8c82f6c1b0f13448fee25c89d08cc3771dd4fb78a4cf58d640442df38e86639cfa SHA512 91da8b1fecbd5db4c0deae1cec4b5265a26c11739633be74f6e2dd2027ab9ba5da10ba33b1b844531a59b63e4117ec57af87d55512d1098033e99f88e2e3aabc
 DIST consul-1.12.3-deps.tar.xz 289711856 BLAKE2B 471b51dfc95ec8185a5d15bd94998f8d115ecbede7df6bc792704a4d63d222bda5e1a7aa260c7a93dcbe602a62df8aefd2d907602f3ca36a57dee8698205c19e SHA512 68b8bc91e03f922e31e68980350b58020ce734b808348bffff5c4b03436e50270cf6337bc9b48b95f28cb085316670ae5bc937d5620b79504e8fac766518621b
-DIST consul-1.12.3.tar.gz 24365779 BLAKE2B 39b110f271fa38e03a39ee05cf0e06e9aa13a84b2cb5c1150a43cfd1c28481044e36e2e11145b4b3411662b7b969aef9b7a4fa06dd7554e6018dfd772547b7bf SHA512 33903c2ba15cde3d2d17b8942ea7a0c7aab54c60872bc80662098ee7f415f5e1651a0e5949f42c8c8b06d3f99d25899a141459a99f04c90a162baa38d33f56b9
 DIST consul-1.12.4.tar.gz 24910442 BLAKE2B cc67dca433d2b96116cb57025b61799fdc6aeeca82bfee002116afe08ce3d30d4b49387927d5a257c44ffa7e30f0242b37f37096a2e271c0ee209c62aae5e918 SHA512 a91279983340d1ca5b349ccaf6b5681516c2be5b0eee7808a0bedb6205020fe3a1b2d1fd9ac29db69bfacb35455200bca62ad5b3e867343fe116f78e89d3b2ac
+DIST consul-1.13.1-deps.tar.xz 252045224 BLAKE2B 55cfd035cbe2b5d1d49ad9cad2abecc73b6103e9d70ef9a49d3476bb8bc5e9f7d34927ea58a994d817fbaf7460b064fc83452392513b40b63d60d119f508a1cb SHA512 e966124d8344309e0fd6d8f76275be13496def38bf30683c1ded50479eaea4ea680b8dd83b916625b1dfabec8e1d23acae23c9d6ccd3f0784145ea56d092f2f5
+DIST consul-1.13.1.tar.gz 24587018 BLAKE2B fb4135ba8cfd3e82312b007f5a49bdc8ca8f01d3107e53a1dfccc7869111053022ce17f5c78715da0c1c9a8cff2543172b14d02dbcea75f5bd758a479354d350 SHA512 b70760ec9b7339f8a1aed76db89d1ea8f96dba6a4d996993b21d59228e885b5f577bab36bf2f153db9572bf81590927442db2ae074ef5f45ccfd154b0ff27284
 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.0.ebuild 1337 BLAKE2B c0512a3b9915f4c71dd369ad2abe77dd26260945cd6fc151be222cf4e8d27ecffb2c0587bb12fbac2cb1ed174687f751fb84bcbaeab796276ea77f020a639ca2 SHA512 bb99a0217082b36ce03965061cb91e4d544ddf5a9e5fe819ca8d39b299c24f8b5b4ff3307e37ffeaa3d4fcc4879b936eda03c592a51cf2b433b7d2c73f646526
-EBUILD consul-1.12.1.ebuild 1346 BLAKE2B fdd4010edfd86bfa9506a02e875e4646cbc85bea4aa46b62131f97b8a6ea08190c5a60c5e7f66f3106cca90c39032ed0a17cc44e23d4408ab0d93326fc606917 SHA512 717c0baa47fdcef0cbec887d3eb610387eb7f7b19dba4997cea0ed9764c33316796b1bacd5dbefb66d422a49c8edb558f809ad94b479a74c4135d4bcfd2406d4
-EBUILD consul-1.12.2.ebuild 1353 BLAKE2B aa0b342491f97c82e07fa2238783a43a5eaaeef8eb62f567e9bc2f7ce88a2aebb2b5eff085fb8f40616495f80d500f131916fad80466846f8e85a15bc7a5dd50 SHA512 94484c9bae036c5c4571d0c5953393577a5b65ae23973bca6401536d0cff27cb6d8e4a6c038d9faa6bf775e5759f5c57769b67b9b85d5e407d8a52e5c58659bd
-EBUILD consul-1.12.3.ebuild 1344 BLAKE2B 7c2aec831068a5e91d0c9483675420d1cc11f946b27e64470a6ff6063c142102cc5c31a93c56a465b2cb608ddb56aac0b197d2bae240667fb0e562622be2f68d SHA512 072a0a82538099b3669086f292da8c8f7d5ef945bcc7ae5acce249e8ce2131b08b253baa5067a2b9ca1a3ae8502744d080d226cdce8eea7e76020e3652800faf
 EBUILD consul-1.12.4.ebuild 1353 BLAKE2B 08388107b5f88ef19b8ffab24b80c95d40a210e2dd238325425d7f596a5505769daee3fd07ac55ee97fc2ca04e48787b587a5bc03151127fac912789787e8983 SHA512 68c3488ecfbb5005c94674be08945f33847ee6f9f46bffcebf86426ca3c3d603623e8a6f391cad96ece035aa8ba427fa2f9cc465e69bd9066c0f4e97149f6cd2
+EBUILD consul-1.13.1.ebuild 1450 BLAKE2B 63796fface1835101e13249314f086c440042ca791d199c82fc0b1597b920b337d0787e8134f03e3d79b6d55397521acf88b28edb9dca3e17b3d6f4c4d7c3098 SHA512 fa3acb687833c302b5443994125ae0547a0dc67bf2009d776b72c3b35fa6de839043d42b9032b892c94fa4b58cb68e79d6e3777ea580869b15a512c1f856d5e4
 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.0.ebuild b/app-admin/consul/consul-1.12.0.ebuild
deleted file mode 100644
index b811e05165c7..000000000000
--- a/app-admin/consul/consul-1.12.0.ebuild
+++ /dev/null
@@ -1,51 +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"
-GIT_COMMIT="09a8cdb4a5c0c53201d7888d9fb618dde007cdd8"
-
-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() {
-	# 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"
-}
diff --git a/app-admin/consul/consul-1.12.1.ebuild b/app-admin/consul/consul-1.12.1.ebuild
deleted file mode 100644
index d9cb8096e6f8..000000000000
--- a/app-admin/consul/consul-1.12.1.ebuild
+++ /dev/null
@@ -1,51 +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"
-GIT_COMMIT="e57f76ae5cce9e70738aadb16f1e47d7c4c257f4"
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/consul-1.12.0-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() {
-	# 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"
-}
diff --git a/app-admin/consul/consul-1.12.2.ebuild b/app-admin/consul/consul-1.12.2.ebuild
deleted file mode 100644
index 4f0bc4667585..000000000000
--- a/app-admin/consul/consul-1.12.2.ebuild
+++ /dev/null
@@ -1,51 +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"
-GIT_COMMIT="19041f202c952a25c5d612a3664e1bdac3c91129"
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~zmedico/dist/consul-1.12.0-deps.tar.xz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-RESTRICT+=" test"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-BDEPEND="dev-go/gox"
-COMMON_DEPEND="
-	acct-group/consul
-	acct-user/consul"
-	DEPEND="${COMMON_DEPEND}"
-	RDEPEND="${COMMON_DEPEND}"
-
-src_compile() {
-	# 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"
-}
diff --git a/app-admin/consul/consul-1.12.3.ebuild b/app-admin/consul/consul-1.13.1.ebuild
index de3e94a7dcd9..05dc180af5c1 100644
--- a/app-admin/consul/consul-1.12.3.ebuild
+++ b/app-admin/consul/consul-1.13.1.ebuild
@@ -6,7 +6,7 @@ inherit go-module systemd
 
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
 HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="2308c75e7018c3f123b5e7bd10f25ed649ce17a4"
+GIT_COMMIT="c6d0f9ecc48e2044db04f5795e997bd9179586de"
 
 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"
@@ -23,6 +23,11 @@ COMMON_DEPEND="
 	DEPEND="${COMMON_DEPEND}"
 	RDEPEND="${COMMON_DEPEND}"
 
+src_prepare() {
+	default
+	sed -e 's|^GIT_DATE=.*|GIT_DATE=2022-08-11T19:07:00Z|' -i GNUmakefile || die
+}
+
 src_compile() {
 	# The dev target sets causes build.sh to set appropriate XC_OS
 	# and XC_ARCH, and skips generation of an unused zip file,