gentoo resync : 19.10.2017

2 files changed, 70 insertions, 0 deletions

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index f2ca680ed4a5..11fe28cadf16 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -7,8 +7,10 @@ AUX data-dir.json.example 36 SHA256 1f1f24ac4b37df816974fbe3e3ba3d7ed1c8d15cb242
 AUX ui.json.example 17 SHA256 a90eb6376a8d69443c5f72b434c84ba51280a64d9831adf3882fe548f65c391b SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d WHIRLPOOL 40ec22ab7c14627f6fa2352b663a3f1545f259e813d14177e591dc52d50de2612d08f53976ddc581e2bef384a11caf22cad41feed521154245eef88537ee6e84
 DIST consul-0.8.4.tar.gz 6614287 SHA256 d5573d6e70d490c8b8109722c2019b5a2b35eff703b92d6276997846361cff1b SHA512 4bbb167a603f1d20940330bd9615ba0f50e0113e1d96ce47773f5d2813635f76dd1aec8f43dae4c8c547cec8a891eb0726eeeda7bd7c5b1d495029b359378e68 WHIRLPOOL e270367c69fe74f25c89ef9e8c7f71307d3b8e48b4210e43e48907f1f5a73f11f45aa2b212f70c24463e35d800b861ccd34e2c82de863fc6e7da9cd3eda5214c
 DIST consul-0.9.3.tar.gz 7278357 SHA256 69b76432203e046a8025ce13f7cc041b2308d72f07f240a57f2ba5d580fcff70 SHA512 a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f WHIRLPOOL 9e5ac311761bc786c986d4b0cdb4ba541a46f57cffd8cac4de96292293518cd8e8f3743bcb0740b245ae5a30f9f157987078874503bd6b0685a9f3c88c92ffba
+DIST consul-1.0.0.tar.gz 7354292 SHA256 60e86cf77c3287edc98f8381c046bc876f969dd97dea7adc68019bff2207af7a SHA512 8223f79aa1b7bfc5693168b56fbe9a506ca504771c92328afeb99e78dce8699c7532582749a372dfed10dd4b7c440ace0dd248f1ae27247059da3e2f88293a88 WHIRLPOOL b40a450efc9587475ccf0f0080c0fb03769557487b3f9a29df9454551149a8235e240aacd82849736f9160d10aee1e04a76035b9bab716b244f7cb13791ff43c
 EBUILD consul-0.8.4-r1.ebuild 1524 SHA256 54f280e236dda24eda7da07f1feed8790b6f493d289b2d3455465f969172454d SHA512 a262f9fcffdff04f28a6e5be42a0037ab15a774675ab32b0d6cdfb1a7c695b9f859e2c189736157c558bef98d21a2cefe48c4556c823667b64ef4578c9541b84 WHIRLPOOL f6fa7c0857d7a470f5ff6ede65ecae00e77a504581b8a04048b314f58e82f950ab84fe4ae0b011c43cbede96ef6e811c57c77f238d870d4c59906c65a0447787
 EBUILD consul-0.9.3.ebuild 1560 SHA256 abff01f71390db4c05ec895508e7f81b9ba4f59514f4e839dc8b5b13407a4a40 SHA512 0b04e487febd8e65b0a24df723fd20532a04506140217a0b4fa671038bcbebd9f7f3d6014b4937871cd05ca1a037ec2ab66a6c3cc045d8b02caed0f61ff90061 WHIRLPOOL dea3ba50f56ab4db18036f04c1bca501e2490aadf99e2de2a0812e4ae9340817b67617f7afec890a9821285162642c786c9500029bbdad7043d8b1e66b3d5dea
+EBUILD consul-1.0.0.ebuild 1560 SHA256 abff01f71390db4c05ec895508e7f81b9ba4f59514f4e839dc8b5b13407a4a40 SHA512 0b04e487febd8e65b0a24df723fd20532a04506140217a0b4fa671038bcbebd9f7f3d6014b4937871cd05ca1a037ec2ab66a6c3cc045d8b02caed0f61ff90061 WHIRLPOOL dea3ba50f56ab4db18036f04c1bca501e2490aadf99e2de2a0812e4ae9340817b67617f7afec890a9821285162642c786c9500029bbdad7043d8b1e66b3d5dea
 MISC ChangeLog 6414 SHA256 b6c3345f18332d9c9965b335a0b7c4246d852886f0c089f166d2c255d6e0af4d SHA512 664491d4dcef4abda009070a482c80a681f39a564ba7d983b8cf7a680db972550233e808bbaadecfef895c9990bb263f95c6273bf6b24c2f5523b660bb68e7d3 WHIRLPOOL 215e15b6c6379fb4e02ca41848e610ebec31946d24cb8f92adc4ac9b7f7675ef6d12679cf509e50cad04ac01587e335063c19f353f2880748dd1cd13928cf04b
 MISC ChangeLog-2015 1260 SHA256 e346cb99b0d823a6e4052d51aed1e13684aa9c7feeeb8a4b3027b74073e172a7 SHA512 9bcc7db86198b81da562dc68a3ebaa3505be6febaba7c21779580493a226fe7ec37e13ce1a3503ab4b17dfe0fc4e6e8b057908c2855c2b897318460ddc67d068 WHIRLPOOL 684c125f9d249b808024e89ad593c7c4219bcf59e4842d850118b728ef28219169fa6ae05e426fdb25b2cbe94c04b41c02748adc971df47374f57b4f6950cf0e
 MISC metadata.xml 391 SHA256 6b88704531e2782296e0491cf2b57c8bef914045a088c8c68c42b6cf0a655eda SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb WHIRLPOOL 344059242683458d3619a02327cf7e2919c43b940346d351c3d30a4dc91d5089491305ddd2193aad97c593a94151dd263bb7e3482447b3d7f914fa6c20199f4a
diff --git a/app-admin/consul/consul-1.0.0.ebuild b/app-admin/consul/consul-1.0.0.ebuild
new file mode 100644
index 000000000000..1eae049ea45d
--- /dev/null
+++ b/app-admin/consul/consul-1.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_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"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.9:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
+		-e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "${S}/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}" \
+		emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	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"
+}