gentoo resync : 30.05.2020

5 files changed, 2 insertions, 231 deletions

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 419f27ee784c..888b2b30772b 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -7,9 +7,6 @@ AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip 2508208 BLAKE2B d17c22f3d8e3f0b52bab350e86c8fe29ea474e104ba89e3238e71dbd29139717a0d26586589f47303da4eb743fe86a76f727b772707584aba5bf76d8f5ef1969 SHA512 6dc6f4229011d8606e1eb3c046640f6938dae2e12a1b0a9e2a22b7d26b4ab50051cee09d17fc05298ef5d4901a6b7e12d4b06b8b8eac6b1e71442653eb25b541
-DIST consul-1.6.2.tar.gz 22041280 BLAKE2B 0b2edcd68fa166c178587a1ed3ca0445847d34510cd4e341f85a370257958a155ef6f976b045fc8e87af39107a3930ccb6d7a798ad142e87362f82d68ece4c3c SHA512 2df67854b85fa27600bf2cd57c913669f784019ee5a25b20a950ab00a403ca0562d74cb73c3402ebcec6cd951d7b9b4eb80c926746bcc27050db85f31192f826
-DIST consul-1.6.3.tar.gz 22065994 BLAKE2B 4d37a8141c097182c66a8ba7ab8f7031125e71b7a1b7dc8c419630504896634d797f4d733ddeb71555a2a988a2418548f40a12f333202833527483cbc8a590f6 SHA512 16a3fb3584d273ca178b213c9f314577d9473c39a5e436108bcae42f8b68803a548a5cc62d0c8426aa82e2b86dd6355f3d86f833ee6ec6fe1a4955589daf039f
-DIST consul-1.7.0.tar.gz 22791558 BLAKE2B 005c6c74d7808183b362286f98a2f5cc301c9aabb9afc4db1cd5f160ac0a0bdf9b868ad96b28bd3f1503e6fc2951720c69b5f9e4f888d0c4fb5f9fa534c322af SHA512 ea368335b34498ea92d80240d71424deceb903eab6fb7a22fca2bf6e7a509526c86899b501ac8045ad69b0fa102be6db0a11fa50917fc15ca17f889f948af4e6
 DIST consul-1.7.2.tar.gz 22755052 BLAKE2B d863ac756f487004d0c1361bf470c1202bc2e2d1364414d4aad16dc313c7bb5021c45b1c8080ded707d67120ac009afcfc0bba37ccc99eb474049e57779f3db1 SHA512 d13d7750c745aeeb2577ed334bfef1ac8a4e0c6f671a6705c0b8978217d071ebcf32455c0bfc83a77fd03caef68a6e256d95b48d5406deaaaba263f1a97b23c2
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod 41 BLAKE2B de145bd0fb63d51b475e0f5d293b9957a170a7c7c206f1cf2d8eb9abdb67a80051b25116b68c5f450bcc8163bb942d34d9bd4ed0b41f4e06d0d510d9b1aeff55 SHA512 be976846ed78cec5b19618c7364c47e66c3475519bed166ad1e6b666399ea08028fa621869ab4980981fc70256acc9a7dd1c1e52c8d3d44cb0ac75f9907b6d3e
 DIST github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip 16060635 BLAKE2B 6c358031305d8c8245b52bc58ed08cea5cb07c3e80cb3043f369ac6faf893a95d66c31fec38f07fe9029f53239c509bc060cfdebda8ac8d5ae556dfa0d6851e3 SHA512 bfd8f9859e519d6e45f2324e3907f88a1e661ca597f8bb3b7ae772246ba9972e09d0883abc887346fed55928f5d8422cf4212e32377e9900137cd63f0f9a93b8
@@ -504,8 +501,5 @@ DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod 27 BLAK
 DIST k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip 707954 BLAKE2B cddd4883d55c346b4e0a8d3050a71cc2c5f95879078ed3fda79f7e633ad8304c5e8401529a9e3d4b0432419fe0f64e9fe2f5bfe23f708ad93671968a24cfa195 SHA512 0caa23d1e454060521384eac7d5cf8b50c023060621bedac8e0c0a2804629adf535eceec2ca79e15781648c95e495573da18f016ae4567d48d77aeca66949ca2
 DIST k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod 24 BLAKE2B e7c6a4736834c042c1326573259f9b789da58f8c53cf0f36b47086b94fa9f5a94ad9b36baa17f7c437218eca6ac6293e4ff1e50378f27e94ef609ff249520261 SHA512 ec86bdb5262590a5169f49362588e90e95a0874fbf2bd670ea27dac7d883be2d7f56e8277336d7ead06f9068ea43375c8fc6f055e1322fc8f802550c927e6d85
 DIST k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip 1299988 BLAKE2B 326b691a1fafec6307354fec0fd2883dd5713e1a3e236d58f3c0dead4afbe7a28268cd25cc5169e09df8c77501b5e0a7593fe27c6c3f7fb8038a668b4bb66121 SHA512 b6b7a2d6615e36848f0b5094aa160014f193c54e8f9eac7d640e5b96ed4bc0ff5abd726c360191e0393b71eff8db549a26897d9a951f03d866d30018b7f7e683
-EBUILD consul-1.6.2.ebuild 1830 BLAKE2B 22f8170ae1aaa139dae769623f382632f1a3b29571691ee7b15d82235a75a5c133d930afcc780bda766a91b93859072a108ea97b9da9a5e469d2a7a0c8f80c99 SHA512 7fa573a22d42f9cac2b8696a3b9fc9e84e59a3e6f489cf6fab7a04b043f1d4702a4bddc52ac9f81c86b24d4df9ca0a5086e4586f9d45a5c65d0c31c9f9d064cc
-EBUILD consul-1.6.3.ebuild 1830 BLAKE2B f6eb505ce206244c39899f14fb1ed24cb791b2290926c97e9069ce60b041dabfb8db72f3a4851dad13db85a4a64782142ad7a365c8061a0803a94d75b1deb812 SHA512 b9b94a1536e035db877670c9568164617be1ce16d7938f0b681bd3c9a1cd3d2bcfaea715265745cb7a44cfb0cd82264d7608e3b34e0f80ad2d7d8828b5989c55
-EBUILD consul-1.7.0.ebuild 1851 BLAKE2B 215c58c1a48b3ad9f0896099cc8b6880a9b0834190185fa2dfc3a2f8e92b387c3a47ccbfa5bb87cec92095c8041b4f985b3c9cb746e45f566649af9cda711bcd SHA512 3f5f64f4a77bb2ac3a4094175543293542ae100d14e11bf07d9d9be049f0cdf01a7dd51c643bf4f664e4c8d0172dd5991d6a286e7f6873f7253808eec05720ea
-EBUILD consul-1.7.2.ebuild 27441 BLAKE2B 43898ede95d6df9e2553a0bc3460d7717662f3c8e123d4a9c2de424e984bf86ec09e7865cbf74e8b268e6f04054b25c119dd342b65a2022905fc720def014335 SHA512 07eca011c4333af48ac4bc8c69209c2408a911ca3c48a212218072b1c7470c34080ad945e434cb96882dfeb2b9948f76ce55a3a2f0c2dd14a1034cbdd6b2a2fd
+EBUILD consul-1.7.2.ebuild 27440 BLAKE2B 6ece05524f485c1297c5a4e3e7a3555b9bb5853b4169794dae863e999739b4bac7af100dac5ce935ce64681b76194c761806ff6f499a797f30bf6cddad85c05e SHA512 835286d9a0c9e13e25a12fa37f7a09775887fce5afbc33571da8895b3ecc1234b93a593f7a666676e43bc793c8899f1c8648134bde809876f635ef4e1f2f0b9a
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.6.2.ebuild b/app-admin/consul/consul-1.6.2.ebuild
deleted file mode 100644
index 59342179c2de..000000000000
--- a/app-admin/consul/consul-1.6.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="1200f25"
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-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"
-
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.11:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	# avoid network-sandbox violations since go-1.13
-	rm src/${EGO_PN}/go.mod || die
-	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
-		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
-
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "src/${EGO_PN}/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,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-	GOBIN="${S}/bin" \
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake -C "src/${EGO_PN}" dev-build
-}
-
-src_install() {
-	local x
-
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	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.6.3.ebuild b/app-admin/consul/consul-1.6.3.ebuild
deleted file mode 100644
index 61bae7df9634..000000000000
--- a/app-admin/consul/consul-1.6.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="7f3b5f3"
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-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"
-
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.11:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	# avoid network-sandbox violations since go-1.13
-	rm src/${EGO_PN}/go.mod || die
-	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
-		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
-
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-i "src/${EGO_PN}/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,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-	GOBIN="${S}/bin" \
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake -C "src/${EGO_PN}" dev-build
-}
-
-src_install() {
-	local x
-
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	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.7.0.ebuild b/app-admin/consul/consul-1.7.0.ebuild
deleted file mode 100644
index b721d4f0ca37..000000000000
--- a/app-admin/consul/consul-1.7.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="95fb95b"
-KEYWORDS="~amd64"
-EGO_PN="github.com/hashicorp/consul"
-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"
-
-SLOT="0"
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND="dev-go/gox
-	>=dev-lang/go-1.11:=
-	>=dev-go/go-tools-0_pre20160121"
-RDEPEND=""
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-src_prepare() {
-	default
-
-	# avoid network-sandbox violations since go-1.13
-	rm src/${EGO_PN}/go.mod || die
-	grep -rlZ '_ "github.com/envoyproxy/protoc-gen-validate/validate"' . | \
-		xargs -0 sed -i '/_ "github.com\/envoyproxy\/protoc-gen-validate\/validate"/d' || die
-
-	sed -e 's:go get -u -v $(GOTOOLS)::' \
-		-e 's:vendorfmt dev-build:dev-build:' \
-		-e '/^GIT.*?=/d' \
-		-i "src/${EGO_PN}/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,
-	# avoiding a dependency on app-arch/zip.
-	GOPATH="${S}" \
-	GOBIN="${S}/bin" \
-	GIT_DESCRIBE="v${PV}" \
-	GIT_DIRTY="" \
-	GIT_COMMIT="${GIT_COMMIT}" \
-	emake -C "src/${EGO_PN}" dev-build
-}
-
-src_install() {
-	local x
-
-	dobin bin/consul
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	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.7.2.ebuild b/app-admin/consul/consul-1.7.2.ebuild
index ef7603606ca6..f7ec296056a0 100644
--- a/app-admin/consul/consul-1.7.2.ebuild
+++ b/app-admin/consul/consul-1.7.2.ebuild
@@ -515,7 +515,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"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="dev-go/gox"
 COMMON_DEPEND="