app-admin/consul: version bump to 0.7.0

Package-Manager: portage-2.3.2

2 files changed, 125 insertions, 0 deletions

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 8b45a342364e..e5003936185d 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -6,6 +6,7 @@ DIST client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 SHA256 d
 DIST columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz 3811 SHA256 1a087a5abbdea9adde033622079930af7a7b171693bef481c2291746ceb333f8 SHA512 0c746f39fe3f5b9ab0c62c188fe92183c23908fce2952d4ada366cedf204dc58883d717666d71fc1b37f5ed00411da39cfbd4d37ce5cf10012cdecc5704149b1 WHIRLPOOL d325bf6486d7e18da71eacd73d0dbac083a6179048aaa5120beb22372ace0d43fc04f80765c635c291924279adf4463ea42c4f61a2a59428cd88d5ecfb9dd5bc
 DIST common-40456948a47496dc22168e6af39297a2f8fbf38c.tar.gz 62809 SHA256 96c62f3441fb41eca0ba19601fc0be862b9f30053f5483b982d3bd67892723ff SHA512 96898a77e49993e9d7420ab734663654535fef071ceb43269d24725534ac0cfa52f2827c8f7ade835bf96b6f47d4cded0af078acf99682735005926226c7f968 WHIRLPOOL e3a29587c3ed430496d8748a85ee4eba9278b430222bb7e7d2eecc00e19be8273f61bd49b2d766c13ad6ee49523987d72f408ccc145e1ff4a530a2e9f1e96ec7
 DIST consul-0.6.4.tar.gz 3912207 SHA256 327c72211af1d6613477856c15bf7bcfc3c80d23542fcffe535d30d09347e08b SHA512 3cbf7f3f33cc95036cf87ab39aebd44211b915d3ec2e8452c65d4093ed4791b531f540f74faddc1e8bdc9478af295ed90f78503ff394f8a7c409b7b07da3dbcf WHIRLPOOL 3cb30416caf41a360a0c61bb92395e0b8f45ac65b66b447ed70a91b43f7be8bfa779494b27f353f1dc99959b8ed08abca0dc57554b943447b98790f4471e8258
+DIST consul-0.7.0.tar.gz 3625239 SHA256 d3616f204370aa199df516d792fe0835019aed7b6596aa7f6bdc71c2b1067494 SHA512 1073dacbd2c9ceb5bb05f15f173daf8ac8ae215e32eefdb7fec0e5bf2c49cd486bb7d07829da217cf78956ea978d02c03611b74a7fa9d77003c42d1ba392f06f WHIRLPOOL 53e9fefe51fd3f5aa9617211cabc28018721ce1dfa3abfc8aa392a7ebe519fe85a54b364f6a3041a7f83e5cc8ed23ec1df77d4b0939c49ee48e30e1d71a567cd
 DIST consul-migrate-0.1.0.tar.gz 12844 SHA256 f9c2699cf5686065b69c3c0af58f140c65c6c0963e699b35b6e03e06fa7f996b SHA512 8884112f8529dbd48afccc21e89b5e0c401a056d7ca2f223803648c6cfe12a6582a2f91ee548672c10c57bad11028a01297ad039c0be39243180deb165d262df WHIRLPOOL bb977a8823360c8159d356aca9273665b41f02b390984e91c005ef8a57e57d9d77143c575fe0b38933522a8ff03743f9b49bc5583c58c1b37bcb04f8f3ec08b9
 DIST datadog-go-b050cd8f4d7c394545fd7d966c8e2909ce89d552.tar.gz 6056 SHA256 90059771f768ca7ab51936823e0bfad9093ff85aee853f9a89d9e16ab6a4dcae SHA512 1baf2ea91c57824b8698c16cd9bb2cf07ecd6a403d8d040c0908a23f6acadbcaddaedb86bbeaddf4c20bc9acb69d8134027441dfa947574d611859947fa9a928 WHIRLPOOL d867f06a5decb4970b680e66477f0729023e0bf742dd2c5c3fda376641eb7c6527bb37591fb6cbee573ab0a078708d57724f79ef91a914f8b9bc3fecc860a3cf
 DIST dns-75e6e86cc601825c5dbcd4e0c209eab180997cd7.tar.gz 155117 SHA256 6b77c9d97f08ae4781f52603102f5f26dc36e8bef44739b3ca7c11a0306312ed SHA512 5dd685d977bdb766eaee2d35c965648d0fc27b4276e9af58d4d45685951391605bc3a6db8f0a90bf1180c666bff92dd645e3e8e765d41cdcba031a58ddf083a8 WHIRLPOOL 2a4d9c25ec5863e9b7bf60a5735ec504ea8fddcf066d20f476cb1e9ab4e8901d3ce6563e923f6cace19090f9ec04ed67bc03ab0dba4e113d7ea5255299d6c235
@@ -29,6 +30,7 @@ DIST golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz 12310 SHA256 9eb
 DIST golang_protobuf_extensions-d0c3fe89de86839aecf2e0579c40ba3bb336a453.tar.gz 10717 SHA256 43a87b207d0c8e6ff7662fddc1dc244caae6bb8c3478f42eb3527bccc28ac9e5 SHA512 10e0bce45f8bb810eb7b029683a7d2b41c54e7359818a081175647a5c94bfda3a38cb5cdd3cdbc19e959a5490b8fb843be1efb0e1a4b7652d82954f41ecf6fc1 WHIRLPOOL c3f2c49289762fca7164315aadfd6c5c3f1b087d37055aae5ef07f2951b8659ecb510a41abee9bbad9a99c22b25d54fa112d20673c74e9f0ffb57d340083c78d
 DIST gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz 100298 SHA256 de5119016d4e12885c474f4f1e682c80984b464a0ae2809f28699aeba1badc68 SHA512 f8f0268b49a091166302440ee34e40ff89a4c6adacfcd2daa62161a04f8ebe2a5e66074c125afa40147eba7493ce5fd5fb75e33b3955ef9f0f836ecc409603a3 WHIRLPOOL bdc42de4d1b8fecd2a9770745d8b80ebaf3afc3471e672e4dd512f8e60272d9cfd7d6991ecafd424f20036b55b894e5befde81281b0a01fefc274df57044050e
 DIST gox-39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz 15118 SHA256 c884282ebb143a037975418d0c3a73843d5147f73af6723d19b6177d369f4fcc SHA512 7c8934def51b370824a357716aeaf85dd0728a3007e60a31a0ef7cbb4e1ebb68d5ea58f883dac12985bf97a1bfd725108161912e2332f4f160a80e016cab85d1 WHIRLPOOL 4097b31a867d5cf39ea52d3729c38ddd009c660e87d026a067f6e255bdb2d15b81a9d1b11c6e45916b9e9ac672e7c2217d34d0f93c651c86b3c954e9177de5c7
+DIST gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
 DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 SHA256 5656a59a398dc22d383d8daf33c410dcc1c21894d0053df5f7263d3a65f85fd9 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd WHIRLPOOL d6dddcfbc53bc68fdf3971829bf8f0662e47a447682b37306424dd91ee2cc3d0280c7c368b3a8ded9f2127b2789b7b68648de9beaf9f9847cedb7324c2605dbf
 DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
 DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 SHA256 a58c8a6112b9ca2eb193d75996a54699f572411f3146d8ba62377af4a9fb933a SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426 WHIRLPOOL 0086485565e6fae835f54a1bb00a40660650c6018a6e79e05ba15120a59a6552ba60d86bfd63f7bc5cd8b331984fcdbe7162ef24d257bcc18a7fd8e6c028dd80
diff --git a/app-admin/consul/consul-0.7.0.ebuild b/app-admin/consul/consul-0.7.0.ebuild
new file mode 100644
index 000000000000..dee540ff628a
--- /dev/null
+++ b/app-admin/consul/consul-0.7.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit golang-base systemd user
+
+GO_PN="github.com/hashicorp/consul"
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz
+	https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
+"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+	app-arch/zip
+	>=dev-lang/go-1.6:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+STRIP_MASK="*.a"
+
+S="${WORKDIR}/src/${GO_PN}"
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		if [[ ${x} == *.tar.gz ]]; then
+			go_package=$(get_archive_go_package ${x})
+			mkdir -p src/${go_package%/*}
+			mv ${go_package##*/}-* src/${go_package} || die
+		fi
+	done
+}
+
+src_unpack() {
+	unpack_go_packages
+}
+
+src_prepare() {
+	eapply_user
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-e 's:-X main.GitCommit.*:" \\:' \
+		-i scripts/build.sh || die
+
+	# go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
+	sed -e 's:go get -u -v $(GOTOOLS)::' \
+		-i GNUmakefile || die
+}
+
+src_compile() {
+	export GOPATH="${WORKDIR}:$(get_golibdir_gopath)"
+	go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${GO_PN}/..." || die
+	PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) emake
+}
+
+src_install() {
+	local x
+
+	dobin "${WORKDIR}/bin/${PN}"
+	rm -rf bin || die
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+	rm "${ED}etc/consul.d/ui-dir.json.example" || die
+
+	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}"
+	systemd_dounit "${FILESDIR}/consul.service"
+
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
+	rm -rf "${WORKDIR}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/${GO_PN}/vendor
+
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
+		rm -rf "${WORKDIR}"/src/${x}
+	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+	insopts -m0644 -p # preserve timestamps for bug 551486
+	insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}"
+	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
+	insinto "$(get_golibdir)/src/${GO_PN%/*}"
+	doins -r "${WORKDIR}"/src/${GO_PN}
+}