gentoo resync : 18.05.2019

7 files changed, 7 insertions, 151 deletions

diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 539260ba5ac6..10979e6f00f0 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,16 +1,12 @@
 AUX bootstrap.json.example 46 BLAKE2B 70821b3ebd2d39d67ec3b1fb06d7ffd20b89c13932e125682cc671d3914e860ee495e422d1d67fadf0762acfbcbdc9194fd54d851fc537966370287c13e1c779 SHA512 eda1c8779b06ce6020e3f4e759201336b2bfa716986446882db4e6e95ff89a7da0c6101dd4dd603a59202b9c2db79d96f36cf53b63bc63375d94ba74ba4e2857
 AUX consul.confd 301 BLAKE2B 0e3e2953a92c26f7cad295c5c11f8a1efe0c764266f9478a19cf64b182d561bc70485dc6aa18f10caf6d0ce056f40656cc7579033d3447150e3d2ef53c4b0c71 SHA512 d0587263753965b4614a24c3bd4aeed13e236a1dc6ed329b2ce542d394d1d5542e5db061af2151be54f5882c4bb0e254511645065f32c59d7fc338ac0bd4de7a
-AUX consul.initd 726 BLAKE2B b3bf7924a0eb0e3c499256a802b9d5f22bf362b59ba2d50b45049edb72192c9f67733d8042ed219835a997b4994a1d3966000cff79efb541f3d62c798836de80 SHA512 a13fa8476d27288ee284b7460d77f7e67327b5a18b4635ab9c6f2f5ae05981f6876f1a2f4f27448a22a602a2ed30bd7873fe15776473d5aa6db9497765f1be6e
+AUX consul.initd 706 BLAKE2B 9a9eb472c3843fda947dbbd236eaf6f31477509c17a207cded98a60eac94b2b242c60028dcdd9c53bcfc65da48e5da4f375e27b83e0160e4c74982afd0ec9d74 SHA512 eeb6ff64b13e91ee5892f4f91de2ffc97fc339a9426edebafd3d0f9686c6695ebf127dd254298726d0c97a7a3b3f2e3dde36e32f7ba126025fb8bfba6ed6721f
 AUX consul.logrotated 85 BLAKE2B 8f3212c58295d57e9265dec26b9bfe562c47ca16844218002e51bdaf421adca082b9a955f1ebb71d83f1243b2e79c236f94f5f520d0606c15d20c3db9f5f7de6 SHA512 e4943908e26d75ca8eb658b268479e47bc71b96957de8c35dddec52e7b8062aec3fada4e86fd97f986fbac912d29cad1f83f943ea4451b7469df0712799bb972
-AUX consul.service 354 BLAKE2B 9996b9d6a1aab360a3b46518e2091e8f30794f3bd3d113a3e9cbff2f4ff8a4cd014475806bd75feb6948c12b60846a403e35630820b814032fadc9a664985b90 SHA512 537d35e5a79d40dc62f6eb04f4631251d1e6dd62f2bd7d5483274903996052705db5fb4026000ef6e768e3dafb02f155c5bc1fd15a32813ecca8b1348a95e92d
+AUX consul.service 336 BLAKE2B 4d5c00fbc7a9436b5ab14ba4ee1c1f850aa2a42fb297ed0294e0dfc42c5acf05c93f4da570ed89f807063009e3c52d3fc7f980eb243e89e553f39c30c8dbf5d6 SHA512 311661e0201411846334976570ae68d8601818715e5e7094f19a24b1d995a72f0b445661c9870e880e7c73a9dfd545e35822a6e86f737cd49e862ab9ccd5afb8
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
-DIST consul-1.3.0.tar.gz 19423317 BLAKE2B 1db4de2d24be31b2d889b6f49cae33f2719080cf35df15c12c09159a57b9930cbe7204f8a35bbfe0f77145f562e3fe7d224785dde1f7b0cc3f0086e95e1316ef SHA512 b05b0ed316e10f45b83839812fb3394153e8bed604d35f0a983d33fcad3012a3b1872411b3034dbba54dd0ba000e737f18f7f351ed57fe737b0f365bdfe92f2c
-DIST consul-1.4.0.tar.gz 19685523 BLAKE2B df999d29fdab59b41d8e7ea4ec977a35aa7ec5b7daa293a75a39f695e3a75b1748b5bb584be9d9d5b3e1f0adac9626613a04949ff711ac713e2741cd2f9ad127 SHA512 a9f253ef5baa4e43800a0982ecb6893bf9487775cdcbe3a17bc7c45d601b6dca4e4c398ae3b70cdc1880577dbe1504d1a1f0cb702a1dd8c98b108e059fc721a0
-DIST consul-1.4.1.tar.gz 22517128 BLAKE2B a4091ad1c2d743693ec14e364bf610479cb6c6f33caeb601698ca37a98fa0ddb6417bbca4ca30e3941bdb1c8be18f0eb31b0e515498d7fea38c553ef2d0a1f46 SHA512 e5451a414878a2a9d3591d4ae2caf8a227035017a6b65cbacf272a1a14727d33cabb1a11bd0fa3b837195309ff77aa49d4087cb6faedddb8ea002ac46412bc90
 DIST consul-1.4.4.tar.gz 22736827 BLAKE2B a1b973a303f77d84993e4879aa92072d4f2d36353683cf9a2c6cdeaded8587e8464f066168f190f7347f6038df28b3cba1d8b8a3ca0b700ee085019af5014966 SHA512 d3e5dd536726976b705fe4c78c67eaf345b8f47225919c0ca1609d75e74343d9a16d893ef4cd5140998f23b3149cfa60f5b432ed9a7251bb3b232be9b65e7241
-EBUILD consul-1.3.0.ebuild 1547 BLAKE2B d59397ef54fb8ed539558cb408a5501edec87db0fb1ae10634c652e16726c59413ad2b40be1f42f233c9dfee998db14e68e79f74ec3695421ecdac22999ea895 SHA512 57d60cc8bb7766a1bd82bd1941ea4cf6c34adb781d3876784d38115d686365a690d81ffbce7b2765c50e47a6dd67c858eac24435fdfb23a87901d8e41b895a81
-EBUILD consul-1.4.0.ebuild 1547 BLAKE2B 020b91abeebd82a60c7a60893996d29214c4456b4758a15cbf810a3582fe36bc6dc5950128f8653bf9eba3bac2458cb359e194b7c0e99a9be0f5712bb5be65e0 SHA512 9400fd01450d0543eb6b29f67fd40a41874961d6bdfc7d1492a24201e085b2fa829f1e1350e4c84c20ccdd6c18b8b9a54fd9b2e56981c9c2e8604e95be915db7
-EBUILD consul-1.4.1.ebuild 1548 BLAKE2B 4e3e87a0d75be8ba8fa8e5cdfa0a57a07dced2dc84fbf9282ac277b3808ec54c8c7face667f31deb96ad02249b1e0be9462c730921d81fb0e0faa198b822646c SHA512 54af81a5e1bf9eaaf58d2529620f7da2ede7f305588545e23960265ab34607c313e3a60bb9ebed51921d82b0ec0365f9d00240eac774d7bb255ea96ff392309f
-EBUILD consul-1.4.4.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
+DIST consul-1.5.0.tar.gz 20830405 BLAKE2B e64fbc22ade0c737db4f2f1b0e3966dbe617456a35d18a7a3cfa1b0f6ce2e335542b3add06c8b8e49995135b5a1576c824840030ac8dd46019bee915689bc5e2 SHA512 8cefb77b56b27995bba38517144bf42585bd1d9ad9a10fc0c9b6bc1a87bfbd042e336ed5e945cfce1fb8eb4b8162dbc8246e2b4109dea5767b8745a7b2159ef8
+EBUILD consul-1.4.4-r1.ebuild 1548 BLAKE2B 65d5c22f412b28abf5c7067b5744ca2fb627f6513eca10d91055276016487f0123e6636c080d4841be9d05f4e26fe332f1867e7d540c7810ae43a187b1485988 SHA512 9ce2e18e5177ed96d005b6967d68e8df138ff18e47b28b52ea4fb971323c5cced167bc26fc08a30d39cb243bcaa275697fe7e10c6cacb87c12d969a00bd154b1
+EBUILD consul-1.5.0-r1.ebuild 1548 BLAKE2B b70a82e758c23c2c34ecd0fa5d45e56d840966135c8d578b09d702bed31b5148bffa2eb68412a0555464018ad04e62922a4e75d5c8a2fdc779b8497a6a539159 SHA512 00c8ddee82cacfaa5092bf45a37bccf7475e8fb6402579ee95188a9334f12309ba9a70771fb49f1b43bebec1e37ae68eb7d260a34c3134009f0b4507447c8504
 MISC metadata.xml 391 BLAKE2B c60fccfb61459803d5e9cff21d68525df118fc15b2390e805e3358b4e50e19a6eba6e06c057c5310797a9ba533f0d24746c95d8160a67e285732e7adab9b7fb2 SHA512 74541a7ccabd8ed4cebaec46f8d848d1930e8b50bc1fe5d84a5d37022d307e261d8e5537f942608c019992a2deccf0831a7624447d92dd68fe85128cfabf4ceb
diff --git a/app-admin/consul/consul-1.3.0.ebuild b/app-admin/consul/consul-1.3.0.ebuild
deleted file mode 100644
index 325264fb4c98..000000000000
--- a/app-admin/consul/consul-1.3.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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="e875783"
-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"
-}
diff --git a/app-admin/consul/consul-1.4.0.ebuild b/app-admin/consul/consul-1.4.0.ebuild
deleted file mode 100644
index e1763349f0d4..000000000000
--- a/app-admin/consul/consul-1.4.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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"
-}
diff --git a/app-admin/consul/consul-1.4.4.ebuild b/app-admin/consul/consul-1.4.4-r1.ebuild
index cd2aa631ab42..cd2aa631ab42 100644
--- a/app-admin/consul/consul-1.4.4.ebuild
+++ b/app-admin/consul/consul-1.4.4-r1.ebuild
diff --git a/app-admin/consul/consul-1.4.1.ebuild b/app-admin/consul/consul-1.5.0-r1.ebuild
index 86592d84b726..13e2f4eb6140 100644
--- a/app-admin/consul/consul-1.4.1.ebuild
+++ b/app-admin/consul/consul-1.5.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 inherit golang-vcs-snapshot systemd user
-GIT_COMMIT="65d2c9b"
+GIT_COMMIT="34eff65"
 KEYWORDS="~amd64"
 EGO_PN="github.com/hashicorp/consul"
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
diff --git a/app-admin/consul/files/consul.initd b/app-admin/consul/files/consul.initd
index b36db8aef13c..fb1c1c4529e4 100644
--- a/app-admin/consul/files/consul.initd
+++ b/app-admin/consul/files/consul.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2015-2017 Gentoo Foundation
+# Copyright 2015-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="consul agent"
@@ -14,7 +14,6 @@ command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
 	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
-stopsig="SIGINT"
 
 depend() {
 	need net
diff --git a/app-admin/consul/files/consul.service b/app-admin/consul/files/consul.service
index 496fe4814789..967b30b3b329 100644
--- a/app-admin/consul/files/consul.service
+++ b/app-admin/consul/files/consul.service
@@ -9,7 +9,6 @@ Environment=GOMAXPROCS=2
 Environment=CONSUL_AGENT_OPTS="-config-dir=/etc/consul.d"
 ExecStart=/usr/bin/consul agent $CONSUL_AGENT_OPTS
 Restart=on-failure
-KillSignal=SIGINT
 ExecReload=/usr/bin/consul reload
 
 [Install]