gentoo resync : 06.08.2019

3 files changed, 82 insertions, 1 deletions

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index ce8b024993f9..46ff9281208d 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -10,9 +10,11 @@ DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe61745
 DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
 DIST consul-1.5.2.tar.gz 21697719 BLAKE2B 782d6fe02cda097db9256a7e508cf19cf4d514d7936022d339fa62db705f6c60468cea907cd22338bb61c3287bfccb3a4d435a4f9222aa7558999553909e5d40 SHA512 e0820592abc5e119f74c8bf3d11a23726ee6dda7d193864a4486d64deef0bfd6ae4c9170b57d6f978e7ddfeb425229a019c45a8edcdea0938bce9315f2444fd6
 DIST consul-1.5.3.tar.gz 21743194 BLAKE2B c797b04457c5f0b12f06732a94038b25367b53a9e6088d725eea61786a0e18bd905ad680bc12c4bfa30b44292d2676689dd6f18e9e2143bf6e1b02c2c55f678f SHA512 3f275ec160b9e583b81ba8d463fdb05e9fc9058db2453d9393a56b67337ea04df98a89225323192230938e1abfb48fa60fe0a32b4d8980573b749217b69933e9
+DIST consul-1.6.0.tar.gz 22465984 BLAKE2B 3a030619786e8dabdf8b778012a80ff4b0e76ede6c313b688bf04bfd1a8488bff1bbd4a36c1dd11496bd1942f7bba2a9bb22ae3b364fee4335adfb741756dd67 SHA512 a122892693e3bee0fc0e0b5c0945e4a8dddb890228c091112e0db11a8afd33430611c20ff9bc13d2b3a2ac0d3b560be2d9c4e03a9cc425983fbd8f7edb699658
 EBUILD consul-1.4.4-r1.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
 EBUILD consul-1.5.0-r1.ebuild 1548 BLAKE2B b70a82e758c23c2c34ecd0fa5d45e56d840966135c8d578b09d702bed31b5148bffa2eb68412a0555464018ad04e62922a4e75d5c8a2fdc779b8497a6a539159 SHA512 00c8ddee82cacfaa5092bf45a37bccf7475e8fb6402579ee95188a9334f12309ba9a70771fb49f1b43bebec1e37ae68eb7d260a34c3134009f0b4507447c8504
 EBUILD consul-1.5.1-r1.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
 EBUILD consul-1.5.2.ebuild 1548 BLAKE2B ef17177024301747b243ac1b77fd9061cd76a661af705ca1beee37709ee03b07c2a1738a5e2277b8db93d377c442ba3831511c6df73c6096639971236b819e76 SHA512 41dd870ec80824c66139d4e44d10ec22079fbca640213f3454dee789ef535ef13605742f2999448475e5107134f436e3d8f9cb9e3d3fe3de021e45fc7ed67421
-EBUILD consul-1.5.3.ebuild 1548 BLAKE2B f8cfe586cc76eb91db2369980ad8dd3b13f305baaca3aecd69eae820a6d2dfec0927dbae152cef61f7960d8eabd508089d2441319ea1ffb2423a97809826f71c SHA512 7f046114417edd0b55be2d1800076ce735305df2dccb188e0e4a5c228d63266ec74419b55d79645f77482a1e49bf23e237bf0ffe3dbd5b91a16b99e271f3fb6c
+EBUILD consul-1.5.3.ebuild 1793 BLAKE2B 54e7ecb7a0d7eba9bbfbc767fe14f437ba129b5cd5a113b4111bd323e96ab7817ec86a82f58b3db6e62d41411db0cd6911b7db6dcce30b1ebcf6b941a0159450 SHA512 bbbbc8a895aca5c35438a7fb40de9624919f2bf133885b1a137eeee09de70630e4e21872eecec2c41fcd615793782fd1fcc4665437ed3429dccc6b5f84bda85a
+EBUILD consul-1.6.0.ebuild 1793 BLAKE2B 82a0527541f3c03aab2c03586691a7d405a1cce98e951bc874badbeaa6fc478391fba937ea600e346e67d901dacca1ef3d4ba0311c2e469c212a86da166a5ac9 SHA512 2a197552640c848be3fb1003f2f3daa543a3ac530105714ec758cc43430f18d24a76fa80172d2218261544b3e60b01758dacebb4d8d2160da6703a128b95e88e
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.5.3.ebuild b/app-admin/consul/consul-1.5.3.ebuild
index 13ebbc13a381..913d62b917c2 100644
--- a/app-admin/consul/consul-1.5.3.ebuild
+++ b/app-admin/consul/consul-1.5.3.ebuild
@@ -30,6 +30,11 @@ pkg_setup() {
 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
diff --git a/app-admin/consul/consul-1.6.0.ebuild b/app-admin/consul/consul-1.6.0.ebuild
new file mode 100644
index 000000000000..b5b9eab35a17
--- /dev/null
+++ b/app-admin/consul/consul-1.6.0.ebuild
@@ -0,0 +1,74 @@
+# 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="944cc71"
+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"
+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"
+}