gentoo resync : 19.07.2019

6 files changed, 80 insertions, 10 deletions

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index eca4ed626002..496b0a515d84 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,14 +1,16 @@
 AUX bootstrap.json.example 46 BLAKE2B 70821b3ebd2d39d67ec3b1fb06d7ffd20b89c13932e125682cc671d3914e860ee495e422d1d67fadf0762acfbcbdc9194fd54d851fc537966370287c13e1c779 SHA512 eda1c8779b06ce6020e3f4e759201336b2bfa716986446882db4e6e95ff89a7da0c6101dd4dd603a59202b9c2db79d96f36cf53b63bc63375d94ba74ba4e2857
-AUX consul.confd 301 BLAKE2B 0e3e2953a92c26f7cad295c5c11f8a1efe0c764266f9478a19cf64b182d561bc70485dc6aa18f10caf6d0ce056f40656cc7579033d3447150e3d2ef53c4b0c71 SHA512 d0587263753965b4614a24c3bd4aeed13e236a1dc6ed329b2ce542d394d1d5542e5db061af2151be54f5882c4bb0e254511645065f32c59d7fc338ac0bd4de7a
-AUX consul.initd 706 BLAKE2B 9a9eb472c3843fda947dbbd236eaf6f31477509c17a207cded98a60eac94b2b242c60028dcdd9c53bcfc65da48e5da4f375e27b83e0160e4c74982afd0ec9d74 SHA512 eeb6ff64b13e91ee5892f4f91de2ffc97fc339a9426edebafd3d0f9686c6695ebf127dd254298726d0c97a7a3b3f2e3dde36e32f7ba126025fb8bfba6ed6721f
+AUX consul.confd 252 BLAKE2B c21410d5f983aec1b188965f0f76b64f477e682a4b254a3b4a2e122454c04a2d61f14cc3fcf9ea1d3b8adda10ad7ee3864734b3bda3a5b07d37e7a05671c33f8 SHA512 b87210a8f522d5775c9c14c445e6e1baca511c252ed9f1d1d6ba7ced4e26d161bd78a52cc21c70368f72e75717dfe8aabc8939ed8fcc407d98135609f5eff1c2
+AUX consul.initd 705 BLAKE2B 74bb6ae40f6a964ae3820091668e30997070b8449d82d1c60bb9ea3ae5f47a38ac170f9507538cabcd0b410e8161d3bc3734c151087efca8e371f211473c7b4e SHA512 18f5039c71a5f8a2df651d9ecf74c0492bab6d156dd2361a7d3db23ec0b70e47ea35fd1f3ff7a8fc043ad5767a4dd0ab3c4f4cc7cc3eb5ab844bf39fca3549d9
 AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca16844218002e51bdaf421adca082b9a955f1ebb71d83f1243b2e79c236f94f5f520d0606c15d20c3db9f5f7de6 SHA512 e4943908e26d75ca8eb658b268479e47bc71b96957de8c35dddec52e7b8062aec3fada4e86fd97f986fbac912d29cad1f83f943ea4451b7469df0712799bb972
-AUX consul.service 336 BLAKE2B 4d5c00fbc7a9436b5ab14ba4ee1c1f850aa2a42fb297ed0294e0dfc42c5acf05c93f4da570ed89f807063009e3c52d3fc7f980eb243e89e553f39c30c8dbf5d6 SHA512 311661e0201411846334976570ae68d8601818715e5e7094f19a24b1d995a72f0b445661c9870e880e7c73a9dfd545e35822a6e86f737cd49e862ab9ccd5afb8
+AUX consul.service 359 BLAKE2B 04a42a1546d2e4dbf57b9d75b32feddd4d0f4f8b6f750b1b4a8c19cd51fdb3cedce2cbe2a1680dcbb407890aa3e75ab9ffc5c88566b3c1e44158b1b480e5119f SHA512 d0f73304d644cf26e609a2136f1107efe36afe54721cbbd6208cfe279629ef5603a94ecd786e83ad37d7828c038f01baa4482872fa65c625646fa73684e3e477
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
 DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36353683cf9a2c6cdeaded8587e8464f066168f190f7347f6038df28b3cba1d8b8a3ca0b700ee085019af5014966 SHA512 d3e5dd536726976b705fe4c78c67eaf345b8f47225919c0ca1609d75e74343d9a16d893ef4cd5140998f23b3149cfa60f5b432ed9a7251bb3b232be9b65e7241
 DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe617456a35d18a7a3cfa1b0f6ce2e335542b3add06c8b8e49995135b5a1576c824840030ac8dd46019bee915689bc5e2 SHA512 8cefb77b56b27995bba38517144bf42585bd1d9ad9a10fc0c9b6bc1a87bfbd042e336ed5e945cfce1fb8eb4b8162dbc8246e2b4109dea5767b8745a7b2159ef8
 DIST consul-1.5.1.tar.gz 21123963 BLAKE2B 4fe6a45f442d849196a7b9961110cdcc6f92931626ab583859efabe62038f6b2c356b27b37ea41b27755cca138c567be5c81854794a1ba0ccae3f9e0dfd10749 SHA512 7486d24bf1fa9fe94175abf9e008dc4fe4277c509381a524a9ee20e17bc4959f621e39be29e33622cb672ef3a04f9161e575009197bcd35c78b45f1d2637a2ea
+DIST consul-1.5.2.tar.gz 21697719 BLAKE2B 782d6fe02cda097db9256a7e508cf19cf4d514d7936022d339fa62db705f6c60468cea907cd22338bb61c3287bfccb3a4d435a4f9222aa7558999553909e5d40 SHA512 e0820592abc5e119f74c8bf3d11a23726ee6dda7d193864a4486d64deef0bfd6ae4c9170b57d6f978e7ddfeb425229a019c45a8edcdea0938bce9315f2444fd6
 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.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
+EBUILD consul-1.5.1-r1.ebuild 1548 BLAKE2B d1d499907ec300d216e6884fb3c31d741911a799185f8220e0f4bb1f141105781368f9cb7c98bcd8ccd790e34b667f33b0dddc8eb5f1185318bf6c70917ead33 SHA512 6ab3f29b2416dd52250589d2ccae36f86161edea4a103d16a00e21e78c630fe8a6c7a61e8a50c08e3df546698e91f577e6ed94dcaeaf766b51f97ca93f894837
+EBUILD consul-1.5.2.ebuild 1548 BLAKE2B ef17177024301747b243ac1b77fd9061cd76a661af705ca1beee37709ee03b07c2a1738a5e2277b8db93d377c442ba3831511c6df73c6096639971236b819e76 SHA512 41dd870ec80824c66139d4e44d10ec22079fbca640213f3454dee789ef535ef13605742f2999448475e5107134f436e3d8f9cb9e3d3fe3de021e45fc7ed67421
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.5.1.ebuild b/app-admin/consul/consul-1.5.1-r1.ebuild
index 23474dcfc441..23474dcfc441 100644
--- a/app-admin/consul/consul-1.5.1.ebuild
+++ b/app-admin/consul/consul-1.5.1-r1.ebuild
diff --git a/app-admin/consul/consul-1.5.2.ebuild b/app-admin/consul/consul-1.5.2.ebuild
new file mode 100644
index 000000000000..99191243cd38
--- /dev/null
+++ b/app-admin/consul/consul-1.5.2.ebuild
@@ -0,0 +1,69 @@
+# 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="a82e6a7"
+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
+
+	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/files/consul.confd b/app-admin/consul/files/consul.confd
index b15e19c77013..d2ed781b3837 100644
--- a/app-admin/consul/files/consul.confd
+++ b/app-admin/consul/files/consul.confd
@@ -5,6 +5,3 @@
 
 # extra arguments for the consul agent
 command_args="-config-dir=/etc/consul.d"
-
-# upstream strongly recommends > 1
-GOMAXPROCS=2
diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd
index fb1c1c4529e4..00a65695fa2b 100644
--- a/app-admin/consul/files/consul.initd
+++ b/app-admin/consul/files/consul.initd
@@ -4,10 +4,10 @@
 
 description="consul agent"
 extra_started_commands="reload"
-export GOMAXPROCS=${GOMAXPROCS:-2}
 group=${group:-${RC_SVCNAME}}
 user=${user:-${RC_SVCNAME}}
 pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+rc_ulimit=${rc_ulimit-"-n 65536"}
 command="/usr/bin/${RC_SVCNAME}"
 command_args="agent ${command_args:-config-dir=/etc/consul.d}"
 command_background="true"
diff --git a/app-admin/consul/files/consul.service b/app-admin/consul/files/consul.service
index 967b30b3b329..7839d7c20a87 100644
--- a/app-admin/consul/files/consul.service
+++ b/app-admin/consul/files/consul.service
@@ -5,11 +5,13 @@ After=network-online.target
 
 [Service]
 User=consul
-Environment=GOMAXPROCS=2
+Group=consul
 Environment=CONSUL_AGENT_OPTS="-config-dir=/etc/consul.d"
 ExecStart=/usr/bin/consul agent $CONSUL_AGENT_OPTS
-Restart=on-failure
 ExecReload=/usr/bin/consul reload
+KillMode=process
+Restart=on-failure
+LimitNOFILE=65536
 
 [Install]
 WantedBy=default.target