gentoo resync : 24.12.2018

5 files changed, 71 insertions, 5 deletions

diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index ad54b206b291..84fdbb498bdd 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -1,15 +1,18 @@
 AUX fluent.conf 2728 BLAKE2B 1986af0d4062e7d85590e044d47ec77e3a46d9d4e8e79e42a30db05f0c5b730ebdef3f5f233bf929ec05311e644ade0fa89144323fe5ed8a8089dea8e3c5b103 SHA512 b400910c76fe2286e7887643471a55dfbad4aceb8dce07fba33d34923dcc13a609b909394bab50d509719d76a231a77441431e2d6dad75dd62b69ad05a5a804e
 AUX fluentd-1.2.6.initd 421 BLAKE2B c245bfe6fb30a699616f503cd5e2f09f1d84c2a6b605fe244ccf25d2ba3500dd497f950103c99816950541b10e7f0885470510531ad361b76ae882e466423d0f SHA512 fa636af8e7129129887b981bd5e5af68414ceaf32f3de8bbd754e37e29a2bc0a6c44e300000034b8e99fb0df7976ddd331d91001eb11d4b6bfb29886d3a7fa19
 AUX fluentd.confd 85 BLAKE2B 742ae368e0a8dd99f2f697c9438fc0ae4814693ee547be39b3bd8c9956fcb9acd5b6cffcf2a033e987b9a6eb7557a628f360fdd3f0053d055faeb62cad3f1d6a SHA512 9774f8fb0c9db7a501011558ac0c6222bed42501be90ac1c70ae0333cb3dd5ee5bc38417cd5ec3d1e0d8769d7f90bcc230746aed3fd30f28ea643c97d54d1f09
-AUX fluentd.initd 389 BLAKE2B 224ae3df5f6f7406a7bb7c735baf164598d1a42f5bb18d1948738492012a46e547f1ed4ffb68ca9a53a84930040f4bb50c67adb487b78a58a8257000ca3f3d7f SHA512 47704319bebb56ea28bb1331794f7838291a1ec0f841765b5b907c014cd58286d90707c55c28b219e495c56bbe39d19c82fc81969de83fe9499e81cd0ff0cbd7
+AUX fluentd.initd 420 BLAKE2B 4498ab59ed5cd542d4a760fdb324c27849680a41df9a8b696381f796a6712fe89caedfd1c038119640621093d4dcad3b67b70092101bbf36370d9824cb9ff199 SHA512 d039c1a7854b7f5f3088b8d4ff38d3357fb13eb4d00cb5e80bf1c8999637a750ffd9299957c64657ce9f62a2ef28ff8bf8f5e95fc493dd5d7934f7b8e3ed328f
 AUX fluentd.logrotate 191 BLAKE2B da3f35ab90d627f35aba5a1b5e51ec54d649c725bb50ca2e5cc66561c94bedb2eaa83e6489051dbf2c1ea209fe35f0b77be1228f1b8e46d61aa00775e65abfbd SHA512 f74c0ef04f479adb7c11074ddd803c2574fadb7ce90022f3efc28c1d44d0b77b1483c7bb217652decf22f879a69c7ba1ee7bdc78e5b153762a4f535ea5faa404
 DIST fluentd-1.1.3.gem 413184 BLAKE2B facda41a26f9fe4f55a4ae6f97336acaa818534b6ac8740badcb132a18497e8767723e931bb2506843b56208deaf41cdaf9ac81821618cb223b8035527d355d7 SHA512 0d17668c06e515219a39ddc7ecda6b5ec5d29e7d4d3799e3447034ad731568d870ac3d36d468be21b6ef7a4198353c3045872902c41a54c0c2eacad8ec12f357
 DIST fluentd-1.2.0.gem 430592 BLAKE2B 698666a5c1dfc3f90b6b1f5b9e58070b71caef859f5d41472185a6f9f1d1d2b1c3631ca0ad01fbac4b4f333484a539aedc70a90a4381fef90c5c4130ffd61b61 SHA512 928ad81381c024efa2ad1e5b0f3d3a74f4bf8e3373c8f835925e89739c6536048a8a16e6b59accf4719192118b86b2fb49b3e9536611381a8a236997fcc96651
 DIST fluentd-1.2.2.gem 431616 BLAKE2B 854f23908f10d0bbae1a48392f439ce33e1e3619eb887235b2018bc30166faec8c40d05b9fc1b4aac44befd7afea87b3547a7d458c6e471bde65616e92f41951 SHA512 2a582bfd54f290612cdfee5e3ff9e5adc894bc02639991ccfd551c90070167837288d33fecf1e4975165b6f6758d124ff0b0fed715c9276ef9def566057d9e57
 DIST fluentd-1.2.6.gem 434176 BLAKE2B 05fb0a29def48b673f458a19eb2662b0e447d949284af3a2aa28694e0cef8177c5a584d9f475ff71a548d7acdde504e8843a312ed0dc85e892b0f2dd59cdf8ef SHA512 9faeef818195d0014f9fffc29222d031a819ef8af323700b26290d5b394bec6815e86699ab89ba4e8d428321e10d3463c297d6c9046dbb46fdc061777206f8ae
+DIST fluentd-1.3.1.gem 437760 BLAKE2B 59afdadc2d67e30d35df2f33c169e9f2cbfd44ac6b7497b025fd9229921f91ac37ce8b6f80f37df26a03e5062ce2f5187156a70302ca11f9a7d9db9cfccebf9c SHA512 84351148809332c9a703243416004f18d0470cafc04cf63de7c52d9b6da18f1c6f2de0682ff1d5283f28013707fcfe24cbcf67aebc3be91090c4d5cca80ec2cc
+DIST fluentd-1.3.2.gem 438272 BLAKE2B c7a239928e251b84217cba4181e81f58dda42065c07c254ec5ed1012f8ebd98323cfbd671d5e9f940025d049c67b6dedd4f0feb9a079291e83f465e107e105d3 SHA512 8357ae88ed028778f6c7ae3dca051b32840bcf8cd344292e1fd3d203dae85e32d8263dea72d657010d803bb36d78d27a8441a8a7edf49439609041acac39f967
 EBUILD fluentd-1.1.3-r1.ebuild 1173 BLAKE2B ba1b38a72d8830ad9b2b8232274929a21d645b2a3a6f3ce1f0c6e3c793a06d7d52bc0c9b6bade0850502bd0c72ec08e1ef15356183725d5d377c6b41404acd9f SHA512 5c1f89f3394bbfbf6a9de90a7d666eb288c055a0c0c2d605207083b9a1511b774729e24a96b20644265cdac884ef40967278cfae2fbf3e2d13c8c35e7d29f099
 EBUILD fluentd-1.2.0.ebuild 1175 BLAKE2B 89bdf7cbf46df0894f653b0de9064aed66d0d8fbe566dee7087ff431b3ee86884a017ba6199c3991187c30c9074257c22b606b0d5c7c880b030dd577a4a46dff SHA512 2b12a2adc48b4189006adc5ebdd34e99d7e5ddab4e65c8991aafe040cde4e72eb112971db180f390e19f35335d44ceb1eaca34c65647b22e377114912c002e31
 EBUILD fluentd-1.2.2.ebuild 1239 BLAKE2B 2e50f7ac980ca902390e2b5bdb63e48d8b95ac3a732f6cf3dee9d2489b2f6f370500781a0a51d380973f312cb5ca9f13aa6a9722ee903c2a758c33eea9e87f65 SHA512 775d02b67182d4fa78889c14ad4c45e702da064996623998822058ebaa5fe459f5c5668237b3f4fae631d6a37060429552ff477250b0947ad2dcb37059f654f0
 EBUILD fluentd-1.2.6-r1.ebuild 1321 BLAKE2B 61dc1451550625f564ca392cfaf85e55041f9cda108ac62f60f8cf83a4d6af1d1583dd2c031e07076fa87520d9b868870faceb38854ac2aff0551c3ff2f1ecc1 SHA512 e0b1b558b84f71af90c3d05484e1ea740a71a2f8f07ac6cd971aa2389a8c396c25a9b5005095d9c402603f8e952c921ddecc34acf0a2de4997c4280d19fa6c91
-EBUILD fluentd-1.2.6.ebuild 1306 BLAKE2B ef2bb25281faed75cd3dfc9e9c1c32371adda152ea4232a700b7d4bd9fbd351e1a1afc69868f73bef884a79d35c527ba74014b71e2fc6edf462ec1b60ce48f6e SHA512 d6a39557e413c862a8162fd3f2ec814405826afc04904ecb16a78d92aeab9e4b18f7f2a68833faae3f6afe3987d50a8a46b684862c47b8f136e01ff10d7b9dba
-MISC metadata.xml 557 BLAKE2B a4f765631fe109d217f577b3de01c7fe4901e7b7ad92d38e2844720188f3316e0c6f288065aa1b4e27e53d4b1f562d65839502d755081423b55e239119beccac SHA512 214770043d1c60e385a509faa12f4b7c04bbe0137b9dd9082c49fa6adea2e1a4555e38695bdb7b14cffe6a700430202e2ab711ddcfe413c6a7986584010f133f
+EBUILD fluentd-1.3.1.ebuild 1292 BLAKE2B 96937096ac662d8c61f03cd98d7042ef4485f881512768b989f5674b632b77d94c60934a87db2b5080dad9e1b4e30c7dcae4b5a7a3cb4d457c93dcbf4ed98554 SHA512 c01132839e15fe58d6c48b6d6b9885b11fbb8d1f2ac193c377d9e107548f72e1742d7134e8ab85d3c91563c79a458563ae5696a830f1efef0175c261355e6961
+EBUILD fluentd-1.3.2.ebuild 1324 BLAKE2B b790236e46c31cbd53337cdf38ce51d8184f1bcca6fd7b5722b39afa1b6218f0e94a79a551495c6355ec18ce600ff362c4741e27427c9608bf8ef4436c162395 SHA512 bdd1ee61c01eda0f9e38ecf3467461f3afb2bba08615680aaf8e7139e94af08e87f8c17bd98499ef55f93da2a6ad2a607bfd590f6e70d21e4b4b4ebb8154b7fb
+MISC metadata.xml 665 BLAKE2B b2487570d210ca695ec87ff2643128d9b7ccd84820efc9de8c3785298c0462ec1eb93abd3a9c481264aa564ceab8371db370b2b5d78975ecbcf8d812c6652ea4 SHA512 8b2888a9b821c0629750471fb3304e399122652a36e605adf3c11b8340ceafae5467035737d9c13a55aeab3b6dda79bb623b524fbb8fa6a1bbe0c576f32b2407
diff --git a/app-admin/fluentd/files/fluentd.initd b/app-admin/fluentd/files/fluentd.initd
index b2e39d55f60e..03fb7fbff7e7 100644
--- a/app-admin/fluentd/files/fluentd.initd
+++ b/app-admin/fluentd/files/fluentd.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command=/usr/bin/fluentd
@@ -8,6 +8,7 @@ pidfile=/var/run/fluentd.pid
 command_args="--daemon ${pidfile} --no-supervisor -o ${logfile} ${fluentd_opts}"
 command_background=yes
 command_user=fluentd:fluentd
+retry="${retry:-TERM/10/KILL/30}"
 
 start_pre() {
 	fluentd -q --dry-run
diff --git a/app-admin/fluentd/fluentd-1.2.6.ebuild b/app-admin/fluentd/fluentd-1.3.1.ebuild
index ecc42f637b01..5e5149235966 100644
--- a/app-admin/fluentd/fluentd-1.2.6.ebuild
+++ b/app-admin/fluentd/fluentd-1.3.1.ebuild
@@ -40,7 +40,7 @@ all_ruby_install() {
 	keepdir /var/log/fluentd
 	fowners fluentd:adm /var/log/fluentd
 	insinto /etc/fluent
-	doins "${FILESDIR}"/fluent.conf
+	doins fluent.conf
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	insinto /etc/logrotate.d
diff --git a/app-admin/fluentd/fluentd-1.3.2.ebuild b/app-admin/fluentd/fluentd-1.3.2.ebuild
new file mode 100644
index 000000000000..03f9259d8a00
--- /dev/null
+++ b/app-admin/fluentd/fluentd-1.3.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem user
+
+DESCRIPTION="data collector and unified logging layer (project under CNCF)"
+HOMEPAGE="https://www.fluentd.org"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+ruby_add_rdepend "
+	>=dev-ruby/msgpack-0.7.0
+	>=dev-ruby/yajl-ruby-1.0
+	>=dev-ruby/coolio-1.4.5
+	>=dev-ruby/serverengine-2.0.4
+	>=dev-ruby/http_parser_rb-0.5.1
+	>=dev-ruby/sigdump-0.2.2
+	>=dev-ruby/tzinfo-1.0
+	>=dev-ruby/strptime-0.2.2"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tzinfo-data/d' \
+		-e '/dig_rb/d' \
+		"${PN}".gemspec || die "'sed failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	keepdir /var/log/fluentd
+	fowners fluentd:adm /var/log/fluentd
+	insinto /etc/fluent
+	doins fluent.conf
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "A default configuration file has been installed in"
+		elog "${EROOT}etc/fluent/fluent.conf. You will need to edit"
+		elog "this file to match your configuration."
+	fi
+}
diff --git a/app-admin/fluentd/metadata.xml b/app-admin/fluentd/metadata.xml
index 1fbe5854b306..d4977789cb11 100644
--- a/app-admin/fluentd/metadata.xml
+++ b/app-admin/fluentd/metadata.xml
@@ -5,6 +5,10 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>