gentoo resync : 02.02.2022

4 files changed, 13 insertions, 75 deletions

diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index 032d6303a24e..a233d650b1dc 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -1,9 +1,7 @@
 AUX fluent.conf 2728 BLAKE2B 1986af0d4062e7d85590e044d47ec77e3a46d9d4e8e79e42a30db05f0c5b730ebdef3f5f233bf929ec05311e644ade0fa89144323fe5ed8a8089dea8e3c5b103 SHA512 b400910c76fe2286e7887643471a55dfbad4aceb8dce07fba33d34923dcc13a609b909394bab50d509719d76a231a77441431e2d6dad75dd62b69ad05a5a804e
 AUX fluentd.confd 85 BLAKE2B 742ae368e0a8dd99f2f697c9438fc0ae4814693ee547be39b3bd8c9956fcb9acd5b6cffcf2a033e987b9a6eb7557a628f360fdd3f0053d055faeb62cad3f1d6a SHA512 9774f8fb0c9db7a501011558ac0c6222bed42501be90ac1c70ae0333cb3dd5ee5bc38417cd5ec3d1e0d8769d7f90bcc230746aed3fd30f28ea643c97d54d1f09
-AUX fluentd.initd 420 BLAKE2B 4498ab59ed5cd542d4a760fdb324c27849680a41df9a8b696381f796a6712fe89caedfd1c038119640621093d4dcad3b67b70092101bbf36370d9824cb9ff199 SHA512 d039c1a7854b7f5f3088b8d4ff38d3357fb13eb4d00cb5e80bf1c8999637a750ffd9299957c64657ce9f62a2ef28ff8bf8f5e95fc493dd5d7934f7b8e3ed328f
+AUX fluentd.initd 400 BLAKE2B 7c073341f652e393b3ffc8d1fc2bc54b72edc912dc9175263b4b1313e052016454cf5831747539222d6b06b6c28bff8056d3cd9d9d7047ae8e6f771b08e98b7b SHA512 6ca68c87adc6377b6fbfcc14329747b3b2e8c29c2edb842513122ff1f1cbaccd59e35f08aacb092acf115942a24b44d96fe524618c289d3885dbcf708be4f4ac
 AUX fluentd.logrotate 191 BLAKE2B da3f35ab90d627f35aba5a1b5e51ec54d649c725bb50ca2e5cc66561c94bedb2eaa83e6489051dbf2c1ea209fe35f0b77be1228f1b8e46d61aa00775e65abfbd SHA512 f74c0ef04f479adb7c11074ddd803c2574fadb7ce90022f3efc28c1d44d0b77b1483c7bb217652decf22f879a69c7ba1ee7bdc78e5b153762a4f535ea5faa404
-DIST fluentd-1.4.2.gem 443392 BLAKE2B 0aadec57268c69d45f4cf0e36be59e957b283f33f3dd6ac9bac0294c084b0e7d0e8fc28b1f12c3f5548dbcf6c1e562ff4a2c7f52bf7b0126fdafef102ba9562c SHA512 e67226a1e1fc6debda93b8efef9f19efb8eab7e0951a63ed646f2d01259f08d972c276aff8bf704acb64a10705460c4d68ac527cce1999707611cef79b4ae5cc
-DIST fluentd-1.9.0.gem 500224 BLAKE2B c09fc4d40e931ef2dc669cac1358c3b15baf434b7920f9481644953986dd1c3d140c4f4f8b53dd46d5972207ca7b1cb355f7fc51830b1adbb275c82ea9a7b979 SHA512 145b14b77900b2c7e4b83923d0d06465c7c5fdbfcdf39d1ab0be31a91e9003da7086b02b5fe9b4367956d892aadd65ac3ee34cafdf4f746c630a306af245b69d
-EBUILD fluentd-1.4.2.ebuild 1412 BLAKE2B d5cc7d2c2cfeb8726d6f61ee437f2017f8f4c67db49d0bd39aaa35374082b2c5336f3160838d542cbc4bcb82ef2244f1231eacafa438c1c791eb3741354bdeaf SHA512 4c8100bbda3e6c0b92c477c89d26d0f958b57a2285e8feb004d43f3f2b085befa5c845c43f96454ae9e08b5d98042b5f5dfc8a4ba0060b8c14f794dc95c960de
-EBUILD fluentd-1.9.0.ebuild 1413 BLAKE2B 0e864b68ce2be97d4db38a171c2887c2d836383176d1e89bb318852d5aa79449e74e47a85abd5724cb484f9aeb5b3d85ea92d1477bab5caecea3e53151e16730 SHA512 b99bd88db9564afccbad2c62fb167351365c40682e767a92b758227c9e65d677682da62159e704423cf080761c89823d69a373aafe375b2a68c69653b8d350c9
+DIST fluentd-1.14.4.gem 852480 BLAKE2B d358a067dbfd50164583e629133632039543560104ba5c2b71fb44e3eba0d4119e73556a64f20f60d1c4d67c9c430fa4ab9e3c37e6d0cba166de9396a9dc339b SHA512 09770d0a02e1a29cc0504cd384365fff9445ba5257950b7154f7ba939dbaefcc6b9b1441838cb89d4ddb3101f1715c271de27e1cf46aac430daf968ce145fbe0
+EBUILD fluentd-1.14.4.ebuild 1537 BLAKE2B 3c72950c5dc1913fe6a9f010e739059ac358c4f5ae9c33d479f81ad471c2ec18d83c0947e7f558d17e47a1da48a50356800e5c2db86bdbc349d97d8b45f6e149 SHA512 c28bf790116bed13afba6daf41bfd00f86421bbf4a7adf7001f9ba3771fc81c2e8f36efc7d6aa8088ced5f08ba72e4f83bb897785c2c3966725e62e7fda7e3ed
 MISC metadata.xml 558 BLAKE2B 99fdce6d7b1b9a5a624b92f8d231e9b52aad53aa227fe3f59eb2b936751e613919517a2cc86078b7e6681c5b6fb82cbaea8c74857613de05671f6519b7f56677 SHA512 6daf1af528802d95ecacb1cd579fc4515699c85c408ca63d9bede8b24a0f7a85a6de07ea3ad75a183c23caa8bd279bac69a32dcc38727c9a5850845cc59e135c
diff --git a/app-admin/fluentd/files/fluentd.initd b/app-admin/fluentd/files/fluentd.initd
index 03fb7fbff7e7..76c7c6374f86 100644
--- a/app-admin/fluentd/files/fluentd.initd
+++ b/app-admin/fluentd/files/fluentd.initd
@@ -5,7 +5,7 @@
 command=/usr/bin/fluentd
 logfile=/var/log/fluentd/fluent.log
 pidfile=/var/run/fluentd.pid
-command_args="--daemon ${pidfile} --no-supervisor -o ${logfile} ${fluentd_opts}"
+command_args="--no-supervisor -o ${logfile} ${fluentd_opts}"
 command_background=yes
 command_user=fluentd:fluentd
 retry="${retry:-TERM/10/KILL/30}"
diff --git a/app-admin/fluentd/fluentd-1.9.0.ebuild b/app-admin/fluentd/fluentd-1.14.4.ebuild
index 501d09685987..61c666cd7a7b 100644
--- a/app-admin/fluentd/fluentd-1.9.0.ebuild
+++ b/app-admin/fluentd/fluentd-1.14.4.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
+# ruby30 should be fine according to fluent docs but http_parser_rb and serverengine below doesn't.
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
-inherit ruby-fakegem user
+inherit ruby-fakegem
 
 DESCRIPTION="data collector and unified logging layer (project under CNCF)"
 HOMEPAGE="https://www.fluentd.org"
@@ -15,6 +16,11 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
+COMMON_DEPEND="acct-group/fluentd
+	acct-user/fluentd"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
 ruby_add_rdepend "
 	>=dev-ruby/coolio-1.4.5
 	>=dev-ruby/http_parser_rb-0.5.1
@@ -25,11 +31,6 @@ ruby_add_rdepend "
 	>=dev-ruby/tzinfo-1.0
 	>=dev-ruby/yajl-ruby-1.0"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
 all_ruby_prepare() {
 	sed -i \
 		-e '/tzinfo-data/d' \
diff --git a/app-admin/fluentd/fluentd-1.4.2.ebuild b/app-admin/fluentd/fluentd-1.4.2.ebuild
deleted file mode 100644
index 137927eb85ae..000000000000
--- a/app-admin/fluentd/fluentd-1.4.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-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"
-
-	# Avoid test dependency on unpackaged oj
-	rm -f test/test_event_time.rb || die
-}
-
-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
-}