gentoo resync : 18.11.2018

2 files changed, 71 insertions, 0 deletions

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index c780e7f87ca4..969a5d17067c 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -8,7 +8,9 @@ AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54
 DIST consul-1.2.2.tar.gz 15789375 BLAKE2B 8a0af370568f6fcb90334b147bd84e479efb682ed6c58d63dd56f3554f9e6538d37963ac825bb8598eef8948492feec688b8266733223d1557dbce9704daef35 SHA512 715f69e7b36d0070ea4e602dc50f51aa2547dbbbbb07cce985da79d1e201c6e84dade8a7c810e3602f88cfbd30e063669076954d2541810a18a0c9e7c9ff8458
 DIST consul-1.2.3.tar.gz 18428593 BLAKE2B 14582bf9668e4f2a1c8c443cb01d7b9780c9bc414ff226907335f3873c135b77566898649d16b352ef21ee9300c290338f59672c5fb2b187694aea97b8735dec SHA512 71a7dbfc031df4a96faf2ddd829f289e96adefd0e0087208bbdd26e742a24e3da05fceea4181eb915703ad3323ed5b02bf74eb3fdfbed1e9a1afa2f74acb2a34
 DIST consul-1.3.0.tar.gz 19423317 BLAKE2B 1db4de2d24be31b2d889b6f49cae33f2719080cf35df15c12c09159a57b9930cbe7204f8a35bbfe0f77145f562e3fe7d224785dde1f7b0cc3f0086e95e1316ef SHA512 b05b0ed316e10f45b83839812fb3394153e8bed604d35f0a983d33fcad3012a3b1872411b3034dbba54dd0ba000e737f18f7f351ed57fe737b0f365bdfe92f2c
+DIST consul-1.4.0.tar.gz 19685523 BLAKE2B df999d29fdab59b41d8e7ea4ec977a35aa7ec5b7daa293a75a39f695e3a75b1748b5bb584be9d9d5b3e1f0adac9626613a04949ff711ac713e2741cd2f9ad127 SHA512 a9f253ef5baa4e43800a0982ecb6893bf9487775cdcbe3a17bc7c45d601b6dca4e4c398ae3b70cdc1880577dbe1504d1a1f0cb702a1dd8c98b108e059fc721a0
 EBUILD consul-1.2.2.ebuild 1550 BLAKE2B 83bbc84358ac1cd5854fd6325b62a517e6da51a0cb8d4cce6b5b94278ca4ffafaa74f3232d4d6556ebc6611b4d71608e028f931a72a10536698cec17a7322203 SHA512 bb60a8d056fe2dfbaff0eb0de014af536f9bdf8e5e8a76b17174acb19ca005530eb8811b8357097fb4a469acb0c6751337c8e81eb99fbbd156111aa1040fe4ee
 EBUILD consul-1.2.3.ebuild 1550 BLAKE2B 21eaf66415397eb834e6208082c58bca34e5e02d180503fcdb02d7727ca1d46e2fdbad86fd5c3b7d24961c2f16479c602b2e4ad42b5b6f98c4b48632d98558de SHA512 4ebefcbbd2d253d39c413b083feb0918e430ed27dbc38a728077ca16097729593f70576af0bd434109b3f2ec8ca17bc70cd74d09348c9e7dcc79a8dc1d0ed56e
 EBUILD consul-1.3.0.ebuild 1547 BLAKE2B d59397ef54fb8ed539558cb408a5501edec87db0fb1ae10634c652e16726c59413ad2b40be1f42f233c9dfee998db14e68e79f74ec3695421ecdac22999ea895 SHA512 57d60cc8bb7766a1bd82bd1941ea4cf6c34adb781d3876784d38115d686365a690d81ffbce7b2765c50e47a6dd67c858eac24435fdfb23a87901d8e41b895a81
+EBUILD consul-1.4.0.ebuild 1547 BLAKE2B 020b91abeebd82a60c7a60893996d29214c4456b4758a15cbf810a3582fe36bc6dc5950128f8653bf9eba3bac2458cb359e194b7c0e99a9be0f5712bb5be65e0 SHA512 9400fd01450d0543eb6b29f67fd40a41874961d6bdfc7d1492a24201e085b2fa829f1e1350e4c84c20ccdd6c18b8b9a54fd9b2e56981c9c2e8604e95be915db7
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.4.0.ebuild b/app-admin/consul/consul-1.4.0.ebuild
new file mode 100644
index 000000000000..e1763349f0d4
--- /dev/null
+++ b/app-admin/consul/consul-1.4.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+GIT_COMMIT="0bddfa2"
+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.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: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"
+}